From 64b25c4daa347f4fd9da37f07fb3d46b88ca622b Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Fri, 29 Apr 2022 11:58:11 +0200
Subject: [PATCH 01/15] =?UTF-8?q?:pushpin:=20N=C2=B04284=20Composer=20libs?=
 =?UTF-8?q?=20:=20fix=20twig/twig=20to=20~1.42.5=20Without=20specifying=20?=
 =?UTF-8?q?explicitly=20the=20Twig=20version,=20since=20the=20update=20of?=
 =?UTF-8?q?=20require=20php=20from=205.6=20to=207.0=20we=20are=20getting?=
 =?UTF-8?q?=20Twig=202.12.5=20!=20We=20don't=20want=20Twig=202=20as=20this?=
 =?UTF-8?q?=20version=20changes=20the=20macro=20scope=20and=20causes=20mas?=
 =?UTF-8?q?sive=20changes=20in=20our=20code...=20This=20update=20will=20be?=
 =?UTF-8?q?=20done=20later=20in=20other=20branches.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.json                                 |   3 +-
 composer.lock                                 |  26 ++--
 lib/autoload.php                              |   5 +
 lib/bin/php-parse                             | 118 +++++++++++++++++-
 lib/bin/php-parse.bat                         |   5 +
 lib/composer/ClassLoader.php                  |   2 +-
 lib/composer/InstalledVersions.php            |  15 +++
 lib/composer/autoload_classmap.php            |  13 +-
 lib/composer/autoload_files.php               |   6 +-
 lib/composer/autoload_namespaces.php          |   2 +-
 lib/composer/autoload_psr4.php                |   2 +-
 lib/composer/autoload_real.php                |  30 ++---
 lib/composer/autoload_static.php              |  15 ++-
 lib/composer/include_paths.php                |   2 +-
 lib/composer/installed.json                   |  20 +--
 lib/composer/installed.php                    |  10 +-
 lib/composer/platform_check.php               |   4 +-
 lib/twig/twig/CHANGELOG                       |   4 +
 lib/twig/twig/LICENSE                         |   4 +-
 lib/twig/twig/composer.json                   |   4 +-
 lib/twig/twig/ext/twig/php_twig.h             |   2 +-
 lib/twig/twig/src/Environment.php             |   6 +-
 lib/twig/twig/src/ExpressionParser.php        |   2 +-
 lib/twig/twig/src/Extension/CoreExtension.php |   2 +-
 lib/twig/twig/src/Parser.php                  |   4 +-
 lib/twig/twig/src/Sandbox/SecurityPolicy.php  |   4 +-
 lib/twig/twig/src/Template.php                |   6 +-
 27 files changed, 230 insertions(+), 86 deletions(-)
 mode change 120000 => 100644 lib/bin/php-parse
 create mode 100644 lib/bin/php-parse.bat

diff --git a/composer.json b/composer.json
index c94bff4a4..86f6d1e6a 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,8 @@
     "symfony/framework-bundle": "~3.4.47",
     "symfony/polyfill-php70": "1.*",
     "symfony/twig-bundle": "~3.4.47",
-    "symfony/yaml": "~3.4.47"
+    "symfony/yaml": "~3.4.47",
+    "twig/twig": "~1.42.5"
   },
   "require-dev": {
     "symfony/stopwatch": "~3.4.47",
diff --git a/composer.lock b/composer.lock
index 67b4fcea6..dc6fb38da 100644
--- a/composer.lock
+++ b/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": "9993a936d8716519fc42cc50600cd84f",
+    "content-hash": "3e305dd9061cf7b6d05ab014a27156d0",
     "packages": [
         {
             "name": "combodo/tcpdf",
@@ -2677,16 +2677,16 @@
         },
         {
             "name": "twig/twig",
-            "version": "v1.42.4",
+            "version": "v1.42.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152"
+                "reference": "87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/e587180584c3d2d6cb864a0454e777bb6dcb6152",
-                "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e",
+                "reference": "87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e",
                 "shasum": ""
             },
             "require": {
@@ -2695,8 +2695,7 @@
             },
             "require-dev": {
                 "psr/container": "^1.0",
-                "symfony/debug": "^3.4|^4.2",
-                "symfony/phpunit-bridge": "^4.4@dev|^5.0"
+                "symfony/phpunit-bridge": "^4.4|^5.0"
             },
             "type": "library",
             "extra": {
@@ -2725,7 +2724,6 @@
                 },
                 {
                     "name": "Twig Team",
-                    "homepage": "https://twig.symfony.com/contributors",
                     "role": "Contributors"
                 },
                 {
@@ -2739,7 +2737,11 @@
             "keywords": [
                 "templating"
             ],
-            "time": "2019-11-11T16:49:32+00:00"
+            "support": {
+                "issues": "https://github.com/twigphp/Twig/issues",
+                "source": "https://github.com/twigphp/Twig/tree/1.x"
+            },
+            "time": "2020-02-11T05:59:23+00:00"
         }
     ],
     "packages-dev": [
@@ -2973,7 +2975,7 @@
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=5.6.0",
+        "php": ">=7.0.8",
         "ext-ctype": "*",
         "ext-dom": "*",
         "ext-gd": "*",
@@ -2984,7 +2986,7 @@
     },
     "platform-dev": [],
     "platform-overrides": {
-        "php": "5.6.0"
+        "php": "7.0.8"
     },
-    "plugin-api-version": "2.1.0"
+    "plugin-api-version": "2.3.0"
 }
diff --git a/lib/autoload.php b/lib/autoload.php
index 79c1600b5..64168f99a 100644
--- a/lib/autoload.php
+++ b/lib/autoload.php
@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInit0018331147de7601e7552f7da8e3bb8b::getLoader();
diff --git a/lib/bin/php-parse b/lib/bin/php-parse
deleted file mode 120000
index 062d66a3e..000000000
--- a/lib/bin/php-parse
+++ /dev/null
@@ -1 +0,0 @@
-../nikic/php-parser/bin/php-parse
\ No newline at end of file
diff --git a/lib/bin/php-parse b/lib/bin/php-parse
new file mode 100644
index 000000000..80f0e486d
--- /dev/null
+++ b/lib/bin/php-parse
@@ -0,0 +1,117 @@
+#!/usr/bin/env php
+<?php
+
+/**
+ * Proxy PHP file generated by Composer
+ *
+ * This file includes the referenced bin path (../nikic/php-parser/bin/php-parse)
+ * using a stream wrapper to prevent the shebang from being output on PHP<8
+ *
+ * @generated
+ */
+
+namespace Composer;
+
+$GLOBALS['_composer_bin_dir'] = __DIR__;
+$GLOBALS['_composer_autoload_path'] = __DIR__ . '/..'.'/autoload.php';
+
+if (PHP_VERSION_ID < 80000) {
+    if (!class_exists('Composer\BinProxyWrapper')) {
+        /**
+         * @internal
+         */
+        final class BinProxyWrapper
+        {
+            private $handle;
+            private $position;
+            private $realpath;
+
+            public function stream_open($path, $mode, $options, &$opened_path)
+            {
+                // get rid of phpvfscomposer:// prefix for __FILE__ & __DIR__ resolution
+                $opened_path = substr($path, 17);
+                $this->realpath = realpath($opened_path) ?: $opened_path;
+                $opened_path = $this->realpath;
+                $this->handle = fopen($this->realpath, $mode);
+                $this->position = 0;
+
+                return (bool) $this->handle;
+            }
+
+            public function stream_read($count)
+            {
+                $data = fread($this->handle, $count);
+
+                if ($this->position === 0) {
+                    $data = preg_replace('{^#!.*\r?\n}', '', $data);
+                }
+
+                $this->position += strlen($data);
+
+                return $data;
+            }
+
+            public function stream_cast($castAs)
+            {
+                return $this->handle;
+            }
+
+            public function stream_close()
+            {
+                fclose($this->handle);
+            }
+
+            public function stream_lock($operation)
+            {
+                return $operation ? flock($this->handle, $operation) : true;
+            }
+
+            public function stream_seek($offset, $whence)
+            {
+                if (0 === fseek($this->handle, $offset, $whence)) {
+                    $this->position = ftell($this->handle);
+                    return true;
+                }
+
+                return false;
+            }
+
+            public function stream_tell()
+            {
+                return $this->position;
+            }
+
+            public function stream_eof()
+            {
+                return feof($this->handle);
+            }
+
+            public function stream_stat()
+            {
+                return array();
+            }
+
+            public function stream_set_option($option, $arg1, $arg2)
+            {
+                return true;
+            }
+
+            public function url_stat($path, $flags)
+            {
+                $path = substr($path, 17);
+                if (file_exists($path)) {
+                    return stat($path);
+                }
+
+                return false;
+            }
+        }
+    }
+
+    if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) {
+        include("phpvfscomposer://" . __DIR__ . '/..'.'/nikic/php-parser/bin/php-parse');
+        exit(0);
+    }
+}
+
+include __DIR__ . '/..'.'/nikic/php-parser/bin/php-parse';
diff --git a/lib/bin/php-parse.bat b/lib/bin/php-parse.bat
new file mode 100644
index 000000000..2c5096dc3
--- /dev/null
+++ b/lib/bin/php-parse.bat
@@ -0,0 +1,5 @@
+@ECHO OFF
+setlocal DISABLEDELAYEDEXPANSION
+SET BIN_TARGET=%~dp0/php-parse
+SET COMPOSER_RUNTIME_BIN_DIR=%~dp0
+php "%BIN_TARGET%" %*
diff --git a/lib/composer/ClassLoader.php b/lib/composer/ClassLoader.php
index 0cd6055d1..afef3fa2a 100644
--- a/lib/composer/ClassLoader.php
+++ b/lib/composer/ClassLoader.php
@@ -149,7 +149,7 @@ class ClassLoader
 
     /**
      * @return string[] Array of classname => path
-     * @psalm-var array<string, string>
+     * @psalm-return array<string, string>
      */
     public function getClassMap()
     {
diff --git a/lib/composer/InstalledVersions.php b/lib/composer/InstalledVersions.php
index 7c5502ca4..41bc143c1 100644
--- a/lib/composer/InstalledVersions.php
+++ b/lib/composer/InstalledVersions.php
@@ -21,11 +21,26 @@ use Composer\Semver\VersionParser;
  * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
  *
  * To require its presence, you can require `composer-runtime-api ^2.0`
+ *
+ * @final
  */
 class InstalledVersions
 {
+    /**
+     * @var mixed[]|null
+     * @psalm-var array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}|array{}|null
+     */
     private static $installed;
+
+    /**
+     * @var bool|null
+     */
     private static $canGetVendors;
+
+    /**
+     * @var array[]
+     * @psalm-var array<string, array{root: array{name: string, version: string, reference: string, pretty_version: string, aliases: string[], dev: bool, install_path: string, type: string}, versions: array<string, array{dev_requirement: bool, pretty_version?: string, version?: string, aliases?: string[], reference?: string, replaced?: string[], provided?: string[], install_path?: string, type?: string}>}>
+     */
     private static $installedByVendor = array();
 
     /**
diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index 753caac85..0bfee344b 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -2,7 +2,7 @@
 
 // autoload_classmap.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
@@ -854,9 +854,6 @@ return array(
     'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateNameParser' => $vendorDir . '/symfony/framework-bundle/Templating/TemplateNameParser.php',
     'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateReference' => $vendorDir . '/symfony/framework-bundle/Templating/TemplateReference.php',
     'Symfony\\Bundle\\FrameworkBundle\\Templating\\TimedPhpEngine' => $vendorDir . '/symfony/framework-bundle/Templating/TimedPhpEngine.php',
-    'Symfony\\Bundle\\FrameworkBundle\\Test\\ForwardCompatTestTrait' => $vendorDir . '/symfony/framework-bundle/Test/ForwardCompatTestTrait.php',
-    'Symfony\\Bundle\\FrameworkBundle\\Test\\KernelTestCase' => $vendorDir . '/symfony/framework-bundle/Test/KernelTestCase.php',
-    'Symfony\\Bundle\\FrameworkBundle\\Test\\WebTestCase' => $vendorDir . '/symfony/framework-bundle/Test/WebTestCase.php',
     'Symfony\\Bundle\\FrameworkBundle\\Translation\\PhpExtractor' => $vendorDir . '/symfony/framework-bundle/Translation/PhpExtractor.php',
     'Symfony\\Bundle\\FrameworkBundle\\Translation\\PhpStringTokenParser' => $vendorDir . '/symfony/framework-bundle/Translation/PhpStringTokenParser.php',
     'Symfony\\Bundle\\FrameworkBundle\\Translation\\TranslationLoader' => $vendorDir . '/symfony/framework-bundle/Translation/TranslationLoader.php',
@@ -1661,7 +1658,6 @@ return array(
     'Symfony\\Component\\VarDumper\\Dumper\\DataDumperInterface' => $vendorDir . '/symfony/var-dumper/Dumper/DataDumperInterface.php',
     'Symfony\\Component\\VarDumper\\Dumper\\HtmlDumper' => $vendorDir . '/symfony/var-dumper/Dumper/HtmlDumper.php',
     'Symfony\\Component\\VarDumper\\Exception\\ThrowingCasterException' => $vendorDir . '/symfony/var-dumper/Exception/ThrowingCasterException.php',
-    'Symfony\\Component\\VarDumper\\Test\\VarDumperTestTrait' => $vendorDir . '/symfony/var-dumper/Test/VarDumperTestTrait.php',
     'Symfony\\Component\\VarDumper\\VarDumper' => $vendorDir . '/symfony/var-dumper/VarDumper.php',
     'Symfony\\Component\\Yaml\\Command\\LintCommand' => $vendorDir . '/symfony/yaml/Command/LintCommand.php',
     'Symfony\\Component\\Yaml\\Dumper' => $vendorDir . '/symfony/yaml/Dumper.php',
@@ -1865,6 +1861,8 @@ return array(
     'Twig\\Source' => $vendorDir . '/twig/twig/src/Source.php',
     'Twig\\Template' => $vendorDir . '/twig/twig/src/Template.php',
     'Twig\\TemplateWrapper' => $vendorDir . '/twig/twig/src/TemplateWrapper.php',
+    'Twig\\Test\\IntegrationTestCase' => $vendorDir . '/twig/twig/src/Test/IntegrationTestCase.php',
+    'Twig\\Test\\NodeTestCase' => $vendorDir . '/twig/twig/src/Test/NodeTestCase.php',
     'Twig\\Token' => $vendorDir . '/twig/twig/src/Token.php',
     'Twig\\TokenParser\\AbstractTokenParser' => $vendorDir . '/twig/twig/src/TokenParser/AbstractTokenParser.php',
     'Twig\\TokenParser\\ApplyTokenParser' => $vendorDir . '/twig/twig/src/TokenParser/ApplyTokenParser.php',
@@ -2062,6 +2060,11 @@ return array(
     'Twig_Test' => $vendorDir . '/twig/twig/lib/Twig/Test.php',
     'Twig_TestCallableInterface' => $vendorDir . '/twig/twig/lib/Twig/TestCallableInterface.php',
     'Twig_TestInterface' => $vendorDir . '/twig/twig/lib/Twig/TestInterface.php',
+    'Twig_Test_Function' => $vendorDir . '/twig/twig/lib/Twig/Test/Function.php',
+    'Twig_Test_IntegrationTestCase' => $vendorDir . '/twig/twig/lib/Twig/Test/IntegrationTestCase.php',
+    'Twig_Test_Method' => $vendorDir . '/twig/twig/lib/Twig/Test/Method.php',
+    'Twig_Test_Node' => $vendorDir . '/twig/twig/lib/Twig/Test/Node.php',
+    'Twig_Test_NodeTestCase' => $vendorDir . '/twig/twig/lib/Twig/Test/NodeTestCase.php',
     'Twig_Token' => $vendorDir . '/twig/twig/lib/Twig/Token.php',
     'Twig_TokenParser' => $vendorDir . '/twig/twig/lib/Twig/TokenParser.php',
     'Twig_TokenParserBroker' => $vendorDir . '/twig/twig/lib/Twig/TokenParserBroker.php',
diff --git a/lib/composer/autoload_files.php b/lib/composer/autoload_files.php
index 65bc196d3..6706671aa 100644
--- a/lib/composer/autoload_files.php
+++ b/lib/composer/autoload_files.php
@@ -2,16 +2,16 @@
 
 // autoload_files.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
-    '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
     '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
+    '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
     '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
     '023d27dca8066ef29e6739335ea73bad' => $vendorDir . '/symfony/polyfill-php70/bootstrap.php',
-    '32dcc8afd4335739640db7d200c1971d' => $vendorDir . '/symfony/polyfill-apcu/bootstrap.php',
     'bd9634f2d41831496de0d3dfe4c94881' => $vendorDir . '/symfony/polyfill-php56/bootstrap.php',
+    '32dcc8afd4335739640db7d200c1971d' => $vendorDir . '/symfony/polyfill-apcu/bootstrap.php',
     '667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php',
     '2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
 );
diff --git a/lib/composer/autoload_namespaces.php b/lib/composer/autoload_namespaces.php
index d12922d08..e6117c750 100644
--- a/lib/composer/autoload_namespaces.php
+++ b/lib/composer/autoload_namespaces.php
@@ -2,7 +2,7 @@
 
 // autoload_namespaces.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
diff --git a/lib/composer/autoload_psr4.php b/lib/composer/autoload_psr4.php
index 20234ce5e..596febb62 100644
--- a/lib/composer/autoload_psr4.php
+++ b/lib/composer/autoload_psr4.php
@@ -2,7 +2,7 @@
 
 // autoload_psr4.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
diff --git a/lib/composer/autoload_real.php b/lib/composer/autoload_real.php
index 661cd2543..752e35fbd 100644
--- a/lib/composer/autoload_real.php
+++ b/lib/composer/autoload_real.php
@@ -25,33 +25,20 @@ class ComposerAutoloaderInit0018331147de7601e7552f7da8e3bb8b
         require __DIR__ . '/platform_check.php';
 
         spl_autoload_register(array('ComposerAutoloaderInit0018331147de7601e7552f7da8e3bb8b', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
         spl_autoload_unregister(array('ComposerAutoloaderInit0018331147de7601e7552f7da8e3bb8b', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         $includePaths[] = get_include_path();
         set_include_path(implode(PATH_SEPARATOR, $includePaths));
 
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        if ($useStaticLoader) {
-            require __DIR__ . '/autoload_static.php';
-
-            call_user_func(\Composer\Autoload\ComposerStaticInit0018331147de7601e7552f7da8e3bb8b::getInitializer($loader));
-        } else {
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
-        }
+        require __DIR__ . '/autoload_static.php';
+        call_user_func(\Composer\Autoload\ComposerStaticInit0018331147de7601e7552f7da8e3bb8b::getInitializer($loader));
 
         $loader->setClassMapAuthoritative(true);
         $loader->register(true);
 
-        if ($useStaticLoader) {
-            $includeFiles = Composer\Autoload\ComposerStaticInit0018331147de7601e7552f7da8e3bb8b::$files;
-        } else {
-            $includeFiles = require __DIR__ . '/autoload_files.php';
-        }
+        $includeFiles = \Composer\Autoload\ComposerStaticInit0018331147de7601e7552f7da8e3bb8b::$files;
         foreach ($includeFiles as $fileIdentifier => $file) {
             composerRequire0018331147de7601e7552f7da8e3bb8b($fileIdentifier, $file);
         }
@@ -60,11 +47,16 @@ class ComposerAutoloaderInit0018331147de7601e7552f7da8e3bb8b
     }
 }
 
+/**
+ * @param string $fileIdentifier
+ * @param string $file
+ * @return void
+ */
 function composerRequire0018331147de7601e7552f7da8e3bb8b($fileIdentifier, $file)
 {
     if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) {
-        require $file;
-
         $GLOBALS['__composer_autoload_files'][$fileIdentifier] = true;
+
+        require $file;
     }
 }
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index ee0ac2f41..b8bcc954b 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -7,12 +7,12 @@ namespace Composer\Autoload;
 class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
 {
     public static $files = array (
-        '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
+        '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
         '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php',
         '023d27dca8066ef29e6739335ea73bad' => __DIR__ . '/..' . '/symfony/polyfill-php70/bootstrap.php',
-        '32dcc8afd4335739640db7d200c1971d' => __DIR__ . '/..' . '/symfony/polyfill-apcu/bootstrap.php',
         'bd9634f2d41831496de0d3dfe4c94881' => __DIR__ . '/..' . '/symfony/polyfill-php56/bootstrap.php',
+        '32dcc8afd4335739640db7d200c1971d' => __DIR__ . '/..' . '/symfony/polyfill-apcu/bootstrap.php',
         '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php',
         '2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php',
     );
@@ -1084,9 +1084,6 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateNameParser' => __DIR__ . '/..' . '/symfony/framework-bundle/Templating/TemplateNameParser.php',
         'Symfony\\Bundle\\FrameworkBundle\\Templating\\TemplateReference' => __DIR__ . '/..' . '/symfony/framework-bundle/Templating/TemplateReference.php',
         'Symfony\\Bundle\\FrameworkBundle\\Templating\\TimedPhpEngine' => __DIR__ . '/..' . '/symfony/framework-bundle/Templating/TimedPhpEngine.php',
-        'Symfony\\Bundle\\FrameworkBundle\\Test\\ForwardCompatTestTrait' => __DIR__ . '/..' . '/symfony/framework-bundle/Test/ForwardCompatTestTrait.php',
-        'Symfony\\Bundle\\FrameworkBundle\\Test\\KernelTestCase' => __DIR__ . '/..' . '/symfony/framework-bundle/Test/KernelTestCase.php',
-        'Symfony\\Bundle\\FrameworkBundle\\Test\\WebTestCase' => __DIR__ . '/..' . '/symfony/framework-bundle/Test/WebTestCase.php',
         'Symfony\\Bundle\\FrameworkBundle\\Translation\\PhpExtractor' => __DIR__ . '/..' . '/symfony/framework-bundle/Translation/PhpExtractor.php',
         'Symfony\\Bundle\\FrameworkBundle\\Translation\\PhpStringTokenParser' => __DIR__ . '/..' . '/symfony/framework-bundle/Translation/PhpStringTokenParser.php',
         'Symfony\\Bundle\\FrameworkBundle\\Translation\\TranslationLoader' => __DIR__ . '/..' . '/symfony/framework-bundle/Translation/TranslationLoader.php',
@@ -1891,7 +1888,6 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'Symfony\\Component\\VarDumper\\Dumper\\DataDumperInterface' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/DataDumperInterface.php',
         'Symfony\\Component\\VarDumper\\Dumper\\HtmlDumper' => __DIR__ . '/..' . '/symfony/var-dumper/Dumper/HtmlDumper.php',
         'Symfony\\Component\\VarDumper\\Exception\\ThrowingCasterException' => __DIR__ . '/..' . '/symfony/var-dumper/Exception/ThrowingCasterException.php',
-        'Symfony\\Component\\VarDumper\\Test\\VarDumperTestTrait' => __DIR__ . '/..' . '/symfony/var-dumper/Test/VarDumperTestTrait.php',
         'Symfony\\Component\\VarDumper\\VarDumper' => __DIR__ . '/..' . '/symfony/var-dumper/VarDumper.php',
         'Symfony\\Component\\Yaml\\Command\\LintCommand' => __DIR__ . '/..' . '/symfony/yaml/Command/LintCommand.php',
         'Symfony\\Component\\Yaml\\Dumper' => __DIR__ . '/..' . '/symfony/yaml/Dumper.php',
@@ -2095,6 +2091,8 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'Twig\\Source' => __DIR__ . '/..' . '/twig/twig/src/Source.php',
         'Twig\\Template' => __DIR__ . '/..' . '/twig/twig/src/Template.php',
         'Twig\\TemplateWrapper' => __DIR__ . '/..' . '/twig/twig/src/TemplateWrapper.php',
+        'Twig\\Test\\IntegrationTestCase' => __DIR__ . '/..' . '/twig/twig/src/Test/IntegrationTestCase.php',
+        'Twig\\Test\\NodeTestCase' => __DIR__ . '/..' . '/twig/twig/src/Test/NodeTestCase.php',
         'Twig\\Token' => __DIR__ . '/..' . '/twig/twig/src/Token.php',
         'Twig\\TokenParser\\AbstractTokenParser' => __DIR__ . '/..' . '/twig/twig/src/TokenParser/AbstractTokenParser.php',
         'Twig\\TokenParser\\ApplyTokenParser' => __DIR__ . '/..' . '/twig/twig/src/TokenParser/ApplyTokenParser.php',
@@ -2292,6 +2290,11 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'Twig_Test' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test.php',
         'Twig_TestCallableInterface' => __DIR__ . '/..' . '/twig/twig/lib/Twig/TestCallableInterface.php',
         'Twig_TestInterface' => __DIR__ . '/..' . '/twig/twig/lib/Twig/TestInterface.php',
+        'Twig_Test_Function' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test/Function.php',
+        'Twig_Test_IntegrationTestCase' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test/IntegrationTestCase.php',
+        'Twig_Test_Method' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test/Method.php',
+        'Twig_Test_Node' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test/Node.php',
+        'Twig_Test_NodeTestCase' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test/NodeTestCase.php',
         'Twig_Token' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Token.php',
         'Twig_TokenParser' => __DIR__ . '/..' . '/twig/twig/lib/Twig/TokenParser.php',
         'Twig_TokenParserBroker' => __DIR__ . '/..' . '/twig/twig/lib/Twig/TokenParserBroker.php',
diff --git a/lib/composer/include_paths.php b/lib/composer/include_paths.php
index d4fb96718..af33c1491 100644
--- a/lib/composer/include_paths.php
+++ b/lib/composer/include_paths.php
@@ -2,7 +2,7 @@
 
 // include_paths.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(
diff --git a/lib/composer/installed.json b/lib/composer/installed.json
index 7dfe785e3..87a25eb41 100644
--- a/lib/composer/installed.json
+++ b/lib/composer/installed.json
@@ -3017,17 +3017,17 @@
         },
         {
             "name": "twig/twig",
-            "version": "v1.42.4",
-            "version_normalized": "1.42.4.0",
+            "version": "v1.42.5",
+            "version_normalized": "1.42.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/twigphp/Twig.git",
-                "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152"
+                "reference": "87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/e587180584c3d2d6cb864a0454e777bb6dcb6152",
-                "reference": "e587180584c3d2d6cb864a0454e777bb6dcb6152",
+                "url": "https://api.github.com/repos/twigphp/Twig/zipball/87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e",
+                "reference": "87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e",
                 "shasum": ""
             },
             "require": {
@@ -3036,10 +3036,9 @@
             },
             "require-dev": {
                 "psr/container": "^1.0",
-                "symfony/debug": "^3.4|^4.2",
-                "symfony/phpunit-bridge": "^4.4@dev|^5.0"
+                "symfony/phpunit-bridge": "^4.4|^5.0"
             },
-            "time": "2019-11-11T16:49:32+00:00",
+            "time": "2020-02-11T05:59:23+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
@@ -3068,7 +3067,6 @@
                 },
                 {
                     "name": "Twig Team",
-                    "homepage": "https://twig.symfony.com/contributors",
                     "role": "Contributors"
                 },
                 {
@@ -3082,6 +3080,10 @@
             "keywords": [
                 "templating"
             ],
+            "support": {
+                "issues": "https://github.com/twigphp/Twig/issues",
+                "source": "https://github.com/twigphp/Twig/tree/1.x"
+            },
             "install-path": "../twig/twig"
         }
     ],
diff --git a/lib/composer/installed.php b/lib/composer/installed.php
index 0e7baac98..f13e6c3fe 100644
--- a/lib/composer/installed.php
+++ b/lib/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '9ad341f73a2aa0bd50515d88e1daac99b124238f',
+        'reference' => '51fdd8ab85c2859972d4ecbb40c711f8857cf05c',
         'name' => '__root__',
         'dev' => true,
     ),
@@ -16,7 +16,7 @@
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '9ad341f73a2aa0bd50515d88e1daac99b124238f',
+            'reference' => '51fdd8ab85c2859972d4ecbb40c711f8857cf05c',
             'dev_requirement' => false,
         ),
         'combodo/tcpdf' => array(
@@ -425,12 +425,12 @@
             ),
         ),
         'twig/twig' => array(
-            'pretty_version' => 'v1.42.4',
-            'version' => '1.42.4.0',
+            'pretty_version' => 'v1.42.5',
+            'version' => '1.42.5.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../twig/twig',
             'aliases' => array(),
-            'reference' => 'e587180584c3d2d6cb864a0454e777bb6dcb6152',
+            'reference' => '87b2ea9d8f6fd014d0621ca089bb1b3769ea3f8e',
             'dev_requirement' => false,
         ),
     ),
diff --git a/lib/composer/platform_check.php b/lib/composer/platform_check.php
index 8b379f446..85ef2d984 100644
--- a/lib/composer/platform_check.php
+++ b/lib/composer/platform_check.php
@@ -4,8 +4,8 @@
 
 $issues = array();
 
-if (!(PHP_VERSION_ID >= 50600)) {
-    $issues[] = 'Your Composer dependencies require a PHP version ">= 5.6.0". You are running ' . PHP_VERSION . '.';
+if (!(PHP_VERSION_ID >= 70008)) {
+    $issues[] = 'Your Composer dependencies require a PHP version ">= 7.0.8". You are running ' . PHP_VERSION . '.';
 }
 
 if ($issues) {
diff --git a/lib/twig/twig/CHANGELOG b/lib/twig/twig/CHANGELOG
index b9833e51e..e549c9307 100644
--- a/lib/twig/twig/CHANGELOG
+++ b/lib/twig/twig/CHANGELOG
@@ -1,3 +1,7 @@
+* 1.42.5 (2020-02-11)
+
+ * Fix implementation of case-insensitivity for method names
+
 * 1.42.4 (2019-11-11)
 
  * optimized "block('foo') ?? 'bar"
diff --git a/lib/twig/twig/LICENSE b/lib/twig/twig/LICENSE
index d06ced2a3..5e8a0b8b9 100644
--- a/lib/twig/twig/LICENSE
+++ b/lib/twig/twig/LICENSE
@@ -1,6 +1,4 @@
-Copyright (c) 2009-2019 by the Twig Team.
-
-Some rights reserved.
+Copyright (c) 2009-2020 by the Twig Team.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
diff --git a/lib/twig/twig/composer.json b/lib/twig/twig/composer.json
index 9807aa771..c306353a9 100644
--- a/lib/twig/twig/composer.json
+++ b/lib/twig/twig/composer.json
@@ -14,7 +14,6 @@
         },
         {
             "name": "Twig Team",
-            "homepage": "https://twig.symfony.com/contributors",
             "role": "Contributors"
         },
         {
@@ -28,8 +27,7 @@
         "symfony/polyfill-ctype": "^1.8"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^4.4@dev|^5.0",
-        "symfony/debug": "^3.4|^4.2",
+        "symfony/phpunit-bridge": "^4.4|^5.0",
         "psr/container": "^1.0"
     },
     "autoload": {
diff --git a/lib/twig/twig/ext/twig/php_twig.h b/lib/twig/twig/ext/twig/php_twig.h
index 6cc47b689..344539aba 100644
--- a/lib/twig/twig/ext/twig/php_twig.h
+++ b/lib/twig/twig/ext/twig/php_twig.h
@@ -15,7 +15,7 @@
 #ifndef PHP_TWIG_H
 #define PHP_TWIG_H
 
-#define PHP_TWIG_VERSION "1.42.4"
+#define PHP_TWIG_VERSION "1.42.5-DEV"
 
 #include "php.h"
 
diff --git a/lib/twig/twig/src/Environment.php b/lib/twig/twig/src/Environment.php
index 1f80f3a87..97fa4c4db 100644
--- a/lib/twig/twig/src/Environment.php
+++ b/lib/twig/twig/src/Environment.php
@@ -41,11 +41,11 @@ use Twig\TokenParser\TokenParserInterface;
  */
 class Environment
 {
-    const VERSION = '1.42.4';
-    const VERSION_ID = 14204;
+    const VERSION = '1.42.5';
+    const VERSION_ID = 14205;
     const MAJOR_VERSION = 1;
     const MINOR_VERSION = 42;
-    const RELEASE_VERSION = 4;
+    const RELEASE_VERSION = 5;
     const EXTRA_VERSION = '';
 
     protected $charset;
diff --git a/lib/twig/twig/src/ExpressionParser.php b/lib/twig/twig/src/ExpressionParser.php
index 9066ade16..a3ff72530 100644
--- a/lib/twig/twig/src/ExpressionParser.php
+++ b/lib/twig/twig/src/ExpressionParser.php
@@ -657,7 +657,7 @@ class ExpressionParser
                 $stream->expect(Token::NAME_TYPE, null, 'Only variables can be assigned to');
             }
             $value = $token->getValue();
-            if (\in_array(strtolower($value), ['true', 'false', 'none', 'null'])) {
+            if (\in_array(strtr($value, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'), ['true', 'false', 'none', 'null'])) {
                 throw new SyntaxError(sprintf('You cannot assign a value to "%s".', $value), $token->getLine(), $stream->getSourceContext());
             }
             $targets[] = new AssignNameExpression($value, $token->getLine());
diff --git a/lib/twig/twig/src/Extension/CoreExtension.php b/lib/twig/twig/src/Extension/CoreExtension.php
index 5f3cc24a1..5ff1e39ee 100644
--- a/lib/twig/twig/src/Extension/CoreExtension.php
+++ b/lib/twig/twig/src/Extension/CoreExtension.php
@@ -459,7 +459,7 @@ function twig_date_modify_filter(Environment $env, $date, $modifier)
  * @param \DateTime|\DateTimeInterface|string|null $date     A date
  * @param \DateTimeZone|string|false|null          $timezone The target timezone, null to use the default, false to leave unchanged
  *
- * @return \DateTime
+ * @return \DateTimeInterface
  */
 function twig_date_converter(Environment $env, $date = null, $timezone = null)
 {
diff --git a/lib/twig/twig/src/Parser.php b/lib/twig/twig/src/Parser.php
index 0ea102cc8..9fb6a83a4 100644
--- a/lib/twig/twig/src/Parser.php
+++ b/lib/twig/twig/src/Parser.php
@@ -299,7 +299,7 @@ class Parser implements \Twig_ParserInterface
             $this->reservedMacroNames = [];
             $r = new \ReflectionClass($this->env->getBaseTemplateClass());
             foreach ($r->getMethods() as $method) {
-                $methodName = strtolower($method->getName());
+                $methodName = strtr($method->getName(), 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz');
 
                 if ('get' === substr($methodName, 0, 3) && isset($methodName[3])) {
                     $this->reservedMacroNames[] = substr($methodName, 3);
@@ -307,7 +307,7 @@ class Parser implements \Twig_ParserInterface
             }
         }
 
-        return \in_array(strtolower($name), $this->reservedMacroNames);
+        return \in_array(strtr($name, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'), $this->reservedMacroNames);
     }
 
     public function addTrait($trait)
diff --git a/lib/twig/twig/src/Sandbox/SecurityPolicy.php b/lib/twig/twig/src/Sandbox/SecurityPolicy.php
index 31b6c3483..603843591 100644
--- a/lib/twig/twig/src/Sandbox/SecurityPolicy.php
+++ b/lib/twig/twig/src/Sandbox/SecurityPolicy.php
@@ -51,7 +51,7 @@ class SecurityPolicy implements SecurityPolicyInterface
     {
         $this->allowedMethods = [];
         foreach ($methods as $class => $m) {
-            $this->allowedMethods[$class] = array_map('strtolower', \is_array($m) ? $m : [$m]);
+            $this->allowedMethods[$class] = array_map(function ($value) { return strtr($value, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz'); }, \is_array($m) ? $m : [$m]);
         }
     }
 
@@ -93,7 +93,7 @@ class SecurityPolicy implements SecurityPolicyInterface
         }
 
         $allowed = false;
-        $method = strtolower($method);
+        $method = strtr($method, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz');
         foreach ($this->allowedMethods as $class => $methods) {
             if ($obj instanceof $class) {
                 $allowed = \in_array($method, $methods);
diff --git a/lib/twig/twig/src/Template.php b/lib/twig/twig/src/Template.php
index 3f7447c12..704125e53 100644
--- a/lib/twig/twig/src/Template.php
+++ b/lib/twig/twig/src/Template.php
@@ -628,7 +628,7 @@ abstract class Template implements \Twig_TemplateInterface
 
                 foreach ($ref->getMethods(\ReflectionMethod::IS_PUBLIC) as $refMethod) {
                     // Accessing the environment from templates is forbidden to prevent untrusted changes to the environment
-                    if ('getenvironment' !== strtolower($refMethod->name)) {
+                    if ('getenvironment' !== strtr($refMethod->name, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')) {
                         $methods[] = $refMethod->name;
                     }
                 }
@@ -642,7 +642,7 @@ abstract class Template implements \Twig_TemplateInterface
 
             foreach ($methods as $method) {
                 $cache[$method] = $method;
-                $cache[$lcName = strtolower($method)] = $method;
+                $cache[$lcName = strtr($method, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')] = $method;
 
                 if ('g' === $lcName[0] && 0 === strpos($lcName, 'get')) {
                     $name = substr($method, 3);
@@ -670,7 +670,7 @@ abstract class Template implements \Twig_TemplateInterface
         $call = false;
         if (isset(self::$cache[$class][$item])) {
             $method = self::$cache[$class][$item];
-        } elseif (isset(self::$cache[$class][$lcItem = strtolower($item)])) {
+        } elseif (isset(self::$cache[$class][$lcItem = strtr($item, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', 'abcdefghijklmnopqrstuvwxyz')])) {
             $method = self::$cache[$class][$lcItem];
         } elseif (isset(self::$cache[$class]['__call'])) {
             $method = $item;

From f15ef36fd1a9bbfd5f15de43da33cdd1daf2a20d Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Fri, 29 Apr 2022 12:10:22 +0200
Subject: [PATCH 02/15] =?UTF-8?q?:heavy=5Fminus=5Fsign:=20N=C2=B04284=20Co?=
 =?UTF-8?q?mposer=20libs=20:=20remove=20symfony/polyfill-php70=20Though=20?=
 =?UTF-8?q?it=20is=20still=20downloaded=20because=20asked=20by=20symfony?=
 =?UTF-8?q?=20framework,=20but=20as=20we=20don't=20need=20it=20in=20our=20?=
 =?UTF-8?q?code=20no=20need=20to=20specify=20it=20here=20!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/composer.json b/composer.json
index 86f6d1e6a..0b574dbc6 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,6 @@
     "symfony/console": "~3.4.47",
     "symfony/dotenv": "~3.4.47",
     "symfony/framework-bundle": "~3.4.47",
-    "symfony/polyfill-php70": "1.*",
     "symfony/twig-bundle": "~3.4.47",
     "symfony/yaml": "~3.4.47",
     "twig/twig": "~1.42.5"

From f8d435d5f382dc97974cb4b4a50dd57ecbc6b507 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Fri, 29 Apr 2022 12:11:48 +0200
Subject: [PATCH 03/15] =?UTF-8?q?N=C2=B04284=20Composer=20libs=20:=20refre?=
 =?UTF-8?q?sh=20symfony?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.lock                      | 32 +++++++++++++++---------------
 lib/composer/autoload_classmap.php |  7 -------
 lib/composer/autoload_static.php   |  7 -------
 lib/composer/installed.php         |  4 ++--
 4 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/composer.lock b/composer.lock
index dc6fb38da..c4b3cf6ba 100644
--- a/composer.lock
+++ b/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": "3e305dd9061cf7b6d05ab014a27156d0",
+    "content-hash": "5141c3dfb5b8f6fdd5b262270fec9776",
     "packages": [
         {
             "name": "combodo/tcpdf",
@@ -1968,12 +1968,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2047,12 +2047,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2125,12 +2125,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php56\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php56\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -2202,12 +2202,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php70\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php70\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index 0bfee344b..0961e54e0 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -1861,8 +1861,6 @@ return array(
     'Twig\\Source' => $vendorDir . '/twig/twig/src/Source.php',
     'Twig\\Template' => $vendorDir . '/twig/twig/src/Template.php',
     'Twig\\TemplateWrapper' => $vendorDir . '/twig/twig/src/TemplateWrapper.php',
-    'Twig\\Test\\IntegrationTestCase' => $vendorDir . '/twig/twig/src/Test/IntegrationTestCase.php',
-    'Twig\\Test\\NodeTestCase' => $vendorDir . '/twig/twig/src/Test/NodeTestCase.php',
     'Twig\\Token' => $vendorDir . '/twig/twig/src/Token.php',
     'Twig\\TokenParser\\AbstractTokenParser' => $vendorDir . '/twig/twig/src/TokenParser/AbstractTokenParser.php',
     'Twig\\TokenParser\\ApplyTokenParser' => $vendorDir . '/twig/twig/src/TokenParser/ApplyTokenParser.php',
@@ -2060,11 +2058,6 @@ return array(
     'Twig_Test' => $vendorDir . '/twig/twig/lib/Twig/Test.php',
     'Twig_TestCallableInterface' => $vendorDir . '/twig/twig/lib/Twig/TestCallableInterface.php',
     'Twig_TestInterface' => $vendorDir . '/twig/twig/lib/Twig/TestInterface.php',
-    'Twig_Test_Function' => $vendorDir . '/twig/twig/lib/Twig/Test/Function.php',
-    'Twig_Test_IntegrationTestCase' => $vendorDir . '/twig/twig/lib/Twig/Test/IntegrationTestCase.php',
-    'Twig_Test_Method' => $vendorDir . '/twig/twig/lib/Twig/Test/Method.php',
-    'Twig_Test_Node' => $vendorDir . '/twig/twig/lib/Twig/Test/Node.php',
-    'Twig_Test_NodeTestCase' => $vendorDir . '/twig/twig/lib/Twig/Test/NodeTestCase.php',
     'Twig_Token' => $vendorDir . '/twig/twig/lib/Twig/Token.php',
     'Twig_TokenParser' => $vendorDir . '/twig/twig/lib/Twig/TokenParser.php',
     'Twig_TokenParserBroker' => $vendorDir . '/twig/twig/lib/Twig/TokenParserBroker.php',
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index b8bcc954b..8afe4c51d 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -2091,8 +2091,6 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'Twig\\Source' => __DIR__ . '/..' . '/twig/twig/src/Source.php',
         'Twig\\Template' => __DIR__ . '/..' . '/twig/twig/src/Template.php',
         'Twig\\TemplateWrapper' => __DIR__ . '/..' . '/twig/twig/src/TemplateWrapper.php',
-        'Twig\\Test\\IntegrationTestCase' => __DIR__ . '/..' . '/twig/twig/src/Test/IntegrationTestCase.php',
-        'Twig\\Test\\NodeTestCase' => __DIR__ . '/..' . '/twig/twig/src/Test/NodeTestCase.php',
         'Twig\\Token' => __DIR__ . '/..' . '/twig/twig/src/Token.php',
         'Twig\\TokenParser\\AbstractTokenParser' => __DIR__ . '/..' . '/twig/twig/src/TokenParser/AbstractTokenParser.php',
         'Twig\\TokenParser\\ApplyTokenParser' => __DIR__ . '/..' . '/twig/twig/src/TokenParser/ApplyTokenParser.php',
@@ -2290,11 +2288,6 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'Twig_Test' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test.php',
         'Twig_TestCallableInterface' => __DIR__ . '/..' . '/twig/twig/lib/Twig/TestCallableInterface.php',
         'Twig_TestInterface' => __DIR__ . '/..' . '/twig/twig/lib/Twig/TestInterface.php',
-        'Twig_Test_Function' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test/Function.php',
-        'Twig_Test_IntegrationTestCase' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test/IntegrationTestCase.php',
-        'Twig_Test_Method' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test/Method.php',
-        'Twig_Test_Node' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test/Node.php',
-        'Twig_Test_NodeTestCase' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Test/NodeTestCase.php',
         'Twig_Token' => __DIR__ . '/..' . '/twig/twig/lib/Twig/Token.php',
         'Twig_TokenParser' => __DIR__ . '/..' . '/twig/twig/lib/Twig/TokenParser.php',
         'Twig_TokenParserBroker' => __DIR__ . '/..' . '/twig/twig/lib/Twig/TokenParserBroker.php',
diff --git a/lib/composer/installed.php b/lib/composer/installed.php
index f13e6c3fe..4850fad9c 100644
--- a/lib/composer/installed.php
+++ b/lib/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '51fdd8ab85c2859972d4ecbb40c711f8857cf05c',
+        'reference' => '9f9560f322ed091f816fa7c0b03442a02bb82325',
         'name' => '__root__',
         'dev' => true,
     ),
@@ -16,7 +16,7 @@
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '51fdd8ab85c2859972d4ecbb40c711f8857cf05c',
+            'reference' => '9f9560f322ed091f816fa7c0b03442a02bb82325',
             'dev_requirement' => false,
         ),
         'combodo/tcpdf' => array(

From 5fe0d0b94f0dcbdf35a6794ad7ce1fa00e135ef8 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Fri, 29 Apr 2022 12:15:44 +0200
Subject: [PATCH 04/15] =?UTF-8?q?:arrow=5Fup:=20N=C2=B04284=20Composer=20l?=
 =?UTF-8?q?ibs=20:=20update=20combodo/tcpdf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.json                                 |    2 +-
 composer.lock                                 |   36 +-
 lib/combodo/tcpdf/.github/FUNDING.yml         |    1 -
 lib/combodo/tcpdf/.gitignore                  |    1 -
 lib/combodo/tcpdf/CHANGELOG.TXT               |  121 +-
 lib/combodo/tcpdf/README.md                   |    2 +-
 lib/combodo/tcpdf/VERSION                     |    2 +-
 lib/combodo/tcpdf/composer.json               |   14 +-
 .../tcpdf/include/barcodes/datamatrix.php     |  118 +-
 lib/combodo/tcpdf/include/barcodes/pdf417.php |   28 +-
 lib/combodo/tcpdf/include/barcodes/qrcode.php |  399 +--
 lib/combodo/tcpdf/include/tcpdf_colors.php    |   22 +-
 lib/combodo/tcpdf/include/tcpdf_filters.php   |   52 +-
 lib/combodo/tcpdf/include/tcpdf_fonts.php     |  176 +-
 lib/combodo/tcpdf/include/tcpdf_images.php    |   37 +-
 lib/combodo/tcpdf/include/tcpdf_static.php    |  345 +-
 lib/combodo/tcpdf/tcpdf.php                   | 3121 +++++++++--------
 lib/combodo/tcpdf/tcpdf_barcodes_1d.php       |  141 +-
 lib/combodo/tcpdf/tcpdf_barcodes_2d.php       |   46 +-
 lib/combodo/tcpdf/tcpdf_import.php            |    2 +-
 lib/combodo/tcpdf/tcpdf_parser.php            |   42 +-
 lib/composer/installed.json                   |   32 +-
 lib/composer/installed.php                    |   12 +-
 23 files changed, 2535 insertions(+), 2217 deletions(-)
 delete mode 100644 lib/combodo/tcpdf/.github/FUNDING.yml
 delete mode 100644 lib/combodo/tcpdf/.gitignore

diff --git a/composer.json b/composer.json
index 0b574dbc6..707ad5051 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
     "ext-json": "*",
     "ext-mysqli": "*",
     "ext-soap": "*",
-    "combodo/tcpdf": "6.3.5",
+    "combodo/tcpdf": "~6.4.4",
     "nikic/php-parser": "^3.1",
     "pear/archive_tar": "1.4.14",
     "pelago/emogrifier": "2.1.0",
diff --git a/composer.lock b/composer.lock
index c4b3cf6ba..f6e6277e3 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,20 +4,20 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "5141c3dfb5b8f6fdd5b262270fec9776",
+    "content-hash": "8efc1677968f1aeda2977543982242e6",
     "packages": [
         {
             "name": "combodo/tcpdf",
-            "version": "6.3.5",
+            "version": "6.4.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/combodo-itop-libs/TCPDF.git",
-                "reference": "aedd4b7b8cf7fcc24e617c405c9d3304150f4b94"
+                "reference": "0e31c013ccd000aa6762e9186778aa6e259ac8e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/combodo-itop-libs/TCPDF/zipball/aedd4b7b8cf7fcc24e617c405c9d3304150f4b94",
-                "reference": "aedd4b7b8cf7fcc24e617c405c9d3304150f4b94",
+                "url": "https://api.github.com/repos/combodo-itop-libs/TCPDF/zipball/0e31c013ccd000aa6762e9186778aa6e259ac8e8",
+                "reference": "0e31c013ccd000aa6762e9186778aa6e259ac8e8",
                 "shasum": ""
             },
             "require": {
@@ -62,9 +62,27 @@
                     "email": "contact@combodo.com"
                 }
             ],
-            "description": "TCPDF fork adding requirements for iTop: Specific fonts.",
+            "description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
             "homepage": "https://github.com/combodo-itop-libs/TCPDF",
-            "time": "2020-09-28T12:19:09+00:00"
+            "keywords": [
+                "PDFD32000-2008",
+                "TCPDF",
+                "barcodes",
+                "datamatrix",
+                "pdf",
+                "pdf417",
+                "qrcode"
+            ],
+            "support": {
+                "source": "https://github.com/combodo-itop-libs/TCPDF/tree/6.4.4"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&currency_code=GBP&business=paypal@tecnick.com&item_name=donation%20for%20tcpdf%20project",
+                    "type": "custom"
+                }
+            ],
+            "time": "2022-03-10T14:36:39+00:00"
         },
         {
             "name": "nikic/php-parser",
@@ -115,6 +133,10 @@
                 "parser",
                 "php"
             ],
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v3.1.5"
+            },
             "time": "2018-02-28T20:30:58+00:00"
         },
         {
diff --git a/lib/combodo/tcpdf/.github/FUNDING.yml b/lib/combodo/tcpdf/.github/FUNDING.yml
deleted file mode 100644
index ca5b4292e..000000000
--- a/lib/combodo/tcpdf/.github/FUNDING.yml
+++ /dev/null
@@ -1 +0,0 @@
-custom: ['https://www.paypal.com/cgi-bin/webscr?cmd=_donations&currency_code=GBP&business=paypal@tecnick.com&item_name=donation%20for%20tcpdf%20project']
diff --git a/lib/combodo/tcpdf/.gitignore b/lib/combodo/tcpdf/.gitignore
deleted file mode 100644
index 723ef36f4..000000000
--- a/lib/combodo/tcpdf/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.idea
\ No newline at end of file
diff --git a/lib/combodo/tcpdf/CHANGELOG.TXT b/lib/combodo/tcpdf/CHANGELOG.TXT
index 3bdae3e24..e90bd161a 100644
--- a/lib/combodo/tcpdf/CHANGELOG.TXT
+++ b/lib/combodo/tcpdf/CHANGELOG.TXT
@@ -1,16 +1,129 @@
-6.2.25
+6.4.4 (2021-12-31)
+	- PHP 8.1 fixes
+
+6.4.3 (2021-12-28)
+	- Fix MultiCell PHPDoc typehint (#407)
+	- Fix type hint for \TCPDF_STATIC::_freadint (#414)
+	- Footer and Header font phpdoc fixes + constructor $pdfa phpdoc fix + setHeaderData lw param fix (#402)
+	- Fix text-annotation state options (#412)
+	- Fix - Named links have been broken. This fixes. (#415)
+	- Fixed type in comment for $lw header image logo width in mm
+	- Change Set to set. Fixes #419 (#421)
+	- Fix failing tests and failing tests not marking exit code as 1 (#426)
+	- Fix phpdoc and prefer null as default value (#444)
+	- Run on PHP 8.1 normally and add nightly PHP as allowed to fail (#452)
+	- Fix AES128 encryption if the OpenSSL extension is installed (#453)
+	- Explicitly cast values to int for imagesetpixel (#460)
+	- Fix cell_height_ratio type (#405)
+	- Leave &NBSP; lowercase when using text-transform (#403)
+
+6.4.2 (2021-07-20)
+	- Fix PHP 8.1 type error with TCPDF_STATIC::pregSplit on preg_split
+	- Fix a PHP array offset error
+	- Fixed phpdoc blocks
+	- Drop a PHP 4 polyfill and add a .gitattributes file
+	- Added a test-suite
+	- Removed pointless assignments
+	- Fix docblock spelling error
+	- Update version info
+	- Fix color being filled to type 0 with PHP 8
+	- Fix warnings for undefined tags for $lineStyle
+	- Normalized composer.json
+	- Allowed transparency in PDF/A-2 and PDF/A-3
+	- Add a TCPDF composer example
+	- Fixed implicit conversion from float to int for PHP 8.1
+	- Removed status.txt from font directories, because of filesize
+	- Fixed type hints
+	- Removed "U" modifier from regexes
+
+6.4.1 (2021-03-27)
+	- Update tcpdf version (no code changes)
+
+6.4.0 (2021-03-27)
+	- allow styles on <HR> tags
+	- check if file exists before calling unlink
+	- Fix image file type for urls with query params
+	- Fix SVGPath should accept 1.19.30 (equiv 1.19,.30) compacted values list
+	- Fix Second parameter of TCPDF::cell() must be a number
+	- PHP 8.0 function signature fixes
+	- Fix vulnerability to roman numeral bombs
+	- Optimized a regular expression
+	- Cache file get contents calls
+	- Remove mb_internal encoding handling
+
+6.3.5 (2020-02-14)
+	- Fixed curly braces in pdf417
+	- Fixed a syntax error issue when accessing an index of a casted variable
+
+6.3.4 (2020-02-12)
+	- Check if imagekeys exist
+	- Unlink only images in cache
+
+6.3.3 (2020-02-12)
+	- Fixed PHP 7.4 - cannot use array offset on integers
+	- Fixed PDF/A-3B validation issue caused by missing pdfaSchema:property.
+	- Removed backup changelog files from repo
+	- Prevents the deletion of non-existent files in /tmp
+	- Prevent crash in case of no list access in cache path
+	- Check existence of file before delete it
+	- Fixed erase users pictures
+	- Fixed problem with $imagekeys undefined or unlinked
+	- Fix SVGPath elliptical arc with rx/ry=0 + z should return to initial point
+	- Fixed PHP 7.4 errors
+	- handle integers for pages
+	- Fixed background image doesn't work in RTL
+	- Fixed PDF/A validity
+	- Fixed datamatrix.php for PHP 7.4
+	- Fixed deprecated PHP features
+
+6.3.2 (2019-09-20)
+	- Update ICC profile
+
+6.3.1 (2019-09-20)
+	- Fix reported version
+	- Fix Undefined property: GLPIPDF::$imagekeys
+
+6.3.0 (2019-09-19)
+	- fix SpotColor handling in HTML
+	- Add an additional empty test to prevent error in PHP 7.2
+	- Fix the documentation how to calculate the cell height
+	- Drop duplicated array indices
+	- Fix TCPDF_STATIC::fileGetContents()
+	- Introduce other version of pdfA (2 and 3)
+	- Add UF and AFRelationship missing
+	- Fix performance issue of cloned instances
+	- Change glob to readdir which performs better
+	- URI in PDF can result in E_NOTICE
+	- Fix a warning for PHP 7.4
+	- Fixed gradient offsets for percentage-based stops.
+	- Fixed file_get_contents return value should also be checked for a non-empty string
+	- Fix Array and string offset access syntax with curly braces is deprecated
+	- Fix PHP Warning: chr() expects parameter 1 to be int
+	- Add a VERSION file
+
+6.2.26 (2018-10-16)
+	- Update sRGB.icc with the one from the Debian package icc-profiles-free
+	- Fix unsupported operand types error when codepoints arrays are merged
+
+6.2.25 (2018-09-23)
 	- Fix support for image URLs.
 
 6.2.24
 	- Support remote urls when checking if file exists.
 
-6.2.23
+6.2.23 (2018-09-22)
 	- Simplify file_exists function.
 
-6.2.22
+6.2.22 (2018-09-14)
+	- Fixes on `include/tcpdf_images.php`, `include/tcpdf_static.php` and `tcpdf.php` about file handling
+
+6.2.21 (2018-09-14)
+	- _no code changes_
+
+6.2.20 (2018-09-14)
 	- Fix for security vulnerability: Using the phar:// wrapper it was possible to trigger the unserialization of user provided data.
 
-6.2.19
+6.2.19 (2018-09-14)
 	- Merge various fixes for PHP 7.3 compatibility and security.
 
 6.2.13 (2016-06-10)
diff --git a/lib/combodo/tcpdf/README.md b/lib/combodo/tcpdf/README.md
index db0149f69..0fb94009b 100644
--- a/lib/combodo/tcpdf/README.md
+++ b/lib/combodo/tcpdf/README.md
@@ -6,7 +6,7 @@
 
 * **category**    Library
 * **author**      Nicola Asuni <info@tecnick.com>
-* **copyright**   2002-2020 Nicola Asuni - Tecnick.com LTD
+* **copyright**   2002-2021 Nicola Asuni - Tecnick.com LTD
 * **license**     http://www.gnu.org/copyleft/lesser.html GNU-LGPL v3 (see LICENSE.TXT)
 * **link**        http://www.tcpdf.org
 * **source**      https://github.com/tecnickcom/TCPDF
diff --git a/lib/combodo/tcpdf/VERSION b/lib/combodo/tcpdf/VERSION
index b98d1d3fa..49df80bfe 100644
--- a/lib/combodo/tcpdf/VERSION
+++ b/lib/combodo/tcpdf/VERSION
@@ -1 +1 @@
-6.3.5
+6.4.4
diff --git a/lib/combodo/tcpdf/composer.json b/lib/combodo/tcpdf/composer.json
index fe90ae9eb..b53dd6e7f 100644
--- a/lib/combodo/tcpdf/composer.json
+++ b/lib/combodo/tcpdf/composer.json
@@ -3,9 +3,19 @@
   "replace": {
     "tecnickcom/tcpdf": "self.version"
   },
-  "homepage": "https://github.com/combodo-itop-libs/TCPDF",
   "type": "library",
-  "description": "TCPDF fork adding requirements for iTop: Specific fonts.",
+  "description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
+  "keywords": [
+    "PDF",
+    "tcpdf",
+    "PDFD32000-2008",
+    "qrcode",
+    "datamatrix",
+    "pdf417",
+    "barcodes"
+  ],
+  "homepage": "https://github.com/combodo-itop-libs/TCPDF",
+  "version": "6.4.4",
   "license": "LGPL-3.0-only",
   "authors": [
     {
diff --git a/lib/combodo/tcpdf/include/barcodes/datamatrix.php b/lib/combodo/tcpdf/include/barcodes/datamatrix.php
index 783f99da4..38bd625f7 100644
--- a/lib/combodo/tcpdf/include/barcodes/datamatrix.php
+++ b/lib/combodo/tcpdf/include/barcodes/datamatrix.php
@@ -229,7 +229,7 @@ class Datamatrix {
 	/**
 	 * This is the class constructor.
 	 * Creates a datamatrix object
-	 * @param $code (string) Code to represent using Datamatrix.
+	 * @param string $code Code to represent using Datamatrix.
 	 * @public
 	 */
 	public function __construct($code) {
@@ -355,11 +355,11 @@ class Datamatrix {
 
 	/**
 	 * Product of two numbers in a Power-of-Two Galois Field
-	 * @param $a (int) first number to multiply.
-	 * @param $b (int) second number to multiply.
-	 * @param $log (array) Log table.
-	 * @param $alog (array) Anti-Log table.
-	 * @param $gf (array) Number of Factors of the Reed-Solomon polynomial.
+	 * @param int $a first number to multiply.
+	 * @param int $b second number to multiply.
+	 * @param array $log Log table.
+	 * @param array $alog Anti-Log table.
+	 * @param int $gf Number of Factors of the Reed-Solomon polynomial.
 	 * @return int product
 	 * @protected
 	 */
@@ -372,12 +372,12 @@ class Datamatrix {
 
 	/**
 	 * Add error correction codewords to data codewords array (ANNEX E).
-	 * @param $wd (array) Array of datacodewords.
-	 * @param $nb (int) Number of blocks.
-	 * @param $nd (int) Number of data codewords per block.
-	 * @param $nc (int) Number of correction codewords per block.
-	 * @param $gf (int) numner of fields on log/antilog table (power of 2).
-	 * @param $pp (int) The value of its prime modulus polynomial (301 for ECC200).
+	 * @param array $wd Array of datacodewords.
+	 * @param int $nb Number of blocks.
+	 * @param int $nd Number of data codewords per block.
+	 * @param int $nc Number of correction codewords per block.
+	 * @param int $gf numner of fields on log/antilog table (power of 2).
+	 * @param int $pp The value of its prime modulus polynomial (301 for ECC200).
 	 * @return array data codewords + error codewords
 	 * @protected
 	 */
@@ -438,9 +438,9 @@ class Datamatrix {
 
 	/**
 	 * Return the 253-state codeword
-	 * @param $cwpad (int) Pad codeword.
-	 * @param $cwpos (int) Number of data codewords from the beginning of encoded data.
-	 * @return pad codeword
+	 * @param int $cwpad Pad codeword.
+	 * @param int $cwpos Number of data codewords from the beginning of encoded data.
+	 * @return int pad codeword
 	 * @protected
 	 */
 	protected function get253StateCodeword($cwpad, $cwpos) {
@@ -453,9 +453,9 @@ class Datamatrix {
 
 	/**
 	 * Return the 255-state codeword
-	 * @param $cwpad (int) Pad codeword.
-	 * @param $cwpos (int) Number of data codewords from the beginning of encoded data.
-	 * @return pad codeword
+	 * @param int $cwpad Pad codeword.
+	 * @param int $cwpos Number of data codewords from the beginning of encoded data.
+	 * @return int pad codeword
 	 * @protected
 	 */
 	protected function get255StateCodeword($cwpad, $cwpos) {
@@ -468,8 +468,8 @@ class Datamatrix {
 
 	/**
 	 * Returns true if the char belongs to the selected mode
-	 * @param $chr (int) Character (byte) to check.
-	 * @param $mode (int) Current encoding mode.
+	 * @param int $chr Character (byte) to check.
+	 * @param int $mode Current encoding mode.
 	 * @return boolean true if the char is of the selected mode.
 	 * @protected
 	 */
@@ -514,9 +514,9 @@ class Datamatrix {
 
 	/**
 	 * The look-ahead test scans the data to be encoded to find the best mode (Annex P - steps from J to S).
-	 * @param $data (string) data to encode
-	 * @param $pos (int) current position
-	 * @param $mode (int) current encoding mode
+	 * @param string $data data to encode
+	 * @param int $pos current position
+	 * @param int $mode current encoding mode
 	 * @return int encoding mode
 	 * @protected
 	 */
@@ -646,8 +646,8 @@ class Datamatrix {
 
 	/**
 	 * Get the switching codeword to a new encoding mode (latch codeword)
-	 * @param $mode (int) New encoding mode.
-	 * @return (int) Switch codeword.
+	 * @param int $mode New encoding mode.
+	 * @return int Switch codeword.
 	 * @protected
 	 */
 	protected function getSwitchEncodingCodeword($mode) {
@@ -685,8 +685,8 @@ class Datamatrix {
 
 	/**
 	 * Choose the minimum matrix size and return the max number of data codewords.
-	 * @param $numcw (int) Number of current codewords.
-	 * @return number of data codewords in matrix
+	 * @param int $numcw Number of current codewords.
+	 * @return int number of data codewords in matrix
 	 * @protected
 	 */
 	protected function getMaxDataCodewords($numcw) {
@@ -700,7 +700,7 @@ class Datamatrix {
 
 	/**
 	 * Get high level encoding using the minimum symbol data characters for ECC 200
-	 * @param $data (string) data to encode
+	 * @param string $data data to encode
 	 * @return array of codewords
 	 * @protected
 	 */
@@ -970,13 +970,13 @@ class Datamatrix {
 	/**
 	 * Places "chr+bit" with appropriate wrapping within array[].
 	 * (Annex F - ECC 200 symbol character placement)
-	 * @param $marr (array) Array of symbols.
-	 * @param $nrow (int) Number of rows.
-	 * @param $ncol (int) Number of columns.
-	 * @param $row (int) Row number.
-	 * @param $col (int) Column number.
-	 * @param $chr (int) Char byte.
-	 * @param $bit (int) Bit.
+	 * @param array $marr Array of symbols.
+	 * @param int $nrow Number of rows.
+	 * @param int $ncol Number of columns.
+	 * @param int $row Row number.
+	 * @param int $col Column number.
+	 * @param int $chr Char byte.
+	 * @param int $bit Bit.
 	 * @return array
 	 * @protected
 	 */
@@ -996,12 +996,12 @@ class Datamatrix {
 	/**
 	 * Places the 8 bits of a utah-shaped symbol character.
 	 * (Annex F - ECC 200 symbol character placement)
-	 * @param $marr (array) Array of symbols.
-	 * @param $nrow (int) Number of rows.
-	 * @param $ncol (int) Number of columns.
-	 * @param $row (int) Row number.
-	 * @param $col (int) Column number.
-	 * @param $chr (int) Char byte.
+	 * @param array $marr Array of symbols.
+	 * @param int $nrow Number of rows.
+	 * @param int $ncol Number of columns.
+	 * @param int $row Row number.
+	 * @param int $col Column number.
+	 * @param int $chr Char byte.
 	 * @return array
 	 * @protected
 	 */
@@ -1020,10 +1020,10 @@ class Datamatrix {
 	/**
 	 * Places the 8 bits of the first special corner case.
 	 * (Annex F - ECC 200 symbol character placement)
-	 * @param $marr (array) Array of symbols.
-	 * @param $nrow (int) Number of rows.
-	 * @param $ncol (int) Number of columns.
-	 * @param $chr (int) Char byte.
+	 * @param array $marr Array of symbols.
+	 * @param int $nrow Number of rows.
+	 * @param int $ncol Number of columns.
+	 * @param int $chr Char byte.
 	 * @return array
 	 * @protected
 	 */
@@ -1042,10 +1042,10 @@ class Datamatrix {
 	/**
 	 * Places the 8 bits of the second special corner case.
 	 * (Annex F - ECC 200 symbol character placement)
-	 * @param $marr (array) Array of symbols.
-	 * @param $nrow (int) Number of rows.
-	 * @param $ncol (int) Number of columns.
-	 * @param $chr (int) Char byte.
+	 * @param array $marr Array of symbols.
+	 * @param int $nrow Number of rows.
+	 * @param int $ncol Number of columns.
+	 * @param int $chr Char byte.
 	 * @return array
 	 * @protected
 	 */
@@ -1064,10 +1064,10 @@ class Datamatrix {
 	/**
 	 * Places the 8 bits of the third special corner case.
 	 * (Annex F - ECC 200 symbol character placement)
-	 * @param $marr (array) Array of symbols.
-	 * @param $nrow (int) Number of rows.
-	 * @param $ncol (int) Number of columns.
-	 * @param $chr (int) Char byte.
+	 * @param array $marr Array of symbols.
+	 * @param int $nrow Number of rows.
+	 * @param int $ncol Number of columns.
+	 * @param int $chr Char byte.
 	 * @return array
 	 * @protected
 	 */
@@ -1086,10 +1086,10 @@ class Datamatrix {
 	/**
 	 * Places the 8 bits of the fourth special corner case.
 	 * (Annex F - ECC 200 symbol character placement)
-	 * @param $marr (array) Array of symbols.
-	 * @param $nrow (int) Number of rows.
-	 * @param $ncol (int) Number of columns.
-	 * @param $chr (int) Char byte.
+	 * @param array $marr Array of symbols.
+	 * @param int $nrow Number of rows.
+	 * @param int $ncol Number of columns.
+	 * @param int $chr Char byte.
 	 * @return array
 	 * @protected
 	 */
@@ -1108,8 +1108,8 @@ class Datamatrix {
 	/**
 	 * Build a placement map.
 	 * (Annex F - ECC 200 symbol character placement)
-	 * @param $nrow (int) Number of rows.
-	 * @param $ncol (int) Number of columns.
+	 * @param int $nrow Number of rows.
+	 * @param int $ncol Number of columns.
 	 * @return array
 	 * @protected
 	 */
diff --git a/lib/combodo/tcpdf/include/barcodes/pdf417.php b/lib/combodo/tcpdf/include/barcodes/pdf417.php
index 9a58a21f6..742802e1f 100644
--- a/lib/combodo/tcpdf/include/barcodes/pdf417.php
+++ b/lib/combodo/tcpdf/include/barcodes/pdf417.php
@@ -523,10 +523,10 @@ class PDF417 {
 	/**
 	 * This is the class constructor.
 	 * Creates a PDF417 object
-	 * @param $code (string) code to represent using PDF417
-	 * @param $ecl (int) error correction level (0-8); default -1 = automatic correction level
-	 * @param $aspectratio (float) the width to height of the symbol (excluding quiet zones)
-	 * @param $macro (array) information for macro block
+	 * @param string $code code to represent using PDF417
+	 * @param int $ecl error correction level (0-8); default -1 = automatic correction level
+	 * @param float $aspectratio the width to height of the symbol (excluding quiet zones)
+	 * @param array $macro information for macro block
 	 * @public
 	 */
 	public function __construct($code, $ecl=-1, $aspectratio=2, $macro=array()) {
@@ -734,12 +734,13 @@ class PDF417 {
 
 	/**
 	 * Returns the error correction level (0-8) to be used
-	 * @param $ecl (int) error correction level
-	 * @param $numcw (int) number of data codewords
+	 * @param int $ecl error correction level
+	 * @param int $numcw number of data codewords
 	 * @return int error correction level
 	 * @protected
 	 */
 	protected function getErrorCorrectionLevel($ecl, $numcw) {
+		$maxecl = 8; // starting error level
 		// check for automatic levels
 		if (($ecl < 0) OR ($ecl > 8)) {
 			if ($numcw < 41) {
@@ -755,7 +756,6 @@ class PDF417 {
 			}
 		}
 		// get maximum correction level
-		$maxecl = 8; // starting error level
 		$maxerrsize = (928 - $numcw); // available codewords for error
 		while ($maxecl > 0) {
 			$errsize = (2 << $ecl);
@@ -772,8 +772,8 @@ class PDF417 {
 
 	/**
 	 * Returns the error correction codewords
-	 * @param $cw (array) array of codewords including Symbol Length Descriptor and pad
-	 * @param $ecl (int) error correction level 0-8
+	 * @param array $cw array of codewords including Symbol Length Descriptor and pad
+	 * @param int $ecl error correction level 0-8
 	 * @return array of error correction codewords
 	 * @protected
 	 */
@@ -809,8 +809,8 @@ class PDF417 {
 
 	/**
 	 * Create array of sequences from input
-	 * @param $code (string) code
-	 * @return bidimensional array containing characters and classification
+	 * @param string $code code
+	 * @return array bi-dimensional array containing characters and classification
 	 * @protected
 	 */
 	protected function getInputSequences($code) {
@@ -864,9 +864,9 @@ class PDF417 {
 
 	/**
 	 * Compact data by mode.
-	 * @param $mode (int) compaction mode number
-	 * @param $code (string) data to compact
-	 * @param $addmode (boolean) if true add the mode codeword at first position
+	 * @param int $mode compaction mode number
+	 * @param string $code data to compact
+	 * @param boolean $addmode if true add the mode codeword at first position
 	 * @return array of codewords
 	 * @protected
 	 */
diff --git a/lib/combodo/tcpdf/include/barcodes/qrcode.php b/lib/combodo/tcpdf/include/barcodes/qrcode.php
index 7ef2759fd..2e7f2f576 100644
--- a/lib/combodo/tcpdf/include/barcodes/qrcode.php
+++ b/lib/combodo/tcpdf/include/barcodes/qrcode.php
@@ -247,32 +247,6 @@ if (!defined('QRCODEDEFS')) {
 
 } // end of definitions
 
-// #*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#*#
-
-// for compatibility with PHP4
-if (!function_exists('str_split')) {
-	/**
-	 * Convert a string to an array (needed for PHP4 compatibility)
-	 * @param $string (string) The input string.
-	 * @param $split_length (int) Maximum length of the chunk.
-	 * @return  If the optional split_length  parameter is specified, the returned array will be broken down into chunks with each being split_length  in length, otherwise each chunk will be one character in length. FALSE is returned if split_length is less than 1. If the split_length length exceeds the length of string , the entire string is returned as the first (and only) array element.
-	 */
-	function str_split($string, $split_length=1) {
-		if ((strlen($string) > $split_length) OR (!$split_length)) {
-			do {
-				$c = strlen($string);
-				$parts[] = substr($string, 0, $split_length);
-				$string = substr($string, $split_length);
-			} while ($string !== false);
-		} else {
-			$parts = array($string);
-		}
-		return $parts;
-	}
-}
-
-// #####################################################
-
 /**
  * @class QRcode
  * Class to create QR-code arrays for TCPDF class.
@@ -631,8 +605,8 @@ class QRcode {
 	/**
 	 * This is the class constructor.
 	 * Creates a QRcode object
-	 * @param $code (string) code to represent using QRcode
-	 * @param $eclevel (string) error level: <ul><li>L : About 7% or less errors can be corrected.</li><li>M : About 15% or less errors can be corrected.</li><li>Q : About 25% or less errors can be corrected.</li><li>H : About 30% or less errors can be corrected.</li></ul>
+	 * @param string $code code to represent using QRcode
+	 * @param string $eclevel error level: <ul><li>L : About 7% or less errors can be corrected.</li><li>M : About 15% or less errors can be corrected.</li><li>Q : About 25% or less errors can be corrected.</li><li>H : About 30% or less errors can be corrected.</li></ul>
 	 * @public
 	 * @since 1.0.000
 	 */
@@ -683,7 +657,7 @@ class QRcode {
 
 	/**
 	 * Convert the frame in binary form
-	 * @param $frame (array) array to binarize
+	 * @param array $frame array to binarize
 	 * @return array frame in binary form
 	 */
 	protected function binarize($frame) {
@@ -699,7 +673,7 @@ class QRcode {
 
 	/**
 	 * Encode the input string to QR code
-	 * @param $string (string) input string to encode
+	 * @param string $string input string to encode
 	 */
 	protected function encodeString($string) {
 		$this->dataStr = $string;
@@ -715,7 +689,7 @@ class QRcode {
 
 	/**
 	 * Encode mask
-	 * @param $mask (int) masking mode
+	 * @param int $mask masking mode
 	 */
 	protected function encodeMask($mask) {
 		$spec = array(0, 0, 0, 0, 0);
@@ -780,8 +754,8 @@ class QRcode {
 
 	/**
 	 * Set frame value at specified position
-	 * @param $at (array) x,y position
-	 * @param $val (int) value of the character to set
+	 * @param array $at x,y position
+	 * @param int $val value of the character to set
 	 */
 	protected function setFrameAt($at, $val) {
 		$this->frame[$at['y']][$at['x']] = chr($val);
@@ -789,7 +763,7 @@ class QRcode {
 
 	/**
 	 * Get frame value at specified position
-	 * @param $at (array) x,y position
+	 * @param array $at x,y position
 	 * @return value at specified position
 	 */
 	protected function getFrameAt($at) {
@@ -853,8 +827,8 @@ class QRcode {
 
 	/**
 	 * Initialize code.
-	 * @param $spec (array) array of ECC specification
-	 * @return 0 in case of success, -1 in case of error
+	 * @param array $spec array of ECC specification
+	 * @return int 0 in case of success, -1 in case of error
 	 */
 	protected function init($spec) {
 		$dl = $this->rsDataCodes1($spec);
@@ -932,10 +906,10 @@ class QRcode {
 
 	/**
 	 * Write Format Information on frame and returns the number of black bits
-	 * @param $width (int) frame width
-	 * @param $frame (array) frame
-	 * @param $mask (array) masking mode
-	 * @param $level (int) error correction level
+	 * @param int $width frame width
+	 * @param array $frame frame
+	 * @param array $mask masking mode
+	 * @param int $level error correction level
 	 * @return int blacks
 	 */
 	 protected function writeFormatInformation($width, &$frame, $mask, $level) {
@@ -976,8 +950,8 @@ class QRcode {
 
 	/**
 	 * mask0
-	 * @param $x (int) X position
-	 * @param $y (int) Y position
+	 * @param int $x X position
+	 * @param int $y Y position
 	 * @return int mask
 	 */
 	 protected function mask0($x, $y) {
@@ -986,8 +960,8 @@ class QRcode {
 
 	/**
 	 * mask1
-	 * @param $x (int) X position
-	 * @param $y (int) Y position
+	 * @param int $x X position
+	 * @param int $y Y position
 	 * @return int mask
 	 */
 	 protected function mask1($x, $y) {
@@ -996,8 +970,8 @@ class QRcode {
 
 	/**
 	 * mask2
-	 * @param $x (int) X position
-	 * @param $y (int) Y position
+	 * @param int $x X position
+	 * @param int $y Y position
 	 * @return int mask
 	 */
 	 protected function mask2($x, $y) {
@@ -1006,8 +980,8 @@ class QRcode {
 
 	/**
 	 * mask3
-	 * @param $x (int) X position
-	 * @param $y (int) Y position
+	 * @param int $x X position
+	 * @param int $y Y position
 	 * @return int mask
 	 */
 	 protected function mask3($x, $y) {
@@ -1016,8 +990,8 @@ class QRcode {
 
 	/**
 	 * mask4
-	 * @param $x (int) X position
-	 * @param $y (int) Y position
+	 * @param int $x X position
+	 * @param int $y Y position
 	 * @return int mask
 	 */
 	 protected function mask4($x, $y) {
@@ -1026,8 +1000,8 @@ class QRcode {
 
 	/**
 	 * mask5
-	 * @param $x (int) X position
-	 * @param $y (int) Y position
+	 * @param int $x X position
+	 * @param int $y Y position
 	 * @return int mask
 	 */
 	 protected function mask5($x, $y) {
@@ -1036,8 +1010,8 @@ class QRcode {
 
 	/**
 	 * mask6
-	 * @param $x (int) X position
-	 * @param $y (int) Y position
+	 * @param int $x X position
+	 * @param int $y Y position
 	 * @return int mask
 	 */
 	 protected function mask6($x, $y) {
@@ -1046,8 +1020,8 @@ class QRcode {
 
 	/**
 	 * mask7
-	 * @param $x (int) X position
-	 * @param $y (int) Y position
+	 * @param int $x X position
+	 * @param int $y Y position
 	 * @return int mask
 	 */
 	 protected function mask7($x, $y) {
@@ -1056,9 +1030,9 @@ class QRcode {
 
 	/**
 	 * Return bitmask
-	 * @param $maskNo (int) mask number
-	 * @param $width (int) width
-	 * @param $frame (array) frame
+	 * @param int $maskNo mask number
+	 * @param int $width width
+	 * @param array $frame frame
 	 * @return array bitmask
 	 */
 	protected function generateMaskNo($maskNo, $width, $frame) {
@@ -1078,11 +1052,11 @@ class QRcode {
 
 	/**
 	 * makeMaskNo
-	 * @param $maskNo (int)
-	 * @param $width (int)
-	 * @param $s (int)
-	 * @param $d (int)
-	 * @param $maskGenOnly (boolean)
+	 * @param int $maskNo
+	 * @param int $width
+	 * @param int $s
+	 * @param int $d
+	 * @param boolean $maskGenOnly
 	 * @return int b
 	 */
 	 protected function makeMaskNo($maskNo, $width, $s, &$d, $maskGenOnly=false) {
@@ -1106,10 +1080,10 @@ class QRcode {
 
 	/**
 	 * makeMask
-	 * @param $width (int)
-	 * @param $frame (array)
-	 * @param $maskNo (int)
-	 * @param $level (int)
+	 * @param int $width
+	 * @param array $frame
+	 * @param int $maskNo
+	 * @param int $level
 	 * @return array mask
 	 */
 	 protected function makeMask($width, $frame, $maskNo, $level) {
@@ -1121,7 +1095,7 @@ class QRcode {
 
 	/**
 	 * calcN1N3
-	 * @param $length (int)
+	 * @param int $length
 	 * @return int demerit
 	 */
 	 protected function calcN1N3($length) {
@@ -1151,8 +1125,8 @@ class QRcode {
 
 	/**
 	 * evaluateSymbol
-	 * @param $width (int)
-	 * @param $frame (array)
+	 * @param int $width
+	 * @param array $frame
 	 * @return int demerit
 	 */
 	 protected function evaluateSymbol($width, $frame) {
@@ -1212,9 +1186,9 @@ class QRcode {
 
 	/**
 	 * mask
-	 * @param $width (int)
-	 * @param $frame (array)
-	 * @param $level (int)
+	 * @param int $width
+	 * @param array $frame
+	 * @param int $level
 	 * @return array best mask
 	 */
 	 protected function mask($width, $frame, $level) {
@@ -1255,8 +1229,8 @@ class QRcode {
 
 	/**
 	 * Return true if the character at specified position is a number
-	 * @param $str (string) string
-	 * @param $pos (int) characted position
+	 * @param string $str string
+	 * @param int $pos characted position
 	 * @return boolean true of false
 	 */
 	 protected function isdigitat($str, $pos) {
@@ -1268,8 +1242,8 @@ class QRcode {
 
 	/**
 	 * Return true if the character at specified position is an alphanumeric character
-	 * @param $str (string) string
-	 * @param $pos (int) characted position
+	 * @param string $str string
+	 * @param int $pos characted position
 	 * @return boolean true of false
 	 */
 	 protected function isalnumat($str, $pos) {
@@ -1281,7 +1255,7 @@ class QRcode {
 
 	/**
 	 * identifyMode
-	 * @param $pos (int)
+	 * @param int $pos
 	 * @return int mode
 	 */
 	 protected function identifyMode($pos) {
@@ -1386,6 +1360,7 @@ class QRcode {
 			$p += 2;
 		}
 		$this->items = $this->appendNewInputItem($this->items, QR_MODE_KJ, $p, str_split($this->dataStr));
+		$run = $p;
 		return $run;
 	}
 
@@ -1440,7 +1415,7 @@ class QRcode {
 
 	/**
 	 * splitString
-	 * @return (int)
+	 * @return int
 	 */
 	 protected function splitString() {
 		while (strlen($this->dataStr) > 0) {
@@ -1455,7 +1430,7 @@ class QRcode {
 					break;
 				}
 				case QR_MODE_KJ: {
-					if ($hint == QR_MODE_KJ) {
+					if ($this->hint == QR_MODE_KJ) {
 						$length = $this->eatKanji();
 					} else {
 						$length = $this->eat8();
@@ -1504,10 +1479,10 @@ class QRcode {
 
 	/**
 	 * newInputItem
-	 * @param $mode (int)
-	 * @param $size (int)
-	 * @param $data (array)
-	 * @param $bstream (array)
+	 * @param int $mode
+	 * @param int $size
+	 * @param array $data
+	 * @param array $bstream
 	 * @return array input item
 	 */
 	 protected function newInputItem($mode, $size, $data, $bstream=null) {
@@ -1528,8 +1503,8 @@ class QRcode {
 
 	/**
 	 * encodeModeNum
-	 * @param $inputitem (array)
-	 * @param $version (int)
+	 * @param array $inputitem
+	 * @param int $version
 	 * @return array input item
 	 */
 	 protected function encodeModeNum($inputitem, $version) {
@@ -1557,8 +1532,8 @@ class QRcode {
 
 	/**
 	 * encodeModeAn
-	 * @param $inputitem (array)
-	 * @param $version (int)
+	 * @param array $inputitem
+	 * @param int $version
 	 * @return array input item
 	 */
 	 protected function encodeModeAn($inputitem, $version) {
@@ -1580,8 +1555,8 @@ class QRcode {
 
 	/**
 	 * encodeMode8
-	 * @param $inputitem (array)
-	 * @param $version (int)
+	 * @param array $inputitem
+	 * @param int $version
 	 * @return array input item
 	 */
 	 protected function encodeMode8($inputitem, $version) {
@@ -1596,8 +1571,8 @@ class QRcode {
 
 	/**
 	 * encodeModeKanji
-	 * @param $inputitem (array)
-	 * @param $version (int)
+	 * @param array $inputitem
+	 * @param int $version
 	 * @return array input item
 	 */
 	 protected function encodeModeKanji($inputitem, $version) {
@@ -1620,7 +1595,7 @@ class QRcode {
 
 	/**
 	 * encodeModeStructure
-	 * @param $inputitem (array)
+	 * @param array $inputitem
 	 * @return array input item
 	 */
 	 protected function encodeModeStructure($inputitem) {
@@ -1634,8 +1609,8 @@ class QRcode {
 
 	/**
 	 * encodeBitStream
-	 * @param $inputitem (array)
-	 * @param $version (int)
+	 * @param array $inputitem
+	 * @param int $version
 	 * @return array input item
 	 */
 	 protected function encodeBitStream($inputitem, $version) {
@@ -1686,11 +1661,11 @@ class QRcode {
 	/**
 	 * Append data to an input object.
 	 * The data is copied and appended to the input object.
-	 * @param $items (arrray) input items
-	 * @param $mode (int) encoding mode.
-	 * @param $size (int) size of data (byte).
-	 * @param $data (array) array of input data.
-	 * @return items
+	 * @param array $items input items
+	 * @param int $mode encoding mode.
+	 * @param int $size size of data (byte).
+	 * @param array $data array of input data.
+	 * @return array items
 	 *
 	 */
 	protected function appendNewInputItem($items, $mode, $size, $data) {
@@ -1703,10 +1678,10 @@ class QRcode {
 
 	/**
 	 * insertStructuredAppendHeader
-	 * @param $items (array)
-	 * @param $size (int)
-	 * @param $index (int)
-	 * @param $parity (int)
+	 * @param array $items
+	 * @param int $size
+	 * @param int $index
+	 * @param int $parity
 	 * @return array items
 	 */
 	 protected function insertStructuredAppendHeader($items, $size, $index, $parity) {
@@ -1724,7 +1699,7 @@ class QRcode {
 
 	/**
 	 * calcParity
-	 * @param $items (array)
+	 * @param array $items
 	 * @return int parity
 	 */
 	 protected function calcParity($items) {
@@ -1741,8 +1716,8 @@ class QRcode {
 
 	/**
 	 * checkModeNum
-	 * @param $size (int)
-	 * @param $data (array)
+	 * @param int $size
+	 * @param array $data
 	 * @return boolean true or false
 	 */
 	 protected function checkModeNum($size, $data) {
@@ -1755,9 +1730,9 @@ class QRcode {
 	}
 
 	/**
-	 * Look up the alphabet-numeric convesion table (see JIS X0510:2004, pp.19).
-	 * @param $c (int) character value
-	 * @return value
+	 * Look up the alphabet-numeric conversion table (see JIS X0510:2004, pp.19).
+	 * @param int $c character value
+	 * @return int value
 	 */
 	protected function lookAnTable($c) {
 		return (($c > 127)?-1:$this->anTable[$c]);
@@ -1765,8 +1740,8 @@ class QRcode {
 
 	/**
 	 * checkModeAn
-	 * @param $size (int)
-	 * @param $data (array)
+	 * @param int $size
+	 * @param array $data
 	 * @return boolean true or false
 	 */
 	 protected function checkModeAn($size, $data) {
@@ -1780,7 +1755,7 @@ class QRcode {
 
 	/**
 	 * estimateBitsModeNum
-	 * @param $size (int)
+	 * @param int $size
 	 * @return int number of bits
 	 */
 	 protected function estimateBitsModeNum($size) {
@@ -1801,7 +1776,7 @@ class QRcode {
 
 	/**
 	 * estimateBitsModeAn
-	 * @param $size (int)
+	 * @param int $size
 	 * @return int number of bits
 	 */
 	 protected function estimateBitsModeAn($size) {
@@ -1814,7 +1789,7 @@ class QRcode {
 
 	/**
 	 * estimateBitsMode8
-	 * @param $size (int)
+	 * @param int $size
 	 * @return int number of bits
 	 */
 	 protected function estimateBitsMode8($size) {
@@ -1823,7 +1798,7 @@ class QRcode {
 
 	/**
 	 * estimateBitsModeKanji
-	 * @param $size (int)
+	 * @param int $size
 	 * @return int number of bits
 	 */
 	 protected function estimateBitsModeKanji($size) {
@@ -1832,8 +1807,8 @@ class QRcode {
 
 	/**
 	 * checkModeKanji
-	 * @param $size (int)
-	 * @param $data (array)
+	 * @param int $size
+	 * @param array $data
 	 * @return boolean true or false
 	 */
 	 protected function checkModeKanji($size, $data) {
@@ -1851,9 +1826,9 @@ class QRcode {
 
 	/**
 	 * Validate the input data.
-	 * @param $mode (int) encoding mode.
-	 * @param $size (int) size of data (byte).
-	 * @param $data (array) data to validate
+	 * @param int $mode encoding mode.
+	 * @param int $size size of data (byte).
+	 * @param array $data data to validate
 	 * @return boolean true in case of valid data, false otherwise
 	 */
 	protected function check($mode, $size, $data) {
@@ -1885,8 +1860,8 @@ class QRcode {
 
 	/**
 	 * estimateBitStreamSize
-	 * @param $items (array)
-	 * @param $version (int)
+	 * @param array $items
+	 * @param int $version
 	 * @return int bits
 	 */
 	 protected function estimateBitStreamSize($items, $version) {
@@ -1929,7 +1904,7 @@ class QRcode {
 
 	/**
 	 * estimateVersion
-	 * @param $items (array)
+	 * @param array $items
 	 * @return int version
 	 */
 	 protected function estimateVersion($items) {
@@ -1948,9 +1923,9 @@ class QRcode {
 
 	/**
 	 * lengthOfCode
-	 * @param $mode (int)
-	 * @param $version (int)
-	 * @param $bits (int)
+	 * @param int $mode
+	 * @param int $version
+	 * @param int $bits
 	 * @return int size
 	 */
 	 protected function lengthOfCode($mode, $version, $bits) {
@@ -2005,7 +1980,7 @@ class QRcode {
 
 	/**
 	 * createBitStream
-	 * @param $items (array)
+	 * @param array $items
 	 * @return array of items and total bits
 	 */
 	 protected function createBitStream($items) {
@@ -2020,7 +1995,7 @@ class QRcode {
 
 	/**
 	 * convertData
-	 * @param $items (array)
+	 * @param array $items
 	 * @return array items
 	 */
 	 protected function convertData($items) {
@@ -2049,7 +2024,7 @@ class QRcode {
 
 	/**
 	 * Append Padding Bit to bitstream
-	 * @param $bstream (array)
+	 * @param array $bstream
 	 * @return array bitstream
 	 */
 	 protected function appendPaddingBit($bstream) {
@@ -2082,7 +2057,7 @@ class QRcode {
 
 	/**
 	 * mergeBitStream
-	 * @param $items (array) items
+	 * @param array $items items
 	 * @return array bitstream
 	 */
 	 protected function mergeBitStream($items) {
@@ -2099,7 +2074,7 @@ class QRcode {
 
 	/**
 	 * Returns a stream of bits.
-	 * @param $items (int)
+	 * @param int $items
 	 * @return array padded merged byte stream
 	 */
 	protected function getBitStream($items) {
@@ -2109,7 +2084,7 @@ class QRcode {
 
 	/**
 	 * Pack all bit streams padding bits into a byte array.
-	 * @param $items (int)
+	 * @param int $items
 	 * @return array padded merged byte stream
 	 */
 	protected function getByteStream($items) {
@@ -2123,7 +2098,7 @@ class QRcode {
 
 	/**
 	 * Return an array with zeros
-	 * @param $setLength (int) array size
+	 * @param int $setLength array size
 	 * @return array
 	 */
 	 protected function allocate($setLength) {
@@ -2132,8 +2107,8 @@ class QRcode {
 
 	/**
 	 * Return new bitstream from number
-	 * @param $bits (int) number of bits
-	 * @param $num (int) number
+	 * @param int $bits number of bits
+	 * @param int $num number
 	 * @return array bitstream
 	 */
 	 protected function newFromNum($bits, $num) {
@@ -2152,8 +2127,8 @@ class QRcode {
 
 	/**
 	 * Return new bitstream from bytes
-	 * @param $size (int) size
-	 * @param $data (array) bytes
+	 * @param int $size size
+	 * @param array $data bytes
 	 * @return array bitstream
 	 */
 	 protected function newFromBytes($size, $data) {
@@ -2176,8 +2151,8 @@ class QRcode {
 
 	/**
 	 * Append one bitstream to another
-	 * @param $bitstream (array) original bitstream
-	 * @param $append (array) bitstream to append
+	 * @param array $bitstream original bitstream
+	 * @param array $append bitstream to append
 	 * @return array bitstream
 	 */
 	 protected function appendBitstream($bitstream, $append) {
@@ -2192,9 +2167,9 @@ class QRcode {
 
 	/**
 	 * Append one bitstream created from number to another
-	 * @param $bitstream (array) original bitstream
-	 * @param $bits (int) number of bits
-	 * @param $num (int) number
+	 * @param array $bitstream original bitstream
+	 * @param int $bits number of bits
+	 * @param int $num number
 	 * @return array bitstream
 	 */
 	 protected function appendNum($bitstream, $bits, $num) {
@@ -2207,9 +2182,9 @@ class QRcode {
 
 	/**
 	 * Append one bitstream created from bytes to another
-	 * @param $bitstream (array) original bitstream
-	 * @param $size (int) size
-	 * @param $data (array) bytes
+	 * @param array $bitstream original bitstream
+	 * @param int $size size
+	 * @param array $data bytes
 	 * @return array bitstream
 	 */
 	 protected function appendBytes($bitstream, $size, $data) {
@@ -2222,7 +2197,7 @@ class QRcode {
 
 	/**
 	 * Convert bitstream to bytes
-	 * @param $bstream (array) original bitstream
+	 * @param array $bstream original bitstream
 	 * @return array of bytes
 	 */
 	 protected function bitstreamToByte($bstream) {
@@ -2263,11 +2238,11 @@ class QRcode {
 
 	/**
 	 * Replace a value on the array at the specified position
-	 * @param $srctab (array)
-	 * @param $x (int) X position
-	 * @param $y (int) Y position
-	 * @param $repl (string) value to replace
-	 * @param $replLen (int) length of the repl string
+	 * @param array $srctab
+	 * @param int $x X position
+	 * @param int $y Y position
+	 * @param string $repl value to replace
+	 * @param int $replLen length of the repl string
 	 * @return array srctab
 	 */
 	 protected function qrstrset($srctab, $x, $y, $repl, $replLen=false) {
@@ -2277,8 +2252,8 @@ class QRcode {
 
 	/**
 	 * Return maximum data code length (bytes) for the version.
-	 * @param $version (int) version
-	 * @param $level (int) error correction level
+	 * @param int $version version
+	 * @param int $level error correction level
 	 * @return int maximum size (bytes)
 	 */
 	protected function getDataLength($version, $level) {
@@ -2287,8 +2262,8 @@ class QRcode {
 
 	/**
 	 * Return maximum error correction code length (bytes) for the version.
-	 * @param $version (int) version
-	 * @param $level (int) error correction level
+	 * @param int $version version
+	 * @param int $level error correction level
 	 * @return int ECC size (bytes)
 	 */
 	protected function getECCLength($version, $level){
@@ -2297,7 +2272,7 @@ class QRcode {
 
 	/**
 	 * Return the width of the symbol for the version.
-	 * @param $version (int) version
+	 * @param int $version version
 	 * @return int width
 	 */
 	protected function getWidth($version) {
@@ -2306,7 +2281,7 @@ class QRcode {
 
 	/**
 	 * Return the numer of remainder bits.
-	 * @param $version (int) version
+	 * @param int $version version
 	 * @return int number of remainder bits
 	 */
 	protected function getRemainder($version) {
@@ -2315,8 +2290,8 @@ class QRcode {
 
 	/**
 	 * Return a version number that satisfies the input code length.
-	 * @param $size (int) input code length (bytes)
-	 * @param $level (int) error correction level
+	 * @param int $size input code length (bytes)
+	 * @param int $level error correction level
 	 * @return int version number
 	 */
 	protected function getMinimumVersion($size, $level) {
@@ -2332,8 +2307,8 @@ class QRcode {
 
 	/**
 	 * Return the size of length indicator for the mode and version.
-	 * @param $mode (int) encoding mode
-	 * @param $version (int) version
+	 * @param int $mode encoding mode
+	 * @param int $version version
 	 * @return int the size of the appropriate length indicator (bits).
 	 */
 	protected function lengthIndicator($mode, $version) {
@@ -2352,8 +2327,8 @@ class QRcode {
 
 	/**
 	 * Return the maximum length for the mode and version.
-	 * @param $mode (int) encoding mode
-	 * @param $version (int) version
+	 * @param int $mode encoding mode
+	 * @param int $version version
 	 * @return int the maximum length (bytes)
 	 */
 	protected function maximumWords($mode, $version) {
@@ -2377,9 +2352,9 @@ class QRcode {
 
 	/**
 	 * Return an array of ECC specification.
-	 * @param $version (int) version
-	 * @param $level (int) error correction level
-	 * @param $spec (array) an array of ECC specification contains as following: {# of type1 blocks, # of data code, # of ecc code, # of type2 blocks, # of data code}
+	 * @param int $version version
+	 * @param int $level error correction level
+	 * @param array $spec an array of ECC specification contains as following: {# of type1 blocks, # of data code, # of ecc code, # of type2 blocks, # of data code}
 	 * @return array spec
 	 */
 	protected function getEccSpec($version, $level, $spec) {
@@ -2408,9 +2383,9 @@ class QRcode {
 
 	/**
 	 * Put an alignment marker.
-	 * @param $frame (array) frame
-	 * @param $ox (int) X center coordinate of the pattern
-	 * @param $oy (int) Y center coordinate of the pattern
+	 * @param array $frame frame
+	 * @param int $ox X center coordinate of the pattern
+	 * @param int $oy Y center coordinate of the pattern
 	 * @return array frame
 	 */
 	protected function putAlignmentMarker($frame, $ox, $oy) {
@@ -2431,9 +2406,9 @@ class QRcode {
 
 	/**
 	 * Put an alignment pattern.
-	 * @param $version (int) version
-	 * @param $frame (array) frame
-	 * @param $width (int) width
+	 * @param int $version version
+	 * @param array $frame frame
+	 * @param int $width width
 	 * @return array frame
 	 */
 	 protected function putAlignmentPattern($version, $frame, $width) {
@@ -2473,8 +2448,8 @@ class QRcode {
 
 	/**
 	 * Return BCH encoded version information pattern that is used for the symbol of version 7 or greater. Use lower 18 bits.
-	 * @param $version (int) version
-	 * @return BCH encoded version information pattern
+	 * @param int $version version
+	 * @return string BCH encoded version information pattern
 	 */
 	protected function getVersionPattern($version) {
 		if (($version < 7) OR ($version > QRSPEC_VERSION_MAX)) {
@@ -2485,9 +2460,9 @@ class QRcode {
 
 	/**
 	 * Return BCH encoded format information pattern.
-	 * @param $mask (array)
-	 * @param $level (int) error correction level
-	 * @return BCH encoded format information pattern
+	 * @param array $mask
+	 * @param int $level error correction level
+	 * @return string BCH encoded format information pattern
 	 */
 	protected function getFormatInfo($mask, $level) {
 		if (($mask < 0) OR ($mask > 7)) {
@@ -2501,9 +2476,9 @@ class QRcode {
 
 	/**
 	 * Put a finder pattern.
-	 * @param $frame (array) frame
-	 * @param $ox (int) X center coordinate of the pattern
-	 * @param $oy (int) Y center coordinate of the pattern
+	 * @param array $frame frame
+	 * @param int $ox X center coordinate of the pattern
+	 * @param int $oy Y center coordinate of the pattern
 	 * @return array frame
 	 */
 	protected function putFinderPattern($frame, $ox, $oy) {
@@ -2524,8 +2499,8 @@ class QRcode {
 
 	/**
 	 * Return a copy of initialized frame.
-	 * @param $version (int) version
-	 * @return Array of unsigned char.
+	 * @param int $version version
+	 * @return array array of unsigned char.
 	 */
 	protected function createFrame($version) {
 		$width = $this->capacity[$version][QRCAP_WIDTH];
@@ -2589,8 +2564,8 @@ class QRcode {
 
 	/**
 	 * Set new frame for the specified version.
-	 * @param $version (int) version
-	 * @return Array of unsigned char.
+	 * @param int $version version
+	 * @return array array of unsigned char.
 	 */
 	protected function newFrame($version) {
 		if (($version < 1) OR ($version > QRSPEC_VERSION_MAX)) {
@@ -2607,7 +2582,7 @@ class QRcode {
 
 	/**
 	 * Return block number 0
-	 * @param $spec (array)
+	 * @param array $spec
 	 * @return int value
 	 */
 	 protected function rsBlockNum($spec) {
@@ -2616,7 +2591,7 @@ class QRcode {
 
 	/**
 	* Return block number 1
-	 * @param $spec (array)
+	 * @param array $spec
 	 * @return int value
 	 */
 	 protected function rsBlockNum1($spec) {
@@ -2625,7 +2600,7 @@ class QRcode {
 
 	/**
 	 * Return data codes 1
-	 * @param $spec (array)
+	 * @param array $spec
 	 * @return int value
 	 */
 	 protected function rsDataCodes1($spec) {
@@ -2634,7 +2609,7 @@ class QRcode {
 
 	/**
 	 * Return ecc codes 1
-	 * @param $spec (array)
+	 * @param array $spec
 	 * @return int value
 	 */
 	 protected function rsEccCodes1($spec) {
@@ -2643,7 +2618,7 @@ class QRcode {
 
 	/**
 	 * Return block number 2
-	 * @param $spec (array)
+	 * @param array $spec
 	 * @return int value
 	 */
 	 protected function rsBlockNum2($spec) {
@@ -2652,7 +2627,7 @@ class QRcode {
 
 	/**
 	 * Return data codes 2
-	 * @param $spec (array)
+	 * @param array $spec
 	 * @return int value
 	 */
 	 protected function rsDataCodes2($spec) {
@@ -2661,7 +2636,7 @@ class QRcode {
 
 	/**
 	 * Return ecc codes 2
-	 * @param $spec (array)
+	 * @param array $spec
 	 * @return int value
 	 */
 	 protected function rsEccCodes2($spec) {
@@ -2670,7 +2645,7 @@ class QRcode {
 
 	/**
 	 * Return data length
-	 * @param $spec (array)
+	 * @param array $spec
 	 * @return int value
 	 */
 	 protected function rsDataLength($spec) {
@@ -2679,7 +2654,7 @@ class QRcode {
 
 	/**
 	 * Return ecc length
-	 * @param $spec (array)
+	 * @param array $spec
 	 * @return int value
 	 */
 	 protected function rsEccLength($spec) {
@@ -2692,12 +2667,12 @@ class QRcode {
 
 	/**
 	 * Initialize a Reed-Solomon codec and add it to existing rsitems
-	 * @param $symsize (int) symbol size, bits
-	 * @param $gfpoly (int)  Field generator polynomial coefficients
-	 * @param $fcr (int)  first root of RS code generator polynomial, index form
-	 * @param $prim (int)  primitive element to generate polynomial roots
-	 * @param $nroots (int) RS code generator polynomial degree (number of roots)
-	 * @param $pad (int)  padding bytes at front of shortened block
+	 * @param int $symsize symbol size, bits
+	 * @param int $gfpoly  Field generator polynomial coefficients
+	 * @param int $fcr  first root of RS code generator polynomial, index form
+	 * @param int $prim  primitive element to generate polynomial roots
+	 * @param int $nroots RS code generator polynomial degree (number of roots)
+	 * @param int $pad  padding bytes at front of shortened block
 	 * @return array Array of RS values:<ul><li>mm = Bits per symbol;</li><li>nn = Symbols per block;</li><li>alpha_to = log lookup table array;</li><li>index_of = Antilog lookup table array;</li><li>genpoly = Generator polynomial array;</li><li>nroots = Number of generator;</li><li>roots = number of parity symbols;</li><li>fcr = First consecutive root, index form;</li><li>prim = Primitive element, index form;</li><li>iprim = prim-th root of 1, index form;</li><li>pad = Padding bytes in shortened block;</li><li>gfpoly</ul>.
 	 */
 	 protected function init_rs($symsize, $gfpoly, $fcr, $prim, $nroots, $pad) {
@@ -2719,8 +2694,8 @@ class QRcode {
 
 	/**
 	 * modnn
-	 * @param $rs (array) RS values
-	 * @param $x (int) X position
+	 * @param array $rs RS values
+	 * @param int $x X position
 	 * @return int X osition
 	 */
 	 protected function modnn($rs, $x) {
@@ -2733,12 +2708,12 @@ class QRcode {
 
 	/**
 	 * Initialize a Reed-Solomon codec and returns an array of values.
-	 * @param $symsize (int) symbol size, bits
-	 * @param $gfpoly (int)  Field generator polynomial coefficients
-	 * @param $fcr (int)  first root of RS code generator polynomial, index form
-	 * @param $prim (int)  primitive element to generate polynomial roots
-	 * @param $nroots (int) RS code generator polynomial degree (number of roots)
-	 * @param $pad (int)  padding bytes at front of shortened block
+	 * @param int $symsize symbol size, bits
+	 * @param int $gfpoly  Field generator polynomial coefficients
+	 * @param int $fcr  first root of RS code generator polynomial, index form
+	 * @param int $prim  primitive element to generate polynomial roots
+	 * @param int $nroots RS code generator polynomial degree (number of roots)
+	 * @param int $pad  padding bytes at front of shortened block
 	 * @return array Array of RS values:<ul><li>mm = Bits per symbol;</li><li>nn = Symbols per block;</li><li>alpha_to = log lookup table array;</li><li>index_of = Antilog lookup table array;</li><li>genpoly = Generator polynomial array;</li><li>nroots = Number of generator;</li><li>roots = number of parity symbols;</li><li>fcr = First consecutive root, index form;</li><li>prim = Primitive element, index form;</li><li>iprim = prim-th root of 1, index form;</li><li>pad = Padding bytes in shortened block;</li><li>gfpoly</ul>.
 	 */
 	protected function init_rs_char($symsize, $gfpoly, $fcr, $prim, $nroots, $pad) {
@@ -2820,9 +2795,9 @@ class QRcode {
 
 	/**
 	 * Encode a Reed-Solomon codec and returns the parity array
-	 * @param $rs (array) RS values
-	 * @param $data (array) data
-	 * @param $parity (array) parity
+	 * @param array $rs RS values
+	 * @param array $data data
+	 * @param array $parity parity
 	 * @return parity array
 	 */
 	 protected function encode_rs_char($rs, $data, $parity) {
diff --git a/lib/combodo/tcpdf/include/tcpdf_colors.php b/lib/combodo/tcpdf/include/tcpdf_colors.php
index 27fb7afd1..7f337f31a 100644
--- a/lib/combodo/tcpdf/include/tcpdf_colors.php
+++ b/lib/combodo/tcpdf/include/tcpdf_colors.php
@@ -240,9 +240,9 @@ class TCPDF_COLORS {
 
 	/**
 	 * Return the Spot color array.
-	 * @param $name (string) Name of the spot color.
-	 * @param $spotc (array) Reference to an array of spot colors.
-	 * @return (array) Spot color array or false if not defined.
+	 * @param string $name Name of the spot color.
+	 * @param array $spotc Reference to an array of spot colors.
+	 * @return array|false Spot color array or false if not defined.
 	 * @since 5.9.125 (2011-10-03)
 	 * @public static
 	 */
@@ -264,10 +264,10 @@ class TCPDF_COLORS {
 
 	/**
 	 * Returns an array (RGB or CMYK) from an html color name, or a six-digit (i.e. #3FE5AA), or three-digit (i.e. #7FF) hexadecimal color, or a javascript color array, or javascript color name.
-	 * @param $hcolor (string) HTML color.
-	 * @param $spotc (array) Reference to an array of spot colors.
-	 * @param $defcol (array) Color to return in case of error.
-	 * @return array RGB or CMYK color, or false in case of error.
+	 * @param string $hcolor HTML color.
+	 * @param array $spotc Reference to an array of spot colors.
+	 * @param array $defcol Color to return in case of error.
+	 * @return array|false RGB or CMYK color, or false in case of error.
 	 * @public static
 	 */
 	public static function convertHTMLColorToDec($hcolor, &$spotc, $defcol=array('R'=>128,'G'=>128,'B'=>128)) {
@@ -407,8 +407,8 @@ class TCPDF_COLORS {
 
 	/**
 	 * Convert a color array into a string representation.
-	 * @param $c (array) Array of colors.
-	 * @return (string) The color array representation.
+	 * @param array $c Array of colors.
+	 * @return string The color array representation.
 	 * @since 5.9.137 (2011-12-01)
 	 * @public static
 	 */
@@ -438,7 +438,7 @@ class TCPDF_COLORS {
 
 	/**
 	 * Convert color to javascript color.
-	 * @param $color (string) color name or "#RRGGBB"
+	 * @param string $color color name or "#RRGGBB"
 	 * @protected
 	 * @since 2.1.002 (2008-02-12)
 	 * @public static
@@ -449,7 +449,7 @@ class TCPDF_COLORS {
 		}
 		if (!in_array($color, self::$jscolor)) {
 			// default transparent color
-			$color = $jscolor[0];
+			$color = self::$jscolor[0];
 		}
 		return 'color.'.$color;
 	}
diff --git a/lib/combodo/tcpdf/include/tcpdf_filters.php b/lib/combodo/tcpdf/include/tcpdf_filters.php
index 3bb89c092..3009cff7c 100644
--- a/lib/combodo/tcpdf/include/tcpdf_filters.php
+++ b/lib/combodo/tcpdf/include/tcpdf_filters.php
@@ -60,7 +60,7 @@ class TCPDF_FILTERS {
 
 	/**
 	 * Get a list of available decoding filters.
-	 * @return (array) Array of available filter decoders.
+	 * @return array Array of available filter decoders.
 	 * @since 1.0.000 (2011-05-23)
 	 * @public static
 	 */
@@ -70,9 +70,9 @@ class TCPDF_FILTERS {
 
 	/**
 	 * Decode data using the specified filter type.
-	 * @param $filter (string) Filter name.
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
+	 * @param string $filter Filter name.
+	 * @param string $data Data to decode.
+	 * @return string Decoded data string.
 	 * @since 1.0.000 (2011-05-23)
 	 * @public static
 	 */
@@ -130,8 +130,8 @@ class TCPDF_FILTERS {
 	/**
 	 * Standard
 	 * Default decoding filter (leaves data unchanged).
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
+	 * @param string $data Data to decode.
+	 * @return string Decoded data string.
 	 * @since 1.0.000 (2011-05-23)
 	 * @public static
 	 */
@@ -142,8 +142,8 @@ class TCPDF_FILTERS {
 	/**
 	 * ASCIIHexDecode
 	 * Decodes data encoded in an ASCII hexadecimal representation, reproducing the original binary data.
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
+	 * @param string $data Data to decode.
+	 * @return string Decoded data string.
 	 * @since 1.0.000 (2011-05-23)
 	 * @public static
 	 */
@@ -182,8 +182,8 @@ class TCPDF_FILTERS {
 	/**
 	 * ASCII85Decode
 	 * Decodes data encoded in an ASCII base-85 representation, reproducing the original binary data.
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
+	 * @param string $data Data to decode.
+	 * @return string Decoded data string.
 	 * @since 1.0.000 (2011-05-23)
 	 * @public static
 	 */
@@ -266,8 +266,8 @@ class TCPDF_FILTERS {
 	/**
 	 * LZWDecode
 	 * Decompresses data encoded using the LZW (Lempel-Ziv-Welch) adaptive compression method, reproducing the original text or binary data.
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
+	 * @param string $data Data to decode.
+	 * @return string Decoded data string.
 	 * @since 1.0.000 (2011-05-23)
 	 * @public static
 	 */
@@ -347,8 +347,8 @@ class TCPDF_FILTERS {
 	/**
 	 * FlateDecode
 	 * Decompresses data encoded using the zlib/deflate compression method, reproducing the original text or binary data.
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
+	 * @param string $data Data to decode.
+	 * @return string Decoded data string.
 	 * @since 1.0.000 (2011-05-23)
 	 * @public static
 	 */
@@ -364,7 +364,7 @@ class TCPDF_FILTERS {
 	/**
 	 * RunLengthDecode
 	 * Decompresses data encoded using a byte-oriented run-length encoding algorithm.
-	 * @param $data (string) Data to decode.
+	 * @param string $data Data to decode.
 	 * @since 1.0.000 (2011-05-23)
 	 * @public static
 	 */
@@ -400,8 +400,8 @@ class TCPDF_FILTERS {
 	/**
 	 * CCITTFaxDecode (NOT IMPLEMETED - RETURN AN EXCEPTION)
 	 * Decompresses data encoded using the CCITT facsimile standard, reproducing the original data (typically monochrome image data at 1 bit per pixel).
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
+	 * @param string $data Data to decode.
+	 * @return string Decoded data string.
 	 * @since 1.0.000 (2011-05-23)
 	 * @public static
 	 */
@@ -413,8 +413,8 @@ class TCPDF_FILTERS {
 	/**
 	 * JBIG2Decode (NOT IMPLEMETED - RETURN AN EXCEPTION)
 	 * Decompresses data encoded using the JBIG2 standard, reproducing the original monochrome (1 bit per pixel) image data (or an approximation of that data).
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
+	 * @param string $data Data to decode.
+	 * @return string Decoded data string.
 	 * @since 1.0.000 (2011-05-23)
 	 * @public static
 	 */
@@ -426,8 +426,8 @@ class TCPDF_FILTERS {
 	/**
 	 * DCTDecode (NOT IMPLEMETED - RETURN AN EXCEPTION)
 	 * Decompresses data encoded using a DCT (discrete cosine transform) technique based on the JPEG standard, reproducing image sample data that approximates the original data.
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
+	 * @param string $data Data to decode.
+	 * @return string Decoded data string.
 	 * @since 1.0.000 (2011-05-23)
 	 * @public static
 	 */
@@ -439,8 +439,8 @@ class TCPDF_FILTERS {
 	/**
 	 * JPXDecode (NOT IMPLEMETED - RETURN AN EXCEPTION)
 	 * Decompresses data encoded using the wavelet-based JPEG2000 standard, reproducing the original image data.
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
+	 * @param string $data Data to decode.
+	 * @return string Decoded data string.
 	 * @since 1.0.000 (2011-05-23)
 	 * @public static
 	 */
@@ -452,8 +452,8 @@ class TCPDF_FILTERS {
 	/**
 	 * Crypt (NOT IMPLEMETED - RETURN AN EXCEPTION)
 	 * Decrypts data encrypted by a security handler, reproducing the data as it was before encryption.
-	 * @param $data (string) Data to decode.
-	 * @return Decoded data string.
+	 * @param string $data Data to decode.
+	 * @return string Decoded data string.
 	 * @since 1.0.000 (2011-05-23)
 	 * @public static
 	 */
@@ -466,7 +466,7 @@ class TCPDF_FILTERS {
 
 	/**
 	 * Throw an exception.
-	 * @param $msg (string) The error message
+	 * @param string $msg The error message
 	 * @since 1.0.000 (2011-05-23)
 	 * @public static
 	 */
diff --git a/lib/combodo/tcpdf/include/tcpdf_fonts.php b/lib/combodo/tcpdf/include/tcpdf_fonts.php
index 218fb6df1..c692ef87d 100644
--- a/lib/combodo/tcpdf/include/tcpdf_fonts.php
+++ b/lib/combodo/tcpdf/include/tcpdf_fonts.php
@@ -55,16 +55,16 @@ class TCPDF_FONTS {
 
 	/**
 	 * Convert and add the selected TrueType or Type1 font to the fonts folder (that must be writeable).
-	 * @param $fontfile (string) Font file (full path).
-	 * @param $fonttype (string) Font type. Leave empty for autodetect mode. Valid values are: TrueTypeUnicode, TrueType, Type1, CID0JP = CID-0 Japanese, CID0KR = CID-0 Korean, CID0CS = CID-0 Chinese Simplified, CID0CT = CID-0 Chinese Traditional.
-	 * @param $enc (string) Name of the encoding table to use. Leave empty for default mode. Omit this parameter for TrueType Unicode and symbolic fonts like Symbol or ZapfDingBats.
-	 * @param $flags (int) Unsigned 32-bit integer containing flags specifying various characteristics of the font (PDF32000:2008 - 9.8.2 Font Descriptor Flags): +1 for fixed font; +4 for symbol or +32 for non-symbol; +64 for italic. Fixed and Italic mode are generally autodetected so you have to set it to 32 = non-symbolic font (default) or 4 = symbolic font.
-	 * @param $outpath (string) Output path for generated font files (must be writeable by the web server). Leave empty for default font folder.
-	 * @param $platid (int) Platform ID for CMAP table to extract (when building a Unicode font for Windows this value should be 3, for Macintosh should be 1).
-	 * @param $encid (int) Encoding ID for CMAP table to extract (when building a Unicode font for Windows this value should be 1, for Macintosh should be 0). When Platform ID is 3, legal values for Encoding ID are: 0=Symbol, 1=Unicode, 2=ShiftJIS, 3=PRC, 4=Big5, 5=Wansung, 6=Johab, 7=Reserved, 8=Reserved, 9=Reserved, 10=UCS-4.
-	 * @param $addcbbox (boolean) If true includes the character bounding box information on the php font file.
-	 * @param $link (boolean) If true link to system font instead of copying the font data (not transportable) - Note: do not work with Type1 fonts.
-	 * @return (string) TCPDF font name or boolean false in case of error.
+	 * @param string $fontfile Font file (full path).
+	 * @param string $fonttype Font type. Leave empty for autodetect mode. Valid values are: TrueTypeUnicode, TrueType, Type1, CID0JP = CID-0 Japanese, CID0KR = CID-0 Korean, CID0CS = CID-0 Chinese Simplified, CID0CT = CID-0 Chinese Traditional.
+	 * @param string $enc Name of the encoding table to use. Leave empty for default mode. Omit this parameter for TrueType Unicode and symbolic fonts like Symbol or ZapfDingBats.
+	 * @param int $flags Unsigned 32-bit integer containing flags specifying various characteristics of the font (PDF32000:2008 - 9.8.2 Font Descriptor Flags): +1 for fixed font; +4 for symbol or +32 for non-symbol; +64 for italic. Fixed and Italic mode are generally autodetected so you have to set it to 32 = non-symbolic font (default) or 4 = symbolic font.
+	 * @param string $outpath Output path for generated font files (must be writeable by the web server). Leave empty for default font folder.
+	 * @param int $platid Platform ID for CMAP table to extract (when building a Unicode font for Windows this value should be 3, for Macintosh should be 1).
+	 * @param int $encid Encoding ID for CMAP table to extract (when building a Unicode font for Windows this value should be 1, for Macintosh should be 0). When Platform ID is 3, legal values for Encoding ID are: 0=Symbol, 1=Unicode, 2=ShiftJIS, 3=PRC, 4=Big5, 5=Wansung, 6=Johab, 7=Reserved, 8=Reserved, 9=Reserved, 10=UCS-4.
+	 * @param boolean $addcbbox If true includes the character bounding box information on the php font file.
+	 * @param boolean $link If true link to system font instead of copying the font data (not transportable) - Note: do not work with Type1 fonts.
+	 * @return string|false TCPDF font name or boolean false in case of error.
 	 * @author Nicola Asuni
 	 * @since 5.9.123 (2010-09-30)
 	 * @public static
@@ -557,6 +557,7 @@ class TCPDF_FONTS {
 			$numGlyphs = TCPDF_STATIC::_getUSHORT($font, $offset);
 			// ---------- get CIDToGIDMap ----------
 			$ctg = array();
+			$c = 0;
 			foreach ($encodingTables as $enctable) {
 				// get only specified Platform ID and Encoding ID
 				if (($enctable['platformID'] == $platid) AND ($enctable['encodingID'] == $encid)) {
@@ -920,8 +921,8 @@ class TCPDF_FONTS {
 
 	/**
 	 * Returs the checksum of a TTF table.
-	 * @param $table (string) table to check
-	 * @param $length (int) length of table in bytes
+	 * @param string $table table to check
+	 * @param int $length length of table in bytes
 	 * @return int checksum
 	 * @author Nicola Asuni
 	 * @since 5.2.000 (2010-06-02)
@@ -942,9 +943,9 @@ class TCPDF_FONTS {
 
 	/**
 	 * Returns a subset of the TrueType font data without the unused glyphs.
-	 * @param $font (string) TrueType font data.
-	 * @param $subsetchars (array) Array of used characters (the glyphs to keep).
-	 * @return (string) A subset of TrueType font data without the unused glyphs.
+	 * @param string $font TrueType font data.
+	 * @param array $subsetchars Array of used characters (the glyphs to keep).
+	 * @return string A subset of TrueType font data without the unused glyphs.
 	 * @author Nicola Asuni
 	 * @since 5.2.000 (2010-06-02)
 	 * @public static
@@ -956,6 +957,7 @@ class TCPDF_FONTS {
 			// sfnt version must be 0x00010000 for TrueType version 1.0.
 			return $font;
 		}
+		$c = 0;
 		$offset += 4;
 		// get number of tables
 		$numTables = TCPDF_STATIC::_getUSHORT($font, $offset);
@@ -1387,9 +1389,9 @@ class TCPDF_FONTS {
 
 	/**
 	 * Outputs font widths
-	 * @param $font (array) font data
-	 * @param $cidoffset (int) offset for CID values
-	 * @return PDF command string for font widths
+	 * @param array $font font data
+	 * @param int $cidoffset offset for CID values
+	 * @return string PDF command string for font widths
 	 * @author Nicola Asuni
 	 * @since 4.4.000 (2008-12-07)
 	 * @public static
@@ -1495,10 +1497,10 @@ class TCPDF_FONTS {
 
 	/**
 	 * Update the CIDToGIDMap string with a new value.
-	 * @param $map (string) CIDToGIDMap.
-	 * @param $cid (int) CID value.
-	 * @param $gid (int) GID value.
-	 * @return (string) CIDToGIDMap.
+	 * @param string $map CIDToGIDMap.
+	 * @param int $cid CID value.
+	 * @param int $gid GID value.
+	 * @return string CIDToGIDMap.
 	 * @author Nicola Asuni
 	 * @since 5.9.123 (2011-09-29)
 	 * @public static
@@ -1533,8 +1535,8 @@ class TCPDF_FONTS {
 
 	/**
 	 * Return font full path
-	 * @param $file (string) Font file name.
-	 * @param $fontdir (string) Font directory (set to false fto search on default directories)
+	 * @param string $file Font file name.
+	 * @param string $fontdir Font directory (set to false fto search on default directories)
 	 * @return string Font full path or empty string
 	 * @author Nicola Asuni
 	 * @since 6.0.025
@@ -1558,8 +1560,8 @@ class TCPDF_FONTS {
 
 	/**
 	 * Get a reference font size.
-	 * @param $size (string) String containing font size value.
-	 * @param $refsize (float) Reference font size in points.
+	 * @param string $size String containing font size value.
+	 * @param float $refsize Reference font size in points.
 	 * @return float value in points
 	 * @public static
 	 */
@@ -1657,9 +1659,9 @@ class TCPDF_FONTS {
 
 	/**
 	 * Returns the unicode caracter specified by the value
-	 * @param $c (int) UTF-8 value
-	 * @param $unicode (boolean) True if we are in unicode mode, false otherwise.
-	 * @return Returns the specified character.
+	 * @param int $c UTF-8 value
+	 * @param boolean $unicode True if we are in unicode mode, false otherwise.
+	 * @return string Returns the specified character.
 	 * @since 2.3.000 (2008-03-05)
 	 * @public static
 	 */
@@ -1686,8 +1688,8 @@ class TCPDF_FONTS {
 
 	/**
 	 * Returns the unicode caracter specified by UTF-8 value
-	 * @param $c (int) UTF-8 value
-	 * @return Returns the specified character.
+	 * @param int $c UTF-8 value
+	 * @return string Returns the specified character.
 	 * @public static
 	 */
 	public static function unichrUnicode($c) {
@@ -1696,8 +1698,8 @@ class TCPDF_FONTS {
 
 	/**
 	 * Returns the unicode caracter specified by ASCII value
-	 * @param $c (int) UTF-8 value
-	 * @return Returns the specified character.
+	 * @param int $c UTF-8 value
+	 * @return string Returns the specified character.
 	 * @public static
 	 */
 	public static function unichrASCII($c) {
@@ -1734,8 +1736,8 @@ class TCPDF_FONTS {
 	 *    W1 = 110110yyyyyyyyyy
 	 *    W2 = 110111xxxxxxxxxx
 	 * </pre>
-	 * @param $unicode (array) array containing UTF-8 unicode values
-	 * @param $setbom (boolean) if true set the Byte Order Mark (BOM = 0xFEFF)
+	 * @param array $unicode array containing UTF-8 unicode values
+	 * @param boolean $setbom if true set the Byte Order Mark (BOM = 0xFEFF)
 	 * @return string
 	 * @protected
 	 * @author Nicola Asuni
@@ -1770,9 +1772,9 @@ class TCPDF_FONTS {
 
 	/**
 	 * Convert an array of UTF8 values to array of unicode characters
-	 * @param $ta (array) The input array of UTF8 values.
-	 * @param $isunicode (boolean) True for Unicode mode, false otherwise.
-	 * @return Return array of unicode characters
+	 * @param array $ta The input array of UTF8 values.
+	 * @param boolean $isunicode True for Unicode mode, false otherwise.
+	 * @return array Return array of unicode characters
 	 * @since 4.5.037 (2009-04-07)
 	 * @public static
 	 */
@@ -1785,11 +1787,11 @@ class TCPDF_FONTS {
 
 	/**
 	 * Extract a slice of the $strarr array and return it as string.
-	 * @param $strarr (string) The input array of characters.
-	 * @param $start (int) the starting element of $strarr.
-	 * @param $end (int) first element that will not be returned.
-	 * @param $unicode (boolean) True if we are in unicode mode, false otherwise.
-	 * @return Return part of a string
+	 * @param string[] $strarr The input array of characters.
+	 * @param int $start the starting element of $strarr.
+	 * @param int $end first element that will not be returned.
+	 * @param boolean $unicode True if we are in unicode mode, false otherwise.
+	 * @return string Return part of a string
 	 * @public static
 	 */
 	public static function UTF8ArrSubString($strarr, $start='', $end='', $unicode=true) {
@@ -1808,10 +1810,10 @@ class TCPDF_FONTS {
 
 	/**
 	 * Extract a slice of the $uniarr array and return it as string.
-	 * @param $uniarr (string) The input array of characters.
-	 * @param $start (int) the starting element of $strarr.
-	 * @param $end (int) first element that will not be returned.
-	 * @return Return part of a string
+	 * @param string[] $uniarr The input array of characters.
+	 * @param int $start the starting element of $strarr.
+	 * @param int $end first element that will not be returned.
+	 * @return string Return part of a string
 	 * @since 4.5.037 (2009-04-07)
 	 * @public static
 	 */
@@ -1831,7 +1833,7 @@ class TCPDF_FONTS {
 
 	/**
 	 * Converts UTF-8 characters array to array of Latin1 characters array<br>
-	 * @param $unicode (array) array containing UTF-8 unicode values
+	 * @param array $unicode array containing UTF-8 unicode values
 	 * @return array
 	 * @author Nicola Asuni
 	 * @since 4.8.023 (2010-01-15)
@@ -1855,9 +1857,9 @@ class TCPDF_FONTS {
 	}
 
 	/**
-	 * Converts UTF-8 characters array to array of Latin1 string<br>
-	 * @param $unicode (array) array containing UTF-8 unicode values
-	 * @return array
+	 * Converts UTF-8 characters array to Latin1 string<br>
+	 * @param array $unicode array containing UTF-8 unicode values
+	 * @return string
 	 * @author Nicola Asuni
 	 * @since 4.8.023 (2010-01-15)
 	 * @public static
@@ -1882,8 +1884,8 @@ class TCPDF_FONTS {
 	/**
 	 * Converts UTF-8 character to integer value.<br>
 	 * Uses the getUniord() method if the value is not cached.
-	 * @param $uch (string) character string to process.
-	 * @return integer Unicode value
+	 * @param string $uch character string to process.
+	 * @return int Unicode value
 	 * @public static
 	 */
 	public static function uniord($uch) {
@@ -1921,8 +1923,8 @@ class TCPDF_FONTS {
 	 *   UTF8-tail   = %x80-BF
 	 *   ---------------------------------------------------------------------
 	 * </pre>
-	 * @param $uch (string) character string to process.
-	 * @return integer Unicode value
+	 * @param string $uch character string to process.
+	 * @return int Unicode value
 	 * @author Nicola Asuni
 	 * @public static
 	 */
@@ -1988,14 +1990,14 @@ class TCPDF_FONTS {
 	/**
 	 * Converts UTF-8 strings to codepoints array.<br>
 	 * Invalid byte sequences will be replaced with 0xFFFD (replacement character)<br>
-	 * @param $str (string) string to process.
-	 * @param $isunicode (boolean) True when the documetn is in Unicode mode, false otherwise.
-	 * @param $currentfont (array) Reference to current font array.
+	 * @param string $str string to process.
+	 * @param boolean $isunicode True when the documetn is in Unicode mode, false otherwise.
+	 * @param array $currentfont Reference to current font array.
 	 * @return array containing codepoints (UTF-8 characters values)
 	 * @author Nicola Asuni
 	 * @public static
 	 */
-	public static function UTF8StringToArray($str, $isunicode=true, &$currentfont) {
+	public static function UTF8StringToArray($str, $isunicode, &$currentfont) {
 		if ($isunicode) {
 			// requires PCRE unicode support turned on
 			$chars = TCPDF_STATIC::pregSplit('//','u', $str, -1, PREG_SPLIT_NO_EMPTY);
@@ -2014,30 +2016,30 @@ class TCPDF_FONTS {
 
 	/**
 	 * Converts UTF-8 strings to Latin1 when using the standard 14 core fonts.<br>
-	 * @param $str (string) string to process.
-	 * @param $isunicode (boolean) True when the documetn is in Unicode mode, false otherwise.
-	 * @param $currentfont (array) Reference to current font array.
+	 * @param string $str string to process.
+	 * @param boolean $isunicode True when the documetn is in Unicode mode, false otherwise.
+	 * @param array $currentfont Reference to current font array.
 	 * @return string
 	 * @since 3.2.000 (2008-06-23)
 	 * @public static
 	 */
-	public static function UTF8ToLatin1($str, $isunicode=true, &$currentfont) {
+	public static function UTF8ToLatin1($str, $isunicode, &$currentfont) {
 		$unicode = self::UTF8StringToArray($str, $isunicode, $currentfont); // array containing UTF-8 unicode values
 		return self::UTF8ArrToLatin1($unicode);
 	}
 
 	/**
 	 * Converts UTF-8 strings to UTF16-BE.<br>
-	 * @param $str (string) string to process.
-	 * @param $setbom (boolean) if true set the Byte Order Mark (BOM = 0xFEFF)
-	 * @param $isunicode (boolean) True when the documetn is in Unicode mode, false otherwise.
-	 * @param $currentfont (array) Reference to current font array.
+	 * @param string $str string to process.
+	 * @param boolean $setbom if true set the Byte Order Mark (BOM = 0xFEFF)
+	 * @param boolean $isunicode True when the documetn is in Unicode mode, false otherwise.
+	 * @param array $currentfont Reference to current font array.
 	 * @return string
 	 * @author Nicola Asuni
 	 * @since 1.53.0.TC005 (2005-01-05)
 	 * @public static
 	 */
-	public static function UTF8ToUTF16BE($str, $setbom=false, $isunicode=true, &$currentfont) {
+	public static function UTF8ToUTF16BE($str, $setbom, $isunicode, &$currentfont) {
 		if (!$isunicode) {
 			return $str; // string is not in unicode
 		}
@@ -2047,50 +2049,50 @@ class TCPDF_FONTS {
 
 	/**
 	 * Reverse the RLT substrings using the Bidirectional Algorithm (http://unicode.org/reports/tr9/).
-	 * @param $str (string) string to manipulate.
-	 * @param $setbom (bool) if true set the Byte Order Mark (BOM = 0xFEFF)
-	 * @param $forcertl (bool) if true forces RTL text direction
-	 * @param $isunicode (boolean) True if the document is in Unicode mode, false otherwise.
-	 * @param $currentfont (array) Reference to current font array.
+	 * @param string $str string to manipulate.
+	 * @param bool $setbom if true set the Byte Order Mark (BOM = 0xFEFF)
+	 * @param bool $forcertl if true forces RTL text direction
+	 * @param boolean $isunicode True if the document is in Unicode mode, false otherwise.
+	 * @param array $currentfont Reference to current font array.
 	 * @return string
 	 * @author Nicola Asuni
 	 * @since 2.1.000 (2008-01-08)
 	 * @public static
 	 */
-	public static function utf8StrRev($str, $setbom=false, $forcertl=false, $isunicode=true, &$currentfont) {
+	public static function utf8StrRev($str, $setbom, $forcertl, $isunicode, &$currentfont) {
 		return self::utf8StrArrRev(self::UTF8StringToArray($str, $isunicode, $currentfont), $str, $setbom, $forcertl, $isunicode, $currentfont);
 	}
 
 	/**
 	 * Reverse the RLT substrings array using the Bidirectional Algorithm (http://unicode.org/reports/tr9/).
-	 * @param $arr (array) array of unicode values.
-	 * @param $str (string) string to manipulate (or empty value).
-	 * @param $setbom (bool) if true set the Byte Order Mark (BOM = 0xFEFF)
-	 * @param $forcertl (bool) if true forces RTL text direction
-	 * @param $isunicode (boolean) True if the document is in Unicode mode, false otherwise.
-	 * @param $currentfont (array) Reference to current font array.
+	 * @param array $arr array of unicode values.
+	 * @param string $str string to manipulate (or empty value).
+	 * @param bool $setbom if true set the Byte Order Mark (BOM = 0xFEFF)
+	 * @param bool $forcertl if true forces RTL text direction
+	 * @param boolean $isunicode True if the document is in Unicode mode, false otherwise.
+	 * @param array $currentfont Reference to current font array.
 	 * @return string
 	 * @author Nicola Asuni
 	 * @since 4.9.000 (2010-03-27)
 	 * @public static
 	 */
-	public static function utf8StrArrRev($arr, $str='', $setbom=false, $forcertl=false, $isunicode=true, &$currentfont) {
+	public static function utf8StrArrRev($arr, $str, $setbom, $forcertl, $isunicode, &$currentfont) {
 		return self::arrUTF8ToUTF16BE(self::utf8Bidi($arr, $str, $forcertl, $isunicode, $currentfont), $setbom);
 	}
 
 	/**
 	 * Reverse the RLT substrings using the Bidirectional Algorithm (http://unicode.org/reports/tr9/).
-	 * @param $ta (array) array of characters composing the string.
-	 * @param $str (string) string to process
-	 * @param $forcertl (bool) if 'R' forces RTL, if 'L' forces LTR
-	 * @param $isunicode (boolean) True if the document is in Unicode mode, false otherwise.
-	 * @param $currentfont (array) Reference to current font array.
+	 * @param array $ta array of characters composing the string.
+	 * @param string $str string to process
+	 * @param bool $forcertl if 'R' forces RTL, if 'L' forces LTR
+	 * @param boolean $isunicode True if the document is in Unicode mode, false otherwise.
+	 * @param array $currentfont Reference to current font array.
 	 * @return array of unicode chars
 	 * @author Nicola Asuni
 	 * @since 2.4.000 (2008-03-06)
 	 * @public static
 	 */
-	public static function utf8Bidi($ta, $str='', $forcertl=false, $isunicode=true, &$currentfont) {
+	public static function utf8Bidi($ta, $str, $forcertl, $isunicode, &$currentfont) {
 		// paragraph embedding level
 		$pel = 0;
 		// max level
diff --git a/lib/combodo/tcpdf/include/tcpdf_images.php b/lib/combodo/tcpdf/include/tcpdf_images.php
index 5e504f210..6f2860c60 100644
--- a/lib/combodo/tcpdf/include/tcpdf_images.php
+++ b/lib/combodo/tcpdf/include/tcpdf_images.php
@@ -55,6 +55,8 @@ class TCPDF_IMAGES {
 	 * Array of hinheritable SVG properties.
 	 * @since 5.0.000 (2010-05-02)
 	 * @public static
+	 * 
+	 * @var string[]
 	 */
 	public static $svginheritprop = array('clip-rule', 'color', 'color-interpolation', 'color-interpolation-filters', 'color-profile', 'color-rendering', 'cursor', 'direction', 'display', 'fill', 'fill-opacity', 'fill-rule', 'font', 'font-family', 'font-size', 'font-size-adjust', 'font-stretch', 'font-style', 'font-variant', 'font-weight', 'glyph-orientation-horizontal', 'glyph-orientation-vertical', 'image-rendering', 'kerning', 'letter-spacing', 'marker', 'marker-end', 'marker-mid', 'marker-start', 'pointer-events', 'shape-rendering', 'stroke', 'stroke-dasharray', 'stroke-dashoffset', 'stroke-linecap', 'stroke-linejoin', 'stroke-miterlimit', 'stroke-opacity', 'stroke-width', 'text-anchor', 'text-rendering', 'visibility', 'word-spacing', 'writing-mode');
 
@@ -62,8 +64,8 @@ class TCPDF_IMAGES {
 
 	/**
 	 * Return the image type given the file name or array returned by getimagesize() function.
-	 * @param $imgfile (string) image file name
-	 * @param $iminfo (array) array of image information returned by getimagesize() function.
+	 * @param string $imgfile image file name
+	 * @param array $iminfo array of image information returned by getimagesize() function.
 	 * @return string image type
 	 * @since 4.8.017 (2009-11-27)
 	 * @public static
@@ -77,10 +79,7 @@ class TCPDF_IMAGES {
 			}
 		}
 		if (empty($type)) {
-			$fileinfo = pathinfo($imgfile);
-			if (isset($fileinfo['extension']) AND (!TCPDF_STATIC::empty_string($fileinfo['extension']))) {
-				$type = strtolower(trim($fileinfo['extension']));
-			}
+            $type = strtolower(trim(pathinfo(parse_url($imgfile, PHP_URL_PATH), PATHINFO_EXTENSION)));
 		}
 		if ($type == 'jpg') {
 			$type = 'jpeg';
@@ -90,9 +89,9 @@ class TCPDF_IMAGES {
 
 	/**
 	 * Set the transparency for the given GD image.
-	 * @param $new_image (image) GD image object
-	 * @param $image (image) GD image object.
-	 * return GD image object.
+	 * @param resource $new_image GD image object
+	 * @param resource $image GD image object.
+	 * @return resource GD image object $new_image
 	 * @since 4.9.016 (2010-04-20)
 	 * @public static
 	 */
@@ -115,8 +114,8 @@ class TCPDF_IMAGES {
 	/**
 	 * Convert the loaded image to a PNG and then return a structure for the PDF creator.
 	 * This function requires GD library and write access to the directory defined on K_PATH_CACHE constant.
-	 * @param $image (image) Image object.
-	 * @param $tempfile (string) Temporary file name.
+	 * @param resource $image Image object.
+	 * @param string $tempfile Temporary file name.
 	 * return image PNG image object.
 	 * @since 4.9.016 (2010-04-20)
 	 * @public static
@@ -138,10 +137,10 @@ class TCPDF_IMAGES {
 	/**
 	 * Convert the loaded image to a JPEG and then return a structure for the PDF creator.
 	 * This function requires GD library and write access to the directory defined on K_PATH_CACHE constant.
-	 * @param $image (image) Image object.
-	 * @param $quality (int) JPEG quality.
-	 * @param $tempfile (string) Temporary file name.
-	 * return image JPEG image object.
+	 * @param resource $image Image object.
+	 * @param int $quality JPEG quality.
+	 * @param string $tempfile Temporary file name.
+	 * return array|false image JPEG image object.
 	 * @public static
 	 */
 	public static function _toJPEG($image, $quality, $tempfile) {
@@ -155,8 +154,8 @@ class TCPDF_IMAGES {
 
 	/**
 	 * Extract info from a JPEG file without using the GD library.
-	 * @param $file (string) image file to parse
-	 * @return array structure containing the image data
+	 * @param string $file image file to parse
+	 * @return array|false structure containing the image data
 	 * @public static
 	 */
 	public static function _parsejpeg($file) {
@@ -234,8 +233,8 @@ class TCPDF_IMAGES {
 
 	/**
 	 * Extract info from a PNG file without using the GD library.
-	 * @param $file (string) image file to parse
-	 * @return array structure containing the image data
+	 * @param string $file image file to parse
+	 * @return array|false structure containing the image data
 	 * @public static
 	 */
 	public static function _parsepng($file) {
diff --git a/lib/combodo/tcpdf/include/tcpdf_static.php b/lib/combodo/tcpdf/include/tcpdf_static.php
index 06a1dddcc..a118d0588 100644
--- a/lib/combodo/tcpdf/include/tcpdf_static.php
+++ b/lib/combodo/tcpdf/include/tcpdf_static.php
@@ -7,7 +7,7 @@
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
-// Copyright (C) 2002-2015 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2002-2021 Nicola Asuni - Tecnick.com LTD
 //
 // This file is part of TCPDF software library.
 //
@@ -55,7 +55,7 @@ class TCPDF_STATIC {
 	 * Current TCPDF version.
 	 * @private static
 	 */
-	private static $tcpdf_version = '6.3.5';
+	private static $tcpdf_version = '6.4.4';
 
 	/**
 	 * String alias for total number of pages.
@@ -110,7 +110,7 @@ class TCPDF_STATIC {
 
 	/**
 	 * Return the current TCPDF version.
-	 * @return TCPDF version string
+	 * @return string TCPDF version string
 	 * @since 5.9.012 (2010-11-10)
 	 * @public static
 	 */
@@ -120,7 +120,7 @@ class TCPDF_STATIC {
 
 	/**
 	 * Return the current TCPDF producer.
-	 * @return TCPDF producer string
+	 * @return string TCPDF producer string
 	 * @since 6.0.000 (2013-03-16)
 	 * @public static
 	 */
@@ -130,7 +130,7 @@ class TCPDF_STATIC {
 
 	/**
 	 * Sets the current active configuration setting of magic_quotes_runtime (if the set_magic_quotes_runtime function exist)
-	 * @param $mqr (boolean) FALSE for off, TRUE for on.
+	 * @param boolean $mqr FALSE for off, TRUE for on.
 	 * @since 4.6.025 (2009-08-17)
 	 * @public static
 	 */
@@ -146,7 +146,7 @@ class TCPDF_STATIC {
 
 	/**
 	 * Gets the current active configuration setting of magic_quotes_runtime (if the get_magic_quotes_runtime function exist)
-	 * @return Returns 0 if magic quotes runtime is off or get_magic_quotes_runtime doesn't exist, 1 otherwise.
+	 * @return int Returns 0 if magic quotes runtime is off or get_magic_quotes_runtime doesn't exist, 1 otherwise.
 	 * @since 4.6.025 (2009-08-17)
 	 * @public static
 	 */
@@ -163,13 +163,16 @@ class TCPDF_STATIC {
 
 	/**
 	 * Check if the URL exist.
-	 * @param $url (string) URL to check.
-	 * @return Boolean true if the URl exist, false otherwise.
+	 * @param string $url URL to check.
+	 * @return boolean true if the URl exist, false otherwise.
 	 * @since 5.9.204 (2013-01-28)
 	 * @public static
 	 */
 	public static function isValidURL($url) {
 		$headers = @get_headers($url);
+		if ($headers === false) {
+			return false;
+		}
     	return (strpos($headers[0], '200') !== false);
 	}
 
@@ -184,8 +187,8 @@ class TCPDF_STATIC {
 	 * <li>UTF-8 (hex): 0xC2 0xAD (c2ad)</li>
 	 * <li>UTF-8 character: chr(194).chr(173)</li>
 	 * </ul>
-	 * @param $txt (string) input string
-	 * @param $unicode (boolean) True if we are in unicode mode, false otherwise.
+	 * @param string $txt input string
+	 * @param boolean $unicode True if we are in unicode mode, false otherwise.
 	 * @return string without SHY characters.
 	 * @since (4.5.019) 2009-02-28
 	 * @public static
@@ -201,10 +204,10 @@ class TCPDF_STATIC {
 
 	/**
 	 * Get the border mode accounting for multicell position (opens bottom side of multicell crossing pages)
-	 * @param $brd (mixed) Indicates if borders must be drawn around the cell block. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param $position (string) multicell position: 'start', 'middle', 'end'
-	 * @param $opencell (boolean) True when the cell is left open at the page bottom, false otherwise.
-	 * @return border mode array
+	 * @param string|array|int $brd Indicates if borders must be drawn around the cell block. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul>or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
+	 * @param string $position multicell position: 'start', 'middle', 'end'
+	 * @param boolean $opencell True when the cell is left open at the page bottom, false otherwise.
+	 * @return array border mode array
 	 * @since 4.4.002 (2008-12-09)
 	 * @public static
 	 */
@@ -275,8 +278,8 @@ class TCPDF_STATIC {
 
 	/**
 	 * Determine whether a string is empty.
-	 * @param $str (string) string to be checked
-	 * @return boolean true if string is empty
+	 * @param string $str string to be checked
+	 * @return bool true if string is empty
 	 * @since 4.5.044 (2009-04-16)
 	 * @public static
 	 */
@@ -286,8 +289,8 @@ class TCPDF_STATIC {
 
 	/**
 	 * Returns a temporary filename for caching object on filesystem.
-	 * @param $type (string) Type of file (name of the subdir on the tcpdf cache folder).
-	 * @param $file_id (string) TCPDF file_id.
+	 * @param string $type Type of file (name of the subdir on the tcpdf cache folder).
+	 * @param string $file_id TCPDF file_id.
 	 * @return string filename.
 	 * @since 4.5.000 (2008-12-31)
 	 * @public static
@@ -298,7 +301,7 @@ class TCPDF_STATIC {
 
 	/**
 	 * Add "\" before "\", "(" and ")"
-	 * @param $s (string) string to escape.
+	 * @param string $s string to escape.
 	 * @return string escaped string.
 	 * @public static
 	 */
@@ -309,8 +312,8 @@ class TCPDF_STATIC {
 
 	/**
 	* Escape some special characters (&lt; &gt; &amp;) for XML output.
-	* @param $str (string) Input string to convert.
-	* @return converted string
+	* @param string $str Input string to convert.
+	* @return string converted string
 	* @since 5.9.121 (2011-09-28)
 	 * @public static
 	 */
@@ -322,8 +325,8 @@ class TCPDF_STATIC {
 
 	/**
 	 * Creates a copy of a class object
-	 * @param $object (object) class object to be cloned
-	 * @return cloned object
+	 * @param object $object class object to be cloned
+	 * @return object cloned object
 	 * @since 4.5.029 (2009-03-19)
 	 * @public static
 	 */
@@ -337,8 +340,8 @@ class TCPDF_STATIC {
 
 	/**
 	 * Output input data and compress it if possible.
-	 * @param $data (string) Data to output.
-	 * @param $length (int) Data length in bytes.
+	 * @param string $data Data to output.
+	 * @param int $length Data length in bytes.
 	 * @since 5.9.086
 	 * @public static
 	 */
@@ -352,10 +355,10 @@ class TCPDF_STATIC {
 
 	/**
 	 * Replace page number aliases with number.
-	 * @param $page (string) Page content.
-	 * @param $replace (array) Array of replacements (array keys are replacement strings, values are alias arrays).
-	 * @param $diff (int) If passed, this will be set to the total char number difference between alias and replacements.
-	 * @return replaced page content and updated $diff parameter as array.
+	 * @param string $page Page content.
+	 * @param array $replace Array of replacements (array keys are replacement strings, values are alias arrays).
+	 * @param int $diff If passed, this will be set to the total char number difference between alias and replacements.
+	 * @return array replaced page content and updated $diff parameter as array.
 	 * @public static
 	 */
 	public static function replacePageNumAliases($page, $replace, $diff=0) {
@@ -372,7 +375,7 @@ class TCPDF_STATIC {
 
 	/**
 	 * Returns timestamp in seconds from formatted date-time.
-	 * @param $date (string) Formatted date-time.
+	 * @param string $date Formatted date-time.
 	 * @return int seconds.
 	 * @since 5.9.152 (2012-03-23)
 	 * @public static
@@ -387,7 +390,7 @@ class TCPDF_STATIC {
 
 	/**
 	 * Returns a formatted date-time.
-	 * @param $time (int) Time in seconds.
+	 * @param int $time Time in seconds.
 	 * @return string escaped date string.
 	 * @since 5.9.152 (2012-03-23)
 	 * @public static
@@ -398,7 +401,7 @@ class TCPDF_STATIC {
 
 	/**
 	 * Returns a string containing random data to be used as a seed for encryption methods.
-	 * @param $seed (string) starting seed value
+	 * @param string $seed starting seed value
 	 * @return string containing random data
 	 * @author Nicola Asuni
 	 * @since 5.9.006 (2010-10-19)
@@ -422,8 +425,8 @@ class TCPDF_STATIC {
 
 	/**
 	 * Encrypts a string using MD5 and returns it's value as a binary string.
-	 * @param $str (string) input string
-	 * @return String MD5 encrypted binary string
+	 * @param string $str input string
+	 * @return string MD5 encrypted binary string
 	 * @since 2.0.000 (2008-01-02)
 	 * @public static
 	 */
@@ -432,11 +435,11 @@ class TCPDF_STATIC {
 	}
 
 	/**
-	 * Returns the input text exrypted using AES algorithm and the specified key.
+	 * Returns the input text encrypted using AES algorithm and the specified key.
 	 * This method requires openssl or mcrypt. Text is padded to 16bytes blocks
-	 * @param $key (string) encryption key
-	 * @param $text (String) input text to be encrypted
-	 * @return String encrypted text
+	 * @param string $key encryption key
+	 * @param string $text input text to be encrypted
+	 * @return string encrypted text
 	 * @author Nicola Asuni
 	 * @since 5.0.005 (2010-05-11)
 	 * @public static
@@ -446,8 +449,12 @@ class TCPDF_STATIC {
 		$padding = 16 - (strlen($text) % 16);
 		$text .= str_repeat(chr($padding), $padding);
 		if (extension_loaded('openssl')) {
-			$iv = openssl_random_pseudo_bytes (openssl_cipher_iv_length('aes-256-cbc'));
-			$text = openssl_encrypt($text, 'aes-256-cbc', $key, OPENSSL_RAW_DATA, $iv);
+			$algo = 'aes-256-cbc';
+			if (strlen($key) == 16) {
+				$algo = 'aes-128-cbc';
+			}
+			$iv = openssl_random_pseudo_bytes(openssl_cipher_iv_length($algo));
+			$text = openssl_encrypt($text, $algo, $key, OPENSSL_RAW_DATA, $iv);
 			return $iv.substr($text, 0, -16);
 		}
 		$iv = mcrypt_create_iv(mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC), MCRYPT_RAND);
@@ -457,19 +464,23 @@ class TCPDF_STATIC {
 	}
 
 	/**
-	 * Returns the input text exrypted using AES algorithm and the specified key.
+	 * Returns the input text encrypted using AES algorithm and the specified key.
 	 * This method requires openssl or mcrypt. Text is not padded
-	 * @param $key (string) encryption key
-	 * @param $text (String) input text to be encrypted
-	 * @return String encrypted text
+	 * @param string $key encryption key
+	 * @param string $text input text to be encrypted
+	 * @return string encrypted text
 	 * @author Nicola Asuni
 	 * @since TODO
 	 * @public static
 	 */
 	public static function _AESnopad($key, $text) {
 		if (extension_loaded('openssl')) {
-			$iv = str_repeat("\x00", openssl_cipher_iv_length('aes-256-cbc'));
-			$text = openssl_encrypt($text, 'aes-256-cbc', $key, OPENSSL_RAW_DATA, $iv);
+			$algo = 'aes-256-cbc';
+			if (strlen($key) == 16) {
+				$algo = 'aes-128-cbc';
+			}
+			$iv = str_repeat("\x00", openssl_cipher_iv_length($algo));
+			$text = openssl_encrypt($text, $algo, $key, OPENSSL_RAW_DATA, $iv);
 			return substr($text, 0, -16);
 		}
 		$iv = str_repeat("\x00", mcrypt_get_iv_size(MCRYPT_RIJNDAEL_128, MCRYPT_MODE_CBC));
@@ -480,11 +491,11 @@ class TCPDF_STATIC {
 	/**
 	 * Returns the input text encrypted using RC4 algorithm and the specified key.
 	 * RC4 is the standard encryption algorithm used in PDF format
-	 * @param $key (string) Encryption key.
-	 * @param $text (String) Input text to be encrypted.
-	 * @param $last_enc_key (String) Reference to last RC4 key encrypted.
-	 * @param $last_enc_key_c (String) Reference to last RC4 computed key.
-	 * @return String encrypted text
+	 * @param string $key Encryption key.
+	 * @param string $text Input text to be encrypted.
+	 * @param string $last_enc_key Reference to last RC4 key encrypted.
+	 * @param string $last_enc_key_c Reference to last RC4 computed key.
+	 * @return string encrypted text
 	 * @since 2.0.000 (2008-01-02)
 	 * @author Klemen Vodopivec, Nicola Asuni
 	 * @public static
@@ -495,7 +506,7 @@ class TCPDF_STATIC {
 			return $out;
 		}
 		if ($last_enc_key != $key) {
-			$k = str_repeat($key, ((256 / strlen($key)) + 1));
+			$k = str_repeat($key, (int) ((256 / strlen($key)) + 1));
 			$rc4 = range(0, 255);
 			$j = 0;
 			for ($i = 0; $i < 256; ++$i) {
@@ -527,8 +538,8 @@ class TCPDF_STATIC {
 
 	/**
 	 * Return the permission code used on encryption (P value).
-	 * @param $permissions (Array) the set of permissions (specify the ones you want to block).
-	 * @param $mode (int) encryption strength: 0 = RC4 40 bit; 1 = RC4 128 bit; 2 = AES 128 bit; 3 = AES 256 bit.
+	 * @param array $permissions the set of permissions (specify the ones you want to block).
+	 * @param int $mode encryption strength: 0 = RC4 40 bit; 1 = RC4 128 bit; 2 = AES 128 bit; 3 = AES 256 bit.
 	 * @since 5.0.005 (2010-05-12)
 	 * @author Nicola Asuni
 	 * @public static
@@ -564,8 +575,8 @@ class TCPDF_STATIC {
 
 	/**
 	 * Convert hexadecimal string to string
-	 * @param $bs (string) byte-string to convert
-	 * @return String
+	 * @param string $bs byte-string to convert
+	 * @return string
 	 * @since 5.0.005 (2010-05-12)
 	 * @author Nicola Asuni
 	 * @public static
@@ -586,8 +597,8 @@ class TCPDF_STATIC {
 
 	/**
 	 * Convert string to hexadecimal string (byte string)
-	 * @param $s (string) string to convert
-	 * @return byte string
+	 * @param string $s string to convert
+	 * @return string byte string
 	 * @since 5.0.010 (2010-05-17)
 	 * @author Nicola Asuni
 	 * @public static
@@ -603,8 +614,8 @@ class TCPDF_STATIC {
 
 	/**
 	 * Convert encryption P value to a string of bytes, low-order byte first.
-	 * @param $protection (string) 32bit encryption permission value (P value)
-	 * @return String
+	 * @param string $protection 32bit encryption permission value (P value)
+	 * @return string
 	 * @since 5.0.005 (2010-05-12)
 	 * @author Nicola Asuni
 	 * @public static
@@ -620,8 +631,8 @@ class TCPDF_STATIC {
 
 	/**
 	 * Encode a name object.
-	 * @param $name (string) Name object to encode.
-	 * @return (string) Encoded name object.
+	 * @param string $name Name object to encode.
+	 * @return string Encoded name object.
 	 * @author Nicola Asuni
 	 * @since 5.9.097 (2011-06-23)
 	 * @public static
@@ -642,9 +653,9 @@ class TCPDF_STATIC {
 
 	/**
 	 * Convert JavaScript form fields properties array to Annotation Properties array.
-	 * @param $prop (array) javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @param $spot_colors (array) Reference to spot colors array.
-	 * @param $rtl (boolean) True if in Right-To-Left text direction mode, false otherwise.
+	 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
+	 * @param array $spot_colors Reference to spot colors array.
+	 * @param boolean $rtl True if in Right-To-Left text direction mode, false otherwise.
 	 * @return array of annotation properties
 	 * @author Nicola Asuni
 	 * @since 4.8.000 (2009-09-06)
@@ -652,7 +663,7 @@ class TCPDF_STATIC {
 	 */
 	public static function getAnnotOptFromJSProp($prop, &$spot_colors, $rtl=false) {
 		if (isset($prop['aopt']) AND is_array($prop['aopt'])) {
-			// the annotation options area lready defined
+			// the annotation options are already defined
 			return $prop['aopt'];
 		}
 		$opt = array(); // value to be returned
@@ -1011,8 +1022,9 @@ class TCPDF_STATIC {
 
 	/**
 	 * Format the page numbers.
-	 * This method can be overriden for custom formats.
-	 * @param $num (int) page number
+	 * This method can be overridden for custom formats.
+	 * @param int $num page number
+	 * @return string
 	 * @since 4.2.005 (2008-11-06)
 	 * @public static
 	 */
@@ -1022,8 +1034,9 @@ class TCPDF_STATIC {
 
 	/**
 	 * Format the page numbers on the Table Of Content.
-	 * This method can be overriden for custom formats.
-	 * @param $num (int) page number
+	 * This method can be overridden for custom formats.
+	 * @param int $num page number
+	 * @return string
 	 * @since 4.5.001 (2009-01-04)
 	 * @see addTOC(), addHTMLTOC()
 	 * @public static
@@ -1034,8 +1047,8 @@ class TCPDF_STATIC {
 
 	/**
 	 * Extracts the CSS properties from a CSS string.
-	 * @param $cssdata (string) string containing CSS definitions.
-	 * @return An array where the keys are the CSS selectors and the values are the CSS properties.
+	 * @param string $cssdata string containing CSS definitions.
+	 * @return array An array where the keys are the CSS selectors and the values are the CSS properties.
 	 * @author Nicola Asuni
 	 * @since 5.1.000 (2010-05-25)
 	 * @public static
@@ -1125,20 +1138,20 @@ class TCPDF_STATIC {
 
 	/**
 	 * Cleanup HTML code (requires HTML Tidy library).
-	 * @param $html (string) htmlcode to fix
-	 * @param $default_css (string) CSS commands to add
-	 * @param $tagvs (array) parameters for setHtmlVSpace method
-	 * @param $tidy_options (array) options for tidy_parse_string function
-	 * @param $tagvspaces (array) Array of vertical spaces for tags.
+	 * @param string $html htmlcode to fix
+	 * @param string $default_css CSS commands to add
+	 * @param array|null $tagvs parameters for setHtmlVSpace method
+	 * @param array|null $tidy_options options for tidy_parse_string function
+	 * @param array $tagvspaces Array of vertical spaces for tags.
 	 * @return string XHTML code cleaned up
 	 * @author Nicola Asuni
 	 * @since 5.9.017 (2010-11-16)
 	 * @see setHtmlVSpace()
 	 * @public static
 	 */
-	public static function fixHTMLCode($html, $default_css='', $tagvs='', $tidy_options='', &$tagvspaces) {
+	public static function fixHTMLCode($html, $default_css, $tagvs, $tidy_options, &$tagvspaces) {
 		// configure parameters for HTML Tidy
-		if ($tidy_options === '') {
+		if (TCPDF_STATIC::empty_string($tidy_options)) {
 			$tidy_options = array (
 				'clean' => 1,
 				'drop-empty-paras' => 0,
@@ -1185,7 +1198,7 @@ class TCPDF_STATIC {
 		// remove some empty tag blocks
 		$html = preg_replace('/<div([^\>]*)><\/div>/', '', $html);
 		$html = preg_replace('/<p([^\>]*)><\/p>/', '', $html);
-		if ($tagvs !== '') {
+		if (!TCPDF_STATIC::empty_string($tagvs)) {
 			// set vertical space for some XHTML tags
 			$tagvspaces = $tagvs;
 		}
@@ -1195,9 +1208,9 @@ class TCPDF_STATIC {
 
 	/**
 	 * Returns true if the CSS selector is valid for the selected HTML tag
-	 * @param $dom (array) array of HTML tags and properties
-	 * @param $key (int) key of the current HTML tag
-	 * @param $selector (string) CSS selector string
+	 * @param array $dom array of HTML tags and properties
+	 * @param int $key key of the current HTML tag
+	 * @param string $selector CSS selector string
 	 * @return true if the selector is valid, false otherwise
 	 * @since 5.1.000 (2010-05-25)
 	 * @public static
@@ -1355,9 +1368,9 @@ class TCPDF_STATIC {
 
 	/**
 	 * Returns the styles array that apply for the selected HTML tag.
-	 * @param $dom (array) array of HTML tags and properties
-	 * @param $key (int) key of the current HTML tag
-	 * @param $css (array) array of CSS properties
+	 * @param array $dom array of HTML tags and properties
+	 * @param int $key key of the current HTML tag
+	 * @param array $css array of CSS properties
 	 * @return array containing CSS properties
 	 * @since 5.1.000 (2010-05-25)
 	 * @public static
@@ -1402,7 +1415,7 @@ class TCPDF_STATIC {
 
 	/**
 	 * Compact CSS data array into single string.
-	 * @param $css (array) array of CSS properties
+	 * @param array $css array of CSS properties
 	 * @return string containing merged CSS properties
 	 * @since 5.9.070 (2011-04-19)
 	 * @public static
@@ -1433,13 +1446,17 @@ class TCPDF_STATIC {
 
 	/**
 	 * Returns the Roman representation of an integer number
-	 * @param $number (int) number to convert
+	 * @param int $number number to convert
 	 * @return string roman representation of the specified number
 	 * @since 4.4.004 (2008-12-10)
 	 * @public static
 	 */
 	public static function intToRoman($number) {
 		$roman = '';
+		if ($number >= 4000) {
+			// do not represent numbers above 4000 in Roman numerals
+			return strval($number);
+		}
 		while ($number >= 1000) {
 			$roman .= 'M';
 			$number -= 1000;
@@ -1497,10 +1514,10 @@ class TCPDF_STATIC {
 
 	/**
 	 * Find position of last occurrence of a substring in a string
-	 * @param $haystack (string) The string to search in.
-	 * @param $needle (string) substring to search.
-	 * @param $offset (int) May be specified to begin searching an arbitrary number of characters into the string.
-	 * @return Returns the position where the needle exists. Returns FALSE if the needle was not found.
+	 * @param string $haystack The string to search in.
+	 * @param string $needle substring to search.
+	 * @param int $offset May be specified to begin searching an arbitrary number of characters into the string.
+	 * @return int|false Returns the position where the needle exists. Returns FALSE if the needle was not found.
 	 * @since 4.8.038 (2010-03-13)
 	 * @public static
 	 */
@@ -1513,7 +1530,7 @@ class TCPDF_STATIC {
 
 	/**
 	 * Returns an array of hyphenation patterns.
-	 * @param $file (string) TEX file containing hypenation patterns. TEX pattrns can be downloaded from http://www.ctan.org/tex-archive/language/hyph-utf8/tex/generic/hyph-utf8/patterns/
+	 * @param string $file TEX file containing hypenation patterns. TEX patterns can be downloaded from http://www.ctan.org/tex-archive/language/hyph-utf8/tex/generic/hyph-utf8/patterns/
 	 * @return array of hyphenation patterns
 	 * @author Nicola Asuni
 	 * @since 4.9.012 (2010-04-12)
@@ -1546,7 +1563,7 @@ class TCPDF_STATIC {
 
 	/**
 	 * Get the Path-Painting Operators.
-	 * @param $style (string) Style of rendering. Possible values are:
+	 * @param string $style Style of rendering. Possible values are:
 	 * <ul>
 	 *   <li>S or D: Stroke the path.</li>
 	 *   <li>s or d: Close and stroke the path.</li>
@@ -1560,7 +1577,8 @@ class TCPDF_STATIC {
 	 *   <li>CEO: Clipping mode using the nonzero winding number rule to determine which regions lie inside the clipping path</li>
 	 *   <li>n: End the path object without filling or stroking it.</li>
 	 * </ul>
-	 * @param $default (string) default style
+	 * @param string $default default style
+	 * @return string
 	 * @author Nicola Asuni
 	 * @since 5.0.000 (2010-04-30)
 	 * @public static
@@ -1637,9 +1655,9 @@ class TCPDF_STATIC {
 
 	/**
 	 * Get the product of two SVG tranformation matrices
-	 * @param $ta (array) first SVG tranformation matrix
-	 * @param $tb (array) second SVG tranformation matrix
-	 * @return transformation array
+	 * @param array $ta first SVG tranformation matrix
+	 * @param array $tb second SVG tranformation matrix
+	 * @return array transformation array
 	 * @author Nicola Asuni
 	 * @since 5.0.000 (2010-05-02)
 	 * @public static
@@ -1657,7 +1675,7 @@ class TCPDF_STATIC {
 
 	/**
 	 * Get the tranformation matrix from SVG transform attribute
-	 * @param $attribute (string) transformation
+	 * @param string $attribute transformation
 	 * @return array of transformations
 	 * @author Nicola Asuni
 	 * @since 5.0.000 (2010-05-02)
@@ -1752,10 +1770,10 @@ class TCPDF_STATIC {
 
 	/**
 	 * Returns the angle in radiants between two vectors
-	 * @param $x1 (int) X coordinate of first vector point
-	 * @param $y1 (int) Y coordinate of first vector point
-	 * @param $x2 (int) X coordinate of second vector point
-	 * @param $y2 (int) Y coordinate of second vector point
+	 * @param int $x1 X coordinate of first vector point
+	 * @param int $y1 Y coordinate of first vector point
+	 * @param int $x2 X coordinate of second vector point
+	 * @param int $y2 Y coordinate of second vector point
 	 * @author Nicola Asuni
 	 * @since 5.0.000 (2010-05-04)
 	 * @public static
@@ -1777,17 +1795,20 @@ class TCPDF_STATIC {
 	/**
 	 * Split string by a regular expression.
 	 * This is a wrapper for the preg_split function to avoid the bug: https://bugs.php.net/bug.php?id=45850
-	 * @param $pattern (string) The regular expression pattern to search for without the modifiers, as a string.
-	 * @param $modifiers (string) The modifiers part of the pattern,
-	 * @param $subject (string) The input string.
-	 * @param $limit (int) If specified, then only substrings up to limit are returned with the rest of the string being placed in the last substring. A limit of -1, 0 or NULL means "no limit" and, as is standard across PHP, you can use NULL to skip to the flags parameter.
-	 * @param $flags (int) The flags as specified on the preg_split PHP function.
-	 * @return Returns an array containing substrings of subject split along boundaries matched by pattern.modifier
+	 * @param string $pattern The regular expression pattern to search for without the modifiers, as a string.
+	 * @param string $modifiers The modifiers part of the pattern,
+	 * @param string $subject The input string.
+	 * @param int $limit If specified, then only substrings up to limit are returned with the rest of the string being placed in the last substring. A limit of -1, 0 or NULL means "no limit" and, as is standard across PHP, you can use NULL to skip to the flags parameter.
+	 * @param int $flags The flags as specified on the preg_split PHP function.
+	 * @return array Returns an array containing substrings of subject split along boundaries matched by pattern.modifier
 	 * @author Nicola Asuni
 	 * @since 6.0.023
 	 * @public static
 	 */
 	public static function pregSplit($pattern, $modifiers, $subject, $limit=NULL, $flags=NULL) {
+		// PHP 8.1 deprecates nulls for $limit and $flags
+		$limit = $limit === null ? -1 : $limit;
+		$flags = $flags === null ? 0 : $flags;
 		// the bug only happens on PHP 5.2 when using the u modifier
 		if ((strpos($modifiers, 'u') === FALSE) OR (count(preg_split('//u', "\n\t", -1, PREG_SPLIT_NO_EMPTY)) == 2)) {
 			return preg_split($pattern.$modifiers, $subject, $limit, $flags);
@@ -1807,9 +1828,9 @@ class TCPDF_STATIC {
 
 	/**
 	 * Wrapper to use fopen only with local files
-	 * @param filename (string) Name of the file to open
-	 * @param $mode (string) 
-	 * @return Returns a file pointer resource on success, or FALSE on error.  
+	 * @param string $filename Name of the file to open
+	 * @param string $mode
+	 * @return resource|false Returns a file pointer resource on success, or FALSE on error.
 	 * @public static
 	 */
 	public static function fopenLocal($filename, $mode) {
@@ -1823,9 +1844,10 @@ class TCPDF_STATIC {
 
 	/**
 	 * Check if the URL exist.
-	 * @param url (string) URL to check.
-	 * @return Returns TRUE if the URL exists; FALSE otherwise.
+	 * @param string $url URL to check.
+	 * @return bool Returns TRUE if the URL exists; FALSE otherwise.
 	 * @public static
+	 * @since 6.2.25
 	 */
 	public static function url_exists($url) {
 		$crs = curl_init();
@@ -1842,6 +1864,10 @@ class TCPDF_STATIC {
 		curl_setopt($crs, CURLOPT_SSL_VERIFYPEER, false);
 		curl_setopt($crs, CURLOPT_SSL_VERIFYHOST, false);
 		curl_setopt($crs, CURLOPT_USERAGENT, 'tc-lib-file');
+		curl_setopt($crs, CURLOPT_MAXREDIRS, 5);
+		if (defined('CURLOPT_PROTOCOLS')) {
+		    curl_setopt($crs, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP |  CURLPROTO_FTP | CURLPROTO_FTPS);
+		}
 		curl_exec($crs);
 		$code = curl_getinfo($crs, CURLINFO_HTTP_CODE);
 		curl_close($crs);
@@ -1872,8 +1898,8 @@ class TCPDF_STATIC {
 	 * Wrapper for file_exists.
 	 * Checks whether a file or directory exists.
 	 * Only allows some protocols and local files.
-	 * @param filename (string) Path to the file or directory. 
-	 * @return Returns TRUE if the file or directory specified by filename exists; FALSE otherwise.  
+	 * @param string $filename Path to the file or directory.
+	 * @return bool Returns TRUE if the file or directory specified by filename exists; FALSE otherwise.
 	 * @public static
 	 */
 	public static function file_exists($filename) {
@@ -1889,8 +1915,8 @@ class TCPDF_STATIC {
 	/**
 	 * Reads entire file into a string.
 	 * The file can be also an URL.
-	 * @param $file (string) Name of the file or URL to read.
-	 * @return The function returns the read data or FALSE on failure. 
+	 * @param string $file Name of the file or URL to read.
+	 * @return string|false The function returns the read data or FALSE on failure.
 	 * @author Nicola Asuni
 	 * @since 6.0.025
 	 * @public static
@@ -1973,6 +1999,10 @@ class TCPDF_STATIC {
 				curl_setopt($crs, CURLOPT_SSL_VERIFYPEER, false);
 				curl_setopt($crs, CURLOPT_SSL_VERIFYHOST, false);
 				curl_setopt($crs, CURLOPT_USERAGENT, 'tc-lib-file');
+				curl_setopt($crs, CURLOPT_MAXREDIRS, 5);
+				if (defined('CURLOPT_PROTOCOLS')) {
+				    curl_setopt($crs, CURLOPT_PROTOCOLS, CURLPROTO_HTTPS | CURLPROTO_HTTP |  CURLPROTO_FTP | CURLPROTO_FTPS);
+				}
 				$ret = curl_exec($crs);
 				curl_close($crs);
 				if ($ret !== false) {
@@ -1985,8 +2015,8 @@ class TCPDF_STATIC {
 
 	/**
 	 * Get ULONG from string (Big Endian 32-bit unsigned integer).
-	 * @param $str (string) string from where to extract value
-	 * @param $offset (int) point from where to read the data
+	 * @param string $str string from where to extract value
+	 * @param int $offset point from where to read the data
 	 * @return int 32 bit value
 	 * @author Nicola Asuni
 	 * @since 5.2.000 (2010-06-02)
@@ -1999,8 +2029,8 @@ class TCPDF_STATIC {
 
 	/**
 	 * Get USHORT from string (Big Endian 16-bit unsigned integer).
-	 * @param $str (string) string from where to extract value
-	 * @param $offset (int) point from where to read the data
+	 * @param string $str string from where to extract value
+	 * @param int $offset point from where to read the data
 	 * @return int 16 bit value
 	 * @author Nicola Asuni
 	 * @since 5.2.000 (2010-06-02)
@@ -2013,8 +2043,8 @@ class TCPDF_STATIC {
 
 	/**
 	 * Get SHORT from string (Big Endian 16-bit signed integer).
-	 * @param $str (string) String from where to extract value.
-	 * @param $offset (int) Point from where to read the data.
+	 * @param string $str String from where to extract value.
+	 * @param int $offset Point from where to read the data.
 	 * @return int 16 bit value
 	 * @author Nicola Asuni
 	 * @since 5.2.000 (2010-06-02)
@@ -2027,8 +2057,8 @@ class TCPDF_STATIC {
 
 	/**
 	 * Get FWORD from string (Big Endian 16-bit signed integer).
-	 * @param $str (string) String from where to extract value.
-	 * @param $offset (int) Point from where to read the data.
+	 * @param string $str String from where to extract value.
+	 * @param int $offset Point from where to read the data.
 	 * @return int 16 bit value
 	 * @author Nicola Asuni
 	 * @since 5.9.123 (2011-09-30)
@@ -2044,8 +2074,8 @@ class TCPDF_STATIC {
 
 	/**
 	 * Get UFWORD from string (Big Endian 16-bit unsigned integer).
-	 * @param $str (string) string from where to extract value
-	 * @param $offset (int) point from where to read the data
+	 * @param string $str string from where to extract value
+	 * @param int $offset point from where to read the data
 	 * @return int 16 bit value
 	 * @author Nicola Asuni
 	 * @since 5.9.123 (2011-09-30)
@@ -2058,8 +2088,8 @@ class TCPDF_STATIC {
 
 	/**
 	 * Get FIXED from string (32-bit signed fixed-point number (16.16).
-	 * @param $str (string) string from where to extract value
-	 * @param $offset (int) point from where to read the data
+	 * @param string $str string from where to extract value
+	 * @param int $offset point from where to read the data
 	 * @return int 16 bit value
 	 * @author Nicola Asuni
 	 * @since 5.9.123 (2011-09-30)
@@ -2076,8 +2106,8 @@ class TCPDF_STATIC {
 
 	/**
 	 * Get BYTE from string (8-bit unsigned integer).
-	 * @param $str (string) String from where to extract value.
-	 * @param $offset (int) Point from where to read the data.
+	 * @param string $str String from where to extract value.
+	 * @param int $offset Point from where to read the data.
 	 * @return int 8 bit value
 	 * @author Nicola Asuni
 	 * @since 5.2.000 (2010-06-02)
@@ -2090,9 +2120,9 @@ class TCPDF_STATIC {
 	/**
 	 * Binary-safe and URL-safe file read.
 	 * Reads up to length bytes from the file pointer referenced by handle. Reading stops as soon as one of the following conditions is met: length bytes have been read; EOF (end of file) is reached.
-	 * @param $handle (resource)
-	 * @param $length (int)
-	 * @return Returns the read string or FALSE in case of error.
+	 * @param resource $handle
+	 * @param int $length
+	 * @return string|false Returns the read string or FALSE in case of error.
 	 * @author Nicola Asuni
 	 * @since 4.5.027 (2009-03-16)
 	 * @public static
@@ -2111,8 +2141,8 @@ class TCPDF_STATIC {
 
 	/**
 	 * Read a 4-byte (32 bit) integer from file.
-	 * @param $f (string) file name.
-	 * @return 4-byte integer
+	 * @param resource $f file resource.
+	 * @return int 4-byte integer
 	 * @public static
 	 */
 	public static function _freadint($f) {
@@ -2120,11 +2150,12 @@ class TCPDF_STATIC {
 		return $a['i'];
 	}
 
-	
 	/**
 	 * Array of page formats
 	 * measures are calculated in this way: (inches * 72) or (millimeters * 72 / 25.4)
 	 * @public static
+	 * 
+     * @var array<string,float[]>
 	 */
 	public static $page_formats = array(
 		// ISO 216 A Series + 2 SIS 014711 extensions
@@ -2480,7 +2511,7 @@ class TCPDF_STATIC {
 
 	/**
 	 * Get page dimensions from format name.
-	 * @param $format (mixed) The format name @see self::$page_format<ul>
+	 * @param mixed $format The format name @see self::$page_format<ul>
 	 * @return array containing page width and height in points
 	 * @since 5.0.010 (2010-05-17)
 	 * @public static
@@ -2494,20 +2525,20 @@ class TCPDF_STATIC {
 
 	/**
 	 * Set page boundaries.
-	 * @param $page (int) page number
-	 * @param $type (string) valid values are: <ul><li>'MediaBox' : the boundaries of the physical medium on which the page shall be displayed or printed;</li><li>'CropBox' : the visible region of default user space;</li><li>'BleedBox' : the region to which the contents of the page shall be clipped when output in a production environment;</li><li>'TrimBox' : the intended dimensions of the finished page after trimming;</li><li>'ArtBox' : the page's meaningful content (including potential white space).</li></ul>
-	 * @param $llx (float) lower-left x coordinate in user units.
-	 * @param $lly (float) lower-left y coordinate in user units.
-	 * @param $urx (float) upper-right x coordinate in user units.
-	 * @param $ury (float) upper-right y coordinate in user units.
-	 * @param $points (boolean) If true uses user units as unit of measure, otherwise uses PDF points.
-	 * @param $k (float) Scale factor (number of points in user unit).
-	 * @param $pagedim (array) Array of page dimensions.
-	 * @return pagedim array of page dimensions.
+	 * @param int $page page number
+	 * @param string $type valid values are: <ul><li>'MediaBox' : the boundaries of the physical medium on which the page shall be displayed or printed;</li><li>'CropBox' : the visible region of default user space;</li><li>'BleedBox' : the region to which the contents of the page shall be clipped when output in a production environment;</li><li>'TrimBox' : the intended dimensions of the finished page after trimming;</li><li>'ArtBox' : the page's meaningful content (including potential white space).</li></ul>
+	 * @param float $llx lower-left x coordinate in user units.
+	 * @param float $lly lower-left y coordinate in user units.
+	 * @param float $urx upper-right x coordinate in user units.
+	 * @param float $ury upper-right y coordinate in user units.
+	 * @param boolean $points If true uses user units as unit of measure, otherwise uses PDF points.
+	 * @param float $k Scale factor (number of points in user unit).
+	 * @param array $pagedim Array of page dimensions.
+	 * @return array pagedim array of page dimensions.
 	 * @since 5.0.010 (2010-05-17)
 	 * @public static
 	 */
-	public static function setPageBoxes($page, $type, $llx, $lly, $urx, $ury, $points=false, $k, $pagedim=array()) {
+	public static function setPageBoxes($page, $type, $llx, $lly, $urx, $ury, $points, $k, $pagedim=array()) {
 		if (!isset($pagedim[$page])) {
 			// initialize array
 			$pagedim[$page] = array();
@@ -2527,9 +2558,9 @@ class TCPDF_STATIC {
 
 	/**
 	 * Swap X and Y coordinates of page boxes (change page boxes orientation).
-	 * @param $page (int) page number
-	 * @param $pagedim (array) Array of page dimensions.
-	 * @return pagedim array of page dimensions.
+	 * @param int $page page number
+	 * @param array $pagedim Array of page dimensions.
+	 * @return array pagedim array of page dimensions.
 	 * @since 5.0.010 (2010-05-17)
 	 * @public static
 	 */
@@ -2550,8 +2581,8 @@ class TCPDF_STATIC {
 
 	/**
 	 * Get the canonical page layout mode.
-	 * @param $layout (string) The page layout. Possible values are:<ul><li>SinglePage Display one page at a time</li><li>OneColumn Display the pages in one column</li><li>TwoColumnLeft Display the pages in two columns, with odd-numbered pages on the left</li><li>TwoColumnRight Display the pages in two columns, with odd-numbered pages on the right</li><li>TwoPageLeft (PDF 1.5) Display the pages two at a time, with odd-numbered pages on the left</li><li>TwoPageRight (PDF 1.5) Display the pages two at a time, with odd-numbered pages on the right</li></ul>
-	 * @return (string) Canonical page layout name.
+	 * @param string $layout The page layout. Possible values are:<ul><li>SinglePage Display one page at a time</li><li>OneColumn Display the pages in one column</li><li>TwoColumnLeft Display the pages in two columns, with odd-numbered pages on the left</li><li>TwoColumnRight Display the pages in two columns, with odd-numbered pages on the right</li><li>TwoPageLeft (PDF 1.5) Display the pages two at a time, with odd-numbered pages on the left</li><li>TwoPageRight (PDF 1.5) Display the pages two at a time, with odd-numbered pages on the right</li></ul>
+	 * @return string Canonical page layout name.
 	 * @public static
 	 */
 	public static function getPageLayoutMode($layout='SinglePage') {
@@ -2593,8 +2624,8 @@ class TCPDF_STATIC {
 
 	/**
 	 * Get the canonical page layout mode.
-	 * @param $mode (string) A name object specifying how the document should be displayed when opened:<ul><li>UseNone Neither document outline nor thumbnail images visible</li><li>UseOutlines Document outline visible</li><li>UseThumbs Thumbnail images visible</li><li>FullScreen Full-screen mode, with no menu bar, window controls, or any other window visible</li><li>UseOC (PDF 1.5) Optional content group panel visible</li><li>UseAttachments (PDF 1.6) Attachments panel visible</li></ul>
-	 * @return (string) Canonical page mode name.
+	 * @param string $mode A name object specifying how the document should be displayed when opened:<ul><li>UseNone Neither document outline nor thumbnail images visible</li><li>UseOutlines Document outline visible</li><li>UseThumbs Thumbnail images visible</li><li>FullScreen Full-screen mode, with no menu bar, window controls, or any other window visible</li><li>UseOC (PDF 1.5) Optional content group panel visible</li><li>UseAttachments (PDF 1.6) Attachments panel visible</li></ul>
+	 * @return string Canonical page mode name.
 	 * @public static
 	 */
 	public static function getPageMode($mode='UseNone') {
diff --git a/lib/combodo/tcpdf/tcpdf.php b/lib/combodo/tcpdf/tcpdf.php
index a71afc3a8..400434730 100644
--- a/lib/combodo/tcpdf/tcpdf.php
+++ b/lib/combodo/tcpdf/tcpdf.php
@@ -1,13 +1,13 @@
 <?php
 //============================================================+
 // File name   : tcpdf.php
-// Version     : 6.3.2
+// Version     : 6.4.4
 // Begin       : 2002-08-03
-// Last Update : 2019-09-20
+// Last Update : 2021-12-31
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
-// Copyright (C) 2002-2019 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2002-2021 Nicola Asuni - Tecnick.com LTD
 //
 // This file is part of TCPDF software library.
 //
@@ -600,12 +600,16 @@ class TCPDF {
 	/**
 	 * Default font used on page header.
 	 * @protected
+	 * @var array<int,string|float|null>
+	 * @phpstan-var array{0: string, 1: string, 2: float|null}
 	 */
 	protected $header_font;
 
 	/**
 	 * Default font used on page footer.
 	 * @protected
+	 * @var array<int,string|float|null>
+	 * @phpstan-var array{0: string, 1: string, 2: float|null}
 	 */
 	protected $footer_font;
 
@@ -652,7 +656,7 @@ class TCPDF {
 	protected $header_title = '';
 
 	/**
-	 * String to pring on page header after title.
+	 * String to print on page header after title.
 	 * @protected
 	 */
 	protected $header_string = '';
@@ -661,6 +665,8 @@ class TCPDF {
 	 * Color for header text (RGB array).
 	 * @since 5.9.174 (2012-07-25)
 	 * @protected
+	 * @var int[]
+	 * @phpstan-var array{0: int, 1: int, 2: int}
 	 */
 	protected $header_text_color = array(0,0,0);
 
@@ -668,6 +674,8 @@ class TCPDF {
 	 * Color for header line (RGB array).
 	 * @since 5.9.174 (2012-07-25)
 	 * @protected
+	 * @var int[]
+	 * @phpstan-var array{0: int, 1: int, 2: int}
 	 */
 	protected $header_line_color = array(0,0,0);
 
@@ -675,6 +683,8 @@ class TCPDF {
 	 * Color for footer text (RGB array).
 	 * @since 5.9.174 (2012-07-25)
 	 * @protected
+	 * @var int[]
+	 * @phpstan-var array{0: int, 1: int, 2: int}
 	 */
 	protected $footer_text_color = array(0,0,0);
 
@@ -682,6 +692,8 @@ class TCPDF {
 	 * Color for footer line (RGB array).
 	 * @since 5.9.174 (2012-07-25)
 	 * @protected
+	 * @var int[]
+	 * @phpstan-var array{0: int, 1: int, 2: int}
 	 */
 	protected $footer_line_color = array(0,0,0);
 
@@ -773,13 +785,6 @@ class TCPDF {
 	 */
 	protected $encoding = 'UTF-8';
 
-	/**
-	 * PHP internal encoding.
-	 * @protected
-	 * @since 1.53.0.TC016
-	 */
-	protected $internal_encoding;
-
 	/**
 	 * Boolean flag to indicate if the document language is Right-To-Left.
 	 * @protected
@@ -923,6 +928,7 @@ class TCPDF {
 	 * Default cell height ratio.
 	 * @protected
 	 * @since 3.0.014 (2008-05-23)
+	 * @var float
 	 */
 	protected $cell_height_ratio = K_CELL_HEIGHT_RATIO;
 
@@ -1800,6 +1806,7 @@ class TCPDF {
 	 * (Check the "Entries in a Graphics State Parameter Dictionary" on PDF 32000-1:2008).
 	 * @protected
 	 * @since 5.9.152 (2012-03-23)
+	 * @var array<string,bool|int>
 	 */
 	protected $overprint = array('OP' => false, 'op' => false, 'OPM' => 0);
 
@@ -1832,6 +1839,23 @@ class TCPDF {
 	 */
 	protected $gdgammacache = array();
 
+    /**
+     * Cache array for file content
+     * @protected
+     * @var array
+     * @since 6.3.5 (2020-09-28)
+     */
+	protected $fileContentCache = array();
+
+	/**
+	 * Whether to allow local file path in image html tags, when prefixed with file://
+	 *
+	 * @var bool
+	 * @protected
+	 * @since 6.4 (2020-07-23)
+	 */
+	protected $allowLocalFiles = false;
+
 	//------------------------------------------------------------
 	// METHODS
 	//------------------------------------------------------------
@@ -1840,24 +1864,17 @@ class TCPDF {
 	 * This is the class constructor.
 	 * It allows to set up the page format, the orientation and the measure unit used in all the methods (except for the font sizes).
 	 *
-	 * IMPORTANT: Please note that this method sets the mb_internal_encoding to ASCII, so if you are using the mbstring module functions with TCPDF you need to correctly set/unset the mb_internal_encoding when needed.
-	 *
-	 * @param $orientation (string) page orientation. Possible values are (case insensitive):<ul><li>P or Portrait (default)</li><li>L or Landscape</li><li>'' (empty string) for automatic orientation</li></ul>
-	 * @param $unit (string) User measure unit. Possible values are:<ul><li>pt: point</li><li>mm: millimeter (default)</li><li>cm: centimeter</li><li>in: inch</li></ul><br />A point equals 1/72 of inch, that is to say about 0.35 mm (an inch being 2.54 cm). This is a very common unit in typography; font sizes are expressed in that unit.
-	 * @param $format (mixed) The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
-	 * @param $unicode (boolean) TRUE means that the input text is unicode (default = true)
-	 * @param $encoding (string) Charset encoding (used only when converting back html entities); default is UTF-8.
-	 * @param $diskcache (boolean) DEPRECATED FEATURE
-	 * @param $pdfa (integer) If not false, set the document to PDF/A mode and the good version (1 or 3).
+	 * @param string $orientation page orientation. Possible values are (case insensitive):<ul><li>P or Portrait (default)</li><li>L or Landscape</li><li>'' (empty string) for automatic orientation</li></ul>
+	 * @param string $unit User measure unit. Possible values are:<ul><li>pt: point</li><li>mm: millimeter (default)</li><li>cm: centimeter</li><li>in: inch</li></ul><br />A point equals 1/72 of inch, that is to say about 0.35 mm (an inch being 2.54 cm). This is a very common unit in typography; font sizes are expressed in that unit.
+	 * @param mixed $format The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
+	 * @param boolean $unicode TRUE means that the input text is unicode (default = true)
+	 * @param string $encoding Charset encoding (used only when converting back html entities); default is UTF-8.
+	 * @param boolean $diskcache DEPRECATED FEATURE
+	 * @param false|integer $pdfa If not false, set the document to PDF/A mode and the good version (1 or 3).
 	 * @public
 	 * @see getPageSizeFromFormat(), setPageFormat()
 	 */
 	public function __construct($orientation='P', $unit='mm', $format='A4', $unicode=true, $encoding='UTF-8', $diskcache=false, $pdfa=false) {
-		/* Set internal character encoding to ASCII */
-		if (function_exists('mb_internal_encoding') AND mb_internal_encoding()) {
-			$this->internal_encoding = mb_internal_encoding();
-			mb_internal_encoding('ASCII');
-		}
 		// set file ID for trailer
 		$serformat = (is_array($format) ? json_encode($format) : $format);
 		$this->file_id = md5(TCPDF_STATIC::getRandomSeed('TCPDF'.$orientation.$unit.$serformat.$encoding));
@@ -1932,7 +1949,7 @@ class TCPDF {
 		$this->setPageFormat($format, $orientation);
 		// page margins (1 cm)
 		$margin = 28.35 / $this->k;
-		$this->SetMargins($margin, $margin);
+		$this->setMargins($margin, $margin);
 		$this->clMargin = $this->lMargin;
 		$this->crMargin = $this->rMargin;
 		// internal cell padding
@@ -1947,11 +1964,11 @@ class TCPDF {
 		$this->linestyleJoin = '0 j';
 		$this->linestyleDash = '[] 0 d';
 		// automatic page break
-		$this->SetAutoPageBreak(true, (2 * $margin));
+		$this->setAutoPageBreak(true, (2 * $margin));
 		// full width display mode
-		$this->SetDisplayMode('fullwidth');
+		$this->setDisplayMode('fullwidth');
 		// compression
-		$this->SetCompression();
+		$this->setCompression();
 		// set default PDF version number
 		$this->setPDFVersion();
 		$this->tcpdflink = true;
@@ -1982,7 +1999,7 @@ class TCPDF {
 		// initialize some settings
 		TCPDF_FONTS::utf8Bidi(array(), '', false, $this->isunicode, $this->CurrentFont);
 		// set default font
-		$this->SetFont($this->FontFamily, $this->FontStyle, $this->FontSizePt);
+		$this->setFont($this->FontFamily, $this->FontStyle, $this->FontSizePt);
 		$this->setHeaderFont(array($this->FontFamily, $this->FontStyle, $this->FontSizePt));
 		$this->setFooterFont(array($this->FontFamily, $this->FontStyle, $this->FontSizePt));
 		// check if PCRE Unicode support is enabled
@@ -2024,7 +2041,7 @@ class TCPDF {
 
 	/**
 	 * Set the units of measure for the document.
-	 * @param $unit (string) User measure unit. Possible values are:<ul><li>pt: point</li><li>mm: millimeter (default)</li><li>cm: centimeter</li><li>in: inch</li></ul><br />A point equals 1/72 of inch, that is to say about 0.35 mm (an inch being 2.54 cm). This is a very common unit in typography; font sizes are expressed in that unit.
+	 * @param string $unit User measure unit. Possible values are:<ul><li>pt: point</li><li>mm: millimeter (default)</li><li>cm: centimeter</li><li>in: inch</li></ul><br />A point equals 1/72 of inch, that is to say about 0.35 mm (an inch being 2.54 cm). This is a very common unit in typography; font sizes are expressed in that unit.
 	 * @public
 	 * @since 3.0.015 (2008-06-06)
 	 */
@@ -2067,7 +2084,7 @@ class TCPDF {
 
 	/**
 	 * Change the format of the current page
-	 * @param $format (mixed) The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() documentation or an array of two numbers (width, height) or an array containing the following measures and options:<ul>
+	 * @param mixed $format The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() documentation or an array of two numbers (width, height) or an array containing the following measures and options:<ul>
 	 * <li>['format'] = page format name (one of the above);</li>
 	 * <li>['Rotate'] : The number of degrees by which the page shall be rotated clockwise when displayed or printed. The value shall be a multiple of 90.</li>
 	 * <li>['PZ'] : The page's preferred zoom (magnification) factor.</li>
@@ -2111,7 +2128,7 @@ class TCPDF {
 	 * <li>['trans']['SS'] : (Fly transition style only) The starting or ending scale at which the changes shall be drawn. If M specifies an inward transition, the scale of the changes drawn shall progress from SS to 1.0 over the course of the transition. If M specifies an outward transition, the scale of the changes drawn shall progress from 1.0 to SS over the course of the transition. Default: 1.0.</li>
 	 * <li>['trans']['B'] : (Fly transition style only) If true, the area that shall be flown in is rectangular and opaque. Default: false.</li>
 	 * </ul>
-	 * @param $orientation (string) page orientation. Possible values are (case insensitive):<ul>
+	 * @param string $orientation page orientation. Possible values are (case insensitive):<ul>
 	 * <li>P or Portrait (default)</li>
 	 * <li>L or Landscape</li>
 	 * <li>'' (empty string) for automatic orientation</li>
@@ -2228,13 +2245,13 @@ class TCPDF {
 
 	/**
 	 * Set page orientation.
-	 * @param $orientation (string) page orientation. Possible values are (case insensitive):<ul><li>P or Portrait (default)</li><li>L or Landscape</li><li>'' (empty string) for automatic orientation</li></ul>
-	 * @param $autopagebreak (boolean) Boolean indicating if auto-page-break mode should be on or off.
-	 * @param $bottommargin (float) bottom margin of the page.
+	 * @param string $orientation page orientation. Possible values are (case insensitive):<ul><li>P or Portrait (default)</li><li>L or Landscape</li><li>'' (empty string) for automatic orientation</li></ul>
+	 * @param boolean|null $autopagebreak Boolean indicating if auto-page-break mode should be on or off.
+	 * @param float|null $bottommargin bottom margin of the page.
 	 * @public
 	 * @since 3.0.015 (2008-06-06)
 	 */
-	public function setPageOrientation($orientation, $autopagebreak='', $bottommargin='') {
+	public function setPageOrientation($orientation, $autopagebreak=null, $bottommargin=null) {
 		if (!isset($this->pagedim[$this->page]['MediaBox'])) {
 			// the boundaries of the physical medium on which the page shall be displayed or printed
 			$this->pagedim = TCPDF_STATIC::setPageBoxes($this->page, 'MediaBox', 0, 0, $this->fwPt, $this->fhPt, true, $this->k, $this->pagedim);
@@ -2306,7 +2323,7 @@ class TCPDF {
 				$bottommargin = 2 * 28.35 / $this->k;
 			}
 		}
-		$this->SetAutoPageBreak($autopagebreak, $bottommargin);
+		$this->setAutoPageBreak($autopagebreak, $bottommargin);
 		// store page dimensions
 		$this->pagedim[$this->page]['w'] = $this->wPt;
 		$this->pagedim[$this->page]['h'] = $this->hPt;
@@ -2336,7 +2353,7 @@ class TCPDF {
 	 *      \p{Lo} : Unicode letter or ideograph that does not have lowercase and uppercase variants. Is used to chunk chinese words.
 	 *      \xa0   : Unicode Character 'NO-BREAK SPACE' (U+00A0)
 	 * </pre>
-	 * @param $re (string) regular expression (leave empty for default).
+	 * @param string $re regular expression (leave empty for default).
 	 * @public
 	 * @since 4.6.016 (2009-06-15)
 	 */
@@ -2360,8 +2377,8 @@ class TCPDF {
 
 	/**
 	 * Enable or disable Right-To-Left language mode
-	 * @param $enable (Boolean) if true enable Right-To-Left language mode.
-	 * @param $resetx (Boolean) if true reset the X position on direction change.
+	 * @param boolean $enable if true enable Right-To-Left language mode.
+	 * @param boolean $resetx if true reset the X position on direction change.
 	 * @public
 	 * @since 2.0.000 (2008-01-03)
 	 */
@@ -2377,7 +2394,7 @@ class TCPDF {
 
 	/**
 	 * Return the RTL status
-	 * @return boolean
+	 * @return bool
 	 * @public
 	 * @since 4.0.012 (2008-07-24)
 	 */
@@ -2387,7 +2404,7 @@ class TCPDF {
 
 	/**
 	 * Force temporary RTL language direction
-	 * @param $mode (mixed) can be false, 'L' for LTR or 'R' for RTL
+	 * @param false|string $mode can be false, 'L' for LTR or 'R' for RTL
 	 * @public
 	 * @since 2.1.000 (2008-01-09)
 	 */
@@ -2419,7 +2436,7 @@ class TCPDF {
 
 	/**
 	 * Return the current temporary RTL status
-	 * @return boolean
+	 * @return bool
 	 * @public
 	 * @since 4.8.014 (2009-11-04)
 	 */
@@ -2429,7 +2446,7 @@ class TCPDF {
 
 	/**
 	 * Set the last cell height.
-	 * @param $h (float) cell height.
+	 * @param float $h cell height.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 1.53.0.TC034
@@ -2440,9 +2457,10 @@ class TCPDF {
 
 	/**
 	 * Return the cell height
-	 * @param $fontsize (int) Font size in internal units
-	 * @param $padding (boolean) If true add cell padding
+	 * @param int $fontsize Font size in internal units
+	 * @param boolean $padding If true add cell padding
 	 * @public
+	 * @return float
 	 */
 	public function getCellHeight($fontsize, $padding=TRUE) {
 		$height = ($fontsize * $this->cell_height_ratio);
@@ -2463,7 +2481,7 @@ class TCPDF {
 
 	/**
 	 * Get the last cell height.
-	 * @return last cell height
+	 * @return float last cell height
 	 * @public
 	 * @since 4.0.017 (2008-08-05)
 	 */
@@ -2473,7 +2491,7 @@ class TCPDF {
 
 	/**
 	 * Set the adjusting factor to convert pixels to user units.
-	 * @param $scale (float) adjusting factor to convert pixels to user units.
+	 * @param float $scale adjusting factor to convert pixels to user units.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 1.5.2
@@ -2496,13 +2514,13 @@ class TCPDF {
 	/**
 	 * Returns an array of page dimensions:
 	 * <ul><li>$this->pagedim[$this->page]['w'] = page width in points</li><li>$this->pagedim[$this->page]['h'] = height in points</li><li>$this->pagedim[$this->page]['wk'] = page width in user units</li><li>$this->pagedim[$this->page]['hk'] = page height in user units</li><li>$this->pagedim[$this->page]['tm'] = top margin</li><li>$this->pagedim[$this->page]['bm'] = bottom margin</li><li>$this->pagedim[$this->page]['lm'] = left margin</li><li>$this->pagedim[$this->page]['rm'] = right margin</li><li>$this->pagedim[$this->page]['pb'] = auto page break</li><li>$this->pagedim[$this->page]['or'] = page orientation</li><li>$this->pagedim[$this->page]['olm'] = original left margin</li><li>$this->pagedim[$this->page]['orm'] = original right margin</li><li>$this->pagedim[$this->page]['Rotate'] = The number of degrees by which the page shall be rotated clockwise when displayed or printed. The value shall be a multiple of 90.</li><li>$this->pagedim[$this->page]['PZ'] = The page's preferred zoom (magnification) factor.</li><li>$this->pagedim[$this->page]['trans'] : the style and duration of the visual transition to use when moving from another page to the given page during a presentation<ul><li>$this->pagedim[$this->page]['trans']['Dur'] = The page's display duration (also called its advance timing): the maximum length of time, in seconds, that the page shall be displayed during presentations before the viewer application shall automatically advance to the next page.</li><li>$this->pagedim[$this->page]['trans']['S'] = transition style : Split, Blinds, Box, Wipe, Dissolve, Glitter, R, Fly, Push, Cover, Uncover, Fade</li><li>$this->pagedim[$this->page]['trans']['D'] = The duration of the transition effect, in seconds.</li><li>$this->pagedim[$this->page]['trans']['Dm'] = (Split and Blinds transition styles only) The dimension in which the specified transition effect shall occur: H = Horizontal, V = Vertical. Default value: H.</li><li>$this->pagedim[$this->page]['trans']['M'] = (Split, Box and Fly transition styles only) The direction of motion for the specified transition effect: I = Inward from the edges of the page, O = Outward from the center of the pageDefault value: I.</li><li>$this->pagedim[$this->page]['trans']['Di'] = (Wipe, Glitter, Fly, Cover, Uncover and Push transition styles only) The direction in which the specified transition effect shall moves, expressed in degrees counterclockwise starting from a left-to-right direction. If the value is a number, it shall be one of: 0 = Left to right, 90 = Bottom to top (Wipe only), 180 = Right to left (Wipe only), 270 = Top to bottom, 315 = Top-left to bottom-right (Glitter only). If the value is a name, it shall be None, which is relevant only for the Fly transition when the value of SS is not 1.0. Default value: 0.</li><li>$this->pagedim[$this->page]['trans']['SS'] = (Fly transition style only) The starting or ending scale at which the changes shall be drawn. If M specifies an inward transition, the scale of the changes drawn shall progress from SS to 1.0 over the course of the transition. If M specifies an outward transition, the scale of the changes drawn shall progress from 1.0 to SS over the course of the transition. Default: 1.0. </li><li>$this->pagedim[$this->page]['trans']['B'] = (Fly transition style only) If true, the area that shall be flown in is rectangular and opaque. Default: false.</li></ul></li><li>$this->pagedim[$this->page]['MediaBox'] : the boundaries of the physical medium on which the page shall be displayed or printed<ul><li>$this->pagedim[$this->page]['MediaBox']['llx'] = lower-left x coordinate in points</li><li>$this->pagedim[$this->page]['MediaBox']['lly'] = lower-left y coordinate in points</li><li>$this->pagedim[$this->page]['MediaBox']['urx'] = upper-right x coordinate in points</li><li>$this->pagedim[$this->page]['MediaBox']['ury'] = upper-right y coordinate in points</li></ul></li><li>$this->pagedim[$this->page]['CropBox'] : the visible region of default user space<ul><li>$this->pagedim[$this->page]['CropBox']['llx'] = lower-left x coordinate in points</li><li>$this->pagedim[$this->page]['CropBox']['lly'] = lower-left y coordinate in points</li><li>$this->pagedim[$this->page]['CropBox']['urx'] = upper-right x coordinate in points</li><li>$this->pagedim[$this->page]['CropBox']['ury'] = upper-right y coordinate in points</li></ul></li><li>$this->pagedim[$this->page]['BleedBox'] : the region to which the contents of the page shall be clipped when output in a production environment<ul><li>$this->pagedim[$this->page]['BleedBox']['llx'] = lower-left x coordinate in points</li><li>$this->pagedim[$this->page]['BleedBox']['lly'] = lower-left y coordinate in points</li><li>$this->pagedim[$this->page]['BleedBox']['urx'] = upper-right x coordinate in points</li><li>$this->pagedim[$this->page]['BleedBox']['ury'] = upper-right y coordinate in points</li></ul></li><li>$this->pagedim[$this->page]['TrimBox'] : the intended dimensions of the finished page after trimming<ul><li>$this->pagedim[$this->page]['TrimBox']['llx'] = lower-left x coordinate in points</li><li>$this->pagedim[$this->page]['TrimBox']['lly'] = lower-left y coordinate in points</li><li>$this->pagedim[$this->page]['TrimBox']['urx'] = upper-right x coordinate in points</li><li>$this->pagedim[$this->page]['TrimBox']['ury'] = upper-right y coordinate in points</li></ul></li><li>$this->pagedim[$this->page]['ArtBox'] : the extent of the page's meaningful content<ul><li>$this->pagedim[$this->page]['ArtBox']['llx'] = lower-left x coordinate in points</li><li>$this->pagedim[$this->page]['ArtBox']['lly'] = lower-left y coordinate in points</li><li>$this->pagedim[$this->page]['ArtBox']['urx'] = upper-right x coordinate in points</li><li>$this->pagedim[$this->page]['ArtBox']['ury'] = upper-right y coordinate in points</li></ul></li></ul>
-	 * @param $pagenum (int) page number (empty = current page)
+	 * @param int|null $pagenum page number (empty = current page)
 	 * @return array of page dimensions.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 4.5.027 (2009-03-16)
 	 */
-	public function getPageDimensions($pagenum='') {
+	public function getPageDimensions($pagenum=null) {
 		if (empty($pagenum)) {
 			$pagenum = $this->page;
 		}
@@ -2511,14 +2529,14 @@ class TCPDF {
 
 	/**
 	 * Returns the page width in units.
-	 * @param $pagenum (int) page number (empty = current page)
+	 * @param int|null $pagenum page number (empty = current page)
 	 * @return int page width.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 1.5.2
 	 * @see getPageDimensions()
 	 */
-	public function getPageWidth($pagenum='') {
+	public function getPageWidth($pagenum=null) {
 		if (empty($pagenum)) {
 			return $this->w;
 		}
@@ -2527,14 +2545,14 @@ class TCPDF {
 
 	/**
 	 * Returns the page height in units.
-	 * @param $pagenum (int) page number (empty = current page)
+	 * @param int|null $pagenum page number (empty = current page)
 	 * @return int page height.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 1.5.2
 	 * @see getPageDimensions()
 	 */
-	public function getPageHeight($pagenum='') {
+	public function getPageHeight($pagenum=null) {
 		if (empty($pagenum)) {
 			return $this->h;
 		}
@@ -2543,14 +2561,14 @@ class TCPDF {
 
 	/**
 	 * Returns the page break margin.
-	 * @param $pagenum (int) page number (empty = current page)
+	 * @param int|null $pagenum page number (empty = current page)
 	 * @return int page break margin.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 1.5.2
 	 * @see getPageDimensions()
 	 */
-	public function getBreakMargin($pagenum='') {
+	public function getBreakMargin($pagenum=null) {
 		if (empty($pagenum)) {
 			return $this->bMargin;
 		}
@@ -2570,19 +2588,19 @@ class TCPDF {
 
 	/**
 	 * Defines the left, top and right margins.
-	 * @param $left (float) Left margin.
-	 * @param $top (float) Top margin.
-	 * @param $right (float) Right margin. Default value is the left one.
-	 * @param $keepmargins (boolean) if true overwrites the default page margins
+	 * @param float $left Left margin.
+	 * @param float $top Top margin.
+	 * @param float $right Right margin. Default value is the left one.
+	 * @param boolean $keepmargins if true overwrites the default page margins
 	 * @public
 	 * @since 1.0
 	 * @see SetLeftMargin(), SetTopMargin(), SetRightMargin(), SetAutoPageBreak()
 	 */
-	public function SetMargins($left, $top, $right=-1, $keepmargins=false) {
+	public function setMargins($left, $top, $right=null, $keepmargins=false) {
 		//Set left, top and right margins
 		$this->lMargin = $left;
 		$this->tMargin = $top;
-		if ($right == -1) {
+		if ($right == -1 OR $right === null) {
 			$right = $left;
 		}
 		$this->rMargin = $right;
@@ -2595,12 +2613,12 @@ class TCPDF {
 
 	/**
 	 * Defines the left margin. The method can be called before creating the first page. If the current abscissa gets out of page, it is brought back to the margin.
-	 * @param $margin (float) The margin.
+	 * @param float $margin The margin.
 	 * @public
 	 * @since 1.4
 	 * @see SetTopMargin(), SetRightMargin(), SetAutoPageBreak(), SetMargins()
 	 */
-	public function SetLeftMargin($margin) {
+	public function setLeftMargin($margin) {
 		//Set left margin
 		$this->lMargin = $margin;
 		if (($this->page > 0) AND ($this->x < $margin)) {
@@ -2610,12 +2628,12 @@ class TCPDF {
 
 	/**
 	 * Defines the top margin. The method can be called before creating the first page.
-	 * @param $margin (float) The margin.
+	 * @param float $margin The margin.
 	 * @public
 	 * @since 1.5
 	 * @see SetLeftMargin(), SetRightMargin(), SetAutoPageBreak(), SetMargins()
 	 */
-	public function SetTopMargin($margin) {
+	public function setTopMargin($margin) {
 		//Set top margin
 		$this->tMargin = $margin;
 		if (($this->page > 0) AND ($this->y < $margin)) {
@@ -2625,12 +2643,12 @@ class TCPDF {
 
 	/**
 	 * Defines the right margin. The method can be called before creating the first page.
-	 * @param $margin (float) The margin.
+	 * @param float $margin The margin.
 	 * @public
 	 * @since 1.5
 	 * @see SetLeftMargin(), SetTopMargin(), SetAutoPageBreak(), SetMargins()
 	 */
-	public function SetRightMargin($margin) {
+	public function setRightMargin($margin) {
 		$this->rMargin = $margin;
 		if (($this->page > 0) AND ($this->x > ($this->w - $margin))) {
 			$this->x = $this->w - $margin;
@@ -2639,12 +2657,12 @@ class TCPDF {
 
 	/**
 	 * Set the same internal Cell padding for top, right, bottom, left-
-	 * @param $pad (float) internal padding.
+	 * @param float $pad internal padding.
 	 * @public
 	 * @since 2.1.000 (2008-01-09)
 	 * @see getCellPaddings(), setCellPaddings()
 	 */
-	public function SetCellPadding($pad) {
+	public function setCellPadding($pad) {
 		if ($pad >= 0) {
 			$this->cell_padding['L'] = $pad;
 			$this->cell_padding['T'] = $pad;
@@ -2655,25 +2673,25 @@ class TCPDF {
 
 	/**
 	 * Set the internal Cell paddings.
-	 * @param $left (float) left padding
-	 * @param $top (float) top padding
-	 * @param $right (float) right padding
-	 * @param $bottom (float) bottom padding
+	 * @param float|null $left left padding
+	 * @param float|null $top top padding
+	 * @param float|null $right right padding
+	 * @param float|null $bottom bottom padding
 	 * @public
 	 * @since 5.9.000 (2010-10-03)
 	 * @see getCellPaddings(), SetCellPadding()
 	 */
-	public function setCellPaddings($left='', $top='', $right='', $bottom='') {
-		if (($left !== '') AND ($left >= 0)) {
+	public function setCellPaddings($left=null, $top=null, $right=null, $bottom=null) {
+		if (!TCPDF_STATIC::empty_string($left) AND ($left >= 0)) {
 			$this->cell_padding['L'] = $left;
 		}
-		if (($top !== '') AND ($top >= 0)) {
+		if (!TCPDF_STATIC::empty_string($top) AND ($top >= 0)) {
 			$this->cell_padding['T'] = $top;
 		}
-		if (($right !== '') AND ($right >= 0)) {
+		if (!TCPDF_STATIC::empty_string($right) AND ($right >= 0)) {
 			$this->cell_padding['R'] = $right;
 		}
-		if (($bottom !== '') AND ($bottom >= 0)) {
+		if (!TCPDF_STATIC::empty_string($bottom) AND ($bottom >= 0)) {
 			$this->cell_padding['B'] = $bottom;
 		}
 	}
@@ -2691,25 +2709,25 @@ class TCPDF {
 
 	/**
 	 * Set the internal Cell margins.
-	 * @param $left (float) left margin
-	 * @param $top (float) top margin
-	 * @param $right (float) right margin
-	 * @param $bottom (float) bottom margin
+	 * @param float|null $left left margin
+	 * @param float|null $top top margin
+	 * @param float|null $right right margin
+	 * @param float|null $bottom bottom margin
 	 * @public
 	 * @since 5.9.000 (2010-10-03)
 	 * @see getCellMargins()
 	 */
-	public function setCellMargins($left='', $top='', $right='', $bottom='') {
-		if (($left !== '') AND ($left >= 0)) {
+	public function setCellMargins($left=null, $top=null, $right=null, $bottom=null) {
+		if (!TCPDF_STATIC::empty_string($left) AND ($left >= 0)) {
 			$this->cell_margin['L'] = $left;
 		}
-		if (($top !== '') AND ($top >= 0)) {
+		if (!TCPDF_STATIC::empty_string($top) AND ($top >= 0)) {
 			$this->cell_margin['T'] = $top;
 		}
-		if (($right !== '') AND ($right >= 0)) {
+		if (!TCPDF_STATIC::empty_string($right) AND ($right >= 0)) {
 			$this->cell_margin['R'] = $right;
 		}
-		if (($bottom !== '') AND ($bottom >= 0)) {
+		if (!TCPDF_STATIC::empty_string($bottom) AND ($bottom >= 0)) {
 			$this->cell_margin['B'] = $bottom;
 		}
 	}
@@ -2727,8 +2745,8 @@ class TCPDF {
 
 	/**
 	 * Adjust the internal Cell padding array to take account of the line width.
-	 * @param $brd (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @return array of adjustments
+	 * @param string|array|int $brd Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
+	 * @return void|array array of adjustments
 	 * @public
 	 * @since 5.9.000 (2010-10-03)
 	 */
@@ -2744,7 +2762,11 @@ class TCPDF {
 				$newbrd[$brd[$i]] = true;
 			}
 			$brd = $newbrd;
-		} elseif (($brd === 1) OR ($brd === true) OR (is_numeric($brd) AND (intval($brd) > 0))) {
+		} elseif (
+			($brd === 1)
+			|| ($brd === true)
+			|| (is_numeric($brd) && ((int)$brd > 0))
+		) {
 			$brd = array('LRTB' => true);
 		}
 		if (!is_array($brd)) {
@@ -2762,7 +2784,7 @@ class TCPDF {
 		// process borders
 		foreach ($brd as $border => $style) {
 			$line_width = $this->LineWidth;
-			if (is_array($style) AND isset($style['width'])) {
+			if (is_array($style) && isset($style['width'])) {
 				// get border width
 				$line_width = $style['width'];
 			}
@@ -2783,31 +2805,54 @@ class TCPDF {
 				}
 			}
 			// correct internal cell padding if required to avoid overlap between text and lines
-			if ((strpos($border,'T') !== false) AND ($this->cell_padding['T'] < $adj)) {
+			if (
+				is_numeric($this->cell_padding['T'])
+				&& ($this->cell_padding['T'] < $adj)
+				&& (strpos($border, 'T') !== false)
+			) {
 				$this->cell_padding['T'] = $adj;
 			}
-			if ((strpos($border,'R') !== false) AND ($this->cell_padding['R'] < $adj)) {
+			if (
+				is_numeric($this->cell_padding['R'])
+				&& ($this->cell_padding['R'] < $adj)
+				&& (strpos($border, 'R') !== false)
+			) {
 				$this->cell_padding['R'] = $adj;
 			}
-			if ((strpos($border,'B') !== false) AND ($this->cell_padding['B'] < $adj)) {
+			if (
+				is_numeric($this->cell_padding['B'])
+				&& ($this->cell_padding['B'] < $adj)
+				&& (strpos($border, 'B') !== false)
+			) {
 				$this->cell_padding['B'] = $adj;
 			}
-			if ((strpos($border,'L') !== false) AND ($this->cell_padding['L'] < $adj)) {
+			if (
+				is_numeric($this->cell_padding['L'])
+				&& ($this->cell_padding['L'] < $adj)
+				&& (strpos($border, 'L') !== false)
+			) {
 				$this->cell_padding['L'] = $adj;
 			}
+
 		}
-		return array('T' => ($this->cell_padding['T'] - $cp['T']), 'R' => ($this->cell_padding['R'] - $cp['R']), 'B' => ($this->cell_padding['B'] - $cp['B']), 'L' => ($this->cell_padding['L'] - $cp['L']));
+
+		return array(
+			'T' => ($this->cell_padding['T'] - $cp['T']),
+			'R' => ($this->cell_padding['R'] - $cp['R']),
+			'B' => ($this->cell_padding['B'] - $cp['B']),
+			'L' => ($this->cell_padding['L'] - $cp['L']),
+		);
 	}
 
 	/**
 	 * Enables or disables the automatic page breaking mode. When enabling, the second parameter is the distance from the bottom of the page that defines the triggering limit. By default, the mode is on and the margin is 2 cm.
-	 * @param $auto (boolean) Boolean indicating if mode should be on or off.
-	 * @param $margin (float) Distance from the bottom of the page.
+	 * @param boolean $auto Boolean indicating if mode should be on or off.
+	 * @param float $margin Distance from the bottom of the page.
 	 * @public
 	 * @since 1.0
 	 * @see Cell(), MultiCell(), AcceptPageBreak()
 	 */
-	public function SetAutoPageBreak($auto, $margin=0) {
+	public function setAutoPageBreak($auto, $margin=0) {
 		$this->AutoPageBreak = $auto ? true : false;
 		$this->bMargin = $margin;
 		$this->PageBreakTrigger = $this->h - $margin;
@@ -2815,7 +2860,7 @@ class TCPDF {
 
 	/**
 	 * Return the auto-page-break mode (true or false).
-	 * @return boolean auto-page-break mode
+	 * @return bool auto-page-break mode
 	 * @public
 	 * @since 5.9.088
 	 */
@@ -2825,13 +2870,13 @@ class TCPDF {
 
 	/**
 	 * Defines the way the document is to be displayed by the viewer.
-	 * @param $zoom (mixed) The zoom to use. It can be one of the following string values or a number indicating the zooming factor to use. <ul><li>fullpage: displays the entire page on screen </li><li>fullwidth: uses maximum width of window</li><li>real: uses real size (equivalent to 100% zoom)</li><li>default: uses viewer default mode</li></ul>
-	 * @param $layout (string) The page layout. Possible values are:<ul><li>SinglePage Display one page at a time</li><li>OneColumn Display the pages in one column</li><li>TwoColumnLeft Display the pages in two columns, with odd-numbered pages on the left</li><li>TwoColumnRight Display the pages in two columns, with odd-numbered pages on the right</li><li>TwoPageLeft (PDF 1.5) Display the pages two at a time, with odd-numbered pages on the left</li><li>TwoPageRight (PDF 1.5) Display the pages two at a time, with odd-numbered pages on the right</li></ul>
-	 * @param $mode (string) A name object specifying how the document should be displayed when opened:<ul><li>UseNone Neither document outline nor thumbnail images visible</li><li>UseOutlines Document outline visible</li><li>UseThumbs Thumbnail images visible</li><li>FullScreen Full-screen mode, with no menu bar, window controls, or any other window visible</li><li>UseOC (PDF 1.5) Optional content group panel visible</li><li>UseAttachments (PDF 1.6) Attachments panel visible</li></ul>
+	 * @param mixed $zoom The zoom to use. It can be one of the following string values or a number indicating the zooming factor to use. <ul><li>fullpage: displays the entire page on screen </li><li>fullwidth: uses maximum width of window</li><li>real: uses real size (equivalent to 100% zoom)</li><li>default: uses viewer default mode</li></ul>
+	 * @param string $layout The page layout. Possible values are:<ul><li>SinglePage Display one page at a time</li><li>OneColumn Display the pages in one column</li><li>TwoColumnLeft Display the pages in two columns, with odd-numbered pages on the left</li><li>TwoColumnRight Display the pages in two columns, with odd-numbered pages on the right</li><li>TwoPageLeft (PDF 1.5) Display the pages two at a time, with odd-numbered pages on the left</li><li>TwoPageRight (PDF 1.5) Display the pages two at a time, with odd-numbered pages on the right</li></ul>
+	 * @param string $mode A name object specifying how the document should be displayed when opened:<ul><li>UseNone Neither document outline nor thumbnail images visible</li><li>UseOutlines Document outline visible</li><li>UseThumbs Thumbnail images visible</li><li>FullScreen Full-screen mode, with no menu bar, window controls, or any other window visible</li><li>UseOC (PDF 1.5) Optional content group panel visible</li><li>UseAttachments (PDF 1.6) Attachments panel visible</li></ul>
 	 * @public
 	 * @since 1.2
 	 */
-	public function SetDisplayMode($zoom, $layout='SinglePage', $mode='UseNone') {
+	public function setDisplayMode($zoom, $layout='SinglePage', $mode='UseNone') {
 		if (($zoom == 'fullpage') OR ($zoom == 'fullwidth') OR ($zoom == 'real') OR ($zoom == 'default') OR (!is_string($zoom))) {
 			$this->ZoomMode = $zoom;
 		} else {
@@ -2844,11 +2889,11 @@ class TCPDF {
 	/**
 	 * Activates or deactivates page compression. When activated, the internal representation of each page is compressed, which leads to a compression ratio of about 2 for the resulting document. Compression is on by default.
 	 * Note: the Zlib extension is required for this feature. If not present, compression will be turned off.
-	 * @param $compress (boolean) Boolean indicating if compression must be enabled.
+	 * @param boolean $compress Boolean indicating if compression must be enabled.
 	 * @public
 	 * @since 1.4
 	 */
-	public function SetCompression($compress=true) {
+	public function setCompression($compress=true) {
 		$this->compress = false;
 		if (function_exists('gzcompress')) {
 			if ($compress) {
@@ -2861,7 +2906,7 @@ class TCPDF {
 
 	/**
 	 * Set flag to force sRGB_IEC61966-2.1 black scaled ICC color profile for the whole document.
-	 * @param $mode (boolean) If true force sRGB output intent.
+	 * @param boolean $mode If true force sRGB output intent.
 	 * @public
 	 * @since 5.9.121 (2011-09-28)
 	 */
@@ -2872,72 +2917,84 @@ class TCPDF {
 	/**
 	 * Turn on/off Unicode mode for document information dictionary (meta tags).
 	 * This has effect only when unicode mode is set to false.
-	 * @param $unicode (boolean) if true set the meta information in Unicode
+	 * @param boolean $unicode if true set the meta information in Unicode
 	 * @since 5.9.027 (2010-12-01)
 	 * @public
 	 */
-	public function SetDocInfoUnicode($unicode=true) {
+	public function setDocInfoUnicode($unicode=true) {
 		$this->docinfounicode = $unicode ? true : false;
 	}
 
 	/**
 	 * Defines the title of the document.
-	 * @param $title (string) The title.
+	 * @param string $title The title.
 	 * @public
 	 * @since 1.2
 	 * @see SetAuthor(), SetCreator(), SetKeywords(), SetSubject()
 	 */
-	public function SetTitle($title) {
+	public function setTitle($title) {
 		$this->title = $title;
 	}
 
 	/**
 	 * Defines the subject of the document.
-	 * @param $subject (string) The subject.
+	 * @param string $subject The subject.
 	 * @public
 	 * @since 1.2
 	 * @see SetAuthor(), SetCreator(), SetKeywords(), SetTitle()
 	 */
-	public function SetSubject($subject) {
+	public function setSubject($subject) {
 		$this->subject = $subject;
 	}
 
 	/**
 	 * Defines the author of the document.
-	 * @param $author (string) The name of the author.
+	 * @param string $author The name of the author.
 	 * @public
 	 * @since 1.2
 	 * @see SetCreator(), SetKeywords(), SetSubject(), SetTitle()
 	 */
-	public function SetAuthor($author) {
+	public function setAuthor($author) {
 		$this->author = $author;
 	}
 
 	/**
 	 * Associates keywords with the document, generally in the form 'keyword1 keyword2 ...'.
-	 * @param $keywords (string) The list of keywords.
+	 * @param string $keywords The list of keywords.
 	 * @public
 	 * @since 1.2
 	 * @see SetAuthor(), SetCreator(), SetSubject(), SetTitle()
 	 */
-	public function SetKeywords($keywords) {
+	public function setKeywords($keywords) {
 		$this->keywords = $keywords;
 	}
 
 	/**
 	 * Defines the creator of the document. This is typically the name of the application that generates the PDF.
-	 * @param $creator (string) The name of the creator.
+	 * @param string $creator The name of the creator.
 	 * @public
 	 * @since 1.2
 	 * @see SetAuthor(), SetKeywords(), SetSubject(), SetTitle()
 	 */
-	public function SetCreator($creator) {
+	public function setCreator($creator) {
 		$this->creator = $creator;
 	}
 
+	/**
+	 * Whether to allow local file path in image html tags, when prefixed with file://
+	 *
+	 * @param bool $allowLocalFiles true, when local files should be allowed. Otherwise false.
+	 * @public
+	 * @since 6.4
+	 */
+	public function setAllowLocalFiles($allowLocalFiles) {
+		$this->allowLocalFiles = (bool) $allowLocalFiles;
+	}
+
+
 	/**
 	 * Throw an exception or print an error message and die if the K_TCPDF_PARSER_THROW_EXCEPTION_ERROR constant is set to true.
-	 * @param $msg (string) The error message
+	 * @param string $msg The error message
 	 * @public
 	 * @since 1.0
 	 */
@@ -2984,13 +3041,13 @@ class TCPDF {
 			$gvars = $this->getGraphicVars();
 			$this->setEqualColumns();
 			$this->lastpage(true);
-			$this->SetAutoPageBreak(false);
+			$this->setAutoPageBreak(false);
 			$this->x = 0;
 			$this->y = $this->h - (1 / $this->k);
 			$this->lMargin = 0;
 			$this->_outSaveGraphicsState();
 			$font = defined('PDF_FONT_NAME_MAIN')?PDF_FONT_NAME_MAIN:'helvetica';
-			$this->SetFont($font, '', 1);
+			$this->setFont($font, '', 1);
 			$this->setTextRenderingMode(0, false, false);
 			$msg = "\x50\x6f\x77\x65\x72\x65\x64\x20\x62\x79\x20\x54\x43\x50\x44\x46\x20\x28\x77\x77\x77\x2e\x74\x63\x70\x64\x66\x2e\x6f\x72\x67\x29";
 			$lnk = "\x68\x74\x74\x70\x3a\x2f\x2f\x77\x77\x77\x2e\x74\x63\x70\x64\x66\x2e\x6f\x72\x67";
@@ -3009,8 +3066,8 @@ class TCPDF {
 
 	/**
 	 * Move pointer at the specified document page and update page dimensions.
-	 * @param $pnum (int) page number (1 ... numpages)
-	 * @param $resetmargins (boolean) if true reset left, right, top margins and Y position.
+	 * @param int $pnum page number (1 ... numpages)
+	 * @param boolean $resetmargins if true reset left, right, top margins and Y position.
 	 * @public
 	 * @since 2.1.000 (2008-01-07)
 	 * @see getPage(), lastpage(), getNumPages()
@@ -3035,13 +3092,13 @@ class TCPDF {
 			$this->original_rMargin = $this->pagedim[$this->page]['orm'];
 			$this->AutoPageBreak = $this->pagedim[$this->page]['pb'];
 			$this->CurOrientation = $this->pagedim[$this->page]['or'];
-			$this->SetAutoPageBreak($this->AutoPageBreak, $this->bMargin);
+			$this->setAutoPageBreak($this->AutoPageBreak, $this->bMargin);
 			// restore graphic settings
 			//$this->setGraphicVars($gvars);
 			if ($resetmargins) {
 				$this->lMargin = $this->pagedim[$this->page]['olm'];
 				$this->rMargin = $this->pagedim[$this->page]['orm'];
-				$this->SetY($this->tMargin);
+				$this->setY($this->tMargin);
 			} else {
 				// account for booklet mode
 				if ($this->pagedim[$this->page]['olm'] != $this->pagedim[$oldpage]['olm']) {
@@ -3057,7 +3114,7 @@ class TCPDF {
 
 	/**
 	 * Reset pointer to the last document page.
-	 * @param $resetmargins (boolean) if true reset left, right, top margins and Y position.
+	 * @param boolean $resetmargins if true reset left, right, top margins and Y position.
 	 * @public
 	 * @since 2.0.000 (2008-01-04)
 	 * @see setPage(), getPage(), getNumPages()
@@ -3090,9 +3147,9 @@ class TCPDF {
 
 	/**
 	 * Adds a new TOC (Table Of Content) page to the document.
-	 * @param $orientation (string) page orientation.
-	 * @param $format (mixed) The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
-	 * @param $keepmargins (boolean) if true overwrites the default page margins with the current margins
+	 * @param string $orientation page orientation.
+	 * @param mixed $format The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
+	 * @param boolean $keepmargins if true overwrites the default page margins with the current margins
 	 * @public
 	 * @since 5.0.001 (2010-05-06)
 	 * @see AddPage(), startPage(), endPage(), endTOCPage()
@@ -3114,10 +3171,10 @@ class TCPDF {
 	/**
 	 * Adds a new page to the document. If a page is already present, the Footer() method is called first to output the footer (if enabled). Then the page is added, the current position set to the top-left corner according to the left and top margins (or top-right if in RTL mode), and Header() is called to display the header (if enabled).
 	 * The origin of the coordinate system is at the top-left corner (or top-right for RTL) and increasing ordinates go downwards.
-	 * @param $orientation (string) page orientation. Possible values are (case insensitive):<ul><li>P or PORTRAIT (default)</li><li>L or LANDSCAPE</li></ul>
-	 * @param $format (mixed) The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
-	 * @param $keepmargins (boolean) if true overwrites the default page margins with the current margins
-	 * @param $tocpage (boolean) if true set the tocpage state to true (the added page will be used to display Table Of Content).
+	 * @param string $orientation page orientation. Possible values are (case insensitive):<ul><li>P or PORTRAIT (default)</li><li>L or LANDSCAPE</li></ul>
+	 * @param mixed $format The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
+	 * @param boolean $keepmargins if true overwrites the default page margins with the current margins
+	 * @param boolean $tocpage if true set the tocpage state to true (the added page will be used to display Table Of Content).
 	 * @public
 	 * @since 1.0
 	 * @see startPage(), endPage(), addTOCPage(), endTOCPage(), getPageSizeFromFormat(), setPageFormat()
@@ -3141,7 +3198,7 @@ class TCPDF {
 
 	/**
 	 * Terminate the current page
-	 * @param $tocpage (boolean) if true set the tocpage state to false (end the page used to display Table Of Content).
+	 * @param boolean $tocpage if true set the tocpage state to false (end the page used to display Table Of Content).
 	 * @public
 	 * @since 4.2.010 (2008-11-14)
 	 * @see AddPage(), startPage(), addTOCPage(), endTOCPage()
@@ -3165,9 +3222,9 @@ class TCPDF {
 	/**
 	 * Starts a new page to the document. The page must be closed using the endPage() function.
 	 * The origin of the coordinate system is at the top-left corner and increasing ordinates go downwards.
-	 * @param $orientation (string) page orientation. Possible values are (case insensitive):<ul><li>P or PORTRAIT (default)</li><li>L or LANDSCAPE</li></ul>
-	 * @param $format (mixed) The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
-	 * @param $tocpage (boolean) if true the page is designated to contain the Table-Of-Content.
+	 * @param string $orientation page orientation. Possible values are (case insensitive):<ul><li>P or PORTRAIT (default)</li><li>L or LANDSCAPE</li></ul>
+	 * @param mixed $format The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
+	 * @param boolean $tocpage if true the page is designated to contain the Table-Of-Content.
 	 * @since 4.2.010 (2008-11-14)
 	 * @see AddPage(), endPage(), addTOCPage(), endTOCPage(), getPageSizeFromFormat(), setPageFormat()
 	 * @public
@@ -3204,7 +3261,7 @@ class TCPDF {
 		if ($this->numpages > $this->page) {
 			// this page has been already added
 			$this->setPage($this->page + 1);
-			$this->SetY($this->tMargin);
+			$this->setY($this->tMargin);
 			return;
 		}
 		// start a new page
@@ -3252,7 +3309,7 @@ class TCPDF {
 	/**
 	 * Set start-writing mark on selected page.
 	 * Borders and fills are always created after content and inserted on the position marked by this method.
-	 * @param $page (int) page number (default is the current page)
+	 * @param int $page page number (default is the current page)
 	 * @protected
 	 * @since 4.6.021 (2009-07-20)
 	 */
@@ -3269,12 +3326,12 @@ class TCPDF {
 
 	/**
 	 * Set header data.
-	 * @param $ln (string) header image logo
-	 * @param $lw (string) header image logo width in mm
-	 * @param $ht (string) string to print as title on document header
-	 * @param $hs (string) string to print on document header
-	 * @param $tc (array) RGB array color for text.
-	 * @param $lc (array) RGB array color for line.
+	 * @param string $ln header image logo
+	 * @param int $lw header image logo width in mm
+	 * @param string $ht string to print as title on document header
+	 * @param string $hs string to print on document header
+	 * @param int[] $tc RGB array color for text.
+	 * @param int[] $lc RGB array color for line.
 	 * @public
 	 */
 	public function setHeaderData($ln='', $lw=0, $ht='', $hs='', $tc=array(0,0,0), $lc=array(0,0,0)) {
@@ -3288,8 +3345,8 @@ class TCPDF {
 
 	/**
 	 * Set footer data.
-	 * @param $tc (array) RGB array color for text.
-	 * @param $lc (array) RGB array color for line.
+	 * @param int[] $tc RGB array color for text.
+	 * @param int[] $lc RGB array color for line.
 	 * @public
 	 */
 	public function setFooterData($tc=array(0,0,0), $lc=array(0,0,0)) {
@@ -3300,7 +3357,7 @@ class TCPDF {
 	/**
 	 * Returns header data:
 	 * <ul><li>$ret['logo'] = logo image</li><li>$ret['logo_width'] = width of the image logo in user units</li><li>$ret['title'] = header title</li><li>$ret['string'] = header description string</li></ul>
-	 * @return array()
+	 * @return array<string,mixed>
 	 * @public
 	 * @since 4.0.012 (2008-07-24)
 	 */
@@ -3318,7 +3375,7 @@ class TCPDF {
 	/**
 	 * Set header margin.
 	 * (minimum distance between header and top page margin)
-	 * @param $hm (int) distance in user units
+	 * @param int $hm distance in user units
 	 * @public
 	 */
 	public function setHeaderMargin($hm=10) {
@@ -3338,7 +3395,7 @@ class TCPDF {
 	/**
 	 * Set footer margin.
 	 * (minimum distance between footer and bottom page margin)
-	 * @param $fm (int) distance in user units
+	 * @param int $fm distance in user units
 	 * @public
 	 */
 	public function setFooterMargin($fm=10) {
@@ -3356,7 +3413,7 @@ class TCPDF {
 	}
 	/**
 	 * Set a flag to print page header.
-	 * @param $val (boolean) set to true to print the page header (default), false otherwise.
+	 * @param boolean $val set to true to print the page header (default), false otherwise.
 	 * @public
 	 */
 	public function setPrintHeader($val=true) {
@@ -3365,7 +3422,7 @@ class TCPDF {
 
 	/**
 	 * Set a flag to print page footer.
-	 * @param $val (boolean) set to true to print the page footer (default), false otherwise.
+	 * @param boolean $val set to true to print the page footer (default), false otherwise.
 	 * @public
 	 */
 	public function setPrintFooter($val=true) {
@@ -3400,7 +3457,7 @@ class TCPDF {
 
 	/**
 	 * Set a flag to automatically reset the xobject template used by Header() method at each page.
-	 * @param $val (boolean) set to true to reset Header xobject template at each page, false otherwise.
+	 * @param boolean $val set to true to reset Header xobject template at each page, false otherwise.
 	 * @public
 	 */
 	public function setHeaderTemplateAutoreset($val=true) {
@@ -3445,22 +3502,22 @@ class TCPDF {
 				$header_x = $this->original_lMargin + ($headerdata['logo_width'] * 1.1);
 			}
 			$cw = $this->w - $this->original_lMargin - $this->original_rMargin - ($headerdata['logo_width'] * 1.1);
-			$this->SetTextColorArray($this->header_text_color);
+			$this->setTextColorArray($this->header_text_color);
 			// header title
-			$this->SetFont($headerfont[0], 'B', $headerfont[2] + 1);
-			$this->SetX($header_x);
+			$this->setFont($headerfont[0], 'B', $headerfont[2] + 1);
+			$this->setX($header_x);
 			$this->Cell($cw, $cell_height, $headerdata['title'], 0, 1, '', 0, '', 0);
 			// header string
-			$this->SetFont($headerfont[0], $headerfont[1], $headerfont[2]);
-			$this->SetX($header_x);
+			$this->setFont($headerfont[0], $headerfont[1], $headerfont[2]);
+			$this->setX($header_x);
 			$this->MultiCell($cw, $cell_height, $headerdata['string'], 0, '', 0, 1, '', '', true, 0, false, true, 0, 'T', false);
 			// print an ending header line
-			$this->SetLineStyle(array('width' => 0.85 / $this->k, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $headerdata['line_color']));
-			$this->SetY((2.835 / $this->k) + max($imgy, $this->y));
+			$this->setLineStyle(array('width' => 0.85 / $this->k, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $headerdata['line_color']));
+			$this->setY((2.835 / $this->k) + max($imgy, $this->y));
 			if ($this->rtl) {
-				$this->SetX($this->original_rMargin);
+				$this->setX($this->original_rMargin);
 			} else {
-				$this->SetX($this->original_lMargin);
+				$this->setX($this->original_lMargin);
 			}
 			$this->Cell(($this->w - $this->original_lMargin - $this->original_rMargin), 0, '', 'T', 0, 'C');
 			$this->endTemplate();
@@ -3491,10 +3548,10 @@ class TCPDF {
 	 */
 	public function Footer() {
 		$cur_y = $this->y;
-		$this->SetTextColorArray($this->footer_text_color);
+		$this->setTextColorArray($this->footer_text_color);
 		//set style for cell border
 		$line_width = (0.85 / $this->k);
-		$this->SetLineStyle(array('width' => $line_width, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $this->footer_line_color));
+		$this->setLineStyle(array('width' => $line_width, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $this->footer_line_color));
 		//print document barcode
 		$barcode = $this->getBarcode();
 		if (!empty($barcode)) {
@@ -3520,13 +3577,13 @@ class TCPDF {
 		} else {
 			$pagenumtxt = $w_page.$this->getPageNumGroupAlias().' / '.$this->getPageGroupAlias();
 		}
-		$this->SetY($cur_y);
+		$this->setY($cur_y);
 		//Print page number
 		if ($this->getRTL()) {
-			$this->SetX($this->original_rMargin);
+			$this->setX($this->original_rMargin);
 			$this->Cell(0, 0, $pagenumtxt, 'T', 0, 'L');
 		} else {
-			$this->SetX($this->original_lMargin);
+			$this->setX($this->original_lMargin);
 			$this->Cell(0, 0, $this->getAliasRightShift().$pagenumtxt, 'T', 0, 'R');
 		}
 	}
@@ -3549,20 +3606,20 @@ class TCPDF {
 		$this->_outSaveGraphicsState();
 		$this->rMargin = $this->original_rMargin;
 		$this->lMargin = $this->original_lMargin;
-		$this->SetCellPadding(0);
+		$this->setCellPadding(0);
 		//set current position
 		if ($this->rtl) {
-			$this->SetXY($this->original_rMargin, $this->header_margin);
+			$this->setXY($this->original_rMargin, $this->header_margin);
 		} else {
-			$this->SetXY($this->original_lMargin, $this->header_margin);
+			$this->setXY($this->original_lMargin, $this->header_margin);
 		}
-		$this->SetFont($this->header_font[0], $this->header_font[1], $this->header_font[2]);
+		$this->setFont($this->header_font[0], $this->header_font[1], $this->header_font[2]);
 		$this->Header();
 		//restore position
 		if ($this->rtl) {
-			$this->SetXY($this->original_rMargin, $this->tMargin);
+			$this->setXY($this->original_rMargin, $this->tMargin);
 		} else {
-			$this->SetXY($this->original_lMargin, $this->tMargin);
+			$this->setXY($this->original_lMargin, $this->tMargin);
 		}
 		$this->_outRestoreGraphicsState();
 		$this->lasth = $lasth;
@@ -3597,21 +3654,21 @@ class TCPDF {
 			$this->_outSaveGraphicsState();
 			$this->rMargin = $this->original_rMargin;
 			$this->lMargin = $this->original_lMargin;
-			$this->SetCellPadding(0);
+			$this->setCellPadding(0);
 			//set current position
 			$footer_y = $this->h - $this->footer_margin;
 			if ($this->rtl) {
-				$this->SetXY($this->original_rMargin, $footer_y);
+				$this->setXY($this->original_rMargin, $footer_y);
 			} else {
-				$this->SetXY($this->original_lMargin, $footer_y);
+				$this->setXY($this->original_lMargin, $footer_y);
 			}
-			$this->SetFont($this->footer_font[0], $this->footer_font[1], $this->footer_font[2]);
+			$this->setFont($this->footer_font[0], $this->footer_font[1], $this->footer_font[2]);
 			$this->Footer();
 			//restore position
 			if ($this->rtl) {
-				$this->SetXY($this->original_rMargin, $this->tMargin);
+				$this->setXY($this->original_rMargin, $this->tMargin);
 			} else {
-				$this->SetXY($this->original_lMargin, $this->tMargin);
+				$this->setXY($this->original_lMargin, $this->tMargin);
 			}
 			$this->_outRestoreGraphicsState();
 			$this->lasth = $lasth;
@@ -3629,7 +3686,7 @@ class TCPDF {
 
 	/**
 	 * Check if we are on the page body (excluding page header and footer).
-	 * @return true if we are not in page header nor in page footer, false otherwise.
+	 * @return bool true if we are not in page header nor in page footer, false otherwise.
 	 * @protected
 	 * @since 5.9.091 (2011-06-15)
 	 */
@@ -3715,7 +3772,7 @@ class TCPDF {
 
 	/**
 	 * Returns the array of spot colors.
-	 * @return (array) Spot colors array.
+	 * @return array Spot colors array.
 	 * @public
 	 * @since 6.0.038 (2013-09-30)
 	 */
@@ -3727,11 +3784,11 @@ class TCPDF {
 	 * Defines a new spot color.
 	 * It can be expressed in RGB components or gray scale.
 	 * The method can be called before the first page is created and the value is retained from page to page.
-	 * @param $name (string) Full name of the spot color.
-	 * @param $c (float) Cyan color for CMYK. Value between 0 and 100.
-	 * @param $m (float) Magenta color for CMYK. Value between 0 and 100.
-	 * @param $y (float) Yellow color for CMYK. Value between 0 and 100.
-	 * @param $k (float) Key (Black) color for CMYK. Value between 0 and 100.
+	 * @param string $name Full name of the spot color.
+	 * @param float $c Cyan color for CMYK. Value between 0 and 100.
+	 * @param float $m Magenta color for CMYK. Value between 0 and 100.
+	 * @param float $y Yellow color for CMYK. Value between 0 and 100.
+	 * @param float $k Key (Black) color for CMYK. Value between 0 and 100.
 	 * @public
 	 * @since 4.0.024 (2008-09-12)
 	 * @see SetDrawSpotColor(), SetFillSpotColor(), SetTextSpotColor()
@@ -3745,10 +3802,10 @@ class TCPDF {
 
 	/**
 	 * Set the spot color for the specified type ('draw', 'fill', 'text').
-	 * @param $type (string) Type of object affected by this color: ('draw', 'fill', 'text').
-	 * @param $name (string) Name of the spot color.
-	 * @param $tint (float) Intensity of the color (from 0 to 100 ; 100 = full intensity by default).
-	 * @return (string) PDF color command.
+	 * @param string $type Type of object affected by this color: ('draw', 'fill', 'text').
+	 * @param string $name Name of the spot color.
+	 * @param float $tint Intensity of the color (from 0 to 100 ; 100 = full intensity by default).
+	 * @return string PDF color command.
 	 * @public
 	 * @since 5.9.125 (2011-10-03)
 	 */
@@ -3792,37 +3849,37 @@ class TCPDF {
 
 	/**
 	 * Defines the spot color used for all drawing operations (lines, rectangles and cell borders).
-	 * @param $name (string) Name of the spot color.
-	 * @param $tint (float) Intensity of the color (from 0 to 100 ; 100 = full intensity by default).
+	 * @param string $name Name of the spot color.
+	 * @param float $tint Intensity of the color (from 0 to 100 ; 100 = full intensity by default).
 	 * @public
 	 * @since 4.0.024 (2008-09-12)
 	 * @see AddSpotColor(), SetFillSpotColor(), SetTextSpotColor()
 	 */
-	public function SetDrawSpotColor($name, $tint=100) {
+	public function setDrawSpotColor($name, $tint=100) {
 		$this->setSpotColor('draw', $name, $tint);
 	}
 
 	/**
 	 * Defines the spot color used for all filling operations (filled rectangles and cell backgrounds).
-	 * @param $name (string) Name of the spot color.
-	 * @param $tint (float) Intensity of the color (from 0 to 100 ; 100 = full intensity by default).
+	 * @param string $name Name of the spot color.
+	 * @param float $tint Intensity of the color (from 0 to 100 ; 100 = full intensity by default).
 	 * @public
 	 * @since 4.0.024 (2008-09-12)
 	 * @see AddSpotColor(), SetDrawSpotColor(), SetTextSpotColor()
 	 */
-	public function SetFillSpotColor($name, $tint=100) {
+	public function setFillSpotColor($name, $tint=100) {
 		$this->setSpotColor('fill', $name, $tint);
 	}
 
 	/**
 	 * Defines the spot color used for text.
-	 * @param $name (string) Name of the spot color.
-	 * @param $tint (int) Intensity of the color (from 0 to 100 ; 100 = full intensity by default).
+	 * @param string $name Name of the spot color.
+	 * @param int $tint Intensity of the color (from 0 to 100 ; 100 = full intensity by default).
 	 * @public
 	 * @since 4.0.024 (2008-09-12)
 	 * @see AddSpotColor(), SetDrawSpotColor(), SetFillSpotColor()
 	 */
-	public function SetTextSpotColor($name, $tint=100) {
+	public function setTextSpotColor($name, $tint=100) {
 		$this->setSpotColor('text', $name, $tint);
 	}
 
@@ -3830,10 +3887,10 @@ class TCPDF {
 	 * Set the color array for the specified type ('draw', 'fill', 'text').
 	 * It can be expressed in RGB, CMYK or GRAY SCALE components.
 	 * The method can be called before the first page is created and the value is retained from page to page.
-	 * @param $type (string) Type of object affected by this color: ('draw', 'fill', 'text').
-	 * @param $color (array) Array of colors (1=gray, 3=RGB, 4=CMYK or 5=spotcolor=CMYK+name values).
-	 * @param $ret (boolean) If true do not send the PDF command.
-	 * @return (string) The PDF command or empty string.
+	 * @param string $type Type of object affected by this color: ('draw', 'fill', 'text').
+	 * @param array $color Array of colors (1=gray, 3=RGB, 4=CMYK or 5=spotcolor=CMYK+name values).
+	 * @param boolean $ret If true do not send the PDF command.
+	 * @return string The PDF command or empty string.
 	 * @public
 	 * @since 3.1.000 (2008-06-11)
 	 */
@@ -3861,14 +3918,14 @@ class TCPDF {
 	 * Defines the color used for all drawing operations (lines, rectangles and cell borders).
 	 * It can be expressed in RGB, CMYK or GRAY SCALE components.
 	 * The method can be called before the first page is created and the value is retained from page to page.
-	 * @param $color (array) Array of colors (1, 3 or 4 values).
-	 * @param $ret (boolean) If true do not send the PDF command.
+	 * @param array $color Array of colors (1, 3 or 4 values).
+	 * @param boolean $ret If true do not send the PDF command.
 	 * @return string the PDF command
 	 * @public
 	 * @since 3.1.000 (2008-06-11)
 	 * @see SetDrawColor()
 	 */
-	public function SetDrawColorArray($color, $ret=false) {
+	public function setDrawColorArray($color, $ret=false) {
 		return $this->setColorArray('draw', $color, $ret);
 	}
 
@@ -3876,39 +3933,39 @@ class TCPDF {
 	 * Defines the color used for all filling operations (filled rectangles and cell backgrounds).
 	 * It can be expressed in RGB, CMYK or GRAY SCALE components.
 	 * The method can be called before the first page is created and the value is retained from page to page.
-	 * @param $color (array) Array of colors (1, 3 or 4 values).
-	 * @param $ret (boolean) If true do not send the PDF command.
+	 * @param array $color Array of colors (1, 3 or 4 values).
+	 * @param boolean $ret If true do not send the PDF command.
 	 * @public
 	 * @since 3.1.000 (2008-6-11)
 	 * @see SetFillColor()
 	 */
-	public function SetFillColorArray($color, $ret=false) {
+	public function setFillColorArray($color, $ret=false) {
 		return $this->setColorArray('fill', $color, $ret);
 	}
 
 	/**
 	 * Defines the color used for text. It can be expressed in RGB components or gray scale.
 	 * The method can be called before the first page is created and the value is retained from page to page.
-	 * @param $color (array) Array of colors (1, 3 or 4 values).
-	 * @param $ret (boolean) If true do not send the PDF command.
+	 * @param array $color Array of colors (1, 3 or 4 values).
+	 * @param boolean $ret If true do not send the PDF command.
 	 * @public
 	 * @since 3.1.000 (2008-6-11)
 	 * @see SetFillColor()
 	 */
-	public function SetTextColorArray($color, $ret=false) {
+	public function setTextColorArray($color, $ret=false) {
 		return $this->setColorArray('text', $color, $ret);
 	}
 
 	/**
 	 * Defines the color used by the specified type ('draw', 'fill', 'text').
-	 * @param $type (string) Type of object affected by this color: ('draw', 'fill', 'text').
-	 * @param $col1 (float) GRAY level for single color, or Red color for RGB (0-255), or CYAN color for CMYK (0-100).
-	 * @param $col2 (float) GREEN color for RGB (0-255), or MAGENTA color for CMYK (0-100).
-	 * @param $col3 (float) BLUE color for RGB (0-255), or YELLOW color for CMYK (0-100).
-	 * @param $col4 (float) KEY (BLACK) color for CMYK (0-100).
-	 * @param $ret (boolean) If true do not send the command.
-	 * @param $name (string) spot color name (if any)
-	 * @return (string) The PDF command or empty string.
+	 * @param string $type Type of object affected by this color: ('draw', 'fill', 'text').
+	 * @param float $col1 GRAY level for single color, or Red color for RGB (0-255), or CYAN color for CMYK (0-100).
+	 * @param float $col2 GREEN color for RGB (0-255), or MAGENTA color for CMYK (0-100).
+	 * @param float $col3 BLUE color for RGB (0-255), or YELLOW color for CMYK (0-100).
+	 * @param float $col4 KEY (BLACK) color for CMYK (0-100).
+	 * @param boolean $ret If true do not send the command.
+	 * @param string $name spot color name (if any)
+	 * @return string The PDF command or empty string.
 	 * @public
 	 * @since 5.9.125 (2011-10-03)
 	 */
@@ -3980,7 +4037,7 @@ class TCPDF {
 			}
 		}
 		$this->ColorFlag = ($this->FillColor != $this->TextColor);
-		if (($type != 'text') AND ($this->state == 2)) {
+		if (($type != 'text') AND ($this->state == 2) AND $type !== 0) {
 			if (!$ret) {
 				$this->_out($pdfcolor);
 			}
@@ -3991,63 +4048,63 @@ class TCPDF {
 
 	/**
 	 * Defines the color used for all drawing operations (lines, rectangles and cell borders). It can be expressed in RGB components or gray scale. The method can be called before the first page is created and the value is retained from page to page.
-	 * @param $col1 (float) GRAY level for single color, or Red color for RGB (0-255), or CYAN color for CMYK (0-100).
-	 * @param $col2 (float) GREEN color for RGB (0-255), or MAGENTA color for CMYK (0-100).
-	 * @param $col3 (float) BLUE color for RGB (0-255), or YELLOW color for CMYK (0-100).
-	 * @param $col4 (float) KEY (BLACK) color for CMYK (0-100).
-	 * @param $ret (boolean) If true do not send the command.
-	 * @param $name (string) spot color name (if any)
+	 * @param float $col1 GRAY level for single color, or Red color for RGB (0-255), or CYAN color for CMYK (0-100).
+	 * @param float $col2 GREEN color for RGB (0-255), or MAGENTA color for CMYK (0-100).
+	 * @param float $col3 BLUE color for RGB (0-255), or YELLOW color for CMYK (0-100).
+	 * @param float $col4 KEY (BLACK) color for CMYK (0-100).
+	 * @param boolean $ret If true do not send the command.
+	 * @param string $name spot color name (if any)
 	 * @return string the PDF command
 	 * @public
 	 * @since 1.3
 	 * @see SetDrawColorArray(), SetFillColor(), SetTextColor(), Line(), Rect(), Cell(), MultiCell()
 	 */
-	public function SetDrawColor($col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
+	public function setDrawColor($col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
 		return $this->setColor('draw', $col1, $col2, $col3, $col4, $ret, $name);
 	}
 
 	/**
 	 * Defines the color used for all filling operations (filled rectangles and cell backgrounds). It can be expressed in RGB components or gray scale. The method can be called before the first page is created and the value is retained from page to page.
-	 * @param $col1 (float) GRAY level for single color, or Red color for RGB (0-255), or CYAN color for CMYK (0-100).
-	 * @param $col2 (float) GREEN color for RGB (0-255), or MAGENTA color for CMYK (0-100).
-	 * @param $col3 (float) BLUE color for RGB (0-255), or YELLOW color for CMYK (0-100).
-	 * @param $col4 (float) KEY (BLACK) color for CMYK (0-100).
-	 * @param $ret (boolean) If true do not send the command.
-	 * @param $name (string) Spot color name (if any).
-	 * @return (string) The PDF command.
+	 * @param float $col1 GRAY level for single color, or Red color for RGB (0-255), or CYAN color for CMYK (0-100).
+	 * @param float $col2 GREEN color for RGB (0-255), or MAGENTA color for CMYK (0-100).
+	 * @param float $col3 BLUE color for RGB (0-255), or YELLOW color for CMYK (0-100).
+	 * @param float $col4 KEY (BLACK) color for CMYK (0-100).
+	 * @param boolean $ret If true do not send the command.
+	 * @param string $name Spot color name (if any).
+	 * @return string The PDF command.
 	 * @public
 	 * @since 1.3
 	 * @see SetFillColorArray(), SetDrawColor(), SetTextColor(), Rect(), Cell(), MultiCell()
 	 */
-	public function SetFillColor($col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
+	public function setFillColor($col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
 		return $this->setColor('fill', $col1, $col2, $col3, $col4, $ret, $name);
 	}
 
 	/**
 	 * Defines the color used for text. It can be expressed in RGB components or gray scale. The method can be called before the first page is created and the value is retained from page to page.
-	 * @param $col1 (float) GRAY level for single color, or Red color for RGB (0-255), or CYAN color for CMYK (0-100).
-	 * @param $col2 (float) GREEN color for RGB (0-255), or MAGENTA color for CMYK (0-100).
-	 * @param $col3 (float) BLUE color for RGB (0-255), or YELLOW color for CMYK (0-100).
-	 * @param $col4 (float) KEY (BLACK) color for CMYK (0-100).
-	 * @param $ret (boolean) If true do not send the command.
-	 * @param $name (string) Spot color name (if any).
-	 * @return (string) Empty string.
+	 * @param float $col1 GRAY level for single color, or Red color for RGB (0-255), or CYAN color for CMYK (0-100).
+	 * @param float $col2 GREEN color for RGB (0-255), or MAGENTA color for CMYK (0-100).
+	 * @param float $col3 BLUE color for RGB (0-255), or YELLOW color for CMYK (0-100).
+	 * @param float $col4 KEY (BLACK) color for CMYK (0-100).
+	 * @param boolean $ret If true do not send the command.
+	 * @param string $name Spot color name (if any).
+	 * @return string Empty string.
 	 * @public
 	 * @since 1.3
 	 * @see SetTextColorArray(), SetDrawColor(), SetFillColor(), Text(), Cell(), MultiCell()
 	 */
-	public function SetTextColor($col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
+	public function setTextColor($col1=0, $col2=-1, $col3=-1, $col4=-1, $ret=false, $name='') {
 		return $this->setColor('text', $col1, $col2, $col3, $col4, $ret, $name);
 	}
 
 	/**
 	 * Returns the length of a string in user unit. A font must be selected.<br>
-	 * @param $s (string) The string whose length is to be computed
-	 * @param $fontname (string) Family font. It can be either a name defined by AddFont() or one of the standard families. It is also possible to pass an empty string, in that case, the current family is retained.
-	 * @param $fontstyle (string) Font style. Possible values are (case insensitive):<ul><li>empty string: regular</li><li>B: bold</li><li>I: italic</li><li>U: underline</li><li>D: line-through</li><li>O: overline</li></ul> or any combination. The default value is regular.
-	 * @param $fontsize (float) Font size in points. The default value is the current size.
-	 * @param $getarray (boolean) if true returns an array of characters widths, if false returns the total length.
-	 * @return mixed int total string length or array of characted widths
+	 * @param string $s The string whose length is to be computed
+	 * @param string $fontname Family font. It can be either a name defined by AddFont() or one of the standard families. It is also possible to pass an empty string, in that case, the current family is retained.
+	 * @param string $fontstyle Font style. Possible values are (case insensitive):<ul><li>empty string: regular</li><li>B: bold</li><li>I: italic</li><li>U: underline</li><li>D: line-through</li><li>O: overline</li></ul> or any combination. The default value is regular.
+	 * @param float $fontsize Font size in points. The default value is the current size.
+	 * @param boolean $getarray if true returns an array of characters widths, if false returns the total length.
+	 * @return float[]|float total string length or array of characted widths
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 1.2
@@ -4058,12 +4115,12 @@ class TCPDF {
 
 	/**
 	 * Returns the string length of an array of chars in user unit or an array of characters widths. A font must be selected.<br>
-	 * @param $sa (string) The array of chars whose total length is to be computed
-	 * @param $fontname (string) Family font. It can be either a name defined by AddFont() or one of the standard families. It is also possible to pass an empty string, in that case, the current family is retained.
-	 * @param $fontstyle (string) Font style. Possible values are (case insensitive):<ul><li>empty string: regular</li><li>B: bold</li><li>I: italic</li><li>U: underline</li><li>D: line through</li><li>O: overline</li></ul> or any combination. The default value is regular.
-	 * @param $fontsize (float) Font size in points. The default value is the current size.
-	 * @param $getarray (boolean) if true returns an array of characters widths, if false returns the total length.
-	 * @return mixed int total string length or array of characted widths
+	 * @param array $sa The array of chars whose total length is to be computed
+	 * @param string $fontname Family font. It can be either a name defined by AddFont() or one of the standard families. It is also possible to pass an empty string, in that case, the current family is retained.
+	 * @param string $fontstyle Font style. Possible values are (case insensitive):<ul><li>empty string: regular</li><li>B: bold</li><li>I: italic</li><li>U: underline</li><li>D: line through</li><li>O: overline</li></ul> or any combination. The default value is regular.
+	 * @param float $fontsize Font size in points. The default value is the current size.
+	 * @param boolean $getarray if true returns an array of characters widths, if false returns the total length.
+	 * @return float[]|float total string length or array of characted widths
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 2.4.000 (2008-03-06)
@@ -4074,7 +4131,7 @@ class TCPDF {
 			$prev_FontFamily = $this->FontFamily;
 			$prev_FontStyle = $this->FontStyle;
 			$prev_FontSizePt = $this->FontSizePt;
-			$this->SetFont($fontname, $fontstyle, $fontsize, '', 'default', false);
+			$this->setFont($fontname, $fontstyle, $fontsize, '', 'default', false);
 		}
 		// convert UTF-8 array to Latin1 if required
 		if ($this->isunicode AND (!$this->isUnicodeFont())) {
@@ -4090,7 +4147,7 @@ class TCPDF {
 		}
 		// restore previous values
 		if (!TCPDF_STATIC::empty_string($fontname)) {
-			$this->SetFont($prev_FontFamily, $prev_FontStyle, $prev_FontSizePt, '', 'default', false);
+			$this->setFont($prev_FontFamily, $prev_FontStyle, $prev_FontSizePt, '', 'default', false);
 		}
 		if ($getarray) {
 			return $wa;
@@ -4100,8 +4157,8 @@ class TCPDF {
 
 	/**
 	 * Returns the length of the char in user unit for the current font considering current stretching and spacing (tracking).
-	 * @param $char (int) The char code whose length is to be returned
-	 * @param $notlast (boolean) If false ignore the font-spacing.
+	 * @param int $char The char code whose length is to be returned
+	 * @param boolean $notlast If false ignore the font-spacing.
 	 * @return float char width
 	 * @author Nicola Asuni
 	 * @public
@@ -4123,7 +4180,7 @@ class TCPDF {
 
 	/**
 	 * Returns the length of the char in user unit for the current font.
-	 * @param $char (int) The char code whose length is to be returned
+	 * @param int $char The char code whose length is to be returned
 	 * @return float char width
 	 * @author Nicola Asuni
 	 * @public
@@ -4134,8 +4191,8 @@ class TCPDF {
 			// SHY character will not be printed
 			return (0);
 		}
-		if (isset($this->CurrentFont['cw'][$char])) {
-			$w = $this->CurrentFont['cw'][$char];
+		if (isset($this->CurrentFont['cw'][intval($char)])) {
+			$w = $this->CurrentFont['cw'][intval($char)];
 		} elseif (isset($this->CurrentFont['dw'])) {
 			// default width
 			$w = $this->CurrentFont['dw'];
@@ -4150,7 +4207,7 @@ class TCPDF {
 
 	/**
 	 * Returns the numbero of characters in a string.
-	 * @param $s (string) The input string.
+	 * @param string $s The input string.
 	 * @return int number of characters
 	 * @public
 	 * @since 2.0.0001 (2008-01-07)
@@ -4182,11 +4239,11 @@ class TCPDF {
 	 * Imports a TrueType, Type1, core, or CID0 font and makes it available.
 	 * It is necessary to generate a font definition file first (read /fonts/utils/README.TXT).
 	 * The definition file (and the font file itself when embedding) must be present either in the current directory or in the one indicated by K_PATH_FONTS if the constant is defined. If it could not be found, the error "Could not include font definition file" is generated.
-	 * @param $family (string) Font family. The name can be chosen arbitrarily. If it is a standard family name, it will override the corresponding font.
-	 * @param $style (string) Font style. Possible values are (case insensitive):<ul><li>empty string: regular (default)</li><li>B: bold</li><li>I: italic</li><li>BI or IB: bold italic</li></ul>
-	 * @param $fontfile (string) The font definition file. By default, the name is built from the family and style, in lower case with no spaces.
-	 * @return array containing the font data, or false in case of error.
-	 * @param $subset (mixed) if true embedd only a subset of the font (stores only the information related to the used characters); if false embedd full font; if 'default' uses the default value set using setFontSubsetting(). This option is valid only for TrueTypeUnicode fonts. If you want to enable users to change the document, set this parameter to false. If you subset the font, the person who receives your PDF would need to have your same font in order to make changes to your PDF. The file size of the PDF would also be smaller because you are embedding only part of a font.
+	 * @param string $family Font family. The name can be chosen arbitrarily. If it is a standard family name, it will override the corresponding font.
+	 * @param string $style Font style. Possible values are (case insensitive):<ul><li>empty string: regular (default)</li><li>B: bold</li><li>I: italic</li><li>BI or IB: bold italic</li></ul>
+	 * @param string $fontfile The font definition file. By default, the name is built from the family and style, in lower case with no spaces.
+	 * @return array|false array containing the font data, or false in case of error.
+	 * @param mixed $subset if true embedd only a subset of the font (stores only the information related to the used characters); if false embedd full font; if 'default' uses the default value set using setFontSubsetting(). This option is valid only for TrueTypeUnicode fonts. If you want to enable users to change the document, set this parameter to false. If you subset the font, the person who receives your PDF would need to have your same font in order to make changes to your PDF. The file size of the PDF would also be smaller because you are embedding only part of a font.
 	 * @public
 	 * @since 1.5
 	 * @see SetFont(), setFontSubsetting()
@@ -4436,18 +4493,18 @@ class TCPDF {
 	 * The method can be called before the first page is created and the font is retained from page to page.
 	 * If you just wish to change the current font size, it is simpler to call SetFontSize().
 	 * Note: for the standard fonts, the font metric files must be accessible. There are three possibilities for this:<ul><li>They are in the current directory (the one where the running script lies)</li><li>They are in one of the directories defined by the include_path parameter</li><li>They are in the directory defined by the K_PATH_FONTS constant</li></ul><br />
-	 * @param $family (string) Family font. It can be either a name defined by AddFont() or one of the standard Type1 families (case insensitive):<ul><li>times (Times-Roman)</li><li>timesb (Times-Bold)</li><li>timesi (Times-Italic)</li><li>timesbi (Times-BoldItalic)</li><li>helvetica (Helvetica)</li><li>helveticab (Helvetica-Bold)</li><li>helveticai (Helvetica-Oblique)</li><li>helveticabi (Helvetica-BoldOblique)</li><li>courier (Courier)</li><li>courierb (Courier-Bold)</li><li>courieri (Courier-Oblique)</li><li>courierbi (Courier-BoldOblique)</li><li>symbol (Symbol)</li><li>zapfdingbats (ZapfDingbats)</li></ul> It is also possible to pass an empty string. In that case, the current family is retained.
-	 * @param $style (string) Font style. Possible values are (case insensitive):<ul><li>empty string: regular</li><li>B: bold</li><li>I: italic</li><li>U: underline</li><li>D: line through</li><li>O: overline</li></ul> or any combination. The default value is regular. Bold and italic styles do not apply to Symbol and ZapfDingbats basic fonts or other fonts when not defined.
-	 * @param $size (float) Font size in points. The default value is the current size. If no size has been specified since the beginning of the document, the value taken is 12
-	 * @param $fontfile (string) The font definition file. By default, the name is built from the family and style, in lower case with no spaces.
-	 * @param $subset (mixed) if true embedd only a subset of the font (stores only the information related to the used characters); if false embedd full font; if 'default' uses the default value set using setFontSubsetting(). This option is valid only for TrueTypeUnicode fonts. If you want to enable users to change the document, set this parameter to false. If you subset the font, the person who receives your PDF would need to have your same font in order to make changes to your PDF. The file size of the PDF would also be smaller because you are embedding only part of a font.
-	 * @param $out (boolean) if true output the font size command, otherwise only set the font properties.
+	 * @param string $family Family font. It can be either a name defined by AddFont() or one of the standard Type1 families (case insensitive):<ul><li>times (Times-Roman)</li><li>timesb (Times-Bold)</li><li>timesi (Times-Italic)</li><li>timesbi (Times-BoldItalic)</li><li>helvetica (Helvetica)</li><li>helveticab (Helvetica-Bold)</li><li>helveticai (Helvetica-Oblique)</li><li>helveticabi (Helvetica-BoldOblique)</li><li>courier (Courier)</li><li>courierb (Courier-Bold)</li><li>courieri (Courier-Oblique)</li><li>courierbi (Courier-BoldOblique)</li><li>symbol (Symbol)</li><li>zapfdingbats (ZapfDingbats)</li></ul> It is also possible to pass an empty string. In that case, the current family is retained.
+	 * @param string $style Font style. Possible values are (case insensitive):<ul><li>empty string: regular</li><li>B: bold</li><li>I: italic</li><li>U: underline</li><li>D: line through</li><li>O: overline</li></ul> or any combination. The default value is regular. Bold and italic styles do not apply to Symbol and ZapfDingbats basic fonts or other fonts when not defined.
+	 * @param float|null $size Font size in points. The default value is the current size. If no size has been specified since the beginning of the document, the value taken is 12
+	 * @param string $fontfile The font definition file. By default, the name is built from the family and style, in lower case with no spaces.
+	 * @param mixed $subset if true embedd only a subset of the font (stores only the information related to the used characters); if false embedd full font; if 'default' uses the default value set using setFontSubsetting(). This option is valid only for TrueTypeUnicode fonts. If you want to enable users to change the document, set this parameter to false. If you subset the font, the person who receives your PDF would need to have your same font in order to make changes to your PDF. The file size of the PDF would also be smaller because you are embedding only part of a font.
+	 * @param boolean $out if true output the font size command, otherwise only set the font properties.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 1.0
 	 * @see AddFont(), SetFontSize()
 	 */
-	public function SetFont($family, $style='', $size=null, $fontfile='', $subset='default', $out=true) {
+	public function setFont($family, $style='', $size=null, $fontfile='', $subset='default', $out=true) {
 		//Select a font; size given in points
 		if ($size === null) {
 			$size = $this->FontSizePt;
@@ -4464,18 +4521,18 @@ class TCPDF {
 			$this->setFontSubBuffer($this->CurrentFont['fontkey'], 'subsetchars', $this->CurrentFont['subsetchars']);
 		}
 		$this->CurrentFont = $this->getFontBuffer($fontdata['fontkey']);
-		$this->SetFontSize($size, $out);
+		$this->setFontSize($size, $out);
 	}
 
 	/**
 	 * Defines the size of the current font.
-	 * @param $size (float) The font size in points.
-	 * @param $out (boolean) if true output the font size command, otherwise only set the font properties.
+	 * @param float $size The font size in points.
+	 * @param boolean $out if true output the font size command, otherwise only set the font properties.
 	 * @public
 	 * @since 1.0
 	 * @see SetFont()
 	 */
-	public function SetFontSize($size, $out=true) {
+	public function setFontSize($size, $out=true) {
 		$size = (float)$size;
 		// font size in points
 		$this->FontSizePt = $size;
@@ -4551,7 +4608,7 @@ class TCPDF {
 
 	/**
 	 * Convert a relative font measure into absolute value.
-	 * @param $s (int) Font measure.
+	 * @param int $s Font measure.
 	 * @return float Absolute measure.
 	 * @since 5.9.186 (2012-09-13)
 	 */
@@ -4561,8 +4618,8 @@ class TCPDF {
 
 	/**
 	 * Returns the glyph bounding box of the specified character in the current font in user units.
-	 * @param $char (int) Input character code.
-	 * @return mixed array(xMin, yMin, xMax, yMax) or FALSE if not defined.
+	 * @param int $char Input character code.
+	 * @return false|array array(xMin, yMin, xMax, yMax) or FALSE if not defined.
 	 * @since 5.9.186 (2012-09-13)
 	 */
 	public function getCharBBox($char) {
@@ -4580,9 +4637,9 @@ class TCPDF {
 
 	/**
 	 * Return the font descent value
-	 * @param $font (string) font name
-	 * @param $style (string) font style
-	 * @param $size (float) The size (in points)
+	 * @param string $font font name
+	 * @param string $style font style
+	 * @param float $size The size (in points)
 	 * @return int font descent
 	 * @public
 	 * @author Nicola Asuni
@@ -4601,9 +4658,9 @@ class TCPDF {
 
 	/**
 	 * Return the font ascent value.
-	 * @param $font (string) font name
-	 * @param $style (string) font style
-	 * @param $size (float) The size (in points)
+	 * @param string $font font name
+	 * @param string $style font style
+	 * @param float $size The size (in points)
 	 * @return int font ascent
 	 * @public
 	 * @author Nicola Asuni
@@ -4622,10 +4679,10 @@ class TCPDF {
 
 	/**
 	 * Return true in the character is present in the specified font.
-	 * @param $char (mixed) Character to check (integer value or string)
-	 * @param $font (string) Font name (family name).
-	 * @param $style (string) Font style.
-	 * @return (boolean) true if the char is defined, false otherwise.
+	 * @param mixed $char Character to check (integer value or string)
+	 * @param string $font Font name (family name).
+	 * @param string $style Font style.
+	 * @return bool true if the char is defined, false otherwise.
 	 * @public
 	 * @since 5.9.153 (2012-03-28)
 	 */
@@ -4648,11 +4705,11 @@ class TCPDF {
 
 	/**
 	 * Replace missing font characters on selected font with specified substitutions.
-	 * @param $text (string) Text to process.
-	 * @param $font (string) Font name (family name).
-	 * @param $style (string) Font style.
-	 * @param $subs (array) Array of possible character substitutions. The key is the character to check (integer value) and the value is a single intege value or an array of possible substitutes.
-	 * @return (string) Processed text.
+	 * @param string $text Text to process.
+	 * @param string $font Font name (family name).
+	 * @param string $style Font style.
+	 * @param array $subs Array of possible character substitutions. The key is the character to check (integer value) and the value is a single intege value or an array of possible substitutes.
+	 * @return string Processed text.
 	 * @public
 	 * @since 5.9.153 (2012-03-28)
 	 */
@@ -4689,11 +4746,11 @@ class TCPDF {
 
 	/**
 	 * Defines the default monospaced font.
-	 * @param $font (string) Font name.
+	 * @param string $font Font name.
 	 * @public
 	 * @since 4.5.025
 	 */
-	public function SetDefaultMonospacedFont($font) {
+	public function setDefaultMonospacedFont($font) {
 		$this->default_monospaced_font = $font;
 	}
 
@@ -4713,14 +4770,14 @@ class TCPDF {
 
 	/**
 	 * Defines the page and position a link points to.
-	 * @param $link (int) The link identifier returned by AddLink()
-	 * @param $y (float) Ordinate of target position; -1 indicates the current position. The default value is 0 (top of page)
-	 * @param $page (int|string) Number of target page; -1 indicates the current page (default value). If you prefix a page number with the * character, then this page will not be changed when adding/deleting/moving pages.
+	 * @param int $link The link identifier returned by AddLink()
+	 * @param float $y Ordinate of target position; -1 indicates the current position. The default value is 0 (top of page)
+	 * @param int|string $page Number of target page; -1 indicates the current page (default value). If you prefix a page number with the * character, then this page will not be changed when adding/deleting/moving pages.
 	 * @public
 	 * @since 1.5
 	 * @see AddLink()
 	 */
-	public function SetLink($link, $y=0, $page=-1) {
+	public function setLink($link, $y=0, $page=-1) {
 		$fixed = false;
 		if (!empty($page) AND (substr($page, 0, 1) == '*')) {
 			$page = intval(substr($page, 1));
@@ -4739,12 +4796,12 @@ class TCPDF {
 	/**
 	 * Puts a link on a rectangular area of the page.
 	 * Text or image links are generally put via Cell(), Write() or Image(), but this method can be useful for instance to define a clickable area inside an image.
-	 * @param $x (float) Abscissa of the upper-left corner of the rectangle
-	 * @param $y (float) Ordinate of the upper-left corner of the rectangle
-	 * @param $w (float) Width of the rectangle
-	 * @param $h (float) Height of the rectangle
-	 * @param $link (mixed) URL or identifier returned by AddLink()
-	 * @param $spaces (int) number of spaces on the text to link
+	 * @param float $x Abscissa of the upper-left corner of the rectangle
+	 * @param float $y Ordinate of the upper-left corner of the rectangle
+	 * @param float $w Width of the rectangle
+	 * @param float $h Height of the rectangle
+	 * @param mixed $link URL or identifier returned by AddLink()
+	 * @param int $spaces number of spaces on the text to link
 	 * @public
 	 * @since 1.5
 	 * @see AddLink(), Annotation(), Cell(), Write(), Image()
@@ -4756,13 +4813,13 @@ class TCPDF {
 	/**
 	 * Puts a markup annotation on a rectangular area of the page.
 	 * !!!!THE ANNOTATION SUPPORT IS NOT YET FULLY IMPLEMENTED !!!!
-	 * @param $x (float) Abscissa of the upper-left corner of the rectangle
-	 * @param $y (float) Ordinate of the upper-left corner of the rectangle
-	 * @param $w (float) Width of the rectangle
-	 * @param $h (float) Height of the rectangle
-	 * @param $text (string) annotation text or alternate content
-	 * @param $opt (array) array of options (see section 8.4 of PDF reference 1.7).
-	 * @param $spaces (int) number of spaces on the text to link
+	 * @param float $x Abscissa of the upper-left corner of the rectangle
+	 * @param float $y Ordinate of the upper-left corner of the rectangle
+	 * @param float $w Width of the rectangle
+	 * @param float $h Height of the rectangle
+	 * @param string $text annotation text or alternate content
+	 * @param array $opt array of options (see section 8.4 of PDF reference 1.7).
+	 * @param int $spaces number of spaces on the text to link
 	 * @public
 	 * @since 4.0.018 (2008-08-06)
 	 */
@@ -4863,7 +4920,7 @@ class TCPDF {
 		}
 		reset($this->embeddedfiles);
 		foreach ($this->embeddedfiles as $filename => $filedata) {
-			$data = TCPDF_STATIC::fileGetContents($filedata['file']);
+		    $data = $this->getCachedFileContents($filedata['file']);
 			if ($data !== FALSE) {
 				$rawsize = strlen($data);
 				if ($rawsize > 0) {
@@ -4902,31 +4959,31 @@ class TCPDF {
 	/**
 	 * Prints a text cell at the specified position.
 	 * This method allows to place a string precisely on the page.
-	 * @param $x (float) Abscissa of the cell origin
-	 * @param $y (float) Ordinate of the cell origin
-	 * @param $txt (string) String to print
-	 * @param $fstroke (int) outline size in user units (false = disable)
-	 * @param $fclip (boolean) if true activate clipping mode (you must call StartTransform() before this function and StopTransform() to stop the clipping tranformation).
-	 * @param $ffill (boolean) if true fills the text
-	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param $ln (int) Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL languages)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
-	 * @param $align (string) Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
-	 * @param $fill (boolean) Indicates if the cell background must be painted (true) or transparent (false).
-	 * @param $link (mixed) URL or identifier returned by AddLink().
-	 * @param $stretch (int) font stretch mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if text is larger than cell width</li><li>2 = forced horizontal scaling to fit cell width</li><li>3 = character spacing only if text is larger than cell width</li><li>4 = forced character spacing to fit cell width</li></ul> General font stretching and scaling values will be preserved when possible.
-	 * @param $ignore_min_height (boolean) if true ignore automatic minimum height value.
-	 * @param $calign (string) cell vertical alignment relative to the specified Y value. Possible values are:<ul><li>T : cell top</li><li>A : font top</li><li>L : font baseline</li><li>D : font bottom</li><li>B : cell bottom</li></ul>
-	 * @param $valign (string) text vertical alignment inside the cell. Possible values are:<ul><li>T : top</li><li>C : center</li><li>B : bottom</li></ul>
-	 * @param $rtloff (boolean) if true uses the page top-left corner as origin of axis for $x and $y initial position.
+	 * @param float $x Abscissa of the cell origin
+	 * @param float $y Ordinate of the cell origin
+	 * @param string $txt String to print
+	 * @param int $fstroke outline size in user units (0 = disable)
+	 * @param boolean $fclip if true activate clipping mode (you must call StartTransform() before this function and StopTransform() to stop the clipping tranformation).
+	 * @param boolean $ffill if true fills the text
+	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
+	 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL languages)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
+	 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
+	 * @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
+	 * @param mixed $link URL or identifier returned by AddLink().
+	 * @param int $stretch font stretch mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if text is larger than cell width</li><li>2 = forced horizontal scaling to fit cell width</li><li>3 = character spacing only if text is larger than cell width</li><li>4 = forced character spacing to fit cell width</li></ul> General font stretching and scaling values will be preserved when possible.
+	 * @param boolean $ignore_min_height if true ignore automatic minimum height value.
+	 * @param string $calign cell vertical alignment relative to the specified Y value. Possible values are:<ul><li>T : cell top</li><li>A : font top</li><li>L : font baseline</li><li>D : font bottom</li><li>B : cell bottom</li></ul>
+	 * @param string $valign text vertical alignment inside the cell. Possible values are:<ul><li>T : top</li><li>C : center</li><li>B : bottom</li></ul>
+	 * @param boolean $rtloff if true uses the page top-left corner as origin of axis for $x and $y initial position.
 	 * @public
 	 * @since 1.0
 	 * @see Cell(), Write(), MultiCell(), WriteHTML(), WriteHTMLCell()
 	 */
-	public function Text($x, $y, $txt, $fstroke=false, $fclip=false, $ffill=true, $border=0, $ln=0, $align='', $fill=false, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M', $rtloff=false) {
+	public function Text($x, $y, $txt, $fstroke=0, $fclip=false, $ffill=true, $border=0, $ln=0, $align='', $fill=false, $link='', $stretch=0, $ignore_min_height=false, $calign='T', $valign='M', $rtloff=false) {
 		$textrendermode = $this->textrendermode;
 		$textstrokewidth = $this->textstrokewidth;
 		$this->setTextRenderingMode($fstroke, $ffill, $fclip);
-		$this->SetXY($x, $y, $rtloff);
+		$this->setXY($x, $y, $rtloff);
 		$this->Cell(0, 0, $txt, $border, $ln, $align, $fill, $link, $stretch, $ignore_min_height, $calign, $valign);
 		// restore previous rendering mode
 		$this->textrendermode = $textrendermode;
@@ -4937,7 +4994,7 @@ class TCPDF {
 	 * Whenever a page break condition is met, the method is called, and the break is issued or not depending on the returned value.
 	 * The default implementation returns a value according to the mode selected by SetAutoPageBreak().<br />
 	 * This method is called automatically and should not be called directly by the application.
-	 * @return boolean
+	 * @return bool
 	 * @public
 	 * @since 1.4
 	 * @see SetAutoPageBreak()
@@ -4962,14 +5019,14 @@ class TCPDF {
 
 	/**
 	 * Add page if needed.
-	 * @param $h (float) Cell height. Default value: 0.
-	 * @param $y (mixed) starting y position, leave empty for current position.
-	 * @param $addpage (boolean) if true add a page, otherwise only return the true/false state
-	 * @return boolean true in case of page break, false otherwise.
+	 * @param float $h Cell height. Default value: 0.
+	 * @param float|null $y starting y position, leave empty for current position.
+	 * @param bool  $addpage if true add a page, otherwise only return the true/false state
+	 * @return bool true in case of page break, false otherwise.
 	 * @since 3.2.000 (2008-07-01)
 	 * @protected
 	 */
-	protected function checkPageBreak($h=0, $y='', $addpage=true) {
+	protected function checkPageBreak($h=0, $y=null, $addpage=true) {
 		if (TCPDF_STATIC::empty_string($y)) {
 			$y = $this->y;
 		}
@@ -5007,18 +5064,18 @@ class TCPDF {
 	/**
 	 * Prints a cell (rectangular area) with optional borders, background color and character string. The upper-left corner of the cell corresponds to the current position. The text can be aligned or centered. After the call, the current position moves to the right or to the next line. It is possible to put a link on the text.<br />
 	 * If automatic page breaking is enabled and the cell goes beyond the limit, a page break is done before outputting.
-	 * @param $w (float) Cell width. If 0, the cell extends up to the right margin.
-	 * @param $h (float) Cell height. Default value: 0.
-	 * @param $txt (string) String to print. Default value: empty string.
-	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param $ln (int) Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL languages)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul> Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
-	 * @param $align (string) Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
-	 * @param $fill (boolean) Indicates if the cell background must be painted (true) or transparent (false).
-	 * @param $link (mixed) URL or identifier returned by AddLink().
-	 * @param $stretch (int) font stretch mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if text is larger than cell width</li><li>2 = forced horizontal scaling to fit cell width</li><li>3 = character spacing only if text is larger than cell width</li><li>4 = forced character spacing to fit cell width</li></ul> General font stretching and scaling values will be preserved when possible.
-	 * @param $ignore_min_height (boolean) if true ignore automatic minimum height value.
-	 * @param $calign (string) cell vertical alignment relative to the specified Y value. Possible values are:<ul><li>T : cell top</li><li>C : center</li><li>B : cell bottom</li><li>A : font top</li><li>L : font baseline</li><li>D : font bottom</li></ul>
-	 * @param $valign (string) text vertical alignment inside the cell. Possible values are:<ul><li>T : top</li><li>C : center</li><li>B : bottom</li></ul>
+	 * @param float $w Cell width. If 0, the cell extends up to the right margin.
+	 * @param float $h Cell height. Default value: 0.
+	 * @param string $txt String to print. Default value: empty string.
+	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
+	 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL languages)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul> Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
+	 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
+	 * @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
+	 * @param mixed $link URL or identifier returned by AddLink().
+	 * @param int $stretch font stretch mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if text is larger than cell width</li><li>2 = forced horizontal scaling to fit cell width</li><li>3 = character spacing only if text is larger than cell width</li><li>4 = forced character spacing to fit cell width</li></ul> General font stretching and scaling values will be preserved when possible.
+	 * @param boolean $ignore_min_height if true ignore automatic minimum height value.
+	 * @param string $calign cell vertical alignment relative to the specified Y value. Possible values are:<ul><li>T : cell top</li><li>C : center</li><li>B : cell bottom</li><li>A : font top</li><li>L : font baseline</li><li>D : font bottom</li></ul>
+	 * @param string $valign text vertical alignment inside the cell. Possible values are:<ul><li>T : top</li><li>C : center</li><li>B : bottom</li></ul>
 	 * @public
 	 * @since 1.0
 	 * @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), AddLink(), Ln(), MultiCell(), Write(), SetAutoPageBreak()
@@ -5046,9 +5103,9 @@ class TCPDF {
 			// print shadow
 			$this->x += $this->txtshadow['depth_w'];
 			$this->y += $this->txtshadow['depth_h'];
-			$this->SetFillColorArray($this->txtshadow['color']);
-			$this->SetTextColorArray($this->txtshadow['color']);
-			$this->SetDrawColorArray($this->txtshadow['color']);
+			$this->setFillColorArray($this->txtshadow['color']);
+			$this->setTextColorArray($this->txtshadow['color']);
+			$this->setDrawColorArray($this->txtshadow['color']);
 			if ($this->txtshadow['opacity'] != $alpha['CA']) {
 				$this->setAlpha($this->txtshadow['opacity'], $this->txtshadow['blend_mode']);
 			}
@@ -5058,9 +5115,9 @@ class TCPDF {
 			//restore data
 			$this->x = $x;
 			$this->y = $y;
-			$this->SetFillColorArray($bc);
-			$this->SetTextColorArray($fc);
-			$this->SetDrawColorArray($sc);
+			$this->setFillColorArray($bc);
+			$this->setTextColorArray($fc);
+			$this->setDrawColorArray($sc);
 			if ($this->txtshadow['opacity'] != $alpha['CA']) {
 				$this->setAlpha($alpha['CA'], $alpha['BM'], $alpha['ca'], $alpha['AIS']);
 			}
@@ -5075,18 +5132,18 @@ class TCPDF {
 	/**
 	 * Returns the PDF string code to print a cell (rectangular area) with optional borders, background color and character string. The upper-left corner of the cell corresponds to the current position. The text can be aligned or centered. After the call, the current position moves to the right or to the next line. It is possible to put a link on the text.<br />
 	 * If automatic page breaking is enabled and the cell goes beyond the limit, a page break is done before outputting.
-	 * @param $w (float) Cell width. If 0, the cell extends up to the right margin.
-	 * @param $h (float) Cell height. Default value: 0.
-	 * @param $txt (string) String to print. Default value: empty string.
-	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param $ln (int) Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL languages)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
-	 * @param $align (string) Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
-	 * @param $fill (boolean) Indicates if the cell background must be painted (true) or transparent (false).
-	 * @param $link (mixed) URL or identifier returned by AddLink().
-	 * @param $stretch (int) font stretch mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if text is larger than cell width</li><li>2 = forced horizontal scaling to fit cell width</li><li>3 = character spacing only if text is larger than cell width</li><li>4 = forced character spacing to fit cell width</li></ul> General font stretching and scaling values will be preserved when possible.
-	 * @param $ignore_min_height (boolean) if true ignore automatic minimum height value.
-	 * @param $calign (string) cell vertical alignment relative to the specified Y value. Possible values are:<ul><li>T : cell top</li><li>C : center</li><li>B : cell bottom</li><li>A : font top</li><li>L : font baseline</li><li>D : font bottom</li></ul>
-	 * @param $valign (string) text vertical alignment inside the cell. Possible values are:<ul><li>T : top</li><li>M : middle</li><li>B : bottom</li></ul>
+	 * @param float $w Cell width. If 0, the cell extends up to the right margin.
+	 * @param float $h Cell height. Default value: 0.
+	 * @param string $txt String to print. Default value: empty string.
+	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
+	 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL languages)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
+	 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
+	 * @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
+	 * @param mixed $link URL or identifier returned by AddLink().
+	 * @param int $stretch font stretch mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if text is larger than cell width</li><li>2 = forced horizontal scaling to fit cell width</li><li>3 = character spacing only if text is larger than cell width</li><li>4 = forced character spacing to fit cell width</li></ul> General font stretching and scaling values will be preserved when possible.
+	 * @param boolean $ignore_min_height if true ignore automatic minimum height value.
+	 * @param string $calign cell vertical alignment relative to the specified Y value. Possible values are:<ul><li>T : cell top</li><li>C : center</li><li>B : cell bottom</li><li>A : font top</li><li>L : font baseline</li><li>D : font bottom</li></ul>
+	 * @param string $valign text vertical alignment inside the cell. Possible values are:<ul><li>T : top</li><li>M : middle</li><li>B : bottom</li></ul>
 	 * @return string containing cell code
 	 * @protected
 	 * @since 1.0
@@ -5554,8 +5611,8 @@ class TCPDF {
 
 	/**
 	 * Replace a char if is defined on the current font.
-	 * @param $oldchar (int) Integer code (unicode) of the character to replace.
-	 * @param $newchar (int) Integer code (unicode) of the new character.
+	 * @param int $oldchar Integer code (unicode) of the character to replace.
+	 * @param int $newchar Integer code (unicode) of the new character.
 	 * @return int the replaced char or the old char in case the new char i not defined
 	 * @protected
 	 * @since 5.9.167 (2012-06-22)
@@ -5573,11 +5630,11 @@ class TCPDF {
 
 	/**
 	 * Returns the code to draw the cell border
-	 * @param $x (float) X coordinate.
-	 * @param $y (float) Y coordinate.
-	 * @param $w (float) Cell width.
-	 * @param $h (float) Cell height.
-	 * @param $brd (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
+	 * @param float $x X coordinate.
+	 * @param float $y Y coordinate.
+	 * @param float $w Cell width.
+	 * @param float $h Cell height.
+	 * @param string|array|int $brd Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
 	 * @return string containing cell border code
 	 * @protected
 	 * @see SetLineStyle()
@@ -5625,7 +5682,7 @@ class TCPDF {
 			if (is_array($style) AND !empty($style)) {
 				// apply border style
 				$prev_style = $this->linestyleWidth.' '.$this->linestyleCap.' '.$this->linestyleJoin.' '.$this->linestyleDash.' '.$this->DrawColor.' ';
-				$s .= $this->SetLineStyle($style, true)."\n";
+				$s .= $this->setLineStyle($style, true)."\n";
 			}
 			switch ($mode) {
 				case 'ext': {
@@ -5765,28 +5822,28 @@ class TCPDF {
 	 * This method allows printing text with line breaks.
 	 * They can be automatic (as soon as the text reaches the right border of the cell) or explicit (via the \n character). As many cells as necessary are output, one below the other.<br />
 	 * Text can be aligned, centered or justified. The cell block can be framed and the background painted.
-	 * @param $w (float) Width of cells. If 0, they extend up to the right margin of the page.
-	 * @param $h (float) Cell minimum height. The cell extends automatically if needed.
-	 * @param $txt (string) String to print
-	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param $align (string) Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align</li><li>C: center</li><li>R: right align</li><li>J: justification (default value when $ishtml=false)</li></ul>
-	 * @param $fill (boolean) Indicates if the cell background must be painted (true) or transparent (false).
-	 * @param $ln (int) Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right</li><li>1: to the beginning of the next line [DEFAULT]</li><li>2: below</li></ul>
-	 * @param $x (float) x position in user units
-	 * @param $y (float) y position in user units
-	 * @param $reseth (boolean) if true reset the last cell height (default true).
-	 * @param $stretch (int) font stretch mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if text is larger than cell width</li><li>2 = forced horizontal scaling to fit cell width</li><li>3 = character spacing only if text is larger than cell width</li><li>4 = forced character spacing to fit cell width</li></ul> General font stretching and scaling values will be preserved when possible.
-	 * @param $ishtml (boolean) INTERNAL USE ONLY -- set to true if $txt is HTML content (default = false). Never set this parameter to true, use instead writeHTMLCell() or writeHTML() methods.
-	 * @param $autopadding (boolean) if true, uses internal padding and automatically adjust it to account for line width.
-	 * @param $maxh (float) maximum height. It should be >= $h and less then remaining space to the bottom of the page, or 0 for disable this feature. This feature works only when $ishtml=false.
-	 * @param $valign (string) Vertical alignment of text (requires $maxh = $h > 0). Possible values are:<ul><li>T: TOP</li><li>M: middle</li><li>B: bottom</li></ul>. This feature works only when $ishtml=false and the cell must fit in a single page.
-	 * @param $fitcell (boolean) if true attempt to fit all the text within the cell by reducing the font size (do not work in HTML mode). $maxh must be greater than 0 and equal to $h.
+	 * @param float $w Width of cells. If 0, they extend up to the right margin of the page.
+	 * @param float $h Cell minimum height. The cell extends automatically if needed.
+	 * @param string $txt String to print
+	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
+	 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align</li><li>C: center</li><li>R: right align</li><li>J: justification (default value when $ishtml=false)</li></ul>
+	 * @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
+	 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right</li><li>1: to the beginning of the next line [DEFAULT]</li><li>2: below</li></ul>
+	 * @param float|null $x x position in user units
+	 * @param float|null $y y position in user units
+	 * @param boolean $reseth if true reset the last cell height (default true).
+	 * @param int $stretch font stretch mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if text is larger than cell width</li><li>2 = forced horizontal scaling to fit cell width</li><li>3 = character spacing only if text is larger than cell width</li><li>4 = forced character spacing to fit cell width</li></ul> General font stretching and scaling values will be preserved when possible.
+	 * @param boolean $ishtml INTERNAL USE ONLY -- set to true if $txt is HTML content (default = false). Never set this parameter to true, use instead writeHTMLCell() or writeHTML() methods.
+	 * @param boolean $autopadding if true, uses internal padding and automatically adjust it to account for line width.
+	 * @param float $maxh maximum height. It should be >= $h and less then remaining space to the bottom of the page, or 0 for disable this feature. This feature works only when $ishtml=false.
+	 * @param string $valign Vertical alignment of text (requires $maxh = $h > 0). Possible values are:<ul><li>T: TOP</li><li>M: middle</li><li>B: bottom</li></ul>. This feature works only when $ishtml=false and the cell must fit in a single page.
+	 * @param boolean $fitcell if true attempt to fit all the text within the cell by reducing the font size (do not work in HTML mode). $maxh must be greater than 0 and equal to $h.
 	 * @return int Return the number of cells or 1 for html mode.
 	 * @public
 	 * @since 1.3
 	 * @see SetFont(), SetDrawColor(), SetFillColor(), SetTextColor(), SetLineWidth(), Cell(), Write(), SetAutoPageBreak()
 	 */
-	public function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=true, $maxh=0, $valign='T', $fitcell=false) {
+	public function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false, $ln=1, $x=null, $y=null, $reseth=true, $stretch=0, $ishtml=false, $autopadding=true, $maxh=0, $valign='T', $fitcell=false) {
 		$prev_cell_margin = $this->cell_margin;
 		$prev_cell_padding = $this->cell_padding;
 		// adjust internal padding
@@ -5801,7 +5858,7 @@ class TCPDF {
 			$this->resetLastH();
 		}
 		if (!TCPDF_STATIC::empty_string($y)) {
-			$this->SetY($y); // set y in order to convert negative y values to positive ones
+			$this->setY($y); // set y in order to convert negative y values to positive ones
 		}
 		$y = $this->GetY();
 		$resth = 0;
@@ -5816,7 +5873,7 @@ class TCPDF {
 		// get current column
 		$startcolumn = $this->current_column;
 		if (!TCPDF_STATIC::empty_string($x)) {
-			$this->SetX($x);
+			$this->setX($x);
 		} else {
 			$x = $this->GetX();
 		}
@@ -5877,7 +5934,7 @@ class TCPDF {
 					$maxit = (2 * min(100, max(10, intval($fmax)))); // max number of iterations
 					while ($maxit >= 0) {
 						$fmid = (($fmax + $fmin) / 2);
-						$this->SetFontSize($fmid, false);
+						$this->setFontSize($fmid, false);
 						$this->resetLastH();
 						$text_height = $this->getStringHeight($w, $txt, $reseth, $autopadding, $mc_padding, $border);
 						$diff = ($maxh - $text_height);
@@ -5893,11 +5950,11 @@ class TCPDF {
 					}
 					if ($maxit < 0) {
 						// premature exit, we get the minimum font value to fit the cell
-						$this->SetFontSize($fmin);
+						$this->setFontSize($fmin);
 						$this->resetLastH();
 						$text_height = $this->getStringHeight($w, $txt, $reseth, $autopadding, $mc_padding, $border);
 					} else {
-						$this->SetFontSize($fmid);
+						$this->setFontSize($fmid);
 						$this->resetLastH();
 					}
 				}
@@ -5914,7 +5971,7 @@ class TCPDF {
 			$nl = $this->Write($this->lasth, $txt, '', 0, $align, true, $stretch, false, true, $maxh, 0, $mc_margin);
 			if ($fitcell) {
 				// restore font size
-				$this->SetFontSize($prev_FontSizePt);
+				$this->setFontSize($prev_FontSizePt);
 			}
 		}
 		if ($autopadding) {
@@ -5961,7 +6018,7 @@ class TCPDF {
 			$this->setPage($page);
 			if ($this->num_columns < 2) {
 				// single-column mode
-				$this->SetX($x);
+				$this->setX($x);
 				$this->y = $this->tMargin;
 			}
 			// account for margin changes
@@ -6123,15 +6180,15 @@ class TCPDF {
 		}
 		if ($ln > 0) {
 			//Go to the beginning of the next line
-			$this->SetY($currentY + $mc_margin['B']);
+			$this->setY($currentY + $mc_margin['B']);
 			if ($ln == 2) {
-				$this->SetX($x + $w + $mc_margin['L'] + $mc_margin['R']);
+				$this->setX($x + $w + $mc_margin['L'] + $mc_margin['R']);
 			}
 		} else {
 			// go left or right by case
 			$this->setPage($startpage);
 			$this->y = $y;
-			$this->SetX($x + $w + $mc_margin['L'] + $mc_margin['R']);
+			$this->setX($x + $w + $mc_margin['L'] + $mc_margin['R']);
 		}
 		$this->setContentMark();
 		$this->cell_padding = $prev_cell_padding;
@@ -6143,18 +6200,18 @@ class TCPDF {
 
 	/**
 	 * This method return the estimated number of lines for print a simple text string using Multicell() method.
-	 * @param $txt (string) String for calculating his height
-	 * @param $w (float) Width of cells. If 0, they extend up to the right margin of the page.
-	 * @param $reseth (boolean) if true reset the last cell height (default false).
-	 * @param $autopadding (boolean) if true, uses internal padding and automatically adjust it to account for line width (default true).
-	 * @param $cellpadding (float) Internal cell padding, if empty uses default cell padding.
-	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
+	 * @param string $txt String for calculating his height
+	 * @param float $w Width of cells. If 0, they extend up to the right margin of the page.
+	 * @param boolean $reseth if true reset the last cell height (default false).
+	 * @param boolean $autopadding if true, uses internal padding and automatically adjust it to account for line width (default true).
+	 * @param array|null $cellpadding Internal cell padding, if empty uses default cell padding.
+	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
 	 * @return float Return the minimal height needed for multicell method for printing the $txt param.
 	 * @author Alexander Escalona Fern\E1ndez, Nicola Asuni
 	 * @public
 	 * @since 4.5.011
 	 */
-	public function getNumLines($txt, $w=0, $reseth=false, $autopadding=true, $cellpadding='', $border=0) {
+	public function getNumLines($txt, $w=0, $reseth=false, $autopadding=true, $cellpadding=null, $border=0) {
 		if ($txt === NULL) {
 			return 0;
 		}
@@ -6237,7 +6294,7 @@ class TCPDF {
 	 *  $start_page = $pdf->getPage();
 	 *  // call your printing functions with your parameters
 	 *  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-	 *  $pdf->MultiCell($w=0, $h=0, $txt, $border=1, $align='L', $fill=false, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=true, $maxh=0);
+	 *  $pdf->MultiCell($w=0, $h=0, $txt, $border=1, $align='L', $fill=false, $ln=1, $x=null, $y=null, $reseth=true, $stretch=0, $ishtml=false, $autopadding=true, $maxh=0);
 	 *  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 	 *  // get the new Y
 	 *  $end_y = $pdf->GetY();
@@ -6263,17 +6320,17 @@ class TCPDF {
 	 *  // restore previous object
 	 *  $pdf = $pdf->rollbackTransaction();
 	 *
-	 * @param $w (float) Width of cells. If 0, they extend up to the right margin of the page.
-	 * @param $txt (string) String for calculating his height
-	 * @param $reseth (boolean) if true reset the last cell height (default false).
-	 * @param $autopadding (boolean) if true, uses internal padding and automatically adjust it to account for line width (default true).
-	 * @param $cellpadding (float) Internal cell padding, if empty uses default cell padding.
-	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
+	 * @param float $w Width of cells. If 0, they extend up to the right margin of the page.
+	 * @param string $txt String for calculating his height
+	 * @param boolean $reseth if true reset the last cell height (default false).
+	 * @param boolean $autopadding if true, uses internal padding and automatically adjust it to account for line width (default true).
+	 * @param array|null $cellpadding Internal cell padding, if empty uses default cell padding.
+	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
 	 * @return float Return the minimal height needed for multicell method for printing the $txt param.
 	 * @author Nicola Asuni, Alexander Escalona Fern\E1ndez
 	 * @public
 	 */
-	public function getStringHeight($w, $txt, $reseth=false, $autopadding=true, $cellpadding='', $border=0) {
+	public function getStringHeight($w, $txt, $reseth=false, $autopadding=true, $cellpadding=null, $border=0) {
 		// adjust internal padding
 		$prev_cell_padding = $this->cell_padding;
 		$prev_lasth = $this->lasth;
@@ -6290,30 +6347,30 @@ class TCPDF {
 
 	/**
 	 * This method prints text from the current position.<br />
-	 * @param $h (float) Line height
-	 * @param $txt (string) String to print
-	 * @param $link (mixed) URL or identifier returned by AddLink()
-	 * @param $fill (boolean) Indicates if the cell background must be painted (true) or transparent (false).
-	 * @param $align (string) Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
-	 * @param $ln (boolean) if true set cursor at the bottom of the line, otherwise set cursor at the top of the line.
-	 * @param $stretch (int) font stretch mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if text is larger than cell width</li><li>2 = forced horizontal scaling to fit cell width</li><li>3 = character spacing only if text is larger than cell width</li><li>4 = forced character spacing to fit cell width</li></ul> General font stretching and scaling values will be preserved when possible.
-	 * @param $firstline (boolean) if true prints only the first line and return the remaining string.
-	 * @param $firstblock (boolean) if true the string is the starting of a line.
-	 * @param $maxh (float) maximum height. It should be >= $h and less then remaining space to the bottom of the page, or 0 for disable this feature.
-	 * @param $wadj (float) first line width will be reduced by this amount (used in HTML mode).
-	 * @param $margin (array) margin array of the parent container
+	 * @param float $h Line height
+	 * @param string $txt String to print
+	 * @param mixed $link URL or identifier returned by AddLink()
+	 * @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
+	 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L or empty string: left align (default value)</li><li>C: center</li><li>R: right align</li><li>J: justify</li></ul>
+	 * @param boolean $ln if true set cursor at the bottom of the line, otherwise set cursor at the top of the line.
+	 * @param int $stretch font stretch mode: <ul><li>0 = disabled</li><li>1 = horizontal scaling only if text is larger than cell width</li><li>2 = forced horizontal scaling to fit cell width</li><li>3 = character spacing only if text is larger than cell width</li><li>4 = forced character spacing to fit cell width</li></ul> General font stretching and scaling values will be preserved when possible.
+	 * @param boolean $firstline if true prints only the first line and return the remaining string.
+	 * @param boolean $firstblock if true the string is the starting of a line.
+	 * @param float $maxh maximum height. It should be >= $h and less then remaining space to the bottom of the page, or 0 for disable this feature.
+	 * @param float $wadj first line width will be reduced by this amount (used in HTML mode).
+	 * @param array|null $margin margin array of the parent container
 	 * @return mixed Return the number of cells or the remaining string if $firstline = true.
 	 * @public
 	 * @since 1.5
 	 */
-	public function Write($h, $txt, $link='', $fill=false, $align='', $ln=false, $stretch=0, $firstline=false, $firstblock=false, $maxh=0, $wadj=0, $margin='') {
+	public function Write($h, $txt, $link='', $fill=false, $align='', $ln=false, $stretch=0, $firstline=false, $firstblock=false, $maxh=0, $wadj=0, $margin=null) {
 		// check page for no-write regions and adapt page margins if necessary
 		list($this->x, $this->y) = $this->checkPageRegions($h, $this->x, $this->y);
 		if (strlen($txt) == 0) {
 			// fix empty text
 			$txt = ' ';
 		}
-		if ($margin === '') {
+		if (!is_array($margin)) {
 			// set default margins
 			$margin = $this->cell_margin;
 		}
@@ -6415,7 +6472,7 @@ class TCPDF {
 					$w = $linew;
 					$tmpcellpadding = $this->cell_padding;
 					if ($maxh == 0) {
-						$this->SetCellPadding(0);
+						$this->setCellPadding(0);
 					}
 				}
 				if ($firstblock AND $this->isRTLTextDir()) {
@@ -6489,7 +6546,7 @@ class TCPDF {
 					// *** very slow ***
 					$l = $this->GetArrStringWidth(TCPDF_FONTS::utf8Bidi(array_slice($chars, $j, ($i - $j)), '', $this->tmprtl, $this->isunicode, $this->CurrentFont));
 				} else {
-					$l += $this->GetCharWidth($c);
+					$l += $this->GetCharWidth($c, ($i+1 < $nb));
 				}
 				if (($l > $wmax) OR (($c == 173) AND (($l + $tmp_shy_replacement_width) >= $wmax))) {
 					if (($c == 173) AND (($l + $tmp_shy_replacement_width) > $wmax)) {
@@ -6526,7 +6583,7 @@ class TCPDF {
 								$w = $linew;
 								$tmpcellpadding = $this->cell_padding;
 								if ($maxh == 0) {
-									$this->SetCellPadding(0);
+									$this->setCellPadding(0);
 								}
 							}
 							if ($firstblock AND $this->isRTLTextDir()) {
@@ -6570,7 +6627,7 @@ class TCPDF {
 								$w = $linew;
 								$tmpcellpadding = $this->cell_padding;
 								if ($maxh == 0) {
-									$this->SetCellPadding(0);
+									$this->setCellPadding(0);
 								}
 							}
 							if ($firstblock AND $this->isRTLTextDir()) {
@@ -6618,7 +6675,7 @@ class TCPDF {
 								$w = $linew;
 								$tmpcellpadding = $this->cell_padding;
 								if ($maxh == 0) {
-									$this->SetCellPadding(0);
+									$this->setCellPadding(0);
 								}
 							}
 							// print the line
@@ -6671,13 +6728,10 @@ class TCPDF {
 			switch ($align) {
 				case 'J':
 				case 'C': {
-					$w = $w;
 					break;
 				}
 				case 'L': {
-					if ($this->rtl) {
-						$w = $w;
-					} else {
+					if (!$this->rtl) {
 						$w = $l;
 					}
 					break;
@@ -6685,8 +6739,6 @@ class TCPDF {
 				case 'R': {
 					if ($this->rtl) {
 						$w = $l;
-					} else {
-						$w = $w;
 					}
 					break;
 				}
@@ -6712,7 +6764,7 @@ class TCPDF {
 				$w = $linew;
 				$tmpcellpadding = $this->cell_padding;
 				if ($maxh == 0) {
-					$this->SetCellPadding(0);
+					$this->setCellPadding(0);
 				}
 			}
 			if ($firstblock AND $this->isRTLTextDir()) {
@@ -6734,7 +6786,7 @@ class TCPDF {
 
 	/**
 	 * Returns the remaining width between the current position and margins.
-	 * @return int Return the remaining width
+	 * @return float Return the remaining width
 	 * @protected
 	 */
 	protected function getRemainingWidth() {
@@ -6748,12 +6800,12 @@ class TCPDF {
 
 	/**
 	 * Set the block dimensions accounting for page breaks and page/column fitting
-	 * @param $w (float) width
-	 * @param $h (float) height
-	 * @param $x (float) X coordinate
-	 * @param $y (float) Y coodiante
-	 * @param $fitonpage (boolean) if true the block is resized to not exceed page dimensions.
-	 * @return array($w, $h, $x, $y)
+	 * @param float $w width
+	 * @param float $h height
+	 * @param float $x X coordinate
+	 * @param float $y Y coodiante
+	 * @param boolean $fitonpage if true the block is resized to not exceed page dimensions.
+	 * @return array array($w, $h, $x, $y)
 	 * @protected
 	 * @since 5.5.009 (2010-07-05)
 	 */
@@ -6829,43 +6881,49 @@ class TCPDF {
 	 * The format can be specified explicitly or inferred from the file extension.<br />
 	 * It is possible to put a link on the image.<br />
 	 * Remark: if an image is used several times, only one copy will be embedded in the file.<br />
-	 * @param $file (string) Name of the file containing the image or a '@' character followed by the image data string. To link an image without embedding it on the document, set an asterisk character before the URL (i.e.: '*http://www.example.com/image.jpg').
-	 * @param $x (float) Abscissa of the upper-left corner (LTR) or upper-right corner (RTL).
-	 * @param $y (float) Ordinate of the upper-left corner (LTR) or upper-right corner (RTL).
-	 * @param $w (float) Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param $h (float) Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param $type (string) Image format. Possible values are (case insensitive): JPEG and PNG (whitout GD library) and all images supported by GD: GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM;. If not specified, the type is inferred from the file extension.
-	 * @param $link (mixed) URL or identifier returned by AddLink().
-	 * @param $align (string) Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-	 * @param $resize (mixed) If true resize (reduce) the image to fit $w and $h (requires GD or ImageMagick library); if false do not resize; if 2 force resize in all cases (upscaling and downscaling).
-	 * @param $dpi (int) dot-per-inch resolution used on resize
-	 * @param $palign (string) Allows to center or align the image on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-	 * @param $ismask (boolean) true if this image is a mask, false otherwise
-	 * @param $imgmask (mixed) image object returned by this function or false
-	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param $fitbox (mixed) If not false scale image dimensions proportionally to fit within the ($w, $h) box. $fitbox can be true or a 2 characters string indicating the image alignment inside the box. The first character indicate the horizontal alignment (L = left, C = center, R = right) the second character indicate the vertical algnment (T = top, M = middle, B = bottom).
-	 * @param $hidden (boolean) If true do not display the image.
-	 * @param $fitonpage (boolean) If true the image is resized to not exceed page dimensions.
-	 * @param $alt (boolean) If true the image will be added as alternative and not directly printed (the ID of the image will be returned).
-	 * @param $altimgs (array) Array of alternate images IDs. Each alternative image must be an array with two values: an integer representing the image ID (the value returned by the Image method) and a boolean value to indicate if the image is the default for printing.
-	 * @return image information
+	 * @param string $file Name of the file containing the image or a '@' character followed by the image data string. To link an image without embedding it on the document, set an asterisk character before the URL (i.e.: '*http://www.example.com/image.jpg').
+	 * @param float|null $x Abscissa of the upper-left corner (LTR) or upper-right corner (RTL).
+	 * @param float|null $y Ordinate of the upper-left corner (LTR) or upper-right corner (RTL).
+	 * @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
+	 * @param float $h Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
+	 * @param string $type Image format. Possible values are (case insensitive): JPEG and PNG (whitout GD library) and all images supported by GD: GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM;. If not specified, the type is inferred from the file extension.
+	 * @param mixed $link URL or identifier returned by AddLink().
+	 * @param string $align Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
+	 * @param mixed $resize If true resize (reduce) the image to fit $w and $h (requires GD or ImageMagick library); if false do not resize; if 2 force resize in all cases (upscaling and downscaling).
+	 * @param int $dpi dot-per-inch resolution used on resize
+	 * @param string $palign Allows to center or align the image on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
+	 * @param boolean $ismask true if this image is a mask, false otherwise
+	 * @param mixed $imgmask image object returned by this function or false
+	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
+	 * @param mixed $fitbox If not false scale image dimensions proportionally to fit within the ($w, $h) box. $fitbox can be true or a 2 characters string indicating the image alignment inside the box. The first character indicate the horizontal alignment (L = left, C = center, R = right) the second character indicate the vertical algnment (T = top, M = middle, B = bottom).
+	 * @param boolean $hidden If true do not display the image.
+	 * @param boolean $fitonpage If true the image is resized to not exceed page dimensions.
+	 * @param boolean $alt If true the image will be added as alternative and not directly printed (the ID of the image will be returned).
+	 * @param array $altimgs Array of alternate images IDs. Each alternative image must be an array with two values: an integer representing the image ID (the value returned by the Image method) and a boolean value to indicate if the image is the default for printing.
+	 * @return mixed|false image information
 	 * @public
 	 * @since 1.1
 	 */
-	public function Image($file, $x='', $y='', $w=0, $h=0, $type='', $link='', $align='', $resize=false, $dpi=300, $palign='', $ismask=false, $imgmask=false, $border=0, $fitbox=false, $hidden=false, $fitonpage=false, $alt=false, $altimgs=array()) {
+	public function Image($file, $x=null, $y=null, $w=0, $h=0, $type='', $link='', $align='', $resize=false, $dpi=300, $palign='', $ismask=false, $imgmask=false, $border=0, $fitbox=false, $hidden=false, $fitonpage=false, $alt=false, $altimgs=array()) {
 		if ($this->state != 2) {
-			return;
+			return false;
 		}
-		if (strcmp($x, '') === 0) {
+		if (TCPDF_STATIC::empty_string($x)) {
 			$x = $this->x;
 		}
-		if (strcmp($y, '') === 0) {
+		if (TCPDF_STATIC::empty_string($y)) {
 			$y = $this->y;
 		}
 		// check page for no-write regions and adapt page margins if necessary
 		list($x, $y) = $this->checkPageRegions($h, $x, $y);
 		$exurl = ''; // external streams
 		$imsize = FALSE;
+
+        // Make sure the file variable is not empty or null because accessing $file[0] later
+        // results in error when running PHP 7.4
+        if (empty($file)) {
+            return false;
+        }
 		// check if we are passing an image as file or string
 		if ($file[0] === '@') {
 			// image from string
@@ -6877,18 +6935,14 @@ class TCPDF {
 				$exurl = $file;
 			}
 			// check if file exist and it is valid
-			if (!@TCPDF_STATIC::file_exists($file)) {
+			if (!@$this->fileExists($file)) {
 				return false;
 			}
-			if (($imsize = @getimagesize($file)) === FALSE) {
-				if (in_array($file, $this->imagekeys)) {
-					// get existing image data
-					$info = $this->getImageBuffer($file);
-					$imsize = array($info['w'], $info['h']);
-				} elseif (strpos($file, '__tcpdf_'.$this->file_id.'_img') === FALSE) {
-					$imgdata = TCPDF_STATIC::fileGetContents($file);
-				}
-			}
+            if (false !== $info = $this->getImageBuffer($file)) {
+                $imsize = array($info['w'], $info['h']);
+            } elseif (($imsize = @getimagesize($file)) === FALSE && strpos($file, '__tcpdf_'.$this->file_id.'_img') === FALSE){
+                $imgdata = $this->getCachedFileContents($file);
+            }
 		}
 		if (!empty($imgdata)) {
 			// copy image to cache
@@ -7093,7 +7147,7 @@ class TCPDF {
 							$svgimg = substr($file, 1);
 						} else {
 							// get SVG file content
-							$svgimg = TCPDF_STATIC::fileGetContents($file);
+                            $svgimg = $this->getCachedFileContents($file);
 						}
 						if ($svgimg !== FALSE) {
 							// get width and height
@@ -7146,7 +7200,7 @@ class TCPDF {
 			}
 			if ($info === false) {
 				// unable to process image
-				return;
+				return false;
 			}
 			TCPDF_STATIC::set_mqr($mqr);
 			if ($ismask) {
@@ -7221,7 +7275,7 @@ class TCPDF {
 				break;
 			}
 			case 'N': {
-				$this->SetY($this->img_rb_y);
+				$this->setY($this->img_rb_y);
 				break;
 			}
 			default:{
@@ -7238,20 +7292,20 @@ class TCPDF {
 
 	/**
 	 * Extract info from a PNG image with alpha channel using the Imagick or GD library.
-	 * @param $file (string) Name of the file containing the image.
-	 * @param $x (float) Abscissa of the upper-left corner.
-	 * @param $y (float) Ordinate of the upper-left corner.
-	 * @param $wpx (float) Original width of the image in pixels.
-	 * @param $hpx (float) original height of the image in pixels.
-	 * @param $w (float) Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param $h (float) Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param $type (string) Image format. Possible values are (case insensitive): JPEG and PNG (whitout GD library) and all images supported by GD: GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM;. If not specified, the type is inferred from the file extension.
-	 * @param $link (mixed) URL or identifier returned by AddLink().
-	 * @param $align (string) Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-	 * @param $resize (boolean) If true resize (reduce) the image to fit $w and $h (requires GD library).
-	 * @param $dpi (int) dot-per-inch resolution used on resize
-	 * @param $palign (string) Allows to center or align the image on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-	 * @param $filehash (string) File hash used to build unique file names.
+	 * @param string $file Name of the file containing the image.
+	 * @param float $x Abscissa of the upper-left corner.
+	 * @param float $y Ordinate of the upper-left corner.
+	 * @param float $wpx Original width of the image in pixels.
+	 * @param float $hpx original height of the image in pixels.
+	 * @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
+	 * @param float $h Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
+	 * @param string $type Image format. Possible values are (case insensitive): JPEG and PNG (whitout GD library) and all images supported by GD: GD, GD2, GD2PART, GIF, JPEG, PNG, BMP, XBM, XPM;. If not specified, the type is inferred from the file extension.
+	 * @param mixed $link URL or identifier returned by AddLink().
+	 * @param string $align Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
+	 * @param boolean $resize If true resize (reduce) the image to fit $w and $h (requires GD library).
+	 * @param int $dpi dot-per-inch resolution used on resize
+	 * @param string $palign Allows to center or align the image on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
+	 * @param string $filehash File hash used to build unique file names.
 	 * @author Nicola Asuni
 	 * @protected
 	 * @since 4.3.007 (2008-12-04)
@@ -7315,7 +7369,7 @@ class TCPDF {
 						$color = imagecolorat($img, $xpx, $ypx);
 						// get and correct gamma color
 						$alpha = $this->getGDgamma($img, $color);
-						imagesetpixel($imgalpha, $xpx, $ypx, $alpha);
+						imagesetpixel($imgalpha, (int) $xpx, (int) $ypx, (int) $alpha);
 					}
 				}
 				imagepng($imgalpha, $tempfile_alpha);
@@ -7346,8 +7400,8 @@ class TCPDF {
 
 	/**
 	 * Get the GD-corrected PNG gamma value from alpha color
-	 * @param $img (int) GD image Resource ID.
-	 * @param $c (int) alpha color
+	 * @param resource $img GD image Resource ID.
+	 * @param int $c alpha color
 	 * @protected
 	 * @since 4.3.007 (2008-12-04)
 	 */
@@ -7355,9 +7409,9 @@ class TCPDF {
 		if (!isset($this->gdgammacache['#'.$c])) {
 			$colors = imagecolorsforindex($img, $c);
 			// GD alpha is only 7 bit (0 -> 127)
-			$this->gdgammacache['#'.$c] = (((127 - $colors['alpha']) / 127) * 255);
+			$this->gdgammacache['#'.$c] = (int) (((127 - $colors['alpha']) / 127) * 255);
 			// correct gamma
-			$this->gdgammacache['#'.$c] = (pow(($this->gdgammacache['#'.$c] / 255), 2.2) * 255);
+			$this->gdgammacache['#'.$c] = (int) (pow(($this->gdgammacache['#'.$c] / 255), 2.2) * 255);
 			// store the latest values on cache to improve performances
 			if (count($this->gdgammacache) > 8) {
 				// remove one element from the cache array
@@ -7370,13 +7424,13 @@ class TCPDF {
 	/**
 	 * Performs a line break.
 	 * The current abscissa goes back to the left margin and the ordinate increases by the amount passed in parameter.
-	 * @param $h (float) The height of the break. By default, the value equals the height of the last printed cell.
-	 * @param $cell (boolean) if true add the current left (or right o for RTL) padding to the X coordinate
+	 * @param float|null $h The height of the break. By default, the value equals the height of the last printed cell.
+	 * @param boolean $cell if true add the current left (or right o for RTL) padding to the X coordinate
 	 * @public
 	 * @since 1.0
 	 * @see Cell()
 	 */
-	public function Ln($h='', $cell=false) {
+	public function Ln($h=null, $cell=false) {
 		if (($this->num_columns > 1) AND ($this->y == $this->columns[$this->current_column]['y']) AND isset($this->columns[$this->current_column]['x']) AND ($this->x == $this->columns[$this->current_column]['x'])) {
 			// revove vertical space from the top of the column
 			return;
@@ -7395,7 +7449,7 @@ class TCPDF {
 		} else {
 			$this->x = $this->lMargin + $cellpadding;
 		}
-		if (is_string($h)) {
+		if (TCPDF_STATIC::empty_string($h)) {
 			$h = $this->lasth;
 		}
 		$this->y += $h;
@@ -7444,13 +7498,13 @@ class TCPDF {
 	/**
 	 * Defines the abscissa of the current position.
 	 * If the passed value is negative, it is relative to the right of the page (or left if language is RTL).
-	 * @param $x (float) The value of the abscissa in user units.
-	 * @param $rtloff (boolean) if true always uses the page top-left corner as origin of axis.
+	 * @param float $x The value of the abscissa in user units.
+	 * @param boolean $rtloff if true always uses the page top-left corner as origin of axis.
 	 * @public
 	 * @since 1.2
 	 * @see GetX(), GetY(), SetY(), SetXY()
 	 */
-	public function SetX($x, $rtloff=false) {
+	public function setX($x, $rtloff=false) {
 		$x = floatval($x);
 		if (!$rtloff AND $this->rtl) {
 			if ($x >= 0) {
@@ -7476,14 +7530,14 @@ class TCPDF {
 	/**
 	 * Moves the current abscissa back to the left margin and sets the ordinate.
 	 * If the passed value is negative, it is relative to the bottom of the page.
-	 * @param $y (float) The value of the ordinate in user units.
-	 * @param $resetx (bool) if true (default) reset the X position.
-	 * @param $rtloff (boolean) if true always uses the page top-left corner as origin of axis.
+	 * @param float $y The value of the ordinate in user units.
+	 * @param bool $resetx if true (default) reset the X position.
+	 * @param boolean $rtloff if true always uses the page top-left corner as origin of axis.
 	 * @public
 	 * @since 1.0
 	 * @see GetX(), GetY(), SetY(), SetXY()
 	 */
-	public function SetY($y, $resetx=true, $rtloff=false) {
+	public function setY($y, $resetx=true, $rtloff=false) {
 		$y = floatval($y);
 		if ($resetx) {
 			//reset x
@@ -7509,59 +7563,59 @@ class TCPDF {
 	/**
 	 * Defines the abscissa and ordinate of the current position.
 	 * If the passed values are negative, they are relative respectively to the right and bottom of the page.
-	 * @param $x (float) The value of the abscissa.
-	 * @param $y (float) The value of the ordinate.
-	 * @param $rtloff (boolean) if true always uses the page top-left corner as origin of axis.
+	 * @param float $x The value of the abscissa.
+	 * @param float $y The value of the ordinate.
+	 * @param boolean $rtloff if true always uses the page top-left corner as origin of axis.
 	 * @public
 	 * @since 1.2
 	 * @see SetX(), SetY()
 	 */
-	public function SetXY($x, $y, $rtloff=false) {
-		$this->SetY($y, false, $rtloff);
-		$this->SetX($x, $rtloff);
+	public function setXY($x, $y, $rtloff=false) {
+		$this->setY($y, false, $rtloff);
+		$this->setX($x, $rtloff);
 	}
 
 	/**
 	 * Set the absolute X coordinate of the current pointer.
-	 * @param $x (float) The value of the abscissa in user units.
+	 * @param float $x The value of the abscissa in user units.
 	 * @public
 	 * @since 5.9.186 (2012-09-13)
 	 * @see setAbsX(), setAbsY(), SetAbsXY()
 	 */
-	public function SetAbsX($x) {
+	public function setAbsX($x) {
 		$this->x = floatval($x);
 	}
 
 	/**
 	 * Set the absolute Y coordinate of the current pointer.
-	 * @param $y (float) (float) The value of the ordinate in user units.
+	 * @param float $y (float) The value of the ordinate in user units.
 	 * @public
 	 * @since 5.9.186 (2012-09-13)
 	 * @see setAbsX(), setAbsY(), SetAbsXY()
 	 */
-	public function SetAbsY($y) {
+	public function setAbsY($y) {
 		$this->y = floatval($y);
 	}
 
 	/**
 	 * Set the absolute X and Y coordinates of the current pointer.
-	 * @param $x (float) The value of the abscissa in user units.
-	 * @param $y (float) (float) The value of the ordinate in user units.
+	 * @param float $x The value of the abscissa in user units.
+	 * @param float $y (float) The value of the ordinate in user units.
 	 * @public
 	 * @since 5.9.186 (2012-09-13)
 	 * @see setAbsX(), setAbsY(), SetAbsXY()
 	 */
-	public function SetAbsXY($x, $y) {
-		$this->SetAbsX($x);
-		$this->SetAbsY($y);
+	public function setAbsXY($x, $y) {
+		$this->setAbsX($x);
+		$this->setAbsY($y);
 	}
 
 	/**
 	 * Send the document to a given destination: string, local file or browser.
 	 * In the last case, the plug-in may be used (if present) or a download ("Save as" dialog box) may be forced.<br />
 	 * The method first calls Close() if necessary to terminate the document.
-	 * @param $name (string) The name of the file when saved. Note that special characters are removed and blanks characters are replaced with the underscore character.
-	 * @param $dest (string) Destination where to send the document. It can take one of the following values:<ul><li>I: send the file inline to the browser (default). The plug-in is used if available. The name given by name is used when one selects the "Save as" option on the link generating the PDF.</li><li>D: send to the browser and force a file download with the name given by name.</li><li>F: save to a local server file with the name given by name.</li><li>S: return the document as a string (name is ignored).</li><li>FI: equivalent to F + I option</li><li>FD: equivalent to F + D option</li><li>E: return the document as base64 mime multi-part email attachment (RFC 2045)</li></ul>
+	 * @param string $name The name of the file when saved. Note that special characters are removed and blanks characters are replaced with the underscore character.
+	 * @param string $dest Destination where to send the document. It can take one of the following values:<ul><li>I: send the file inline to the browser (default). The plug-in is used if available. The name given by name is used when one selects the "Save as" option on the link generating the PDF.</li><li>D: send to the browser and force a file download with the name given by name.</li><li>F: save to a local server file with the name given by name.</li><li>S: return the document as a string (name is ignored).</li><li>FI: equivalent to F + I option</li><li>FD: equivalent to F + D option</li><li>E: return the document as base64 mime multi-part email attachment (RFC 2045)</li></ul>
 	 * @return string
 	 * @public
 	 * @since 1.0
@@ -7761,20 +7815,16 @@ class TCPDF {
 	protected static $cleaned_ids = array();
 	/**
 	 * Unset all class variables except the following critical variables.
-	 * @param $destroyall (boolean) if true destroys all class variables, otherwise preserves critical variables.
-	 * @param $preserve_objcopy (boolean) if true preserves the objcopy variable
+	 * @param boolean $destroyall if true destroys all class variables, otherwise preserves critical variables.
+	 * @param boolean $preserve_objcopy if true preserves the objcopy variable
 	 * @public
 	 * @since 4.5.016 (2009-02-24)
 	 */
 	public function _destroy($destroyall=false, $preserve_objcopy=false) {
-		// restore internal encoding
-		if (isset($this->internal_encoding) AND !empty($this->internal_encoding)) {
-			mb_internal_encoding($this->internal_encoding);
-		}
 		if (isset(self::$cleaned_ids[$this->file_id])) {
 			$destroyall = false;
 		}
-		if ($destroyall AND !$preserve_objcopy) {
+		if ($destroyall AND !$preserve_objcopy && isset($this->file_id)) {
 			self::$cleaned_ids[$this->file_id] = true;
 			// remove all temporary files
 			if ($handle = @opendir(K_PATH_CACHE)) {
@@ -7787,7 +7837,7 @@ class TCPDF {
 			}
 			if (isset($this->imagekeys)) {
 				foreach($this->imagekeys as $file) {
-					if (strpos($file, K_PATH_CACHE) === 0) {
+					if (strpos($file, K_PATH_CACHE) === 0 && TCPDF_STATIC::file_exists($file)) {
 						@unlink($file);
 					}
 				}
@@ -7795,7 +7845,6 @@ class TCPDF {
 		}
 		$preserve = array(
 			'file_id',
-			'internal_encoding',
 			'state',
 			'bufferlen',
 			'buffer',
@@ -7834,7 +7883,7 @@ class TCPDF {
 
 	/**
 	 * Return an array containing variations for the basic page number alias.
-	 * @param $a (string) Base alias.
+	 * @param string $a Base alias.
 	 * @return array of page number aliases
 	 * @protected
 	 */
@@ -7871,10 +7920,10 @@ class TCPDF {
 	/**
 	 * Replace right shift page number aliases with spaces to correct right alignment.
 	 * This works perfectly only when using monospaced fonts.
-	 * @param $page (string) Page content.
-	 * @param $aliases (array) Array of page aliases.
-	 * @param $diff (int) initial difference to add.
-	 * @return replaced page content.
+	 * @param string $page Page content.
+	 * @param array $aliases Array of page aliases.
+	 * @param int $diff initial difference to add.
+	 * @return string replaced page content.
 	 * @protected
 	 */
 	protected function replaceRightShiftPageNumAliases($page, $aliases, $diff) {
@@ -7909,7 +7958,7 @@ class TCPDF {
 
 	/**
 	 * Set page boxes to be included on page descriptions.
-	 * @param $boxes (array) Array of page boxes to set on document: ('MediaBox', 'CropBox', 'BleedBox', 'TrimBox', 'ArtBox').
+	 * @param array $boxes Array of page boxes to set on document: ('MediaBox', 'CropBox', 'BleedBox', 'TrimBox', 'ArtBox').
 	 * @protected
 	 */
 	protected function setPageBoxTypes($boxes) {
@@ -8024,7 +8073,7 @@ class TCPDF {
 			}
 			$out .= ' /Contents '.($this->n + 1).' 0 R';
 			$out .= ' /Rotate '.$this->pagedim[$n]['Rotate'];
-			if (!$this->pdfa_mode) {
+			if (!$this->pdfa_mode || $this->pdfa_version >= 2) {
 				$out .= ' /Group << /Type /Group /S /Transparency /CS /DeviceRGB >>';
 			}
 			if (isset($this->pagedim[$n]['trans']) AND !empty($this->pagedim[$n]['trans'])) {
@@ -8081,7 +8130,7 @@ class TCPDF {
 
 	/**
 	 * Get references to page annotations.
-	 * @param $n (int) page number
+	 * @param int $n page number
 	 * @return string
 	 * @protected
 	 * @author Nicola Asuni
@@ -8379,8 +8428,13 @@ class TCPDF {
 							} else {
 								$annots .= ' /Name /Note';
 							}
+							$hasStateModel = isset($pl['opt']['statemodel']);
+							$hasState = isset($pl['opt']['state']); 
 							$statemodels = array('Marked', 'Review');
-							if (isset($pl['opt']['statemodel']) AND in_array($pl['opt']['statemodel'], $statemodels)) {
+							if (!$hasStateModel && !$hasState) {
+								break;
+							}
+							if ($hasStateModel AND in_array($pl['opt']['statemodel'], $statemodels)) {
 								$annots .= ' /StateModel /'.$pl['opt']['statemodel'];
 							} else {
 								$pl['opt']['statemodel'] = 'Marked';
@@ -8391,7 +8445,7 @@ class TCPDF {
 							} else {
 								$states = array('Accepted', 'Rejected', 'Cancelled', 'Completed', 'None');
 							}
-							if (isset($pl['opt']['state']) AND in_array($pl['opt']['state'], $states)) {
+							if ($hasState AND in_array($pl['opt']['state'], $states)) {
 								$annots .= ' /State /'.$pl['opt']['state'];
 							} else {
 								if ($pl['opt']['statemodel'] == 'Marked') {
@@ -8406,7 +8460,7 @@ class TCPDF {
 							if (is_string($pl['txt']) && !empty($pl['txt'])) {
 								if ($pl['txt'][0] == '#') {
 									// internal destination
-									$annots .= ' /A <</S /GoTo /D '.TCPDF_STATIC::encodeNameObject(substr($pl['txt'], 1)).'>>';
+									$annots .= ' /A <</S /GoTo /D /'.TCPDF_STATIC::encodeNameObject(substr($pl['txt'], 1)).'>>';
 								} elseif ($pl['txt'][0] == '%') {
 									// embedded PDF file
 									$filename = basename(substr($pl['txt'], 1));
@@ -8769,9 +8823,9 @@ class TCPDF {
 
 	/**
 	 * Put appearance streams XObject used to define annotation's appearance states.
-	 * @param $w (int) annotation width
-	 * @param $h (int) annotation height
-	 * @param $stream (string) appearance stream
+	 * @param int $w annotation width
+	 * @param int $h annotation height
+	 * @param string $stream appearance stream
 	 * @return int object ID
 	 * @protected
 	 * @since 4.8.001 (2009-09-09)
@@ -8953,7 +9007,7 @@ class TCPDF {
 	/**
 	 * Adds unicode fonts.<br>
 	 * Based on PDF Reference 1.3 (section 5)
-	 * @param $font (array) font data
+	 * @param array $font font data
 	 * @protected
 	 * @author Nicola Asuni
 	 * @since 1.52.0.TC005 (2005-01-05)
@@ -9057,7 +9111,7 @@ class TCPDF {
 	/**
 	 * Output CID-0 fonts.
 	 * A Type 0 CIDFont contains glyph descriptions based on the Adobe Type 1 font format
-	 * @param $font (array) font data
+	 * @param array $font font data
 	 * @protected
 	 * @author Andrew Whitehead, Nicola Asuni, Yukihiro Nakadaira
 	 * @since 3.2.000 (2008-06-23)
@@ -9278,7 +9332,7 @@ class TCPDF {
 				$out .= ' /Matrix [1 0 0 1 0 0]';
 				$out .= ' /Resources <<';
 				$out .= ' /ProcSet [/PDF /Text /ImageB /ImageC /ImageI]';
-				if (!$this->pdfa_mode) {
+				if (!$this->pdfa_mode || $this->pdfa_version >= 2) {
 					// transparency
 					if (isset($data['extgstates']) AND !empty($data['extgstates'])) {
 						$out .= ' /ExtGState <<';
@@ -9416,7 +9470,7 @@ class TCPDF {
 			}
 			$out .= ' >>';
 		}
-		if (!$this->pdfa_mode) {
+		if (!$this->pdfa_mode || $this->pdfa_version >= 2) {
 			// transparency
 			if (isset($this->extgstates) AND !empty($this->extgstates)) {
 				$out .= ' /ExtGState <<';
@@ -9530,7 +9584,7 @@ class TCPDF {
 	/**
 	 * Set additional XMP data to be added on the default XMP data just before the end of "x:xmpmeta" tag.
 	 * IMPORTANT: This data is added as-is without controls, so you have to validate your data before using this method!
-	 * @param $xmp (string) Custom XMP data.
+	 * @param string $xmp Custom XMP data.
 	 * @since 5.9.128 (2011-10-06)
 	 * @public
 	 */
@@ -9541,7 +9595,7 @@ class TCPDF {
 	/**
 	 * Set additional XMP data to be added on the default XMP data just before the end of "rdf:RDF" tag.
 	 * IMPORTANT: This data is added as-is without controls, so you have to validate your data before using this method!
-	 * @param $xmp (string) Custom XMP RDF data.
+	 * @param string $xmp Custom XMP RDF data.
 	 * @since 6.3.0 (2019-09-19)
 	 * @public
 	 */
@@ -9551,7 +9605,7 @@ class TCPDF {
 
 	/**
 	 * Put XMP data object and return ID.
-	 * @return (int) The object ID.
+	 * @return int The object ID.
 	 * @since 5.9.121 (2011-09-28)
 	 * @protected
 	 */
@@ -10058,8 +10112,8 @@ class TCPDF {
 
 	/**
 	 * Initialize a new page.
-	 * @param $orientation (string) page orientation. Possible values are (case insensitive):<ul><li>P or PORTRAIT (default)</li><li>L or LANDSCAPE</li></ul>
-	 * @param $format (mixed) The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
+	 * @param string $orientation page orientation. Possible values are (case insensitive):<ul><li>P or PORTRAIT (default)</li><li>L or LANDSCAPE</li></ul>
+	 * @param mixed $format The format used for pages. It can be either: one of the string values specified at getPageSizeFromFormat() or an array of parameters specified at setPageFormat().
 	 * @protected
 	 * @see getPageSizeFromFormat(), setPageFormat()
 	 */
@@ -10123,13 +10177,13 @@ class TCPDF {
 
 	/**
 	 * Return the starting object string for the selected object ID.
-	 * @param $objid (int) Object ID (leave empty to get a new ID).
+	 * @param int|null $objid Object ID (leave empty to get a new ID).
 	 * @return string the starting object string
 	 * @protected
 	 * @since 5.8.009 (2010-08-20)
 	 */
-	protected function _getobj($objid='') {
-		if ($objid === '') {
+	protected function _getobj($objid=null) {
+		if (TCPDF_STATIC::empty_string($objid)) {
 			++$this->n;
 			$objid = $this->n;
 		}
@@ -10140,9 +10194,9 @@ class TCPDF {
 
 	/**
 	 * Underline text.
-	 * @param $x (int) X coordinate
-	 * @param $y (int) Y coordinate
-	 * @param $txt (string) text to underline
+	 * @param int $x X coordinate
+	 * @param int $y Y coordinate
+	 * @param string $txt text to underline
 	 * @protected
 	 */
 	protected function _dounderline($x, $y, $txt) {
@@ -10152,9 +10206,9 @@ class TCPDF {
 
 	/**
 	 * Underline for rectangular text area.
-	 * @param $x (int) X coordinate
-	 * @param $y (int) Y coordinate
-	 * @param $w (int) width to underline
+	 * @param int $x X coordinate
+	 * @param int $y Y coordinate
+	 * @param int $w width to underline
 	 * @protected
 	 * @since 4.8.008 (2009-09-29)
 	 */
@@ -10165,9 +10219,9 @@ class TCPDF {
 
 	/**
 	 * Line through text.
-	 * @param $x (int) X coordinate
-	 * @param $y (int) Y coordinate
-	 * @param $txt (string) text to linethrough
+	 * @param int $x X coordinate
+	 * @param int $y Y coordinate
+	 * @param string $txt text to linethrough
 	 * @protected
 	 */
 	protected function _dolinethrough($x, $y, $txt) {
@@ -10177,9 +10231,9 @@ class TCPDF {
 
 	/**
 	 * Line through for rectangular text area.
-	 * @param $x (int) X coordinate
-	 * @param $y (int) Y coordinate
-	 * @param $w (int) line length (width)
+	 * @param int $x X coordinate
+	 * @param int $y Y coordinate
+	 * @param int $w line length (width)
 	 * @protected
 	 * @since 4.9.008 (2009-09-29)
 	 */
@@ -10190,9 +10244,9 @@ class TCPDF {
 
 	/**
 	 * Overline text.
-	 * @param $x (int) X coordinate
-	 * @param $y (int) Y coordinate
-	 * @param $txt (string) text to overline
+	 * @param int $x X coordinate
+	 * @param int $y Y coordinate
+	 * @param string $txt text to overline
 	 * @protected
 	 * @since 4.9.015 (2010-04-19)
 	 */
@@ -10203,9 +10257,9 @@ class TCPDF {
 
 	/**
 	 * Overline for rectangular text area.
-	 * @param $x (int) X coordinate
-	 * @param $y (int) Y coordinate
-	 * @param $w (int) width to overline
+	 * @param int $x X coordinate
+	 * @param int $y Y coordinate
+	 * @param int $w width to overline
 	 * @protected
 	 * @since 4.9.015 (2010-04-19)
 	 */
@@ -10217,8 +10271,8 @@ class TCPDF {
 
 	/**
 	 * Format a data string for meta information
-	 * @param $s (string) data string to escape.
-	 * @param $n (int) object ID
+	 * @param string $s data string to escape.
+	 * @param int $n object ID
 	 * @return string escaped string.
 	 * @protected
 	 */
@@ -10232,7 +10286,7 @@ class TCPDF {
 
 	/**
 	 * Set the document creation timestamp
-	 * @param $time (mixed) Document creation timestamp in seconds or date-time string.
+	 * @param mixed $time Document creation timestamp in seconds or date-time string.
 	 * @public
 	 * @since 5.9.152 (2012-03-23)
 	 */
@@ -10245,7 +10299,7 @@ class TCPDF {
 
 	/**
 	 * Set the document modification timestamp
-	 * @param $time (mixed) Document modification timestamp in seconds or date-time string.
+	 * @param mixed $time Document modification timestamp in seconds or date-time string.
 	 * @public
 	 * @since 5.9.152 (2012-03-23)
 	 */
@@ -10258,7 +10312,7 @@ class TCPDF {
 
 	/**
 	 * Returns document creation timestamp in seconds.
-	 * @return (int) Creation timestamp in seconds.
+	 * @return int Creation timestamp in seconds.
 	 * @public
 	 * @since 5.9.152 (2012-03-23)
 	 */
@@ -10268,7 +10322,7 @@ class TCPDF {
 
 	/**
 	 * Returns document modification timestamp in seconds.
-	 * @return (int) Modfication timestamp in seconds.
+	 * @return int Modfication timestamp in seconds.
 	 * @public
 	 * @since 5.9.152 (2012-03-23)
 	 */
@@ -10278,8 +10332,8 @@ class TCPDF {
 
 	/**
 	 * Returns a formatted date for meta information
-	 * @param $n (int) Object ID.
-	 * @param $timestamp (int) Timestamp to convert.
+	 * @param int $n Object ID.
+	 * @param int $timestamp Timestamp to convert.
 	 * @return string escaped date string.
 	 * @protected
 	 * @since 4.6.028 (2009-08-25)
@@ -10293,8 +10347,8 @@ class TCPDF {
 
 	/**
 	 * Format a text string for meta information
-	 * @param $s (string) string to escape.
-	 * @param $n (int) object ID
+	 * @param string $s string to escape.
+	 * @param int $n object ID
 	 * @return string escaped string.
 	 * @protected
 	 */
@@ -10308,8 +10362,8 @@ class TCPDF {
 
 	/**
 	 * get raw output stream.
-	 * @param $s (string) string to output.
-	 * @param $n (int) object reference for encryption mode
+	 * @param string $s string to output.
+	 * @param int $n object reference for encryption mode
 	 * @protected
 	 * @author Nicola Asuni
 	 * @since 5.5.000 (2010-06-22)
@@ -10324,7 +10378,7 @@ class TCPDF {
 
 	/**
 	 * Output a string to the document.
-	 * @param $s (string) string to output.
+	 * @param string $s string to output.
 	 * @protected
 	 */
 	protected function _out($s) {
@@ -10352,7 +10406,8 @@ class TCPDF {
 
 	/**
 	 * Set header font.
-	 * @param $font (array) Array describing the basic font parameters: (family, style, size).
+	 * @param array<int,string|float|null> $font Array describing the basic font parameters: (family, style, size).
+	 * @phpstan-param array{0: string, 1: string, 2: float|null} $font
 	 * @public
 	 * @since 1.1
 	 */
@@ -10362,7 +10417,8 @@ class TCPDF {
 
 	/**
 	 * Get header font.
-	 * @return array() Array describing the basic font parameters: (family, style, size).
+	 * @return array<int,string|float|null> Array describing the basic font parameters: (family, style, size).
+	 * @phpstan-return array{0: string, 1: string, 2: float|null}
 	 * @public
 	 * @since 4.0.012 (2008-07-24)
 	 */
@@ -10372,7 +10428,8 @@ class TCPDF {
 
 	/**
 	 * Set footer font.
-	 * @param $font (array) Array describing the basic font parameters: (family, style, size).
+	 * @param array<int,string|float|null> $font Array describing the basic font parameters: (family, style, size).
+	 * @phpstan-param array{0: string, 1: string, 2: float|null} $font
 	 * @public
 	 * @since 1.1
 	 */
@@ -10382,7 +10439,8 @@ class TCPDF {
 
 	/**
 	 * Get Footer font.
-	 * @return array() Array describing the basic font parameters: (family, style, size).
+	 * @return array<int,string|float|null> Array describing the basic font parameters: (family, style, size).
+	 * @phpstan-return array{0: string, 1: string, 2: float|null} $font
 	 * @public
 	 * @since 4.0.012 (2008-07-24)
 	 */
@@ -10392,7 +10450,7 @@ class TCPDF {
 
 	/**
 	 * Set language array.
-	 * @param $language (array)
+	 * @param array $language
 	 * @public
 	 * @since 1.1
 	 */
@@ -10418,17 +10476,17 @@ class TCPDF {
 
 	/**
 	 * Output anchor link.
-	 * @param $url (string) link URL or internal link (i.e.: &lt;a href="#23,4.5"&gt;link to page 23 at 4.5 Y position&lt;/a&gt;)
-	 * @param $name (string) link name
-	 * @param $fill (boolean) Indicates if the cell background must be painted (true) or transparent (false).
-	 * @param $firstline (boolean) if true prints only the first line and return the remaining string.
-	 * @param $color (array) array of RGB text color
-	 * @param $style (string) font style (U, D, B, I)
-	 * @param $firstblock (boolean) if true the string is the starting of a line.
-	 * @return the number of cells used or the remaining text if $firstline = true;
+	 * @param string $url link URL or internal link (i.e.: &lt;a href="#23,4.5"&gt;link to page 23 at 4.5 Y position&lt;/a&gt;)
+	 * @param string $name link name
+	 * @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
+	 * @param boolean $firstline if true prints only the first line and return the remaining string.
+	 * @param array|null $color array of RGB text color
+	 * @param string $style font style (U, D, B, I)
+	 * @param boolean $firstblock if true the string is the starting of a line.
+	 * @return int the number of cells used or the remaining text if $firstline = true;
 	 * @public
 	 */
-	public function addHtmlLink($url, $name, $fill=false, $firstline=false, $color='', $style=-1, $firstblock=false) {
+	public function addHtmlLink($url, $name, $fill=false, $firstline=false, $color=null, $style=-1, $firstblock=false) {
 		if (isset($url[1]) AND ($url[0] == '#') AND is_numeric($url[1])) {
 			// convert url to internal link
 			$lnkdata = explode(',', $url);
@@ -10440,32 +10498,32 @@ class TCPDF {
 					$lnky = 0;
 				}
 				$url = $this->AddLink();
-				$this->SetLink($url, $lnky, $page);
+				$this->setLink($url, $lnky, $page);
 			}
 		}
 		// store current settings
 		$prevcolor = $this->fgcolor;
 		$prevstyle = $this->FontStyle;
 		if (empty($color)) {
-			$this->SetTextColorArray($this->htmlLinkColorArray);
+			$this->setTextColorArray($this->htmlLinkColorArray);
 		} else {
-			$this->SetTextColorArray($color);
+			$this->setTextColorArray($color);
 		}
 		if ($style == -1) {
-			$this->SetFont('', $this->FontStyle.$this->htmlLinkFontStyle);
+			$this->setFont('', $this->FontStyle.$this->htmlLinkFontStyle);
 		} else {
-			$this->SetFont('', $this->FontStyle.$style);
+			$this->setFont('', $this->FontStyle.$style);
 		}
 		$ret = $this->Write($this->lasth, $name, $url, $fill, '', false, 0, $firstline, $firstblock, 0);
 		// restore settings
-		$this->SetFont('', $prevstyle);
-		$this->SetTextColorArray($prevcolor);
+		$this->setFont('', $prevstyle);
+		$this->setTextColorArray($prevcolor);
 		return $ret;
 	}
 
 	/**
 	 * Converts pixels to User's Units.
-	 * @param $px (int) pixels
+	 * @param int $px pixels
 	 * @return float value in user's unit
 	 * @public
 	 * @see setImageScale(), getImageScale()
@@ -10477,7 +10535,7 @@ class TCPDF {
 	/**
 	 * Reverse function for htmlentities.
 	 * Convert entities in UTF-8.
-	 * @param $text_to_convert (string) Text to convert.
+	 * @param string $text_to_convert Text to convert.
 	 * @return string converted text string
 	 * @public
 	 */
@@ -10490,7 +10548,7 @@ class TCPDF {
 	/**
 	 * Compute encryption key depending on object number where the encrypted data is stored.
 	 * This is used for all strings and streams without crypt filter specifier.
-	 * @param $n (int) object number
+	 * @param int $n object number
 	 * @return int object key
 	 * @protected
 	 * @author Nicola Asuni
@@ -10509,9 +10567,9 @@ class TCPDF {
 
 	/**
 	 * Encrypt the input string.
-	 * @param $n (int) object number
-	 * @param $s (string) data string to encrypt
-	 * @return encrypted string
+	 * @param int $n object number
+	 * @param string $s data string to encrypt
+	 * @return string encrypted string
 	 * @protected
 	 * @author Nicola Asuni
 	 * @since 5.0.005 (2010-05-11)
@@ -10754,7 +10812,7 @@ class TCPDF {
 
 	/**
 	 * Convert password for AES-256 encryption mode
-	 * @param $password (string) password
+	 * @param string $password password
 	 * @return string password
 	 * @protected
 	 * @since 5.9.006 (2010-10-19)
@@ -10884,16 +10942,16 @@ class TCPDF {
 	 * Remark: the protection against modification is for people who have the full Acrobat product.
 	 * If you don't set any password, the document will open as usual. If you set a user password, the PDF viewer will ask for it before displaying the document. The master password, if different from the user one, can be used to get full access.
 	 * Note: protecting a document requires to encrypt it, which increases the processing time a lot. This can cause a PHP time-out in some cases, especially if the document contains images or fonts.
-	 * @param $permissions (Array) the set of permissions (specify the ones you want to block):<ul><li>print : Print the document;</li><li>modify : Modify the contents of the document by operations other than those controlled by 'fill-forms', 'extract' and 'assemble';</li><li>copy : Copy or otherwise extract text and graphics from the document;</li><li>annot-forms : Add or modify text annotations, fill in interactive form fields, and, if 'modify' is also set, create or modify interactive form fields (including signature fields);</li><li>fill-forms : Fill in existing interactive form fields (including signature fields), even if 'annot-forms' is not specified;</li><li>extract : Extract text and graphics (in support of accessibility to users with disabilities or for other purposes);</li><li>assemble : Assemble the document (insert, rotate, or delete pages and create bookmarks or thumbnail images), even if 'modify' is not set;</li><li>print-high : Print the document to a representation from which a faithful digital copy of the PDF content could be generated. When this is not set, printing is limited to a low-level representation of the appearance, possibly of degraded quality.</li><li>owner : (inverted logic - only for public-key) when set permits change of encryption and enables all other permissions.</li></ul>
-	 * @param $user_pass (String) user password. Empty by default.
-	 * @param $owner_pass (String) owner password. If not specified, a random value is used.
-	 * @param $mode (int) encryption strength: 0 = RC4 40 bit; 1 = RC4 128 bit; 2 = AES 128 bit; 3 = AES 256 bit.
-	 * @param $pubkeys (String) array of recipients containing public-key certificates ('c') and permissions ('p'). For example: array(array('c' => 'file://../examples/data/cert/tcpdf.crt', 'p' => array('print')))
+	 * @param array $permissions the set of permissions (specify the ones you want to block):<ul><li>print : Print the document;</li><li>modify : Modify the contents of the document by operations other than those controlled by 'fill-forms', 'extract' and 'assemble';</li><li>copy : Copy or otherwise extract text and graphics from the document;</li><li>annot-forms : Add or modify text annotations, fill in interactive form fields, and, if 'modify' is also set, create or modify interactive form fields (including signature fields);</li><li>fill-forms : Fill in existing interactive form fields (including signature fields), even if 'annot-forms' is not specified;</li><li>extract : Extract text and graphics (in support of accessibility to users with disabilities or for other purposes);</li><li>assemble : Assemble the document (insert, rotate, or delete pages and create bookmarks or thumbnail images), even if 'modify' is not set;</li><li>print-high : Print the document to a representation from which a faithful digital copy of the PDF content could be generated. When this is not set, printing is limited to a low-level representation of the appearance, possibly of degraded quality.</li><li>owner : (inverted logic - only for public-key) when set permits change of encryption and enables all other permissions.</li></ul>
+	 * @param string $user_pass user password. Empty by default.
+	 * @param string|null $owner_pass owner password. If not specified, a random value is used.
+	 * @param int $mode encryption strength: 0 = RC4 40 bit; 1 = RC4 128 bit; 2 = AES 128 bit; 3 = AES 256 bit.
+	 * @param array|null $pubkeys array of recipients containing public-key certificates ('c') and permissions ('p'). For example: array(array('c' => 'file://../examples/data/cert/tcpdf.crt', 'p' => array('print')))
 	 * @public
 	 * @since 2.0.000 (2008-01-02)
 	 * @author Nicola Asuni
 	 */
-	public function SetProtection($permissions=array('print', 'modify', 'copy', 'annot-forms', 'fill-forms', 'extract', 'assemble', 'print-high'), $user_pass='', $owner_pass=null, $mode=0, $pubkeys=null) {
+	public function setProtection($permissions=array('print', 'modify', 'copy', 'annot-forms', 'fill-forms', 'extract', 'assemble', 'print-high'), $user_pass='', $owner_pass=null, $mode=0, $pubkeys=null) {
 		if ($this->pdfa_mode) {
 			// encryption is not allowed in PDF/A mode
 			return;
@@ -11040,9 +11098,9 @@ class TCPDF {
 	}
 	/**
 	 * Horizontal Scaling.
-	 * @param $s_x (float) scaling factor for width as percent. 0 is not allowed.
-	 * @param $x (int) abscissa of the scaling center. Default is current x position
-	 * @param $y (int) ordinate of the scaling center. Default is current y position
+	 * @param float $s_x scaling factor for width as percent. 0 is not allowed.
+	 * @param int $x abscissa of the scaling center. Default is current x position
+	 * @param int $y ordinate of the scaling center. Default is current y position
 	 * @public
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
@@ -11053,9 +11111,9 @@ class TCPDF {
 
 	/**
 	 * Vertical Scaling.
-	 * @param $s_y (float) scaling factor for height as percent. 0 is not allowed.
-	 * @param $x (int) abscissa of the scaling center. Default is current x position
-	 * @param $y (int) ordinate of the scaling center. Default is current y position
+	 * @param float $s_y scaling factor for height as percent. 0 is not allowed.
+	 * @param int $x abscissa of the scaling center. Default is current x position
+	 * @param int $y ordinate of the scaling center. Default is current y position
 	 * @public
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
@@ -11066,9 +11124,9 @@ class TCPDF {
 
 	/**
 	 * Vertical and horizontal proportional Scaling.
-	 * @param $s (float) scaling factor for width and height as percent. 0 is not allowed.
-	 * @param $x (int) abscissa of the scaling center. Default is current x position
-	 * @param $y (int) ordinate of the scaling center. Default is current y position
+	 * @param float $s scaling factor for width and height as percent. 0 is not allowed.
+	 * @param int $x abscissa of the scaling center. Default is current x position
+	 * @param int $y ordinate of the scaling center. Default is current y position
 	 * @public
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
@@ -11079,19 +11137,19 @@ class TCPDF {
 
 	/**
 	 * Vertical and horizontal non-proportional Scaling.
-	 * @param $s_x (float) scaling factor for width as percent. 0 is not allowed.
-	 * @param $s_y (float) scaling factor for height as percent. 0 is not allowed.
-	 * @param $x (int) abscissa of the scaling center. Default is current x position
-	 * @param $y (int) ordinate of the scaling center. Default is current y position
+	 * @param float $s_x scaling factor for width as percent. 0 is not allowed.
+	 * @param float $s_y scaling factor for height as percent. 0 is not allowed.
+	 * @param float|null $x abscissa of the scaling center. Default is current x position
+	 * @param float|null $y ordinate of the scaling center. Default is current y position
 	 * @public
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function Scale($s_x, $s_y, $x='', $y='') {
-		if ($x === '') {
+	public function Scale($s_x, $s_y, $x=null, $y=null) {
+		if (TCPDF_STATIC::empty_string($x)) {
 			$x = $this->x;
 		}
-		if ($y === '') {
+		if (TCPDF_STATIC::empty_string($y)) {
 			$y = $this->y;
 		}
 		if (($s_x == 0) OR ($s_y == 0)) {
@@ -11115,55 +11173,55 @@ class TCPDF {
 
 	/**
 	 * Horizontal Mirroring.
-	 * @param $x (int) abscissa of the point. Default is current x position
+	 * @param float|null $x abscissa of the point. Default is current x position
 	 * @public
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function MirrorH($x='') {
+	public function MirrorH($x=null) {
 		$this->Scale(-100, 100, $x);
 	}
 
 	/**
 	 * Verical Mirroring.
-	 * @param $y (int) ordinate of the point. Default is current y position
+	 * @param float|null $y ordinate of the point. Default is current y position
 	 * @public
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function MirrorV($y='') {
-		$this->Scale(100, -100, '', $y);
+	public function MirrorV($y=null) {
+		$this->Scale(100, -100, null, $y);
 	}
 
 	/**
 	 * Point reflection mirroring.
-	 * @param $x (int) abscissa of the point. Default is current x position
-	 * @param $y (int) ordinate of the point. Default is current y position
+	 * @param float|null $x abscissa of the point. Default is current x position
+	 * @param float|null $y ordinate of the point. Default is current y position
 	 * @public
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function MirrorP($x='',$y='') {
+	public function MirrorP($x=null,$y=null) {
 		$this->Scale(-100, -100, $x, $y);
 	}
 
 	/**
 	 * Reflection against a straight line through point (x, y) with the gradient angle (angle).
-	 * @param $angle (float) gradient angle of the straight line. Default is 0 (horizontal line).
-	 * @param $x (int) abscissa of the point. Default is current x position
-	 * @param $y (int) ordinate of the point. Default is current y position
+	 * @param float $angle gradient angle of the straight line. Default is 0 (horizontal line).
+	 * @param float|null $x abscissa of the point. Default is current x position
+	 * @param float|null $y ordinate of the point. Default is current y position
 	 * @public
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function MirrorL($angle=0, $x='',$y='') {
+	public function MirrorL($angle=0, $x=null,$y=null) {
 		$this->Scale(-100, 100, $x, $y);
 		$this->Rotate(-2*($angle-90), $x, $y);
 	}
 
 	/**
 	 * Translate graphic object horizontally.
-	 * @param $t_x (int) movement to the right (or left for RTL)
+	 * @param int $t_x movement to the right (or left for RTL)
 	 * @public
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
@@ -11174,7 +11232,7 @@ class TCPDF {
 
 	/**
 	 * Translate graphic object vertically.
-	 * @param $t_y (int) movement to the bottom
+	 * @param int $t_y movement to the bottom
 	 * @public
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
@@ -11185,8 +11243,8 @@ class TCPDF {
 
 	/**
 	 * Translate graphic object horizontally and vertically.
-	 * @param $t_x (int) movement to the right
-	 * @param $t_y (int) movement to the bottom
+	 * @param int $t_x movement to the right
+	 * @param int $t_y movement to the bottom
 	 * @public
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
@@ -11206,18 +11264,18 @@ class TCPDF {
 
 	/**
 	 * Rotate object.
-	 * @param $angle (float) angle in degrees for counter-clockwise rotation
-	 * @param $x (int) abscissa of the rotation center. Default is current x position
-	 * @param $y (int) ordinate of the rotation center. Default is current y position
+	 * @param float $angle angle in degrees for counter-clockwise rotation
+	 * @param float|null $x abscissa of the rotation center. Default is current x position
+	 * @param float|null $y ordinate of the rotation center. Default is current y position
 	 * @public
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function Rotate($angle, $x='', $y='') {
-		if ($x === '') {
+	public function Rotate($angle, $x=null, $y=null) {
+		if (TCPDF_STATIC::empty_string($x)) {
 			$x = $this->x;
 		}
-		if ($y === '') {
+		if (TCPDF_STATIC::empty_string($y)) {
 			$y = $this->y;
 		}
 		$y = ($this->h - $y) * $this->k;
@@ -11236,45 +11294,45 @@ class TCPDF {
 
 	/**
 	 * Skew horizontally.
-	 * @param $angle_x (float) angle in degrees between -90 (skew to the left) and 90 (skew to the right)
-	 * @param $x (int) abscissa of the skewing center. default is current x position
-	 * @param $y (int) ordinate of the skewing center. default is current y position
+	 * @param float $angle_x angle in degrees between -90 (skew to the left) and 90 (skew to the right)
+	 * @param float|null $x abscissa of the skewing center. default is current x position
+	 * @param float|null $y ordinate of the skewing center. default is current y position
 	 * @public
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function SkewX($angle_x, $x='', $y='') {
+	public function SkewX($angle_x, $x=null, $y=null) {
 		$this->Skew($angle_x, 0, $x, $y);
 	}
 
 	/**
 	 * Skew vertically.
-	 * @param $angle_y (float) angle in degrees between -90 (skew to the bottom) and 90 (skew to the top)
-	 * @param $x (int) abscissa of the skewing center. default is current x position
-	 * @param $y (int) ordinate of the skewing center. default is current y position
+	 * @param float $angle_y angle in degrees between -90 (skew to the bottom) and 90 (skew to the top)
+	 * @param float|null $x abscissa of the skewing center. default is current x position
+	 * @param float|null $y ordinate of the skewing center. default is current y position
 	 * @public
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function SkewY($angle_y, $x='', $y='') {
+	public function SkewY($angle_y, $x=null, $y=null) {
 		$this->Skew(0, $angle_y, $x, $y);
 	}
 
 	/**
 	 * Skew.
-	 * @param $angle_x (float) angle in degrees between -90 (skew to the left) and 90 (skew to the right)
-	 * @param $angle_y (float) angle in degrees between -90 (skew to the bottom) and 90 (skew to the top)
-	 * @param $x (int) abscissa of the skewing center. default is current x position
-	 * @param $y (int) ordinate of the skewing center. default is current y position
+	 * @param float $angle_x angle in degrees between -90 (skew to the left) and 90 (skew to the right)
+	 * @param float $angle_y angle in degrees between -90 (skew to the bottom) and 90 (skew to the top)
+	 * @param float|null $x abscissa of the skewing center. default is current x position
+	 * @param float|null $y ordinate of the skewing center. default is current y position
 	 * @public
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
 	 */
-	public function Skew($angle_x, $angle_y, $x='', $y='') {
-		if ($x === '') {
+	public function Skew($angle_x, $angle_y, $x=null, $y=null) {
+		if (TCPDF_STATIC::empty_string($x)) {
 			$x = $this->x;
 		}
-		if ($y === '') {
+		if (TCPDF_STATIC::empty_string($y)) {
 			$y = $this->y;
 		}
 		if (($angle_x <= -90) OR ($angle_x >= 90) OR ($angle_y <= -90) OR ($angle_y >= 90)) {
@@ -11296,7 +11354,7 @@ class TCPDF {
 
 	/**
 	 * Apply graphic transformations.
-	 * @param $tm (array) transformation matrix
+	 * @param array $tm transformation matrix
 	 * @protected
 	 * @since 2.1.000 (2008-01-07)
 	 * @see StartTransform(), StopTransform()
@@ -11328,12 +11386,12 @@ class TCPDF {
 
 	/**
 	 * Defines the line width. By default, the value equals 0.2 mm. The method can be called before the first page is created and the value is retained from page to page.
-	 * @param $width (float) The width.
+	 * @param float $width The width.
 	 * @public
 	 * @since 1.0
 	 * @see Line(), Rect(), Cell(), MultiCell()
 	 */
-	public function SetLineWidth($width) {
+	public function setLineWidth($width) {
 		//Set line width
 		$this->LineWidth = $width;
 		$this->linestyleWidth = sprintf('%F w', ($width * $this->k));
@@ -11355,7 +11413,7 @@ class TCPDF {
 
 	/**
 	 * Set line style.
-	 * @param $style (array) Line style. Array with keys among the following:
+	 * @param array $style Line style. Array with keys among the following:
 	 * <ul>
 	 *	 <li>width (float): Width of the line in user units.</li>
 	 *	 <li>cap (string): Type of cap to put on the line. Possible values are:
@@ -11371,15 +11429,15 @@ class TCPDF {
 	 * the point at which the pattern starts.</li>
 	 *	 <li>color (array): Draw color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName).</li>
 	 * </ul>
-	 * @param $ret (boolean) if true do not send the command.
+	 * @param boolean $ret if true do not send the command.
 	 * @return string the PDF command
 	 * @public
 	 * @since 2.1.000 (2008-01-08)
 	 */
-	public function SetLineStyle($style, $ret=false) {
+	public function setLineStyle($style, $ret=false) {
 		$s = ''; // string to be returned
 		if (!is_array($style)) {
-			return;
+			return $s;
 		}
 		if (isset($style['width'])) {
 			$this->LineWidth = $style['width'];
@@ -11423,7 +11481,7 @@ class TCPDF {
 			$s .= $this->linestyleDash.' ';
 		}
 		if (isset($style['color'])) {
-			$s .= $this->SetDrawColorArray($style['color'], true).' ';
+			$s .= $this->setDrawColorArray($style['color'], true).' ';
 		}
 		if (!$ret AND ($this->state == 2)) {
 			$this->_out($s);
@@ -11433,8 +11491,8 @@ class TCPDF {
 
 	/**
 	 * Begin a new subpath by moving the current point to coordinates (x, y), omitting any connecting line segment.
-	 * @param $x (float) Abscissa of point.
-	 * @param $y (float) Ordinate of point.
+	 * @param float $x Abscissa of point.
+	 * @param float $y Ordinate of point.
 	 * @protected
 	 * @since 2.1.000 (2008-01-08)
 	 */
@@ -11447,8 +11505,8 @@ class TCPDF {
 	/**
 	 * Append a straight line segment from the current point to the point (x, y).
 	 * The new current point shall be (x, y).
-	 * @param $x (float) Abscissa of end point.
-	 * @param $y (float) Ordinate of end point.
+	 * @param float $x Abscissa of end point.
+	 * @param float $y Ordinate of end point.
 	 * @protected
 	 * @since 2.1.000 (2008-01-08)
 	 */
@@ -11460,11 +11518,11 @@ class TCPDF {
 
 	/**
 	 * Append a rectangle to the current path as a complete subpath, with lower-left corner (x, y) and dimensions widthand height in user space.
-	 * @param $x (float) Abscissa of upper-left corner.
-	 * @param $y (float) Ordinate of upper-left corner.
-	 * @param $w (float) Width.
-	 * @param $h (float) Height.
-	 * @param $op (string) options
+	 * @param float $x Abscissa of upper-left corner.
+	 * @param float $y Ordinate of upper-left corner.
+	 * @param float $w Width.
+	 * @param float $h Height.
+	 * @param string $op options
 	 * @protected
 	 * @since 2.1.000 (2008-01-08)
 	 */
@@ -11477,12 +11535,12 @@ class TCPDF {
 	/**
 	 * Append a cubic Bezier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the Bezier control points.
 	 * The new current point shall be (x3, y3).
-	 * @param $x1 (float) Abscissa of control point 1.
-	 * @param $y1 (float) Ordinate of control point 1.
-	 * @param $x2 (float) Abscissa of control point 2.
-	 * @param $y2 (float) Ordinate of control point 2.
-	 * @param $x3 (float) Abscissa of end point.
-	 * @param $y3 (float) Ordinate of end point.
+	 * @param float $x1 Abscissa of control point 1.
+	 * @param float $y1 Ordinate of control point 1.
+	 * @param float $x2 Abscissa of control point 2.
+	 * @param float $y2 Ordinate of control point 2.
+	 * @param float $x3 Abscissa of end point.
+	 * @param float $y3 Ordinate of end point.
 	 * @protected
 	 * @since 2.1.000 (2008-01-08)
 	 */
@@ -11495,10 +11553,10 @@ class TCPDF {
 	/**
 	 * Append a cubic Bezier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the Bezier control points.
 	 * The new current point shall be (x3, y3).
-	 * @param $x2 (float) Abscissa of control point 2.
-	 * @param $y2 (float) Ordinate of control point 2.
-	 * @param $x3 (float) Abscissa of end point.
-	 * @param $y3 (float) Ordinate of end point.
+	 * @param float $x2 Abscissa of control point 2.
+	 * @param float $y2 Ordinate of control point 2.
+	 * @param float $x3 Abscissa of end point.
+	 * @param float $y3 Ordinate of end point.
 	 * @protected
 	 * @since 4.9.019 (2010-04-26)
 	 */
@@ -11511,10 +11569,10 @@ class TCPDF {
 	/**
 	 * Append a cubic Bezier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the Bezier control points.
 	 * The new current point shall be (x3, y3).
-	 * @param $x1 (float) Abscissa of control point 1.
-	 * @param $y1 (float) Ordinate of control point 1.
-	 * @param $x3 (float) Abscissa of end point.
-	 * @param $y3 (float) Ordinate of end point.
+	 * @param float $x1 Abscissa of control point 1.
+	 * @param float $y1 Ordinate of control point 1.
+	 * @param float $x3 Abscissa of end point.
+	 * @param float $y3 Ordinate of end point.
 	 * @protected
 	 * @since 2.1.000 (2008-01-08)
 	 */
@@ -11526,11 +11584,11 @@ class TCPDF {
 
 	/**
 	 * Draws a line between two points.
-	 * @param $x1 (float) Abscissa of first point.
-	 * @param $y1 (float) Ordinate of first point.
-	 * @param $x2 (float) Abscissa of second point.
-	 * @param $y2 (float) Ordinate of second point.
-	 * @param $style (array) Line style. Array like for SetLineStyle(). Default value: default line style (empty array).
+	 * @param float $x1 Abscissa of first point.
+	 * @param float $y1 Ordinate of first point.
+	 * @param float $x2 Abscissa of second point.
+	 * @param float $y2 Ordinate of second point.
+	 * @param array $style Line style. Array like for SetLineStyle(). Default value: default line style (empty array).
 	 * @public
 	 * @since 1.0
 	 * @see SetLineWidth(), SetDrawColor(), SetLineStyle()
@@ -11540,7 +11598,7 @@ class TCPDF {
 			return;
 		}
 		if (is_array($style)) {
-			$this->SetLineStyle($style);
+			$this->setLineStyle($style);
 		}
 		$this->_outPoint($x1, $y1);
 		$this->_outLine($x2, $y2);
@@ -11549,18 +11607,18 @@ class TCPDF {
 
 	/**
 	 * Draws a rectangle.
-	 * @param $x (float) Abscissa of upper-left corner.
-	 * @param $y (float) Ordinate of upper-left corner.
-	 * @param $w (float) Width.
-	 * @param $h (float) Height.
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $border_style (array) Border style of rectangle. Array with keys among the following:
+	 * @param float $x Abscissa of upper-left corner.
+	 * @param float $y Ordinate of upper-left corner.
+	 * @param float $w Width.
+	 * @param float $h Height.
+	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
+	 * @param array $border_style Border style of rectangle. Array with keys among the following:
 	 * <ul>
 	 *	 <li>all: Line style of all borders. Array like for SetLineStyle().</li>
 	 *	 <li>L, T, R, B or combinations: Line style of left, top, right or bottom border. Array like for SetLineStyle().</li>
 	 * </ul>
 	 * If a key is not present or is null, the correspondent border is not drawn. Default value: default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
+	 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
 	 * @public
 	 * @since 1.0
 	 * @see SetLineStyle()
@@ -11574,12 +11632,12 @@ class TCPDF {
 		}
 		if (!(strpos($style, 'F') === false) AND !empty($fill_color)) {
 			// set background color
-			$this->SetFillColorArray($fill_color);
+			$this->setFillColorArray($fill_color);
 		}
 		if (!empty($border_style)) {
 			if (isset($border_style['all']) AND !empty($border_style['all'])) {
 				//set global style for border
-				$this->SetLineStyle($border_style['all']);
+				$this->setLineStyle($border_style['all']);
 				$border_style = array();
 			} else {
 				// remove stroke operator from style
@@ -11621,17 +11679,17 @@ class TCPDF {
 	 * Draws a Bezier curve.
 	 * The Bezier curve is a tangent to the line between the control points at
 	 * either end of the curve.
-	 * @param $x0 (float) Abscissa of start point.
-	 * @param $y0 (float) Ordinate of start point.
-	 * @param $x1 (float) Abscissa of control point 1.
-	 * @param $y1 (float) Ordinate of control point 1.
-	 * @param $x2 (float) Abscissa of control point 2.
-	 * @param $y2 (float) Ordinate of control point 2.
-	 * @param $x3 (float) Abscissa of end point.
-	 * @param $y3 (float) Ordinate of end point.
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $line_style (array) Line style of curve. Array like for SetLineStyle(). Default value: default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
+	 * @param float $x0 Abscissa of start point.
+	 * @param float $y0 Ordinate of start point.
+	 * @param float $x1 Abscissa of control point 1.
+	 * @param float $y1 Ordinate of control point 1.
+	 * @param float $x2 Abscissa of control point 2.
+	 * @param float $y2 Ordinate of control point 2.
+	 * @param float $x3 Abscissa of end point.
+	 * @param float $y3 Ordinate of end point.
+	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
+	 * @param array $line_style Line style of curve. Array like for SetLineStyle(). Default value: default line style (empty array).
+	 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
 	 * @public
 	 * @see SetLineStyle()
 	 * @since 2.1.000 (2008-01-08)
@@ -11641,11 +11699,11 @@ class TCPDF {
 			return;
 		}
 		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
-			$this->SetFillColorArray($fill_color);
+			$this->setFillColorArray($fill_color);
 		}
 		$op = TCPDF_STATIC::getPathPaintOperator($style);
 		if ($line_style) {
-			$this->SetLineStyle($line_style);
+			$this->setLineStyle($line_style);
 		}
 		$this->_outPoint($x0, $y0);
 		$this->_outCurve($x1, $y1, $x2, $y2, $x3, $y3);
@@ -11656,12 +11714,12 @@ class TCPDF {
 	 * Draws a poly-Bezier curve.
 	 * Each Bezier curve segment is a tangent to the line between the control points at
 	 * either end of the curve.
-	 * @param $x0 (float) Abscissa of start point.
-	 * @param $y0 (float) Ordinate of start point.
-	 * @param $segments (float) An array of bezier descriptions. Format: array(x1, y1, x2, y2, x3, y3).
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $line_style (array) Line style of curve. Array like for SetLineStyle(). Default value: default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
+	 * @param float $x0 Abscissa of start point.
+	 * @param float $y0 Ordinate of start point.
+	 * @param float[] $segments An array of bezier descriptions. Format: array(x1, y1, x2, y2, x3, y3).
+	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
+	 * @param array $line_style Line style of curve. Array like for SetLineStyle(). Default value: default line style (empty array).
+	 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
 	 * @public
 	 * @see SetLineStyle()
 	 * @since 3.0008 (2008-05-12)
@@ -11671,14 +11729,14 @@ class TCPDF {
 			return;
 		}
 		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
-			$this->SetFillColorArray($fill_color);
+			$this->setFillColorArray($fill_color);
 		}
 		$op = TCPDF_STATIC::getPathPaintOperator($style);
 		if ($op == 'f') {
 			$line_style = array();
 		}
 		if ($line_style) {
-			$this->SetLineStyle($line_style);
+			$this->setLineStyle($line_style);
 		}
 		$this->_outPoint($x0, $y0);
 		foreach ($segments as $segment) {
@@ -11691,22 +11749,22 @@ class TCPDF {
 	/**
 	 * Draws an ellipse.
 	 * An ellipse is formed from n Bezier curves.
-	 * @param $x0 (float) Abscissa of center point.
-	 * @param $y0 (float) Ordinate of center point.
-	 * @param $rx (float) Horizontal radius.
-	 * @param $ry (float) Vertical radius (if ry = 0 then is a circle, see Circle()). Default value: 0.
-	 * @param $angle: (float) Angle oriented (anti-clockwise). Default value: 0.
-	 * @param $astart: (float) Angle start of draw line. Default value: 0.
-	 * @param $afinish: (float) Angle finish of draw line. Default value: 360.
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $line_style (array) Line style of ellipse. Array like for SetLineStyle(). Default value: default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
-	 * @param $nc (integer) Number of curves used to draw a 90 degrees portion of ellipse.
+	 * @param float $x0 Abscissa of center point.
+	 * @param float $y0 Ordinate of center point.
+	 * @param float $rx Horizontal radius.
+	 * @param float $ry Vertical radius (if ry = 0 then is a circle, see Circle()). Default value: 0.
+	 * @param float $angle Angle oriented (anti-clockwise). Default value: 0.
+	 * @param float $astart Angle start of draw line. Default value: 0.
+	 * @param float $afinish Angle finish of draw line. Default value: 360.
+	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
+	 * @param array $line_style Line style of ellipse. Array like for SetLineStyle(). Default value: default line style (empty array).
+	 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
+	 * @param integer $nc Number of curves used to draw a 90 degrees portion of ellipse.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 2.1.000 (2008-01-08)
 	 */
-	public function Ellipse($x0, $y0, $rx, $ry='', $angle=0, $astart=0, $afinish=360, $style='', $line_style=array(), $fill_color=array(), $nc=2) {
+	public function Ellipse($x0, $y0, $rx, $ry=0, $angle=0, $astart=0, $afinish=360, $style='', $line_style=array(), $fill_color=array(), $nc=2) {
 		if ($this->state != 2) {
 			return;
 		}
@@ -11714,14 +11772,14 @@ class TCPDF {
 			$ry = $rx;
 		}
 		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
-			$this->SetFillColorArray($fill_color);
+			$this->setFillColorArray($fill_color);
 		}
 		$op = TCPDF_STATIC::getPathPaintOperator($style);
 		if ($op == 'f') {
 			$line_style = array();
 		}
 		if ($line_style) {
-			$this->SetLineStyle($line_style);
+			$this->setLineStyle($line_style);
 		}
 		$this->_outellipticalarc($x0, $y0, $rx, $ry, $angle, $astart, $afinish, false, $nc, true, true, false);
 		$this->_out($op);
@@ -11730,18 +11788,18 @@ class TCPDF {
 	/**
 	 * Append an elliptical arc to the current path.
 	 * An ellipse is formed from n Bezier curves.
-	 * @param $xc (float) Abscissa of center point.
-	 * @param $yc (float) Ordinate of center point.
-	 * @param $rx (float) Horizontal radius.
-	 * @param $ry (float) Vertical radius (if ry = 0 then is a circle, see Circle()). Default value: 0.
-	 * @param $xang: (float) Angle between the X-axis and the major axis of the ellipse. Default value: 0.
-	 * @param $angs: (float) Angle start of draw line. Default value: 0.
-	 * @param $angf: (float) Angle finish of draw line. Default value: 360.
-	 * @param $pie (boolean) if true do not mark the border point (used to draw pie sectors).
-	 * @param $nc (integer) Number of curves used to draw a 90 degrees portion of ellipse.
-	 * @param $startpoint (boolean) if true output a starting point.
-	 * @param $ccw (boolean) if true draws in counter-clockwise.
-	 * @param $svg (boolean) if true the angles are in svg mode (already calculated).
+	 * @param float $xc Abscissa of center point.
+	 * @param float $yc Ordinate of center point.
+	 * @param float $rx Horizontal radius.
+	 * @param float $ry Vertical radius (if ry = 0 then is a circle, see Circle()). Default value: 0.
+	 * @param float $xang Angle between the X-axis and the major axis of the ellipse. Default value: 0.
+	 * @param float $angs Angle start of draw line. Default value: 0.
+	 * @param float $angf Angle finish of draw line. Default value: 360.
+	 * @param boolean $pie if true do not mark the border point (used to draw pie sectors).
+	 * @param integer $nc Number of curves used to draw a 90 degrees portion of ellipse.
+	 * @param boolean $startpoint if true output a starting point.
+	 * @param boolean $ccw if true draws in counter-clockwise.
+	 * @param boolean $svg if true the angles are in svg mode (already calculated).
 	 * @return array bounding box coordinates (x min, y min, x max, y max)
 	 * @author Nicola Asuni
 	 * @protected
@@ -11866,15 +11924,15 @@ class TCPDF {
 	/**
 	 * Draws a circle.
 	 * A circle is formed from n Bezier curves.
-	 * @param $x0 (float) Abscissa of center point.
-	 * @param $y0 (float) Ordinate of center point.
-	 * @param $r (float) Radius.
-	 * @param $angstr: (float) Angle start of draw line. Default value: 0.
-	 * @param $angend: (float) Angle finish of draw line. Default value: 360.
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $line_style (array) Line style of circle. Array like for SetLineStyle(). Default value: default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(red, green, blue). Default value: default color (empty array).
-	 * @param $nc (integer) Number of curves used to draw a 90 degrees portion of circle.
+	 * @param float $x0 Abscissa of center point.
+	 * @param float $y0 Ordinate of center point.
+	 * @param float $r Radius.
+	 * @param float $angstr Angle start of draw line. Default value: 0.
+	 * @param float $angend Angle finish of draw line. Default value: 360.
+	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
+	 * @param array $line_style Line style of circle. Array like for SetLineStyle(). Default value: default line style (empty array).
+	 * @param array $fill_color Fill color. Format: array(red, green, blue). Default value: default color (empty array).
+	 * @param integer $nc Number of curves used to draw a 90 degrees portion of circle.
 	 * @public
 	 * @since 2.1.000 (2008-01-08)
 	 */
@@ -11884,15 +11942,15 @@ class TCPDF {
 
 	/**
 	 * Draws a polygonal line
-	 * @param $p (array) Points 0 to ($np - 1). Array with values (x0, y0, x1, y1,..., x(np-1), y(np - 1))
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $line_style (array) Line style of polygon. Array with keys among the following:
+	 * @param array $p Points 0 to ($np - 1). Array with values (x0, y0, x1, y1,..., x(np-1), y(np - 1))
+	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
+	 * @param array $line_style Line style of polygon. Array with keys among the following:
 	 * <ul>
 	 *	 <li>all: Line style of all lines. Array like for SetLineStyle().</li>
 	 *	 <li>0 to ($np - 1): Line style of each line. Array like for SetLineStyle().</li>
 	 * </ul>
 	 * If a key is not present or is null, not draws the line. Default value is default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
+	 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
 	 * @since 4.8.003 (2009-09-15)
 	 * @public
 	 */
@@ -11902,16 +11960,16 @@ class TCPDF {
 
 	/**
 	 * Draws a polygon.
-	 * @param $p (array) Points 0 to ($np - 1). Array with values (x0, y0, x1, y1,..., x(np-1), y(np - 1))
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $line_style (array) Line style of polygon. Array with keys among the following:
+	 * @param array $p Points 0 to ($np - 1). Array with values (x0, y0, x1, y1,..., x(np-1), y(np - 1))
+	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
+	 * @param array $line_style Line style of polygon. Array with keys among the following:
 	 * <ul>
 	 *	 <li>all: Line style of all lines. Array like for SetLineStyle().</li>
 	 *	 <li>0 to ($np - 1): Line style of each line. Array like for SetLineStyle().</li>
 	 * </ul>
 	 * If a key is not present or is null, not draws the line. Default value is default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
-	 * @param $closed (boolean) if true the polygon is closes, otherwise will remain open
+	 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
+	 * @param boolean $closed if true the polygon is closes, otherwise will remain open
 	 * @public
 	 * @since 2.1.000 (2008-01-08)
 	 */
@@ -11933,7 +11991,7 @@ class TCPDF {
 			$nc += 4;
 		}
 		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
-			$this->SetFillColorArray($fill_color);
+			$this->setFillColorArray($fill_color);
 		}
 		$op = TCPDF_STATIC::getPathPaintOperator($style);
 		if ($op == 'f') {
@@ -11942,7 +12000,7 @@ class TCPDF {
 		$draw = true;
 		if ($line_style) {
 			if (isset($line_style['all'])) {
-				$this->SetLineStyle($line_style['all']);
+				$this->setLineStyle($line_style['all']);
 			} else {
 				$draw = false;
 				if ($op == 'B') {
@@ -11962,7 +12020,7 @@ class TCPDF {
 						if ($line_style[$line_num] != 0) {
 							if (is_array($line_style[$line_num])) {
 								$this->_out('S');
-								$this->SetLineStyle($line_style[$line_num]);
+								$this->setLineStyle($line_style[$line_num]);
 								$this->_outPoint($p[$i - 2], $p[$i - 1]);
 								$this->_outLine($p[$i], $p[$i + 1]);
 								$this->_out('S');
@@ -11989,21 +12047,21 @@ class TCPDF {
 
 	/**
 	 * Draws a regular polygon.
-	 * @param $x0 (float) Abscissa of center point.
-	 * @param $y0 (float) Ordinate of center point.
-	 * @param $r: (float) Radius of inscribed circle.
-	 * @param $ns (integer) Number of sides.
-	 * @param $angle (float) Angle oriented (anti-clockwise). Default value: 0.
-	 * @param $draw_circle (boolean) Draw inscribed circle or not. Default value: false.
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $line_style (array) Line style of polygon sides. Array with keys among the following:
+	 * @param float $x0 Abscissa of center point.
+	 * @param float $y0 Ordinate of center point.
+	 * @param float $r Radius of inscribed circle.
+	 * @param integer $ns Number of sides.
+	 * @param float $angle Angle oriented (anti-clockwise). Default value: 0.
+	 * @param boolean $draw_circle Draw inscribed circle or not. Default value: false.
+	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
+	 * @param array $line_style Line style of polygon sides. Array with keys among the following:
 	 * <ul>
 	 *	 <li>all: Line style of all sides. Array like for SetLineStyle().</li>
 	 *	 <li>0 to ($ns - 1): Line style of each side. Array like for SetLineStyle().</li>
 	 * </ul>
 	 * If a key is not present or is null, not draws the side. Default value is default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(red, green, blue). Default value: default color (empty array).
-	 * @param $circle_style (string) Style of rendering of inscribed circle (if draws). Possible values are:
+	 * @param array $fill_color Fill color. Format: array(red, green, blue). Default value: default color (empty array).
+	 * @param string $circle_style Style of rendering of inscribed circle (if draws). Possible values are:
 	 * <ul>
 	 *	 <li>D or empty string: Draw (default).</li>
 	 *	 <li>F: Fill.</li>
@@ -12011,8 +12069,8 @@ class TCPDF {
 	 *	 <li>CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).</li>
 	 *	 <li>CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).</li>
 	 * </ul>
-	 * @param $circle_outLine_style (array) Line style of inscribed circle (if draws). Array like for SetLineStyle(). Default value: default line style (empty array).
-	 * @param $circle_fill_color (array) Fill color of inscribed circle (if draws). Format: array(red, green, blue). Default value: default color (empty array).
+	 * @param array $circle_outLine_style Line style of inscribed circle (if draws). Array like for SetLineStyle(). Default value: default line style (empty array).
+	 * @param array $circle_fill_color Fill color of inscribed circle (if draws). Format: array(red, green, blue). Default value: default color (empty array).
 	 * @public
 	 * @since 2.1.000 (2008-01-08)
 	 */
@@ -12035,23 +12093,23 @@ class TCPDF {
 
 	/**
 	 * Draws a star polygon
-	 * @param $x0 (float) Abscissa of center point.
-	 * @param $y0 (float) Ordinate of center point.
-	 * @param $r (float) Radius of inscribed circle.
-	 * @param $nv (integer) Number of vertices.
-	 * @param $ng (integer) Number of gap (if ($ng % $nv = 1) then is a regular polygon).
-	 * @param $angle: (float) Angle oriented (anti-clockwise). Default value: 0.
-	 * @param $draw_circle: (boolean) Draw inscribed circle or not. Default value is false.
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $line_style (array) Line style of polygon sides. Array with keys among the following:
+	 * @param float $x0 Abscissa of center point.
+	 * @param float $y0 Ordinate of center point.
+	 * @param float $r Radius of inscribed circle.
+	 * @param integer $nv Number of vertices.
+	 * @param integer $ng Number of gap (if ($ng % $nv = 1) then is a regular polygon).
+	 * @param float $angle Angle oriented (anti-clockwise). Default value: 0.
+	 * @param boolean $draw_circle Draw inscribed circle or not. Default value is false.
+	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
+	 * @param array $line_style Line style of polygon sides. Array with keys among the following:
 	 * <ul>
 	 *	 <li>all: Line style of all sides. Array like for
 	 * SetLineStyle().</li>
 	 *	 <li>0 to (n - 1): Line style of each side. Array like for SetLineStyle().</li>
 	 * </ul>
 	 * If a key is not present or is null, not draws the side. Default value is default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(red, green, blue). Default value: default color (empty array).
-	 * @param $circle_style (string) Style of rendering of inscribed circle (if draws). Possible values are:
+	 * @param array $fill_color Fill color. Format: array(red, green, blue). Default value: default color (empty array).
+	 * @param string $circle_style Style of rendering of inscribed circle (if draws). Possible values are:
 	 * <ul>
 	 *	 <li>D or empty string: Draw (default).</li>
 	 *	 <li>F: Fill.</li>
@@ -12059,8 +12117,8 @@ class TCPDF {
 	 *	 <li>CNZ: Clipping mode (using the even-odd rule to determine which regions lie inside the clipping path).</li>
 	 *	 <li>CEO: Clipping mode (using the nonzero winding number rule to determine which regions lie inside the clipping path).</li>
 	 * </ul>
-	 * @param $circle_outLine_style (array) Line style of inscribed circle (if draws). Array like for SetLineStyle(). Default value: default line style (empty array).
-	 * @param $circle_fill_color (array) Fill color of inscribed circle (if draws). Format: array(red, green, blue). Default value: default color (empty array).
+	 * @param array $circle_outLine_style Line style of inscribed circle (if draws). Array like for SetLineStyle(). Default value: default line style (empty array).
+	 * @param array $circle_fill_color Fill color of inscribed circle (if draws). Format: array(red, green, blue). Default value: default color (empty array).
 	 * @public
 	 * @since 2.1.000 (2008-01-08)
 	 */
@@ -12094,15 +12152,15 @@ class TCPDF {
 
 	/**
 	 * Draws a rounded rectangle.
-	 * @param $x (float) Abscissa of upper-left corner.
-	 * @param $y (float) Ordinate of upper-left corner.
-	 * @param $w (float) Width.
-	 * @param $h (float) Height.
-	 * @param $r (float) the radius of the circle used to round off the corners of the rectangle.
-	 * @param $round_corner (string) Draws rounded corner or not. String with a 0 (not rounded i-corner) or 1 (rounded i-corner) in i-position. Positions are, in order and begin to 0: top right, bottom right, bottom left and top left. Default value: all rounded corner ("1111").
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $border_style (array) Border style of rectangle. Array like for SetLineStyle(). Default value: default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
+	 * @param float $x Abscissa of upper-left corner.
+	 * @param float $y Ordinate of upper-left corner.
+	 * @param float $w Width.
+	 * @param float $h Height.
+	 * @param float $r the radius of the circle used to round off the corners of the rectangle.
+	 * @param string $round_corner Draws rounded corner or not. String with a 0 (not rounded i-corner) or 1 (rounded i-corner) in i-position. Positions are, in order and begin to 0: top right, bottom right, bottom left and top left. Default value: all rounded corner ("1111").
+	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
+	 * @param array $border_style Border style of rectangle. Array like for SetLineStyle(). Default value: default line style (empty array).
+	 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
 	 * @public
 	 * @since 2.1.000 (2008-01-08)
 	 */
@@ -12112,16 +12170,16 @@ class TCPDF {
 
 	/**
 	 * Draws a rounded rectangle.
-	 * @param $x (float) Abscissa of upper-left corner.
-	 * @param $y (float) Ordinate of upper-left corner.
-	 * @param $w (float) Width.
-	 * @param $h (float) Height.
-	 * @param $rx (float) the x-axis radius of the ellipse used to round off the corners of the rectangle.
-	 * @param $ry (float) the y-axis radius of the ellipse used to round off the corners of the rectangle.
-	 * @param $round_corner (string) Draws rounded corner or not. String with a 0 (not rounded i-corner) or 1 (rounded i-corner) in i-position. Positions are, in order and begin to 0: top right, bottom right, bottom left and top left. Default value: all rounded corner ("1111").
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $border_style (array) Border style of rectangle. Array like for SetLineStyle(). Default value: default line style (empty array).
-	 * @param $fill_color (array) Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
+	 * @param float $x Abscissa of upper-left corner.
+	 * @param float $y Ordinate of upper-left corner.
+	 * @param float $w Width.
+	 * @param float $h Height.
+	 * @param float $rx the x-axis radius of the ellipse used to round off the corners of the rectangle.
+	 * @param float $ry the y-axis radius of the ellipse used to round off the corners of the rectangle.
+	 * @param string $round_corner Draws rounded corner or not. String with a 0 (not rounded i-corner) or 1 (rounded i-corner) in i-position. Positions are, in order and begin to 0: top right, bottom right, bottom left and top left. Default value: all rounded corner ("1111").
+	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
+	 * @param array $border_style Border style of rectangle. Array like for SetLineStyle(). Default value: default line style (empty array).
+	 * @param array $fill_color Fill color. Format: array(GREY) or array(R,G,B) or array(C,M,Y,K) or array(C,M,Y,K,SpotColorName). Default value: default color (empty array).
 	 * @public
 	 * @since 4.9.019 (2010-04-22)
 	 */
@@ -12136,14 +12194,14 @@ class TCPDF {
 		}
 		// Rounded
 		if (!(false === strpos($style, 'F')) AND isset($fill_color)) {
-			$this->SetFillColorArray($fill_color);
+			$this->setFillColorArray($fill_color);
 		}
 		$op = TCPDF_STATIC::getPathPaintOperator($style);
 		if ($op == 'f') {
 			$border_style = array();
 		}
 		if ($border_style) {
-			$this->SetLineStyle($border_style);
+			$this->setLineStyle($border_style);
 		}
 		$MyArc = 4 / 3 * (sqrt(2) - 1);
 		$this->_outPoint($x + $rx, $y);
@@ -12185,13 +12243,13 @@ class TCPDF {
 
 	/**
 	 * Draws a grahic arrow.
-	 * @param $x0 (float) Abscissa of first point.
-	 * @param $y0 (float) Ordinate of first point.
-	 * @param $x1 (float) Abscissa of second point.
-	 * @param $y1 (float) Ordinate of second point.
-	 * @param $head_style (int) (0 = draw only arrowhead arms, 1 = draw closed arrowhead, but no fill, 2 = closed and filled arrowhead, 3 = filled arrowhead)
-	 * @param $arm_size (float) length of arrowhead arms
-	 * @param $arm_angle (int) angle between an arm and the shaft
+	 * @param float $x0 Abscissa of first point.
+	 * @param float $y0 Ordinate of first point.
+	 * @param float $x1 Abscissa of second point.
+	 * @param float $y1 Ordinate of second point.
+	 * @param int $head_style (0 = draw only arrowhead arms, 1 = draw closed arrowhead, but no fill, 2 = closed and filled arrowhead, 3 = filled arrowhead)
+	 * @param float $arm_size length of arrowhead arms
+	 * @param int $arm_angle angle between an arm and the shaft
 	 * @author Piotr Galecki, Nicola Asuni, Andy Meier
 	 * @since 4.6.018 (2009-07-10)
 	 */
@@ -12251,11 +12309,11 @@ class TCPDF {
 	/**
 	 * Add a Named Destination.
 	 * NOTE: destination names are unique, so only last entry will be saved.
-	 * @param $name (string) Destination name.
-	 * @param $y (float) Y position in user units of the destiantion on the selected page (default = -1 = current position; 0 = page start;).
-	 * @param $page (int|string) Target page number (leave empty for current page). If you prefix a page number with the * character, then this page will not be changed when adding/deleting/moving pages.
-	 * @param $x (float) X position in user units of the destiantion on the selected page (default = -1 = current position;).
-	 * @return (string) Stripped named destination identifier or false in case of error.
+	 * @param string $name Destination name.
+	 * @param float $y Y position in user units of the destiantion on the selected page (default = -1 = current position; 0 = page start;).
+	 * @param int|string $page Target page number (leave empty for current page). If you prefix a page number with the * character, then this page will not be changed when adding/deleting/moving pages.
+	 * @param float $x X position in user units of the destiantion on the selected page (default = -1 = current position;).
+	 * @return string|false Stripped named destination identifier or false in case of error.
 	 * @public
 	 * @author Christian Deligant, Nicola Asuni
 	 * @since 5.9.097 (2011-06-23)
@@ -12298,7 +12356,7 @@ class TCPDF {
 
 	/**
 	 * Return the Named Destination array.
-	 * @return (array) Named Destination array.
+	 * @return array Named Destination array.
 	 * @public
 	 * @author Nicola Asuni
 	 * @since 5.9.097 (2011-06-23)
@@ -12329,14 +12387,14 @@ class TCPDF {
 
 	/**
 	 * Adds a bookmark - alias for Bookmark().
-	 * @param $txt (string) Bookmark description.
-	 * @param $level (int) Bookmark level (minimum value is 0).
-	 * @param $y (float) Y position in user units of the bookmark on the selected page (default = -1 = current position; 0 = page start;).
-	 * @param $page (int|string) Target page number (leave empty for current page). If you prefix a page number with the * character, then this page will not be changed when adding/deleting/moving pages.
-	 * @param $style (string) Font style: B = Bold, I = Italic, BI = Bold + Italic.
-	 * @param $color (array) RGB color array (values from 0 to 255).
-	 * @param $x (float) X position in user units of the bookmark on the selected page (default = -1 = current position;).
-	 * @param $link (mixed) URL, or numerical link ID, or named destination (# character followed by the destination name), or embedded file (* character followed by the file name).
+	 * @param string $txt Bookmark description.
+	 * @param int $level Bookmark level (minimum value is 0).
+	 * @param float $y Y position in user units of the bookmark on the selected page (default = -1 = current position; 0 = page start;).
+	 * @param int|string $page Target page number (leave empty for current page). If you prefix a page number with the * character, then this page will not be changed when adding/deleting/moving pages.
+	 * @param string $style Font style: B = Bold, I = Italic, BI = Bold + Italic.
+	 * @param array $color RGB color array (values from 0 to 255).
+	 * @param float $x X position in user units of the bookmark on the selected page (default = -1 = current position;).
+	 * @param mixed $link URL, or numerical link ID, or named destination (# character followed by the destination name), or embedded file (* character followed by the file name).
 	 * @public
 	 */
 	public function setBookmark($txt, $level=0, $y=-1, $page='', $style='', $color=array(0,0,0), $x=-1, $link='') {
@@ -12345,14 +12403,14 @@ class TCPDF {
 
 	/**
 	 * Adds a bookmark.
-	 * @param $txt (string) Bookmark description.
-	 * @param $level (int) Bookmark level (minimum value is 0).
-	 * @param $y (float) Y position in user units of the bookmark on the selected page (default = -1 = current position; 0 = page start;).
-	 * @param $page (int|string) Target page number (leave empty for current page). If you prefix a page number with the * character, then this page will not be changed when adding/deleting/moving pages.
-	 * @param $style (string) Font style: B = Bold, I = Italic, BI = Bold + Italic.
-	 * @param $color (array) RGB color array (values from 0 to 255).
-	 * @param $x (float) X position in user units of the bookmark on the selected page (default = -1 = current position;).
-	 * @param $link (mixed) URL, or numerical link ID, or named destination (# character followed by the destination name), or embedded file (* character followed by the file name).
+	 * @param string $txt Bookmark description.
+	 * @param int $level Bookmark level (minimum value is 0).
+	 * @param float $y Y position in user units of the bookmark on the selected page (default = -1 = current position; 0 = page start;).
+	 * @param int|string $page Target page number (leave empty for current page). If you prefix a page number with the * character, then this page will not be changed when adding/deleting/moving pages.
+	 * @param string $style Font style: B = Bold, I = Italic, BI = Bold + Italic.
+	 * @param array $color RGB color array (values from 0 to 255).
+	 * @param float $x X position in user units of the bookmark on the selected page (default = -1 = current position;).
+	 * @param mixed $link URL, or numerical link ID, or named destination (# character followed by the destination name), or embedded file (* character followed by the file name).
 	 * @public
 	 * @since 2.1.002 (2008-02-12)
 	 */
@@ -12543,7 +12601,7 @@ class TCPDF {
 
 	/**
 	 * Adds a javascript
-	 * @param $script (string) Javascript code
+	 * @param string $script Javascript code
 	 * @public
 	 * @author Johannes G\FCntert, Nicola Asuni
 	 * @since 2.1.002 (2008-02-12)
@@ -12554,8 +12612,8 @@ class TCPDF {
 
 	/**
 	 * Adds a javascript object and return object ID
-	 * @param $script (string) Javascript code
-	 * @param $onload (boolean) if true executes this object when opening the document
+	 * @param string $script Javascript code
+	 * @param boolean $onload if true executes this object when opening the document
 	 * @return int internal object ID
 	 * @public
 	 * @author Nicola Asuni
@@ -12624,13 +12682,13 @@ class TCPDF {
 
 	/**
 	 * Adds a javascript form field.
-	 * @param $type (string) field type
-	 * @param $name (string) field name
-	 * @param $x (int) horizontal position
-	 * @param $y (int) vertical position
-	 * @param $w (int) width
-	 * @param $h (int) height
-	 * @param $prop (array) javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
+	 * @param string $type field type
+	 * @param string $name field name
+	 * @param int $x horizontal position
+	 * @param int $y vertical position
+	 * @param int $w width
+	 * @param int $h height
+	 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
 	 * @protected
 	 * @author Denis Van Nuffelen, Nicola Asuni
 	 * @since 2.1.002 (2008-02-12)
@@ -12666,7 +12724,7 @@ class TCPDF {
 
 	/**
 	 * Set default properties for form fields.
-	 * @param $prop (array) javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
+	 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
 	 * @public
 	 * @author Nicola Asuni
 	 * @since 4.8.000 (2009-09-06)
@@ -12688,23 +12746,23 @@ class TCPDF {
 
 	/**
 	 * Creates a text field
-	 * @param $name (string) field name
-	 * @param $w (float) Width of the rectangle
-	 * @param $h (float) Height of the rectangle
-	 * @param $prop (array) javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @param $opt (array) annotation parameters. Possible values are described on official PDF32000_2008 reference.
-	 * @param $x (float) Abscissa of the upper-left corner of the rectangle
-	 * @param $y (float) Ordinate of the upper-left corner of the rectangle
-	 * @param $js (boolean) if true put the field using JavaScript (requires Acrobat Writer to be rendered).
+	 * @param string $name field name
+	 * @param float $w Width of the rectangle
+	 * @param float $h Height of the rectangle
+	 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
+	 * @param array $opt annotation parameters. Possible values are described on official PDF32000_2008 reference.
+	 * @param float|null $x Abscissa of the upper-left corner of the rectangle
+	 * @param float|null $y Ordinate of the upper-left corner of the rectangle
+	 * @param boolean $js if true put the field using JavaScript (requires Acrobat Writer to be rendered).
 	 * @public
 	 * @author Nicola Asuni
 	 * @since 4.8.000 (2009-09-07)
 	 */
-	public function TextField($name, $w, $h, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
-		if ($x === '') {
+	public function TextField($name, $w, $h, $prop=array(), $opt=array(), $x=null, $y=null, $js=false) {
+		if (TCPDF_STATIC::empty_string($x)) {
 			$x = $this->x;
 		}
-		if ($y === '') {
+		if (TCPDF_STATIC::empty_string($y)) {
 			$y = $this->y;
 		}
 		// check page for no-write regions and adapt page margins if necessary
@@ -12808,24 +12866,24 @@ class TCPDF {
 
 	/**
 	 * Creates a RadioButton field.
-	 * @param $name (string) Field name.
-	 * @param $w (int) Width of the radio button.
-	 * @param $prop (array) Javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @param $opt (array) Annotation parameters. Possible values are described on official PDF32000_2008 reference.
-	 * @param $onvalue (string) Value to be returned if selected.
-	 * @param $checked (boolean) Define the initial state.
-	 * @param $x (float) Abscissa of the upper-left corner of the rectangle
-	 * @param $y (float) Ordinate of the upper-left corner of the rectangle
-	 * @param $js (boolean) If true put the field using JavaScript (requires Acrobat Writer to be rendered).
+	 * @param string $name Field name.
+	 * @param int $w Width of the radio button.
+	 * @param array $prop Javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
+	 * @param array $opt Annotation parameters. Possible values are described on official PDF32000_2008 reference.
+	 * @param string $onvalue Value to be returned if selected.
+	 * @param boolean $checked Define the initial state.
+	 * @param float|null $x Abscissa of the upper-left corner of the rectangle
+	 * @param float|null $y Ordinate of the upper-left corner of the rectangle
+	 * @param boolean $js If true put the field using JavaScript (requires Acrobat Writer to be rendered).
 	 * @public
 	 * @author Nicola Asuni
 	 * @since 4.8.000 (2009-09-07)
 	 */
-	public function RadioButton($name, $w, $prop=array(), $opt=array(), $onvalue='On', $checked=false, $x='', $y='', $js=false) {
-		if ($x === '') {
+	public function RadioButton($name, $w, $prop=array(), $opt=array(), $onvalue='On', $checked=false, $x=null, $y=null, $js=false) {
+		if (TCPDF_STATIC::empty_string($x)) {
 			$x = $this->x;
 		}
-		if ($y === '') {
+		if (TCPDF_STATIC::empty_string($y)) {
 			$y = $this->y;
 		}
 		// check page for no-write regions and adapt page margins if necessary
@@ -12911,24 +12969,24 @@ class TCPDF {
 
 	/**
 	 * Creates a List-box field
-	 * @param $name (string) field name
-	 * @param $w (int) width
-	 * @param $h (int) height
-	 * @param $values (array) array containing the list of values.
-	 * @param $prop (array) javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @param $opt (array) annotation parameters. Possible values are described on official PDF32000_2008 reference.
-	 * @param $x (float) Abscissa of the upper-left corner of the rectangle
-	 * @param $y (float) Ordinate of the upper-left corner of the rectangle
-	 * @param $js (boolean) if true put the field using JavaScript (requires Acrobat Writer to be rendered).
+	 * @param string $name field name
+	 * @param int $w width
+	 * @param int $h height
+	 * @param array $values array containing the list of values.
+	 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
+	 * @param array $opt annotation parameters. Possible values are described on official PDF32000_2008 reference.
+	 * @param float|null $x Abscissa of the upper-left corner of the rectangle
+	 * @param float|null $y Ordinate of the upper-left corner of the rectangle
+	 * @param boolean $js if true put the field using JavaScript (requires Acrobat Writer to be rendered).
 	 * @public
 	 * @author Nicola Asuni
 	 * @since 4.8.000 (2009-09-07)
 	 */
-	public function ListBox($name, $w, $h, $values, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
-		if ($x === '') {
+	public function ListBox($name, $w, $h, $values, $prop=array(), $opt=array(), $x=null, $y=null, $js=false) {
+		if (TCPDF_STATIC::empty_string($x)) {
 			$x = $this->x;
 		}
-		if ($y === '') {
+		if (TCPDF_STATIC::empty_string($y)) {
 			$y = $this->y;
 		}
 		// check page for no-write regions and adapt page margins if necessary
@@ -12997,24 +13055,24 @@ class TCPDF {
 
 	/**
 	 * Creates a Combo-box field
-	 * @param $name (string) field name
-	 * @param $w (int) width
-	 * @param $h (int) height
-	 * @param $values (array) array containing the list of values.
-	 * @param $prop (array) javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @param $opt (array) annotation parameters. Possible values are described on official PDF32000_2008 reference.
-	 * @param $x (float) Abscissa of the upper-left corner of the rectangle
-	 * @param $y (float) Ordinate of the upper-left corner of the rectangle
-	 * @param $js (boolean) if true put the field using JavaScript (requires Acrobat Writer to be rendered).
+	 * @param string $name field name
+	 * @param int $w width
+	 * @param int $h height
+	 * @param array $values array containing the list of values.
+	 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
+	 * @param array $opt annotation parameters. Possible values are described on official PDF32000_2008 reference.
+	 * @param float|null $x Abscissa of the upper-left corner of the rectangle
+	 * @param float|null $y Ordinate of the upper-left corner of the rectangle
+	 * @param boolean $js if true put the field using JavaScript (requires Acrobat Writer to be rendered).
 	 * @public
 	 * @author Nicola Asuni
 	 * @since 4.8.000 (2009-09-07)
 	 */
-	public function ComboBox($name, $w, $h, $values, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
-		if ($x === '') {
+	public function ComboBox($name, $w, $h, $values, $prop=array(), $opt=array(), $x=null, $y=null, $js=false) {
+		if (TCPDF_STATIC::empty_string($x)) {
 			$x = $this->x;
 		}
-		if ($y === '') {
+		if (TCPDF_STATIC::empty_string($y)) {
 			$y = $this->y;
 		}
 		// check page for no-write regions and adapt page margins if necessary
@@ -13084,24 +13142,24 @@ class TCPDF {
 
 	/**
 	 * Creates a CheckBox field
-	 * @param $name (string) field name
-	 * @param $w (int) width
-	 * @param $checked (boolean) define the initial state.
-	 * @param $prop (array) javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @param $opt (array) annotation parameters. Possible values are described on official PDF32000_2008 reference.
-	 * @param $onvalue (string) value to be returned if selected.
-	 * @param $x (float) Abscissa of the upper-left corner of the rectangle
-	 * @param $y (float) Ordinate of the upper-left corner of the rectangle
-	 * @param $js (boolean) if true put the field using JavaScript (requires Acrobat Writer to be rendered).
+	 * @param string $name field name
+	 * @param int $w width
+	 * @param boolean $checked define the initial state.
+	 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
+	 * @param array $opt annotation parameters. Possible values are described on official PDF32000_2008 reference.
+	 * @param string $onvalue value to be returned if selected.
+	 * @param float|null $x Abscissa of the upper-left corner of the rectangle
+	 * @param float|null $y Ordinate of the upper-left corner of the rectangle
+	 * @param boolean $js if true put the field using JavaScript (requires Acrobat Writer to be rendered).
 	 * @public
 	 * @author Nicola Asuni
 	 * @since 4.8.000 (2009-09-07)
 	 */
-	public function CheckBox($name, $w, $checked=false, $prop=array(), $opt=array(), $onvalue='Yes', $x='', $y='', $js=false) {
-		if ($x === '') {
+	public function CheckBox($name, $w, $checked=false, $prop=array(), $opt=array(), $onvalue='Yes', $x=null, $y=null, $js=false) {
+		if (TCPDF_STATIC::empty_string($x)) {
 			$x = $this->x;
 		}
-		if ($y === '') {
+		if (TCPDF_STATIC::empty_string($y)) {
 			$y = $this->y;
 		}
 		// check page for no-write regions and adapt page margins if necessary
@@ -13163,25 +13221,25 @@ class TCPDF {
 
 	/**
 	 * Creates a button field
-	 * @param $name (string) field name
-	 * @param $w (int) width
-	 * @param $h (int) height
-	 * @param $caption (string) caption.
-	 * @param $action (mixed) action triggered by pressing the button. Use a string to specify a javascript action. Use an array to specify a form action options as on section 12.7.5 of PDF32000_2008.
-	 * @param $prop (array) javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
-	 * @param $opt (array) annotation parameters. Possible values are described on official PDF32000_2008 reference.
-	 * @param $x (float) Abscissa of the upper-left corner of the rectangle
-	 * @param $y (float) Ordinate of the upper-left corner of the rectangle
-	 * @param $js (boolean) if true put the field using JavaScript (requires Acrobat Writer to be rendered).
+	 * @param string $name field name
+	 * @param int $w width
+	 * @param int $h height
+	 * @param string $caption caption.
+	 * @param mixed $action action triggered by pressing the button. Use a string to specify a javascript action. Use an array to specify a form action options as on section 12.7.5 of PDF32000_2008.
+	 * @param array $prop javascript field properties. Possible values are described on official Javascript for Acrobat API reference.
+	 * @param array $opt annotation parameters. Possible values are described on official PDF32000_2008 reference.
+	 * @param float|null $x Abscissa of the upper-left corner of the rectangle
+	 * @param float|null $y Ordinate of the upper-left corner of the rectangle
+	 * @param boolean $js if true put the field using JavaScript (requires Acrobat Writer to be rendered).
 	 * @public
 	 * @author Nicola Asuni
 	 * @since 4.8.000 (2009-09-07)
 	 */
-	public function Button($name, $w, $h, $caption, $action, $prop=array(), $opt=array(), $x='', $y='', $js=false) {
-		if ($x === '') {
+	public function Button($name, $w, $h, $caption, $action, $prop=array(), $opt=array(), $x=null, $y=null, $js=false) {
+		if (TCPDF_STATIC::empty_string($x)) {
 			$x = $this->x;
 		}
-		if ($y === '') {
+		if (TCPDF_STATIC::empty_string($y)) {
 			$y = $this->y;
 		}
 		// check page for no-write regions and adapt page margins if necessary
@@ -13214,7 +13272,7 @@ class TCPDF {
 			'R' => array('width' => $bw, 'cap' => 'square', 'join' => 'miter', 'dash' => 0, 'color' => array(51)),
 			'T' => array('width' => $bw, 'cap' => 'square', 'join' => 'miter', 'dash' => 0, 'color' => array(231)),
 			'B' => array('width' => $bw, 'cap' => 'square', 'join' => 'miter', 'dash' => 0, 'color' => array(51)));
-		$this->SetFillColor(204);
+		$this->setFillColor(204);
 		$this->Cell($w, $h, $caption, $border, 0, 'C', true, '', 1, false, 'T', 'M');
 		$this->endTemplate();
 		--$this->n;
@@ -13420,14 +13478,14 @@ class TCPDF {
 	 * WARNING: This is experimental and currently do not work.
 	 * Check the PDF Reference 8.7.1 Transform Methods,
 	 * Table 8.105 Entries in the UR transform parameters dictionary
-	 * @param $enable (boolean) if true enable user's rights on PDF reader
-	 * @param $document (string) Names specifying additional document-wide usage rights for the document. The only defined value is "/FullSave", which permits a user to save the document along with modified form and/or annotation data.
-	 * @param $annots (string) Names specifying additional annotation-related usage rights for the document. Valid names in PDF 1.5 and later are /Create/Delete/Modify/Copy/Import/Export, which permit the user to perform the named operation on annotations.
-	 * @param $form (string) Names specifying additional form-field-related usage rights for the document. Valid names are: /Add/Delete/FillIn/Import/Export/SubmitStandalone/SpawnTemplate
-	 * @param $signature (string) Names specifying additional signature-related usage rights for the document. The only defined value is /Modify, which permits a user to apply a digital signature to an existing signature form field or clear a signed signature form field.
-	 * @param $ef (string) Names specifying additional usage rights for named embedded files in the document. Valid names are /Create/Delete/Modify/Import, which permit the user to perform the named operation on named embedded files
+	 * @param boolean $enable if true enable user's rights on PDF reader
+	 * @param string $document Names specifying additional document-wide usage rights for the document. The only defined value is "/FullSave", which permits a user to save the document along with modified form and/or annotation data.
+	 * @param string $annots Names specifying additional annotation-related usage rights for the document. Valid names in PDF 1.5 and later are /Create/Delete/Modify/Copy/Import/Export, which permit the user to perform the named operation on annotations.
+	 * @param string $form Names specifying additional form-field-related usage rights for the document. Valid names are: /Add/Delete/FillIn/Import/Export/SubmitStandalone/SpawnTemplate
+	 * @param string $signature Names specifying additional signature-related usage rights for the document. The only defined value is /Modify, which permits a user to apply a digital signature to an existing signature form field or clear a signed signature form field.
+	 * @param string $ef Names specifying additional usage rights for named embedded files in the document. Valid names are /Create/Delete/Modify/Import, which permit the user to perform the named operation on named embedded files
 	 Names specifying additional embedded-files-related usage rights for the document.
-	 * @param $formex (string) Names specifying additional form-field-related usage rights. The only valid name is BarcodePlaintext, which permits text form field data to be encoded as a plaintext two-dimensional barcode.
+	 * @param string $formex Names specifying additional form-field-related usage rights. The only valid name is BarcodePlaintext, which permits text form field data to be encoded as a plaintext two-dimensional barcode.
 	 * @public
 	 * @author Nicola Asuni
 	 * @since 2.9.000 (2008-03-26)
@@ -13458,13 +13516,13 @@ class TCPDF {
 	 * To create self-signed signature: openssl req -x509 -nodes -days 365000 -newkey rsa:1024 -keyout tcpdf.crt -out tcpdf.crt
 	 * To export crt to p12: openssl pkcs12 -export -in tcpdf.crt -out tcpdf.p12
 	 * To convert pfx certificate to pem: openssl pkcs12 -in tcpdf.pfx -out tcpdf.crt -nodes
-	 * @param $signing_cert (mixed) signing certificate (string or filename prefixed with 'file://')
-	 * @param $private_key (mixed) private key (string or filename prefixed with 'file://')
-	 * @param $private_key_password (string) password
-	 * @param $extracerts (string) specifies the name of a file containing a bunch of extra certificates to include in the signature which can for example be used to help the recipient to verify the certificate that you used.
-	 * @param $cert_type (int) The access permissions granted for this document. Valid values shall be: 1 = No changes to the document shall be permitted; any change to the document shall invalidate the signature; 2 = Permitted changes shall be filling in forms, instantiating page templates, and signing; other changes shall invalidate the signature; 3 = Permitted changes shall be the same as for 2, as well as annotation creation, deletion, and modification; other changes shall invalidate the signature.
-	 * @param $info (array) array of option information: Name, Location, Reason, ContactInfo.
-	 * @param $approval (string) Enable approval signature eg. for PDF incremental update
+	 * @param mixed $signing_cert signing certificate (string or filename prefixed with 'file://')
+	 * @param mixed $private_key private key (string or filename prefixed with 'file://')
+	 * @param string $private_key_password password
+	 * @param string $extracerts specifies the name of a file containing a bunch of extra certificates to include in the signature which can for example be used to help the recipient to verify the certificate that you used.
+	 * @param int $cert_type The access permissions granted for this document. Valid values shall be: 1 = No changes to the document shall be permitted; any change to the document shall invalidate the signature; 2 = Permitted changes shall be filling in forms, instantiating page templates, and signing; other changes shall invalidate the signature; 3 = Permitted changes shall be the same as for 2, as well as annotation creation, deletion, and modification; other changes shall invalidate the signature.
+	 * @param array $info array of option information: Name, Location, Reason, ContactInfo.
+	 * @param string $approval Enable approval signature eg. for PDF incremental update
 	 * @public
 	 * @author Nicola Asuni
 	 * @since 4.6.005 (2009-04-24)
@@ -13496,12 +13554,12 @@ class TCPDF {
 
 	/**
 	 * Set the digital signature appearance (a cliccable rectangle area to get signature properties)
-	 * @param $x (float) Abscissa of the upper-left corner.
-	 * @param $y (float) Ordinate of the upper-left corner.
-	 * @param $w (float) Width of the signature area.
-	 * @param $h (float) Height of the signature area.
-	 * @param $page (int) option page number (if < 0 the current page is used).
-	 * @param $name (string) Name of the signature.
+	 * @param float $x Abscissa of the upper-left corner.
+	 * @param float $y Ordinate of the upper-left corner.
+	 * @param float $w Width of the signature area.
+	 * @param float $h Height of the signature area.
+	 * @param int $page option page number (if < 0 the current page is used).
+	 * @param string $name Name of the signature.
 	 * @public
 	 * @author Nicola Asuni
 	 * @since 5.3.011 (2010-06-17)
@@ -13512,12 +13570,12 @@ class TCPDF {
 
 	/**
 	 * Add an empty digital signature appearance (a cliccable rectangle area to get signature properties)
-	 * @param $x (float) Abscissa of the upper-left corner.
-	 * @param $y (float) Ordinate of the upper-left corner.
-	 * @param $w (float) Width of the signature area.
-	 * @param $h (float) Height of the signature area.
-	 * @param $page (int) option page number (if < 0 the current page is used).
-	 * @param $name (string) Name of the signature.
+	 * @param float $x Abscissa of the upper-left corner.
+	 * @param float $y Ordinate of the upper-left corner.
+	 * @param float $w Width of the signature area.
+	 * @param float $h Height of the signature area.
+	 * @param int $page option page number (if < 0 the current page is used).
+	 * @param string $name Name of the signature.
 	 * @public
 	 * @author Nicola Asuni
 	 * @since 5.9.101 (2011-07-06)
@@ -13529,13 +13587,13 @@ class TCPDF {
 
 	/**
 	 * Get the array that defines the signature appearance (page and rectangle coordinates).
-	 * @param $x (float) Abscissa of the upper-left corner.
-	 * @param $y (float) Ordinate of the upper-left corner.
-	 * @param $w (float) Width of the signature area.
-	 * @param $h (float) Height of the signature area.
-	 * @param $page (int) option page number (if < 0 the current page is used).
-	 * @param $name (string) Name of the signature.
-	 * @return (array) Array defining page and rectangle coordinates of signature appearance.
+	 * @param float $x Abscissa of the upper-left corner.
+	 * @param float $y Ordinate of the upper-left corner.
+	 * @param float $w Width of the signature area.
+	 * @param float $h Height of the signature area.
+	 * @param int $page option page number (if < 0 the current page is used).
+	 * @param string $name Name of the signature.
+	 * @return array Array defining page and rectangle coordinates of signature appearance.
 	 * @protected
 	 * @author Nicola Asuni
 	 * @since 5.9.101 (2011-07-06)
@@ -13564,10 +13622,10 @@ class TCPDF {
 	 * Enable document timestamping (requires the OpenSSL Library).
 	 * The trusted timestamping improve document security that means that no one should be able to change the document once it has been recorded.
 	 * Use with digital signature only!
-	 * @param $tsa_host (string) Time Stamping Authority (TSA) server (prefixed with 'https://')
-	 * @param $tsa_username (string) Specifies the username for TSA authorization (optional) OR specifies the TSA authorization PEM file (see: example_66.php, optional)
-	 * @param $tsa_password (string) Specifies the password for TSA authorization (optional)
-	 * @param $tsa_cert (string) Specifies the location of TSA certificate for authorization (optional for cURL)
+	 * @param string $tsa_host Time Stamping Authority (TSA) server (prefixed with 'https://')
+	 * @param string $tsa_username Specifies the username for TSA authorization (optional) OR specifies the TSA authorization PEM file (see: example_66.php, optional)
+	 * @param string $tsa_password Specifies the password for TSA authorization (optional)
+	 * @param string $tsa_cert Specifies the location of TSA certificate for authorization (optional for cURL)
 	 * @public
 	 * @author Richard Stockinger
 	 * @since 6.0.090 (2014-06-16)
@@ -13594,8 +13652,8 @@ class TCPDF {
 	/**
 	 * NOT YET IMPLEMENTED
 	 * Request TSA for a timestamp
-	 * @param $signature (string) Digital signature as binary string
-	 * @return (string) Timestamped digital signature
+	 * @param string $signature Digital signature as binary string
+	 * @return string Timestamped digital signature
 	 * @protected
 	 * @author Richard Stockinger
 	 * @since 6.0.090 (2014-06-16)
@@ -13611,11 +13669,11 @@ class TCPDF {
 	/**
 	 * Create a new page group.
 	 * NOTE: call this function before calling AddPage()
-	 * @param $page (int) starting group page (leave empty for next page).
+	 * @param int|null $page starting group page (leave empty for next page).
 	 * @public
 	 * @since 3.0.000 (2008-03-27)
 	 */
-	public function startPageGroup($page='') {
+	public function startPageGroup($page=null) {
 		if (empty($page)) {
 			$page = $this->page + 1;
 		}
@@ -13624,7 +13682,7 @@ class TCPDF {
 
 	/**
 	 * Set the starting page number.
-	 * @param $num (int) Starting page number.
+	 * @param int $num Starting page number.
 	 * @since 5.9.093 (2011-06-16)
 	 * @public
 	 */
@@ -13691,7 +13749,7 @@ class TCPDF {
 	 * Return the alias for the total number of pages in the current page group.
 	 * If the current font is unicode type, the returned string is surrounded by additional curly braces.
 	 * This alias will be replaced by the total number of pages in this group.
-	 * @return alias of the current page group
+	 * @return string alias of the current page group
 	 * @public
 	 * @since 3.0.000 (2008-03-27)
 	 */
@@ -13706,7 +13764,7 @@ class TCPDF {
 	 * Return the alias for the page number on the current page group.
 	 * If the current font is unicode type, the returned string is surrounded by additional curly braces.
 	 * This alias will be replaced by the page number (relative to the belonging group).
-	 * @return alias of the current page group
+	 * @return string alias of the current page group
 	 * @public
 	 * @since 4.5.000 (2009-01-02)
 	 */
@@ -13719,7 +13777,7 @@ class TCPDF {
 
 	/**
 	 * Return the current page in the group.
-	 * @return current page in the group
+	 * @return int current page in the group
 	 * @public
 	 * @since 3.0.000 (2008-03-27)
 	 */
@@ -13773,10 +13831,10 @@ class TCPDF {
 
 	/**
 	 * Start a new pdf layer.
-	 * @param $name (string) Layer name (only a-z letters and numbers). Leave empty for automatic name.
-	 * @param $print (boolean|null) Set to TRUE to print this layer, FALSE to not print and NULL to not set this option
-	 * @param $view (boolean) Set to true to view this layer.
-	 * @param $lock (boolean) If true lock the layer
+	 * @param string $name Layer name (only a-z letters and numbers). Leave empty for automatic name.
+	 * @param boolean|null $print Set to TRUE to print this layer, FALSE to not print and NULL to not set this option
+	 * @param boolean $view Set to true to view this layer.
+	 * @param boolean $lock If true lock the layer
 	 * @public
 	 * @since 5.9.102 (2011-07-13)
 	 */
@@ -13815,7 +13873,7 @@ class TCPDF {
 	 * Set the visibility of the successive elements.
 	 * This can be useful, for instance, to put a background
 	 * image or color that will show on screen but won't print.
-	 * @param $v (string) visibility mode. Legal values are: all, print, screen or view.
+	 * @param string $v visibility mode. Legal values are: all, print, screen or view.
 	 * @public
 	 * @since 3.0.000 (2008-03-27)
 	 */
@@ -13847,13 +13905,13 @@ class TCPDF {
 
 	/**
 	 * Add transparency parameters to the current extgstate
-	 * @param $parms (array) parameters
-	 * @return the number of extgstates
+	 * @param array $parms parameters
+	 * @return int|void the number of extgstates
 	 * @protected
 	 * @since 3.0.000 (2008-03-27)
 	 */
 	protected function addExtGState($parms) {
-		if ($this->pdfa_mode) {
+		if ($this->pdfa_mode || $this->pdfa_version >= 2) {
 			// transparencies are not allowed in PDF/A mode
 			return;
 		}
@@ -13879,13 +13937,13 @@ class TCPDF {
 
 	/**
 	 * Add an extgstate
-	 * @param $gs (array) extgstate
+	 * @param int $gs extgstate
 	 * @protected
 	 * @since 3.0.000 (2008-03-27)
 	 */
 	protected function setExtGState($gs) {
-		if ($this->pdfa_mode OR ($this->state != 2)) {
-			// transparency is not allowed in PDF/A mode
+		if (($this->pdfa_mode && $this->pdfa_version < 2) OR ($this->state != 2)) {
+			// transparency is not allowed in PDF/A-1 mode
 			return;
 		}
 		$this->_out(sprintf('/GS%d gs', $gs));
@@ -13919,13 +13977,13 @@ class TCPDF {
 	/**
 	 * Set overprint mode for stroking (OP) and non-stroking (op) painting operations.
 	 * (Check the "Entries in a Graphics State Parameter Dictionary" on PDF 32000-1:2008).
-	 * @param $stroking (boolean) If true apply overprint for stroking operations.
-	 * @param $nonstroking (boolean) If true apply overprint for painting operations other than stroking.
-	 * @param $mode (integer) Overprint mode: (0 = each source colour component value replaces the value previously painted for the corresponding device colorant; 1 = a tint value of 0.0 for a source colour component shall leave the corresponding component of the previously painted colour unchanged).
+	 * @param boolean $stroking If true apply overprint for stroking operations.
+	 * @param boolean|null $nonstroking If true apply overprint for painting operations other than stroking.
+	 * @param integer $mode Overprint mode: (0 = each source colour component value replaces the value previously painted for the corresponding device colorant; 1 = a tint value of 0.0 for a source colour component shall leave the corresponding component of the previously painted colour unchanged).
 	 * @public
 	 * @since 5.9.152 (2012-03-23)
 	 */
-	public function setOverprint($stroking=true, $nonstroking='', $mode=0) {
+	public function setOverprint($stroking=true, $nonstroking=null, $mode=0) {
 		if ($this->state != 2) {
 			return;
 		}
@@ -13947,7 +14005,7 @@ class TCPDF {
 	/**
 	 * Get the overprint mode array (OP, op, OPM).
 	 * (Check the "Entries in a Graphics State Parameter Dictionary" on PDF 32000-1:2008).
-	 * @return array.
+	 * @return array<string,bool|int>
 	 * @public
 	 * @since 5.9.152 (2012-03-23)
 	 */
@@ -13957,16 +14015,16 @@ class TCPDF {
 
 	/**
 	 * Set alpha for stroking (CA) and non-stroking (ca) operations.
-	 * @param $stroking (float) Alpha value for stroking operations: real value from 0 (transparent) to 1 (opaque).
-	 * @param $bm (string) blend mode, one of the following: Normal, Multiply, Screen, Overlay, Darken, Lighten, ColorDodge, ColorBurn, HardLight, SoftLight, Difference, Exclusion, Hue, Saturation, Color, Luminosity
-	 * @param $nonstroking (float) Alpha value for non-stroking operations: real value from 0 (transparent) to 1 (opaque).
-	 * @param $ais (boolean)
+	 * @param float $stroking Alpha value for stroking operations: real value from 0 (transparent) to 1 (opaque).
+	 * @param string $bm blend mode, one of the following: Normal, Multiply, Screen, Overlay, Darken, Lighten, ColorDodge, ColorBurn, HardLight, SoftLight, Difference, Exclusion, Hue, Saturation, Color, Luminosity
+	 * @param float|null $nonstroking Alpha value for non-stroking operations: real value from 0 (transparent) to 1 (opaque).
+	 * @param boolean $ais
 	 * @public
 	 * @since 3.0.000 (2008-03-27)
 	 */
-	public function setAlpha($stroking=1, $bm='Normal', $nonstroking='', $ais=false) {
-		if ($this->pdfa_mode) {
-			// transparency is not allowed in PDF/A mode
+	public function setAlpha($stroking=1, $bm='Normal', $nonstroking=null, $ais=false) {
+		if ($this->pdfa_mode && $this->pdfa_version < 2) {
+			// transparency is not allowed in PDF/A-1 mode
 			return;
 		}
 		$stroking = floatval($stroking);
@@ -13992,7 +14050,7 @@ class TCPDF {
 	/**
 	 * Get the alpha mode array (CA, ca, BM, AIS).
 	 * (Check the "Entries in a Graphics State Parameter Dictionary" on PDF 32000-1:2008).
-	 * @return array.
+	 * @return array<string,bool|string>
 	 * @public
 	 * @since 5.9.152 (2012-03-23)
 	 */
@@ -14002,7 +14060,7 @@ class TCPDF {
 
 	/**
 	 * Set the default JPEG compression quality (1-100)
-	 * @param $quality (int) JPEG quality, integer between 1 and 100
+	 * @param int $quality JPEG quality, integer between 1 and 100
 	 * @public
 	 * @since 3.0.000 (2008-03-27)
 	 */
@@ -14015,7 +14073,7 @@ class TCPDF {
 
 	/**
 	 * Set the default number of columns in a row for HTML tables.
-	 * @param $cols (int) number of columns
+	 * @param int $cols number of columns
 	 * @public
 	 * @since 3.0.014 (2008-06-04)
 	 */
@@ -14025,7 +14083,7 @@ class TCPDF {
 
 	/**
 	 * Set the height of the cell (line height) respect the font height.
-	 * @param $h (int) cell proportion respect font height (typical value = 1.25).
+	 * @param float $h cell proportion respect font height (typical value = 1.25).
 	 * @public
 	 * @since 3.0.014 (2008-06-04)
 	 */
@@ -14036,6 +14094,7 @@ class TCPDF {
 	/**
 	 * return the height of cell repect font height.
 	 * @public
+	 * @return float
 	 * @since 4.0.012 (2008-07-24)
 	 */
 	public function getCellHeightRatio() {
@@ -14044,15 +14103,18 @@ class TCPDF {
 
 	/**
 	 * Set the PDF version (check PDF reference for valid values).
-	 * @param $version (string) PDF document version.
+	 * @param string $version PDF document version.
 	 * @public
 	 * @since 3.1.000 (2008-06-09)
 	 */
 	public function setPDFVersion($version='1.7') {
 		if ($this->pdfa_mode && $this->pdfa_version == 1 ) {
-			// PDF/A mode
+			// PDF/A-1 mode
 			$this->PDFVersion = '1.4';
-		} else {
+		} elseif ($this->pdfa_mode && $this->pdfa_version >= 2 ) {
+            // PDF/A-2 mode
+            $this->PDFVersion = '1.7';
+        } else {
 			$this->PDFVersion = $version;
 		}
 	}
@@ -14061,7 +14123,7 @@ class TCPDF {
 	 * Set the viewer preferences dictionary controlling the way the document is to be presented on the screen or in print.
 	 * (see Section 8.1 of PDF reference, "Viewer Preferences").
 	 * <ul><li>HideToolbar boolean (Optional) A flag specifying whether to hide the viewer application's tool bars when the document is active. Default value: false.</li><li>HideMenubar boolean (Optional) A flag specifying whether to hide the viewer application's menu bar when the document is active. Default value: false.</li><li>HideWindowUI boolean (Optional) A flag specifying whether to hide user interface elements in the document's window (such as scroll bars and navigation controls), leaving only the document's contents displayed. Default value: false.</li><li>FitWindow boolean (Optional) A flag specifying whether to resize the document's window to fit the size of the first displayed page. Default value: false.</li><li>CenterWindow boolean (Optional) A flag specifying whether to position the document's window in the center of the screen. Default value: false.</li><li>DisplayDocTitle boolean (Optional; PDF 1.4) A flag specifying whether the window's title bar should display the document title taken from the Title entry of the document information dictionary (see Section 10.2.1, "Document Information Dictionary"). If false, the title bar should instead display the name of the PDF file containing the document. Default value: false.</li><li>NonFullScreenPageMode name (Optional) The document's page mode, specifying how to display the document on exiting full-screen mode:<ul><li>UseNone Neither document outline nor thumbnail images visible</li><li>UseOutlines Document outline visible</li><li>UseThumbs Thumbnail images visible</li><li>UseOC Optional content group panel visible</li></ul>This entry is meaningful only if the value of the PageMode entry in the catalog dictionary (see Section 3.6.1, "Document Catalog") is FullScreen; it is ignored otherwise. Default value: UseNone.</li><li>ViewArea name (Optional; PDF 1.4) The name of the page boundary representing the area of a page to be displayed when viewing the document on the screen. Valid values are (see Section 10.10.1, "Page Boundaries").:<ul><li>MediaBox</li><li>CropBox (default)</li><li>BleedBox</li><li>TrimBox</li><li>ArtBox</li></ul></li><li>ViewClip name (Optional; PDF 1.4) The name of the page boundary to which the contents of a page are to be clipped when viewing the document on the screen. Valid values are (see Section 10.10.1, "Page Boundaries").:<ul><li>MediaBox</li><li>CropBox (default)</li><li>BleedBox</li><li>TrimBox</li><li>ArtBox</li></ul></li><li>PrintArea name (Optional; PDF 1.4) The name of the page boundary representing the area of a page to be rendered when printing the document. Valid values are (see Section 10.10.1, "Page Boundaries").:<ul><li>MediaBox</li><li>CropBox (default)</li><li>BleedBox</li><li>TrimBox</li><li>ArtBox</li></ul></li><li>PrintClip name (Optional; PDF 1.4) The name of the page boundary to which the contents of a page are to be clipped when printing the document. Valid values are (see Section 10.10.1, "Page Boundaries").:<ul><li>MediaBox</li><li>CropBox (default)</li><li>BleedBox</li><li>TrimBox</li><li>ArtBox</li></ul></li><li>PrintScaling name (Optional; PDF 1.6) The page scaling option to be selected when a print dialog is displayed for this document. Valid values are: <ul><li>None, which indicates that the print dialog should reflect no page scaling</li><li>AppDefault (default), which indicates that applications should use the current print scaling</li></ul></li><li>Duplex name (Optional; PDF 1.7) The paper handling option to use when printing the file from the print dialog. The following values are valid:<ul><li>Simplex - Print single-sided</li><li>DuplexFlipShortEdge - Duplex and flip on the short edge of the sheet</li><li>DuplexFlipLongEdge - Duplex and flip on the long edge of the sheet</li></ul>Default value: none</li><li>PickTrayByPDFSize boolean (Optional; PDF 1.7) A flag specifying whether the PDF page size is used to select the input paper tray. This setting influences only the preset values used to populate the print dialog presented by a PDF viewer application. If PickTrayByPDFSize is true, the check box in the print dialog associated with input paper tray is checked. Note: This setting has no effect on Mac OS systems, which do not provide the ability to pick the input tray by size.</li><li>PrintPageRange array (Optional; PDF 1.7) The page numbers used to initialize the print dialog box when the file is printed. The first page of the PDF file is denoted by 1. Each pair consists of the first and last pages in the sub-range. An odd number of integers causes this entry to be ignored. Negative numbers cause the entire array to be ignored. Default value: as defined by PDF viewer application</li><li>NumCopies integer (Optional; PDF 1.7) The number of copies to be printed when the print dialog is opened for this file. Supported values are the integers 2 through 5. Values outside this range are ignored. Default value: as defined by PDF viewer application, but typically 1</li></ul>
-	 * @param $preferences (array) array of options.
+	 * @param array $preferences array of options.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 3.1.000 (2008-06-09)
@@ -14072,13 +14134,13 @@ class TCPDF {
 
 	/**
 	 * Paints color transition registration bars
-	 * @param $x (float) abscissa of the top left corner of the rectangle.
-	 * @param $y (float) ordinate of the top left corner of the rectangle.
-	 * @param $w (float) width of the rectangle.
-	 * @param $h (float) height of the rectangle.
-	 * @param $transition (boolean) if true prints tcolor transitions to white.
-	 * @param $vertical (boolean) if true prints bar vertically.
-	 * @param $colors (string) colors to print separated by comma. Valid values are: A,W,R,G,B,C,M,Y,K,RGB,CMYK,ALL,ALLSPOT,<SPOT_COLOR_NAME>. Where: A = grayscale black, W = grayscale white, R = RGB red, G RGB green, B RGB blue, C = CMYK cyan, M = CMYK magenta, Y = CMYK yellow, K = CMYK key/black, RGB = RGB registration color, CMYK = CMYK registration color, ALL = Spot registration color, ALLSPOT = print all defined spot colors, <SPOT_COLOR_NAME> = name of the spot color to print.
+	 * @param float $x abscissa of the top left corner of the rectangle.
+	 * @param float $y ordinate of the top left corner of the rectangle.
+	 * @param float $w width of the rectangle.
+	 * @param float $h height of the rectangle.
+	 * @param boolean $transition if true prints tcolor transitions to white.
+	 * @param boolean $vertical if true prints bar vertically.
+	 * @param string $colors colors to print separated by comma. Valid values are: A,W,R,G,B,C,M,Y,K,RGB,CMYK,ALL,ALLSPOT,<SPOT_COLOR_NAME>. Where: A = grayscale black, W = grayscale white, R = RGB red, G RGB green, B RGB blue, C = CMYK cyan, M = CMYK magenta, Y = CMYK yellow, K = CMYK key/black, RGB = RGB registration color, CMYK = CMYK registration color, ALL = Spot registration color, ALLSPOT = print all defined spot colors, <SPOT_COLOR_NAME> = name of the spot color to print.
 	 * @author Nicola Asuni
 	 * @since 4.9.000 (2010-03-26)
 	 * @public
@@ -14201,7 +14263,7 @@ class TCPDF {
 					// color gradient
 					$this->LinearGradient($xb, $yb, $wb, $hb, $col_a, $col_b, $coords);
 				} else {
-					$this->SetFillColorArray($col_b);
+					$this->setFillColorArray($col_b);
 					// colored rectangle
 					$this->Rect($xb, $yb, $wb, $hb, 'F', array());
 				}
@@ -14213,18 +14275,18 @@ class TCPDF {
 
 	/**
 	 * Paints crop marks.
-	 * @param $x (float) abscissa of the crop mark center.
-	 * @param $y (float) ordinate of the crop mark center.
-	 * @param $w (float) width of the crop mark.
-	 * @param $h (float) height of the crop mark.
-	 * @param $type (string) type of crop mark, one symbol per type separated by comma: T = TOP, F = BOTTOM, L = LEFT, R = RIGHT, TL = A = TOP-LEFT, TR = B = TOP-RIGHT, BL = C = BOTTOM-LEFT, BR = D = BOTTOM-RIGHT.
-	 * @param $color (array) crop mark color (default spot registration color).
+	 * @param float $x abscissa of the crop mark center.
+	 * @param float $y ordinate of the crop mark center.
+	 * @param float $w width of the crop mark.
+	 * @param float $h height of the crop mark.
+	 * @param string $type type of crop mark, one symbol per type separated by comma: T = TOP, F = BOTTOM, L = LEFT, R = RIGHT, TL = A = TOP-LEFT, TR = B = TOP-RIGHT, BL = C = BOTTOM-LEFT, BR = D = BOTTOM-RIGHT.
+	 * @param array $color crop mark color (default spot registration color).
 	 * @author Nicola Asuni
 	 * @since 4.9.000 (2010-03-26)
 	 * @public
 	 */
 	public function cropMark($x, $y, $w, $h, $type='T,R,B,L', $color=array(100,100,100,100,'All')) {
-		$this->SetLineStyle(array('width' => (0.5 / $this->k), 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $color));
+		$this->setLineStyle(array('width' => (0.5 / $this->k), 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $color));
 		$type = strtoupper($type);
 		$type = preg_replace('/[^A-Z\-\,]*/', '', $type);
 		// split type in single components
@@ -14284,28 +14346,28 @@ class TCPDF {
 
 	/**
 	 * Paints a registration mark
-	 * @param $x (float) abscissa of the registration mark center.
-	 * @param $y (float) ordinate of the registration mark center.
-	 * @param $r (float) radius of the crop mark.
-	 * @param $double (boolean) if true print two concentric crop marks.
-	 * @param $cola (array) crop mark color (default spot registration color 'All').
-	 * @param $colb (array) second crop mark color (default spot registration color 'None').
+	 * @param float $x abscissa of the registration mark center.
+	 * @param float $y ordinate of the registration mark center.
+	 * @param float $r radius of the crop mark.
+	 * @param boolean $double if true print two concentric crop marks.
+	 * @param array $cola crop mark color (default spot registration color 'All').
+	 * @param array $colb second crop mark color (default spot registration color 'None').
 	 * @author Nicola Asuni
 	 * @since 4.9.000 (2010-03-26)
 	 * @public
 	 */
 	public function registrationMark($x, $y, $r, $double=false, $cola=array(100,100,100,100,'All'), $colb=array(0,0,0,0,'None')) {
 		$line_style = array('width' => max((0.5 / $this->k),($r / 30)), 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => $cola);
-		$this->SetFillColorArray($cola);
+		$this->setFillColorArray($cola);
 		$this->PieSector($x, $y, $r, 90, 180, 'F');
 		$this->PieSector($x, $y, $r, 270, 360, 'F');
 		$this->Circle($x, $y, $r, 0, 360, 'C', $line_style, array(), 8);
 		if ($double) {
 			$ri = $r * 0.5;
-			$this->SetFillColorArray($colb);
+			$this->setFillColorArray($colb);
 			$this->PieSector($x, $y, $ri, 90, 180, 'F');
 			$this->PieSector($x, $y, $ri, 270, 360, 'F');
-			$this->SetFillColorArray($cola);
+			$this->setFillColorArray($cola);
 			$this->PieSector($x, $y, $ri, 0, 90, 'F');
 			$this->PieSector($x, $y, $ri, 180, 270, 'F');
 			$this->Circle($x, $y, $ri, 0, 360, 'C', $line_style, array(), 8);
@@ -14314,9 +14376,9 @@ class TCPDF {
 
 	/**
 	 * Paints a CMYK registration mark
-	 * @param $x (float) abscissa of the registration mark center.
-	 * @param $y (float) ordinate of the registration mark center.
-	 * @param $r (float) radius of the crop mark.
+	 * @param float $x abscissa of the registration mark center.
+	 * @param float $y ordinate of the registration mark center.
+	 * @param float $r radius of the crop mark.
 	 * @author Nicola Asuni
 	 * @since 6.0.038 (2013-09-30)
 	 * @public
@@ -14329,20 +14391,20 @@ class TCPDF {
 		// external radius
 		$re = ($r * 1.3);
 		// Cyan
-		$this->SetFillColorArray(array(100,0,0,0));
+		$this->setFillColorArray(array(100,0,0,0));
 		$this->PieSector($x, $y, $ri, 270, 360, 'F');
 		// Magenta
-		$this->SetFillColorArray(array(0,100,0,0));
+		$this->setFillColorArray(array(0,100,0,0));
 		$this->PieSector($x, $y, $ri, 0, 90, 'F');
 		// Yellow
-		$this->SetFillColorArray(array(0,0,100,0));
+		$this->setFillColorArray(array(0,0,100,0));
 		$this->PieSector($x, $y, $ri, 90, 180, 'F');
 		// Key - black
-		$this->SetFillColorArray(array(0,0,0,100));
+		$this->setFillColorArray(array(0,0,0,100));
 		$this->PieSector($x, $y, $ri, 180, 270, 'F');
 		// registration color
 		$line_style = array('width' => $lw, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(100,100,100,100,'All'));
-		$this->SetFillColorArray(array(100,100,100,100,'All'));
+		$this->setFillColorArray(array(100,100,100,100,'All'));
 		// external circle
 		$this->Circle($x, $y, $r, 0, 360, 'C', $line_style, array(), 8);
 		// cross lines
@@ -14354,13 +14416,13 @@ class TCPDF {
 
 	/**
 	 * Paints a linear colour gradient.
-	 * @param $x (float) abscissa of the top left corner of the rectangle.
-	 * @param $y (float) ordinate of the top left corner of the rectangle.
-	 * @param $w (float) width of the rectangle.
-	 * @param $h (float) height of the rectangle.
-	 * @param $col1 (array) first color (Grayscale, RGB or CMYK components).
-	 * @param $col2 (array) second color (Grayscale, RGB or CMYK components).
-	 * @param $coords (array) array of the form (x1, y1, x2, y2) which defines the gradient vector (see linear_gradient_coords.jpg). The default value is from left to right (x1=0, y1=0, x2=1, y2=0).
+	 * @param float $x abscissa of the top left corner of the rectangle.
+	 * @param float $y ordinate of the top left corner of the rectangle.
+	 * @param float $w width of the rectangle.
+	 * @param float $h height of the rectangle.
+	 * @param array $col1 first color (Grayscale, RGB or CMYK components).
+	 * @param array $col2 second color (Grayscale, RGB or CMYK components).
+	 * @param array $coords array of the form (x1, y1, x2, y2) which defines the gradient vector (see linear_gradient_coords.jpg). The default value is from left to right (x1=0, y1=0, x2=1, y2=0).
 	 * @author Andreas W\FCrmser, Nicola Asuni
 	 * @since 3.1.000 (2008-06-09)
 	 * @public
@@ -14372,13 +14434,13 @@ class TCPDF {
 
 	/**
 	 * Paints a radial colour gradient.
-	 * @param $x (float) abscissa of the top left corner of the rectangle.
-	 * @param $y (float) ordinate of the top left corner of the rectangle.
-	 * @param $w (float) width of the rectangle.
-	 * @param $h (float) height of the rectangle.
-	 * @param $col1 (array) first color (Grayscale, RGB or CMYK components).
-	 * @param $col2 (array) second color (Grayscale, RGB or CMYK components).
-	 * @param $coords (array) array of the form (fx, fy, cx, cy, r) where (fx, fy) is the starting point of the gradient with color1, (cx, cy) is the center of the circle with color2, and r is the radius of the circle (see radial_gradient_coords.jpg). (fx, fy) should be inside the circle, otherwise some areas will not be defined.
+	 * @param float $x abscissa of the top left corner of the rectangle.
+	 * @param float $y ordinate of the top left corner of the rectangle.
+	 * @param float $w width of the rectangle.
+	 * @param float $h height of the rectangle.
+	 * @param array $col1 first color (Grayscale, RGB or CMYK components).
+	 * @param array $col2 second color (Grayscale, RGB or CMYK components).
+	 * @param array $coords array of the form (fx, fy, cx, cy, r) where (fx, fy) is the starting point of the gradient with color1, (cx, cy) is the center of the circle with color2, and r is the radius of the circle (see radial_gradient_coords.jpg). (fx, fy) should be inside the circle, otherwise some areas will not be defined.
 	 * @author Andreas W\FCrmser, Nicola Asuni
 	 * @since 3.1.000 (2008-06-09)
 	 * @public
@@ -14390,24 +14452,24 @@ class TCPDF {
 
 	/**
 	 * Paints a coons patch mesh.
-	 * @param $x (float) abscissa of the top left corner of the rectangle.
-	 * @param $y (float) ordinate of the top left corner of the rectangle.
-	 * @param $w (float) width of the rectangle.
-	 * @param $h (float) height of the rectangle.
-	 * @param $col1 (array) first color (lower left corner) (RGB components).
-	 * @param $col2 (array) second color (lower right corner) (RGB components).
-	 * @param $col3 (array) third color (upper right corner) (RGB components).
-	 * @param $col4 (array) fourth color (upper left corner) (RGB components).
-	 * @param $coords (array) <ul><li>for one patch mesh: array(float x1, float y1, .... float x12, float y12): 12 pairs of coordinates (normally from 0 to 1) which specify the Bezier control points that define the patch. First pair is the lower left edge point, next is its right control point (control point 2). Then the other points are defined in the order: control point 1, edge point, control point 2 going counter-clockwise around the patch. Last (x12, y12) is the first edge point's left control point (control point 1).</li><li>for two or more patch meshes: array[number of patches]: arrays with the following keys for each patch: f: where to put that patch (0 = first patch, 1, 2, 3 = right, top and left of precedent patch - I didn't figure this out completely - just try and error ;-) points: 12 pairs of coordinates of the Bezier control points as above for the first patch, 8 pairs of coordinates for the following patches, ignoring the coordinates already defined by the precedent patch (I also didn't figure out the order of these - also: try and see what's happening) colors: must be 4 colors for the first patch, 2 colors for the following patches</li></ul>
-	 * @param $coords_min (array) minimum value used by the coordinates. If a coordinate's value is smaller than this it will be cut to coords_min. default: 0
-	 * @param $coords_max (array) maximum value used by the coordinates. If a coordinate's value is greater than this it will be cut to coords_max. default: 1
-	 * @param $antialias (boolean) A flag indicating whether to filter the shading function to prevent aliasing artifacts.
+	 * @param float $x abscissa of the top left corner of the rectangle.
+	 * @param float $y ordinate of the top left corner of the rectangle.
+	 * @param float $w width of the rectangle.
+	 * @param float $h height of the rectangle.
+	 * @param array $col1 first color (lower left corner) (RGB components).
+	 * @param array $col2 second color (lower right corner) (RGB components).
+	 * @param array $col3 third color (upper right corner) (RGB components).
+	 * @param array $col4 fourth color (upper left corner) (RGB components).
+	 * @param array $coords <ul><li>for one patch mesh: array(float x1, float y1, .... float x12, float y12): 12 pairs of coordinates (normally from 0 to 1) which specify the Bezier control points that define the patch. First pair is the lower left edge point, next is its right control point (control point 2). Then the other points are defined in the order: control point 1, edge point, control point 2 going counter-clockwise around the patch. Last (x12, y12) is the first edge point's left control point (control point 1).</li><li>for two or more patch meshes: array[number of patches]: arrays with the following keys for each patch: f: where to put that patch (0 = first patch, 1, 2, 3 = right, top and left of precedent patch - I didn't figure this out completely - just try and error ;-) points: 12 pairs of coordinates of the Bezier control points as above for the first patch, 8 pairs of coordinates for the following patches, ignoring the coordinates already defined by the precedent patch (I also didn't figure out the order of these - also: try and see what's happening) colors: must be 4 colors for the first patch, 2 colors for the following patches</li></ul>
+	 * @param array $coords_min minimum value used by the coordinates. If a coordinate's value is smaller than this it will be cut to coords_min. default: 0
+	 * @param array $coords_max maximum value used by the coordinates. If a coordinate's value is greater than this it will be cut to coords_max. default: 1
+	 * @param boolean $antialias A flag indicating whether to filter the shading function to prevent aliasing artifacts.
 	 * @author Andreas W\FCrmser, Nicola Asuni
 	 * @since 3.1.000 (2008-06-09)
 	 * @public
 	 */
 	public function CoonsPatchMesh($x, $y, $w, $h, $col1=array(), $col2=array(), $col3=array(), $col4=array(), $coords=array(0.00,0.0,0.33,0.00,0.67,0.00,1.00,0.00,1.00,0.33,1.00,0.67,1.00,1.00,0.67,1.00,0.33,1.00,0.00,1.00,0.00,0.67,0.00,0.33), $coords_min=0, $coords_max=1, $antialias=false) {
-		if ($this->pdfa_mode OR ($this->state != 2)) {
+		if (($this->pdfa_mode && $this->pdfa_version < 2) OR ($this->state != 2)) {
 			return;
 		}
 		$this->Clip($x, $y, $w, $h);
@@ -14467,8 +14529,8 @@ class TCPDF {
 				if ($patch_array[$i]['points'][$j] > $bpcd) {
 					$patch_array[$i]['points'][$j] = $bpcd;
 				}
-				$this->gradients[$n]['stream'] .= chr(floor($patch_array[$i]['points'][$j] / 256));
-				$this->gradients[$n]['stream'] .= chr(floor($patch_array[$i]['points'][$j] % 256));
+				$this->gradients[$n]['stream'] .= chr((int) floor($patch_array[$i]['points'][$j] / 256));
+				$this->gradients[$n]['stream'] .= chr((int) floor(intval($patch_array[$i]['points'][$j]) % 256));
 			}
 			$count_cols = count($patch_array[$i]['colors']);
 			for ($j=0; $j < $count_cols; ++$j) {
@@ -14490,10 +14552,10 @@ class TCPDF {
 
 	/**
 	 * Set a rectangular clipping area.
-	 * @param $x (float) abscissa of the top left corner of the rectangle (or top right corner for RTL mode).
-	 * @param $y (float) ordinate of the top left corner of the rectangle.
-	 * @param $w (float) width of the rectangle.
-	 * @param $h (float) height of the rectangle.
+	 * @param float $x abscissa of the top left corner of the rectangle (or top right corner for RTL mode).
+	 * @param float $y ordinate of the top left corner of the rectangle.
+	 * @param float $w width of the rectangle.
+	 * @param float $h height of the rectangle.
 	 * @author Andreas W\FCrmser, Nicola Asuni
 	 * @since 3.1.000 (2008-06-09)
 	 * @protected
@@ -14516,17 +14578,17 @@ class TCPDF {
 
 	/**
 	 * Output gradient.
-	 * @param $type (int) type of gradient (1 Function-based shading; 2 Axial shading; 3 Radial shading; 4 Free-form Gouraud-shaded triangle mesh; 5 Lattice-form Gouraud-shaded triangle mesh; 6 Coons patch mesh; 7 Tensor-product patch mesh). (Not all types are currently supported)
-	 * @param $coords (array) array of coordinates.
-	 * @param $stops (array) array gradient color components: color = array of GRAY, RGB or CMYK color components; offset = (0 to 1) represents a location along the gradient vector; exponent = exponent of the exponential interpolation function (default = 1).
-	 * @param $background (array) An array of colour components appropriate to the colour space, specifying a single background colour value.
-	 * @param $antialias (boolean) A flag indicating whether to filter the shading function to prevent aliasing artifacts.
+	 * @param int $type type of gradient (1 Function-based shading; 2 Axial shading; 3 Radial shading; 4 Free-form Gouraud-shaded triangle mesh; 5 Lattice-form Gouraud-shaded triangle mesh; 6 Coons patch mesh; 7 Tensor-product patch mesh). (Not all types are currently supported)
+	 * @param array $coords array of coordinates.
+	 * @param array $stops array gradient color components: color = array of GRAY, RGB or CMYK color components; offset = (0 to 1) represents a location along the gradient vector; exponent = exponent of the exponential interpolation function (default = 1).
+	 * @param array $background An array of colour components appropriate to the colour space, specifying a single background colour value.
+	 * @param boolean $antialias A flag indicating whether to filter the shading function to prevent aliasing artifacts.
 	 * @author Nicola Asuni
 	 * @since 3.1.000 (2008-06-09)
 	 * @public
 	 */
 	public function Gradient($type, $coords, $stops, $background=array(), $antialias=false) {
-		if ($this->pdfa_mode OR ($this->state != 2)) {
+		if (($this->pdfa_mode && $this->pdfa_version < 2) OR ($this->state != 2)) {
 			return;
 		}
 		$n = count($this->gradients) + 1;
@@ -14582,7 +14644,7 @@ class TCPDF {
 			}
 			if (isset($stop['opacity'])) {
 				$this->gradients[$n]['colors'][$key]['opacity'] = $stop['opacity'];
-				if ((!$this->pdfa_mode) AND ($stop['opacity'] < 1)) {
+				if ((!($this->pdfa_mode && $this->pdfa_version < 2)) AND ($stop['opacity'] < 1)) {
 					$this->gradients[$n]['transparency'] = true;
 				}
 			} else {
@@ -14633,7 +14695,7 @@ class TCPDF {
 	 * @protected
 	 */
 	function _putshaders() {
-		if ($this->pdfa_mode) {
+		if ($this->pdfa_mode && $this->pdfa_version < 2) {
 			return;
 		}
 		$idt = count($this->gradients); //index for transparency gradients
@@ -14812,14 +14874,14 @@ class TCPDF {
 	/**
 	 * Draw the sector of a circle.
 	 * It can be used for instance to render pie charts.
-	 * @param $xc (float) abscissa of the center.
-	 * @param $yc (float) ordinate of the center.
-	 * @param $r (float) radius.
-	 * @param $a (float) start angle (in degrees).
-	 * @param $b (float) end angle (in degrees).
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $cw: (float) indicates whether to go clockwise (default: true).
-	 * @param $o: (float) origin of angles (0 for 3 o'clock, 90 for noon, 180 for 9 o'clock, 270 for 6 o'clock). Default: 90.
+	 * @param float $xc abscissa of the center.
+	 * @param float $yc ordinate of the center.
+	 * @param float $r radius.
+	 * @param float $a start angle (in degrees).
+	 * @param float $b end angle (in degrees).
+	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
+	 * @param float $cw indicates whether to go clockwise (default: true).
+	 * @param float $o origin of angles (0 for 3 o'clock, 90 for noon, 180 for 9 o'clock, 270 for 6 o'clock). Default: 90.
 	 * @author Maxime Delorme, Nicola Asuni
 	 * @since 3.1.000 (2008-06-09)
 	 * @public
@@ -14831,16 +14893,16 @@ class TCPDF {
 	/**
 	 * Draw the sector of an ellipse.
 	 * It can be used for instance to render pie charts.
-	 * @param $xc (float) abscissa of the center.
-	 * @param $yc (float) ordinate of the center.
-	 * @param $rx (float) the x-axis radius.
-	 * @param $ry (float) the y-axis radius.
-	 * @param $a (float) start angle (in degrees).
-	 * @param $b (float) end angle (in degrees).
-	 * @param $style (string) Style of rendering. See the getPathPaintOperator() function for more information.
-	 * @param $cw: (float) indicates whether to go clockwise.
-	 * @param $o: (float) origin of angles (0 for 3 o'clock, 90 for noon, 180 for 9 o'clock, 270 for 6 o'clock).
-	 * @param $nc (integer) Number of curves used to draw a 90 degrees portion of arc.
+	 * @param float $xc abscissa of the center.
+	 * @param float $yc ordinate of the center.
+	 * @param float $rx the x-axis radius.
+	 * @param float $ry the y-axis radius.
+	 * @param float $a start angle (in degrees).
+	 * @param float $b end angle (in degrees).
+	 * @param string $style Style of rendering. See the getPathPaintOperator() function for more information.
+	 * @param float $cw indicates whether to go clockwise.
+	 * @param float $o origin of angles (0 for 3 o'clock, 90 for noon, 180 for 9 o'clock, 270 for 6 o'clock).
+	 * @param integer $nc Number of curves used to draw a 90 degrees portion of arc.
 	 * @author Maxime Delorme, Nicola Asuni
 	 * @since 3.1.000 (2008-06-09)
 	 * @public
@@ -14873,23 +14935,23 @@ class TCPDF {
 	 * NOTE: EPS is not yet fully implemented, use the setRasterizeVectorImages() method to enable/disable rasterization of vector images using ImageMagick library.
 	 * Only vector drawing is supported, not text or bitmap.
 	 * Although the script was successfully tested with various AI format versions, best results are probably achieved with files that were exported in the AI3 format (tested with Illustrator CS2, Freehand MX and Photoshop CS2).
-	 * @param $file (string) Name of the file containing the image or a '@' character followed by the EPS/AI data string.
-	 * @param $x (float) Abscissa of the upper-left corner.
-	 * @param $y (float) Ordinate of the upper-left corner.
-	 * @param $w (float) Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param $h (float) Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param $link (mixed) URL or identifier returned by AddLink().
-	 * @param $useBoundingBox (boolean) specifies whether to position the bounding box (true) or the complete canvas (false) at location (x,y). Default value is true.
-	 * @param $align (string) Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-	 * @param $palign (string) Allows to center or align the image on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param $fitonpage (boolean) if true the image is resized to not exceed page dimensions.
-	 * @param $fixoutvals (boolean) if true remove values outside the bounding box.
+	 * @param string $file Name of the file containing the image or a '@' character followed by the EPS/AI data string.
+	 * @param float|null $x Abscissa of the upper-left corner.
+	 * @param float|null $y Ordinate of the upper-left corner.
+	 * @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
+	 * @param float $h Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
+	 * @param mixed $link URL or identifier returned by AddLink().
+	 * @param boolean $useBoundingBox specifies whether to position the bounding box (true) or the complete canvas (false) at location (x,y). Default value is true.
+	 * @param string $align Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
+	 * @param string $palign Allows to center or align the image on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
+	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
+	 * @param boolean $fitonpage if true the image is resized to not exceed page dimensions.
+	 * @param boolean $fixoutvals if true remove values outside the bounding box.
 	 * @author Valentin Schmidt, Nicola Asuni
 	 * @since 3.1.000 (2008-06-09)
 	 * @public
 	 */
-	public function ImageEps($file, $x='', $y='', $w=0, $h=0, $link='', $useBoundingBox=true, $align='', $palign='', $border=0, $fitonpage=false, $fixoutvals=false) {
+	public function ImageEps($file, $x=null, $y=null, $w=0, $h=0, $link='', $useBoundingBox=true, $align='', $palign='', $border=0, $fitonpage=false, $fixoutvals=false) {
 		if ($this->state != 2) {
 			 return;
 		}
@@ -14897,10 +14959,10 @@ class TCPDF {
 			// convert EPS to raster image using GD or ImageMagick libraries
 			return $this->Image($file, $x, $y, $w, $h, 'EPS', $link, $align, true, 300, $palign, false, false, $border, false, false, $fitonpage);
 		}
-		if ($x === '') {
+		if (TCPDF_STATIC::empty_string($x)) {
 			$x = $this->x;
 		}
-		if ($y === '') {
+		if (TCPDF_STATIC::empty_string($y)) {
 			$y = $this->y;
 		}
 		// check page for no-write regions and adapt page margins if necessary
@@ -14909,7 +14971,7 @@ class TCPDF {
 		if ($file[0] === '@') { // image from string
 			$data = substr($file, 1);
 		} else { // EPS/AI file
-			$data = TCPDF_STATIC::fileGetContents($file);
+            $data = $this->getCachedFileContents($file);
 		}
 		if ($data === FALSE) {
 			$this->Error('EPS file not found: '.$file);
@@ -15193,7 +15255,7 @@ class TCPDF {
 				break;
 			}
 			case 'N':{
-				$this->SetY($this->img_rb_y);
+				$this->setY($this->img_rb_y);
 				break;
 			}
 			default:{
@@ -15205,7 +15267,7 @@ class TCPDF {
 
 	/**
 	 * Set document barcode.
-	 * @param $bc (string) barcode
+	 * @param string $bc barcode
 	 * @public
 	 */
 	public function setBarcode($bc='') {
@@ -15224,14 +15286,14 @@ class TCPDF {
 
 	/**
 	 * Print a Linear Barcode.
-	 * @param $code (string) code to print
-	 * @param $type (string) type of barcode (see tcpdf_barcodes_1d.php for supported formats).
-	 * @param $x (int) x position in user units (empty string = current x position)
-	 * @param $y (int) y position in user units (empty string = current y position)
-	 * @param $w (int) width in user units (empty string = remaining page width)
-	 * @param $h (int) height in user units (empty string = remaining page height)
-	 * @param $xres (float) width of the smallest bar in user units (empty string = default value = 0.4mm)
-	 * @param $style (array) array of options:<ul>
+	 * @param string $code code to print
+	 * @param string $type type of barcode (see tcpdf_barcodes_1d.php for supported formats).
+	 * @param float|null $x x position in user units (null = current x position)
+	 * @param float|null $y y position in user units (null = current y position)
+	 * @param float|null $w width in user units (null = remaining page width)
+	 * @param float|null $h height in user units (null = remaining page height)
+	 * @param float|null $xres width of the smallest bar in user units (null = default value = 0.4mm)
+	 * @param array $style array of options:<ul>
 	 * <li>boolean $style['border'] if true prints a border</li>
 	 * <li>int $style['padding'] padding to leave around the barcode in user units (set to 'auto' for automatic padding)</li>
 	 * <li>int $style['hpadding'] horizontal padding in user units (set to 'auto' for automatic padding)</li>
@@ -15247,12 +15309,12 @@ class TCPDF {
 	 * <li>string $style['stretch'] if true stretch the barcode to best fit the available width, otherwise uses $xres resolution for a single bar.</li>
 	 * <li>string $style['fitwidth'] if true reduce the width to fit the barcode width + padding. When this option is enabled the 'stretch' option is automatically disabled.</li>
 	 * <li>string $style['cellfitalign'] this option works only when 'fitwidth' is true and 'position' is unset or empty. Set the horizontal position of the containing barcode cell inside the specified rectangle: L = left; C = center; R = right.</li></ul>
-	 * @param $align (string) Indicates the alignment of the pointer next to barcode insertion relative to barcode height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
+	 * @param string $align Indicates the alignment of the pointer next to barcode insertion relative to barcode height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
 	 * @author Nicola Asuni
 	 * @since 3.1.000 (2008-06-09)
 	 * @public
 	 */
-	public function write1DBarcode($code, $type, $x='', $y='', $w='', $h='', $xres='', $style=array(), $align='') {
+	public function write1DBarcode($code, $type, $x=null, $y=null, $w=null, $h=null, $xres=null, $style=array(), $align='') {
 		if (TCPDF_STATIC::empty_string(trim($code))) {
 			return;
 		}
@@ -15262,7 +15324,7 @@ class TCPDF {
 		// create new barcode object
 		$barcodeobj = new TCPDFBarcode($code, $type);
 		$arrcode = $barcodeobj->getBarcodeArray();
-		if (($arrcode === false) OR empty($arrcode) OR ($arrcode['maxw'] <= 0)) {
+		if (empty($arrcode) OR ($arrcode['maxw'] <= 0)) {
 			$this->Error('Error in 1D barcode string');
 		}
 		if ($arrcode['maxh'] <= 0) {
@@ -15311,20 +15373,20 @@ class TCPDF {
 			if (isset($style['fontsize'])) {
 				$fontsize = $style['fontsize'];
 			}
-			$this->SetFont($style['font'], '', $fontsize);
+			$this->setFont($style['font'], '', $fontsize);
 		}
 		if (!isset($style['stretchtext'])) {
 			$style['stretchtext'] = 4;
 		}
-		if ($x === '') {
+		if (TCPDF_STATIC::empty_string($x)) {
 			$x = $this->x;
 		}
-		if ($y === '') {
+		if (TCPDF_STATIC::empty_string($y)) {
 			$y = $this->y;
 		}
 		// check page for no-write regions and adapt page margins if necessary
 		list($x, $y) = $this->checkPageRegions($h, $x, $y);
-		if (($w === '') OR ($w <= 0)) {
+		if (TCPDF_STATIC::empty_string($w) OR ($w <= 0)) {
 			if ($this->rtl) {
 				$w = $x - $this->lMargin;
 			} else {
@@ -15408,7 +15470,7 @@ class TCPDF {
 		}
 		$text_height = $this->getCellHeight($fontsize / $this->k);
 		// height
-		if (($h === '') OR ($h <= 0)) {
+		if (TCPDF_STATIC::empty_string($h) OR ($h <= 0)) {
 			// set default height
 			$h = (($arrcode['maxw'] * $xres) / 3) + (2 * $vpadding) + $text_height;
 		}
@@ -15418,7 +15480,7 @@ class TCPDF {
 			if ($text_height > $h) {
 				$fontsize = (($h * $this->k) / (4 * $this->cell_height_ratio));
 				$text_height = $this->getCellHeight($fontsize / $this->k);
-				$this->SetFont($style['font'], '', $fontsize);
+				$this->setFont($style['font'], '', $fontsize);
 			}
 			if ($vpadding > 0) {
 				$vpadding = (($h - $text_height) / 4);
@@ -15483,8 +15545,8 @@ class TCPDF {
 			$this->Rect($xpos_rect, $y, $w, $h, 'D');
 		}
 		// set foreground color
-		$this->SetDrawColorArray($style['fgcolor']);
-		$this->SetTextColorArray($style['fgcolor']);
+		$this->setDrawColorArray($style['fgcolor']);
+		$this->setTextColorArray($style['fgcolor']);
 		// print bars
 		foreach ($arrcode['bcode'] as $k => $v) {
 			$bw = ($v['w'] * $xres);
@@ -15510,8 +15572,8 @@ class TCPDF {
 			$this->x = $xpos_text;
 			$this->y = $y + $vpadding + $barh;
 			$cellpadding = $this->cell_padding;
-			$this->SetCellPadding(0);
-			$this->Cell($txtwidth, '', $label, 0, 0, 'C', false, '', $style['stretchtext'], false, 'T', 'T');
+			$this->setCellPadding(0);
+			$this->Cell($txtwidth, 0, $label, 0, 0, 'C', false, '', $style['stretchtext'], false, 'T', 'T');
 			$this->cell_padding = $cellpadding;
 		}
 		// restore original direction
@@ -15536,7 +15598,7 @@ class TCPDF {
 				break;
 			}
 			case 'N':{
-				$this->SetY($this->img_rb_y);
+				$this->setY($this->img_rb_y);
 				break;
 			}
 			default:{
@@ -15548,13 +15610,13 @@ class TCPDF {
 
 	/**
 	 * Print 2D Barcode.
-	 * @param $code (string) code to print
-	 * @param $type (string) type of barcode (see tcpdf_barcodes_2d.php for supported formats).
-	 * @param $x (int) x position in user units
-	 * @param $y (int) y position in user units
-	 * @param $w (int) width in user units
-	 * @param $h (int) height in user units
-	 * @param $style (array) array of options:<ul>
+	 * @param string $code code to print
+	 * @param string $type type of barcode (see tcpdf_barcodes_2d.php for supported formats).
+	 * @param float|null $x x position in user units
+	 * @param float|null $y y position in user units
+	 * @param float|null $w width in user units
+	 * @param float|null $h height in user units
+	 * @param array $style array of options:<ul>
 	 * <li>boolean $style['border'] if true prints a border around the barcode</li>
 	 * <li>int $style['padding'] padding to leave around the barcode in barcode units (set to 'auto' for automatic padding)</li>
 	 * <li>int $style['hpadding'] horizontal padding in barcode units (set to 'auto' for automatic padding)</li>
@@ -15564,13 +15626,13 @@ class TCPDF {
 	 * <li>array $style['fgcolor'] color array for bars and text</li>
 	 * <li>mixed $style['bgcolor'] color array for background or false for transparent</li>
 	 * <li>string $style['position'] barcode position on the page: L = left margin; C = center; R = right margin; S = stretch</li>
-	 * @param $align (string) Indicates the alignment of the pointer next to barcode insertion relative to barcode height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-	 * @param $distort (boolean) if true distort the barcode to fit width and height, otherwise preserve aspect ratio
+	 * @param string $align Indicates the alignment of the pointer next to barcode insertion relative to barcode height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
+	 * @param boolean $distort if true distort the barcode to fit width and height, otherwise preserve aspect ratio
 	 * @author Nicola Asuni
 	 * @since 4.5.037 (2009-04-07)
 	 * @public
 	 */
-	public function write2DBarcode($code, $type, $x='', $y='', $w='', $h='', $style=array(), $align='', $distort=false) {
+	public function write2DBarcode($code, $type, $x=null, $y=null, $w=null, $h=null, $style=array(), $align='', $distort=false) {
 		if (TCPDF_STATIC::empty_string(trim($code))) {
 			return;
 		}
@@ -15580,7 +15642,7 @@ class TCPDF {
 		// create new barcode object
 		$barcodeobj = new TCPDF2DBarcode($code, $type);
 		$arrcode = $barcodeobj->getBarcodeArray();
-		if (($arrcode === false) OR empty($arrcode) OR !isset($arrcode['num_rows']) OR ($arrcode['num_rows'] == 0) OR !isset($arrcode['num_cols']) OR ($arrcode['num_cols'] == 0)) {
+		if (empty($arrcode) OR !isset($arrcode['num_rows']) OR ($arrcode['num_rows'] == 0) OR !isset($arrcode['num_cols']) OR ($arrcode['num_cols'] == 0)) {
 			$this->Error('Error in 2D barcode string');
 		}
 		// set default values
@@ -15621,10 +15683,10 @@ class TCPDF {
 		if (!isset($style['module_height'])) {
 			$style['module_height'] = 1; // height of a single module in points
 		}
-		if ($x === '') {
+		if (TCPDF_STATIC::empty_string($x)) {
 			$x = $this->x;
 		}
-		if ($y === '') {
+		if (TCPDF_STATIC::empty_string($y)) {
 			$y = $this->y;
 		}
 		// check page for no-write regions and adapt page margins if necessary
@@ -15666,7 +15728,7 @@ class TCPDF {
 			$h = $maxh;
 		}
 		// set dimensions
-		if ((($w === '') OR ($w <= 0)) AND (($h === '') OR ($h <= 0))) {
+		if ((TCPDF_STATIC::empty_string($w) OR ($w <= 0)) AND (TCPDF_STATIC::empty_string($h) OR ($h <= 0))) {
 			$w = ($cols + $hpad) * ($mw / $this->k);
 			$h = ($rows + $vpad) * ($mh / $this->k);
 		} elseif (($w === '') OR ($w <= 0)) {
@@ -15733,7 +15795,7 @@ class TCPDF {
 			$this->Rect($xpos, $y, $w, $h, 'D');
 		}
 		// set foreground color
-		$this->SetDrawColorArray($style['fgcolor']);
+		$this->setDrawColorArray($style['fgcolor']);
 		// print barcode cells
 		// for each row
 		for ($r = 0; $r < $rows; ++$r) {
@@ -15770,7 +15832,7 @@ class TCPDF {
 				break;
 			}
 			case 'N':{
-				$this->SetY($this->img_rb_y);
+				$this->setY($this->img_rb_y);
 				break;
 			}
 			default:{
@@ -15836,7 +15898,7 @@ class TCPDF {
 
 	/**
 	 * Returns the current font size.
-	 * @return current font size
+	 * @return float current font size
 	 * @public
 	 * @since 3.2.000 (2008-06-23)
 	 */
@@ -15846,7 +15908,7 @@ class TCPDF {
 
 	/**
 	 * Returns the current font size in points unit.
-	 * @return current font size in points unit
+	 * @return int current font size in points unit
 	 * @public
 	 * @since 3.2.000 (2008-06-23)
 	 */
@@ -15876,23 +15938,23 @@ class TCPDF {
 
 	/**
 	 * Cleanup HTML code (requires HTML Tidy library).
-	 * @param $html (string) htmlcode to fix
-	 * @param $default_css (string) CSS commands to add
-	 * @param $tagvs (array) parameters for setHtmlVSpace method
-	 * @param $tidy_options (array) options for tidy_parse_string function
+	 * @param string $html htmlcode to fix
+	 * @param string $default_css CSS commands to add
+	 * @param array|null $tagvs parameters for setHtmlVSpace method
+	 * @param array|null $tidy_options options for tidy_parse_string function
 	 * @return string XHTML code cleaned up
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 5.9.017 (2010-11-16)
 	 * @see setHtmlVSpace()
 	 */
-	public function fixHTMLCode($html, $default_css='', $tagvs='', $tidy_options='') {
+	public function fixHTMLCode($html, $default_css='', $tagvs=null, $tidy_options=null) {
 		return TCPDF_STATIC::fixHTMLCode($html, $default_css, $tagvs, $tidy_options, $this->tagvspaces);
 	}
 
 	/**
 	 * Returns the border width from CSS property
-	 * @param $width (string) border width
+	 * @param string $width border width
 	 * @return int with in user units
 	 * @protected
 	 * @since 5.7.000 (2010-08-02)
@@ -15912,7 +15974,7 @@ class TCPDF {
 
 	/**
 	 * Returns the border dash style from CSS property
-	 * @param $style (string) border style to convert
+	 * @param string $style border style to convert
 	 * @return int sash style (return -1 in case of none or hidden border)
 	 * @protected
 	 * @since 5.7.000 (2010-08-02)
@@ -15948,7 +16010,7 @@ class TCPDF {
 
 	/**
 	 * Returns the border style array from CSS border properties
-	 * @param $cssborder (string) border properties
+	 * @param string $cssborder border properties
 	 * @return array containing border properties
 	 * @protected
 	 * @since 5.7.000 (2010-08-02)
@@ -15998,8 +16060,8 @@ class TCPDF {
 
 	/**
 	 * Get the internal Cell padding from CSS attribute.
-	 * @param $csspadding (string) padding properties
-	 * @param $width (float) width of the containing element
+	 * @param string $csspadding padding properties
+	 * @param float $width width of the containing element
 	 * @return array of cell paddings
 	 * @public
 	 * @since 5.9.000 (2010-10-04)
@@ -16052,8 +16114,8 @@ class TCPDF {
 
 	/**
 	 * Get the internal Cell margin from CSS attribute.
-	 * @param $cssmargin (string) margin properties
-	 * @param $width (float) width of the containing element
+	 * @param string $cssmargin margin properties
+	 * @param float $width width of the containing element
 	 * @return array of cell margins
 	 * @public
 	 * @since 5.9.000 (2010-10-04)
@@ -16106,8 +16168,8 @@ class TCPDF {
 
 	/**
 	 * Get the border-spacing from CSS attribute.
-	 * @param $cssbspace (string) border-spacing CSS properties
-	 * @param $width (float) width of the containing element
+	 * @param string $cssbspace border-spacing CSS properties
+	 * @param float $width width of the containing element
 	 * @return array of border spacings
 	 * @public
 	 * @since 5.9.010 (2010-10-27)
@@ -16140,8 +16202,8 @@ class TCPDF {
 
 	/**
 	 * Returns the letter-spacing value from CSS value
-	 * @param $spacing (string) letter-spacing value
-	 * @param $parent (float) font spacing (tracking) value of the parent element
+	 * @param string $spacing letter-spacing value
+	 * @param float $parent font spacing (tracking) value of the parent element
 	 * @return float quantity to increases or decreases the space between characters in a text.
 	 * @protected
 	 * @since 5.9.000 (2010-10-02)
@@ -16171,8 +16233,8 @@ class TCPDF {
 
 	/**
 	 * Returns the percentage of font stretching from CSS value
-	 * @param $stretch (string) stretch mode
-	 * @param $parent (float) stretch value of the parent element
+	 * @param string $stretch stretch mode
+	 * @param float $parent stretch value of the parent element
 	 * @return float font stretching percentage
 	 * @protected
 	 * @since 5.9.000 (2010-10-02)
@@ -16242,10 +16304,10 @@ class TCPDF {
 
 	/**
 	 * Convert HTML string containing font size value to points
-	 * @param $val (string) String containing font size value and unit.
-	 * @param $refsize (float) Reference font size in points.
-	 * @param $parent_size (float) Parent font size in points.
-	 * @param $defaultunit (string) Default unit (can be one of the following: %, em, ex, px, in, mm, pc, pt).
+	 * @param string $val String containing font size value and unit.
+	 * @param float $refsize Reference font size in points.
+	 * @param float $parent_size Parent font size in points.
+	 * @param string $defaultunit Default unit (can be one of the following: %, em, ex, px, in, mm, pc, pt).
 	 * @return float value in points
 	 * @public
 	 */
@@ -16298,7 +16360,7 @@ class TCPDF {
 
 	/**
 	 * Returns the HTML DOM array.
-	 * @param $html (string) html code
+	 * @param string $html html code
 	 * @return array
 	 * @protected
 	 * @since 3.2.000 (2008-06-20)
@@ -16308,15 +16370,15 @@ class TCPDF {
 		$css = array();
 		// get CSS array defined at previous call
 		$matches = array();
-		if (preg_match_all('/<cssarray>([^\<]*)<\/cssarray>/isU', $html, $matches) > 0) {
+		if (preg_match_all('/<cssarray>([^\<]*?)<\/cssarray>/is', $html, $matches) > 0) {
 			if (isset($matches[1][0])) {
 				$css = array_merge($css, json_decode($this->unhtmlentities($matches[1][0]), true));
 			}
-			$html = preg_replace('/<cssarray>(.*?)<\/cssarray>/isU', '', $html);
+			$html = preg_replace('/<cssarray>(.*?)<\/cssarray>/is', '', $html);
 		}
 		// extract external CSS files
 		$matches = array();
-		if (preg_match_all('/<link([^\>]*)>/isU', $html, $matches) > 0) {
+		if (preg_match_all('/<link([^\>]*?)>/is', $html, $matches) > 0) {
 			foreach ($matches[1] as $key => $link) {
 				$type = array();
 				if (preg_match('/type[\s]*=[\s]*"text\/css"/', $link, $type)) {
@@ -16328,7 +16390,7 @@ class TCPDF {
 						$type = array();
 						if (preg_match('/href[\s]*=[\s]*"([^"]*)"/', $link, $type) > 0) {
 							// read CSS data file
-							$cssdata = TCPDF_STATIC::fileGetContents(trim($type[1]));
+                            $cssdata = $this->getCachedFileContents(trim($type[1]));
 							if (($cssdata !== FALSE) AND (strlen($cssdata) > 0)) {
 								$css = array_merge($css, TCPDF_STATIC::extractCSSproperties($cssdata));
 							}
@@ -16339,7 +16401,7 @@ class TCPDF {
 		}
 		// extract style tags
 		$matches = array();
-		if (preg_match_all('/<style([^\>]*)>([^\<]*)<\/style>/isU', $html, $matches) > 0) {
+		if (preg_match_all('/<style([^\>]*?)>([^\<]*?)<\/style>/is', $html, $matches) > 0) {
 			foreach ($matches[1] as $key => $media) {
 				$type = array();
 				preg_match('/media[\s]*=[\s]*"([^"]*)"/', $media, $type);
@@ -16354,8 +16416,8 @@ class TCPDF {
 		// create a special tag to contain the CSS array (used for table content)
 		$csstagarray = '<cssarray>'.htmlentities(json_encode($css)).'</cssarray>';
 		// remove head and style blocks
-		$html = preg_replace('/<head([^\>]*)>(.*?)<\/head>/siU', '', $html);
-		$html = preg_replace('/<style([^\>]*)>([^\<]*)<\/style>/isU', '', $html);
+		$html = preg_replace('/<head([^\>]*?)>(.*?)<\/head>/is', '', $html);
+		$html = preg_replace('/<style([^\>]*?)>([^\<]*?)<\/style>/is', '', $html);
 		// define block tags
 		$blocktags = array('blockquote','br','dd','dl','div','dt','h1','h2','h3','h4','h5','h6','hr','li','ol','p','pre','ul','tcpdf','table','tr','td');
 		// define self-closing tags
@@ -16549,7 +16611,11 @@ class TCPDF {
 						$dom[($dom[$key]['parent'])]['content'] = str_replace('</thead>', '', $dom[($dom[$key]['parent'])]['content']);
 					}
 					// store header rows on a new table
-					if (($dom[$key]['value'] == 'tr') AND ($dom[($dom[$key]['parent'])]['thead'] === true)) {
+					if (
+						($dom[$key]['value'] === 'tr')
+						&& !empty($dom[($dom[$key]['parent'])]['thead'])
+						&& ($dom[($dom[$key]['parent'])]['thead'] === true)
+					) {
 						if (TCPDF_STATIC::empty_string($dom[($dom[($dom[$key]['parent'])]['parent'])]['thead'])) {
 							$dom[($dom[($dom[$key]['parent'])]['parent'])]['thead'] = $csstagarray.$a[$dom[($dom[($dom[$key]['parent'])]['parent'])]['elkey']];
 						}
@@ -16979,10 +17045,20 @@ class TCPDF {
 							// rows on thead block are printed as a separate table
 						} else {
 							$dom[$key]['thead'] = false;
+							$parent = $dom[$key]['parent'];
+
+							if (!isset($dom[$parent]['rows'])) {
+								$dom[$parent]['rows'] = 0;
+							}
 							// store the number of rows on table element
-							++$dom[($dom[$key]['parent'])]['rows'];
+							++$dom[$parent]['rows'];
+
+							if (!isset($dom[$parent]['trids'])) {
+								$dom[$parent]['trids'] = array();
+							}
+
 							// store the TR elements IDs on table element
-							array_push($dom[($dom[$key]['parent'])]['trids'], $key);
+							array_push($dom[$parent]['trids'], $key);
 						}
 					}
 					if (($dom[$key]['value'] == 'th') OR ($dom[$key]['value'] == 'td')) {
@@ -17075,6 +17151,7 @@ class TCPDF {
 							}
 						}
 					}
+					$element = preg_replace("/&NBSP;/i", "&nbsp;", $element);
 				}
 				$dom[$key]['value'] = stripslashes($this->unhtmlentities($element));
 			}
@@ -17101,7 +17178,7 @@ class TCPDF {
 
 	/**
 	 * Return an hash code used to ensure that the serialized data has been generated by this TCPDF instance.
-	 * @param $data (string) serialized data
+	 * @param string $data serialized data
 	 * @return string
 	 * @public static
 	 */
@@ -17111,7 +17188,7 @@ class TCPDF {
 
 	/**
 	 * Serialize an array of parameters to be used with TCPDF tag in HTML code.
-	 * @param $data (array) parameters array
+	 * @param array $data parameters array
 	 * @return string containing serialized data
 	 * @public static
 	 */
@@ -17122,7 +17199,7 @@ class TCPDF {
 
 	/**
 	 * Unserialize parameters to be used with TCPDF tag in HTML code.
-	 * @param $data (string) serialized data
+	 * @param string $data serialized data
 	 * @return array containing unserialized data
 	 * @protected static
 	 */
@@ -17142,18 +17219,18 @@ class TCPDF {
 	 * IMPORTANT: The HTML must be well formatted - try to clean-up it using an application like HTML-Tidy before submitting.
 	 * Supported tags are: a, b, blockquote, br, dd, del, div, dl, dt, em, font, h1, h2, h3, h4, h5, h6, hr, i, img, li, ol, p, pre, small, span, strong, sub, sup, table, tcpdf, td, th, thead, tr, tt, u, ul
 	 * NOTE: all the HTML attributes must be enclosed in double-quote.
-	 * @param $w (float) Cell width. If 0, the cell extends up to the right margin.
-	 * @param $h (float) Cell minimum height. The cell extends automatically if needed.
-	 * @param $x (float) upper-left corner X coordinate
-	 * @param $y (float) upper-left corner Y coordinate
-	 * @param $html (string) html text to print. Default value: empty string.
-	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param $ln (int) Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL language)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>
+	 * @param float $w Cell width. If 0, the cell extends up to the right margin.
+	 * @param float $h Cell minimum height. The cell extends automatically if needed.
+	 * @param float|null $x upper-left corner X coordinate
+	 * @param float|null $y upper-left corner Y coordinate
+	 * @param string $html html text to print. Default value: empty string.
+	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
+	 * @param int $ln Indicates where the current position should go after the call. Possible values are:<ul><li>0: to the right (or left for RTL language)</li><li>1: to the beginning of the next line</li><li>2: below</li></ul>
 Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value: 0.
-	 * @param $fill (boolean) Indicates if the cell background must be painted (true) or transparent (false).
-	 * @param $reseth (boolean) if true reset the last cell height (default true).
-	 * @param $align (string) Allows to center or align the text. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-	 * @param $autopadding (boolean) if true, uses internal padding and automatically adjust it to account for line width.
+	 * @param boolean $fill Indicates if the cell background must be painted (true) or transparent (false).
+	 * @param boolean $reseth if true reset the last cell height (default true).
+	 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
+	 * @param boolean $autopadding if true, uses internal padding and automatically adjust it to account for line width.
 	 * @see Multicell(), writeHTML()
 	 * @public
 	 */
@@ -17166,12 +17243,12 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * IMPORTANT: The HTML must be well formatted - try to clean-up it using an application like HTML-Tidy before submitting.
 	 * Supported tags are: a, b, blockquote, br, dd, del, div, dl, dt, em, font, h1, h2, h3, h4, h5, h6, hr, i, img, li, ol, p, pre, small, span, strong, sub, sup, table, tcpdf, td, th, thead, tr, tt, u, ul
 	 * NOTE: all the HTML attributes must be enclosed in double-quote.
-	 * @param $html (string) text to display
-	 * @param $ln (boolean) if true add a new line after text (default = true)
-	 * @param $fill (boolean) Indicates if the background must be painted (true) or transparent (false).
-	 * @param $reseth (boolean) if true reset the last cell height (default false).
-	 * @param $cell (boolean) if true add the current left (or right for RTL) padding to each Write (default false).
-	 * @param $align (string) Allows to center or align the text. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
+	 * @param string $html text to display
+	 * @param boolean $ln if true add a new line after text (default = true)
+	 * @param boolean $fill Indicates if the background must be painted (true) or transparent (false).
+	 * @param boolean $reseth if true reset the last cell height (default false).
+	 * @param boolean $cell if true add the current left (or right for RTL) padding to each Write (default false).
+	 * @param string $align Allows to center or align the text. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
 	 * @public
 	 */
 	public function writeHTML($html, $ln=true, $fill=false, $reseth=false, $cell=false, $align='') {
@@ -17561,7 +17638,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 							$this->cell_height_ratio = $dom[$key]['line-height'];
 							$fontaligned = true;
 						}
-						$this->SetFont($fontname, $fontstyle, $fontsize);
+						$this->setFont($fontname, $fontstyle, $fontsize);
 						// reset row height
 						$this->resetLastH();
 						$curfontname = $fontname;
@@ -17588,16 +17665,16 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 				// get current position on page buffer
 				$curpos = $this->pagelen[$startlinepage];
 				if (isset($dom[$key]['bgcolor']) AND ($dom[$key]['bgcolor'] !== false)) {
-					$this->SetFillColorArray($dom[$key]['bgcolor']);
+					$this->setFillColorArray($dom[$key]['bgcolor']);
 					$wfill = true;
 				} else {
 					$wfill = $fill | false;
 				}
 				if (isset($dom[$key]['fgcolor']) AND ($dom[$key]['fgcolor'] !== false)) {
-					$this->SetTextColorArray($dom[$key]['fgcolor']);
+					$this->setTextColorArray($dom[$key]['fgcolor']);
 				}
 				if (isset($dom[$key]['strokecolor']) AND ($dom[$key]['strokecolor'] !== false)) {
-					$this->SetDrawColorArray($dom[$key]['strokecolor']);
+					$this->setDrawColorArray($dom[$key]['strokecolor']);
 				}
 				if (isset($dom[$key]['align'])) {
 					$lalign = $dom[$key]['align'];
@@ -18056,9 +18133,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 				if (!($dom[$key]['tag'] AND !$dom[$key]['opening'] AND ($dom[$key]['value'] == 'table')
 					AND (isset($this->emptypagemrk[$this->page]))
 					AND ($this->emptypagemrk[$this->page] == $this->pagelen[$this->page]))) {
-					$this->SetFont($fontname, $fontstyle, $fontsize);
+					$this->setFont($fontname, $fontstyle, $fontsize);
 					if ($wfill) {
-						$this->SetFillColorArray($this->bgcolor);
+						$this->setFillColorArray($this->bgcolor);
 					}
 				}
 			} // end newline
@@ -18358,14 +18435,14 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 			} elseif (strlen($dom[$key]['value']) > 0) {
 				// print list-item
 				if (!TCPDF_STATIC::empty_string($this->lispacer) AND ($this->lispacer != '^')) {
-					$this->SetFont($pfontname, $pfontstyle, $pfontsize);
+					$this->setFont($pfontname, $pfontstyle, $pfontsize);
 					$this->resetLastH();
 					$minstartliney = $this->y;
 					$maxbottomliney = ($startliney + $this->getCellHeight($this->FontSize));
 					if (is_numeric($pfontsize) AND ($pfontsize > 0)) {
 						$this->putHtmlListBullet($this->listnum, $this->lispacer, $pfontsize);
 					}
-					$this->SetFont($curfontname, $curfontstyle, $curfontsize);
+					$this->setFont($curfontname, $curfontstyle, $curfontsize);
 					$this->resetLastH();
 					if (is_numeric($pfontsize) AND ($pfontsize > 0) AND is_numeric($curfontsize) AND ($curfontsize > 0) AND ($pfontsize != $curfontsize)) {
 						$pfontascent = $this->getFontAscent($pfontname, $pfontstyle, $pfontsize);
@@ -18726,10 +18803,10 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Process opening tags.
-	 * @param $dom (array) html dom array
-	 * @param $key (int) current element id
-	 * @param $cell (boolean) if true add the default left (or right if RTL) padding to each new line (default false).
-	 * @return $dom array
+	 * @param array $dom html dom array
+	 * @param int $key current element id
+	 * @param boolean $cell if true add the default left (or right if RTL) padding to each new line (default false).
+	 * @return array $dom
 	 * @protected
 	 */
 	protected function openHTMLTagHandler($dom, $key, $cell) {
@@ -18823,7 +18900,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 				$dom[$key]['old_cell_padding'] = $this->cell_padding;
 				if (isset($tag['attribute']['cellpadding'])) {
 					$pad = $this->getHTMLUnitToUnits($tag['attribute']['cellpadding'], 1, 'px');
-					$this->SetCellPadding($pad);
+					$this->setCellPadding($pad);
 				} elseif (isset($tag['padding'])) {
 					$this->cell_padding = $tag['padding'];
 				}
@@ -18864,9 +18941,37 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 					$hrWidth = $wtmp;
 				}
 				$prevlinewidth = $this->GetLineWidth();
-				$this->SetLineWidth($hrHeight);
-				$this->Line($x, $y, $x + $hrWidth, $y);
-				$this->SetLineWidth($prevlinewidth);
+				$this->setLineWidth($hrHeight);
+
+				$lineStyle = array();
+                    		if (isset($tag['fgcolor'])) {
+		                        $lineStyle['color'] = $tag['fgcolor'];
+                    		}
+
+                    		if (isset($tag['fgcolor'])) {
+                        		$lineStyle['color'] = $tag['fgcolor'];
+                    		}
+
+                    		if (isset($tag['style']['cap'])) {
+                        		$lineStyle['cap'] = $tag['style']['cap'];
+                    		}
+
+                    		if (isset($tag['style']['join'])) {
+                        		$lineStyle['join'] = $tag['style']['join'];
+                    		}
+
+                    		if (isset($tag['style']['dash'])) {
+                        		$lineStyle['dash'] = $tag['style']['dash'];
+                    		}
+
+                    		if (isset($tag['style']['phase'])) {
+                        		$lineStyle['phase'] = $tag['style']['phase'];
+                    		}
+
+				$lineStyle = array_filter($lineStyle);
+
+				$this->Line($x, $y, $x + $hrWidth, $y, $lineStyle);
+				$this->setLineWidth($prevlinewidth);
 				$this->addHTMLVertSpace(max($hbc, ($hrHeight / 2)), 0, $cell, !isset($dom[($key + 1)]));
 				break;
 			}
@@ -18885,7 +18990,11 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 					// data stream
 					$imgsrc = '@'.base64_decode(substr($imgsrc, 1));
 					$type = '';
-				} else {
+				} elseif ( $this->allowLocalFiles && substr($imgsrc, 0, 7) === 'file://') {
+                    // get image type from a local file path
+                    $imgsrc = substr($imgsrc, 7);
+                    $type = TCPDF_IMAGES::getImageFileType($imgsrc);
+                } else {
 					if (($imgsrc[0] === '/') AND !empty($_SERVER['DOCUMENT_ROOT']) AND ($_SERVER['DOCUMENT_ROOT'] != '/')) {
 						// fix image path
 						$findroot = strpos($imgsrc, $_SERVER['DOCUMENT_ROOT']);
@@ -18957,7 +19066,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 								$lnky = 0;
 							}
 							$imglink = $this->AddLink();
-							$this->SetLink($imglink, $lnky, $page);
+							$this->setLink($imglink, $lnky, $page);
 						}
 					}
 				}
@@ -19111,11 +19220,11 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 				break;
 			}
 			case 'sup': {
-				$this->SetXY($this->GetX(), $this->GetY() - ((0.7 * $this->FontSizePt) / $this->k));
+				$this->setXY($this->GetX(), $this->GetY() - ((0.7 * $this->FontSizePt) / $this->k));
 				break;
 			}
 			case 'sub': {
-				$this->SetXY($this->GetX(), $this->GetY() + ((0.3 * $this->FontSizePt) / $this->k));
+				$this->setXY($this->GetX(), $this->GetY() + ((0.3 * $this->FontSizePt) / $this->k));
 				break;
 			}
 			case 'h1':
@@ -19417,11 +19526,11 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Process closing tags.
-	 * @param $dom (array) html dom array
-	 * @param $key (int) current element id
-	 * @param $cell (boolean) if true add the default left (or right if RTL) padding to each new line (default false).
-	 * @param $maxbottomliney (int) maximum y value of current line
-	 * @return $dom array
+	 * @param array $dom html dom array
+	 * @param int $key current element id
+	 * @param boolean $cell if true add the default left (or right if RTL) padding to each new line (default false).
+	 * @param int $maxbottomliney maximum y value of current line
+	 * @return array $dom
 	 * @protected
 	 */
 	protected function closeHTMLTagHandler($dom, $key, $cell, $maxbottomliney=0) {
@@ -19626,7 +19735,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 							$border = $cellpos['border'];
 						}
 						if (isset($cellpos['bgcolor']) AND ($cellpos['bgcolor']) !== false) {
-							$this->SetFillColorArray($cellpos['bgcolor']);
+							$this->setFillColorArray($cellpos['bgcolor']);
 							$fill = true;
 						} else {
 							$fill = false;
@@ -19807,7 +19916,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 					}
 				}
 				if (!$in_table_head) { // we are not inside a thead section
-					$this->cell_padding = $table_el['old_cell_padding'];
+					$this->cell_padding = isset($table_el['old_cell_padding']) ? $table_el['old_cell_padding'] : null;
 					// reset row height
 					$this->resetLastH();
 					if (($this->page == ($this->numpages - 1)) AND ($this->pageopen[$this->numpages])) {
@@ -19843,11 +19952,11 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 				break;
 			}
 			case 'sup': {
-				$this->SetXY($this->GetX(), $this->GetY() + ((0.7 * $parent['fontsize']) / $this->k));
+				$this->setXY($this->GetX(), $this->GetY() + ((0.7 * $parent['fontsize']) / $this->k));
 				break;
 			}
 			case 'sub': {
-				$this->SetXY($this->GetX(), $this->GetY() - ((0.3 * $parent['fontsize']) / $this->k));
+				$this->setXY($this->GetX(), $this->GetY() - ((0.3 * $parent['fontsize']) / $this->k));
 				break;
 			}
 			case 'div': {
@@ -19964,11 +20073,11 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Add vertical spaces if needed.
-	 * @param $hbz (string) Distance between current y and line bottom.
-	 * @param $hb (string) The height of the break.
-	 * @param $cell (boolean) if true add the default left (or right if RTL) padding to each new line (default false).
-	 * @param $firsttag (boolean) set to true when the tag is the first.
-	 * @param $lasttag (boolean) set to true when the tag is the last.
+	 * @param string $hbz Distance between current y and line bottom.
+	 * @param string $hb The height of the break.
+	 * @param boolean $cell if true add the default left (or right if RTL) padding to each new line (default false).
+	 * @param boolean $firsttag set to true when the tag is the first.
+	 * @param boolean $lasttag set to true when the tag is the last.
 	 * @protected
 	 */
 	protected function addHTMLVertSpace($hbz=0, $hb=0, $cell=false, $firsttag=false, $lasttag=false) {
@@ -20008,8 +20117,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Draw an HTML block border and fill
-	 * @param $tag (array) array of tag properties.
-	 * @param $xmax (int) end X coordinate for border.
+	 * @param array $tag array of tag properties.
+	 * @param int $xmax end X coordinate for border.
 	 * @protected
 	 * @since 5.7.000 (2010-08-03)
 	 */
@@ -20035,7 +20144,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 		if (isset($tag['bgcolor']) AND ($tag['bgcolor'] !== false)) {
 			// get background color
 			$old_bgcolor = $this->bgcolor;
-			$this->SetFillColorArray($tag['bgcolor']);
+			$this->setFillColorArray($tag['bgcolor']);
 			$fill = true;
 		}
 		if (!$border AND !$fill) {
@@ -20201,7 +20310,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 		$this->page_regions = $temp_page_regions;
 		if (isset($old_bgcolor)) {
 			// restore background color
-			$this->SetFillColorArray($old_bgcolor);
+			$this->setFillColorArray($old_bgcolor);
 		}
 		// restore pointer position
 		$this->x = $prev_x;
@@ -20211,7 +20320,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Set the default bullet to be used as LI bullet symbol
-	 * @param $symbol (string) character or string to be used (legal values are: '' = automatic, '!' = auto bullet, '#' = auto numbering, 'disc', 'disc', 'circle', 'square', '1', 'decimal', 'decimal-leading-zero', 'i', 'lower-roman', 'I', 'upper-roman', 'a', 'lower-alpha', 'lower-latin', 'A', 'upper-alpha', 'upper-latin', 'lower-greek', 'img|type|width|height|image.ext')
+	 * @param string $symbol character or string to be used (legal values are: '' = automatic, '!' = auto bullet, '#' = auto numbering, 'disc', 'disc', 'circle', 'square', '1', 'decimal', 'decimal-leading-zero', 'i', 'lower-roman', 'I', 'upper-roman', 'a', 'lower-alpha', 'lower-latin', 'A', 'upper-alpha', 'upper-latin', 'lower-greek', 'img|type|width|height|image.ext')
 	 * @public
 	 * @since 4.0.028 (2008-09-26)
 	 */
@@ -20232,13 +20341,13 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Set the booklet mode for double-sided pages.
-	 * @param $booklet (boolean) true set the booklet mode on, false otherwise.
-	 * @param $inner (float) Inner page margin.
-	 * @param $outer (float) Outer page margin.
+	 * @param boolean $booklet true set the booklet mode on, false otherwise.
+	 * @param float $inner Inner page margin.
+	 * @param float $outer Outer page margin.
 	 * @public
 	 * @since 4.2.000 (2008-10-29)
 	 */
-	public function SetBooklet($booklet=true, $inner=-1, $outer=-1) {
+	public function setBooklet($booklet=true, $inner=-1, $outer=-1) {
 		$this->booklet = $booklet;
 		if ($inner >= 0) {
 			$this->lMargin = $inner;
@@ -20250,7 +20359,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Swap the left and right margins.
-	 * @param $reverse (boolean) if true swap left and right margins.
+	 * @param boolean $reverse if true swap left and right margins.
 	 * @protected
 	 * @since 4.2.000 (2008-10-29)
 	 */
@@ -20274,7 +20383,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * the second level contains 0 for opening tags or 1 for closing tags,
 	 * the third level contains the vertical space unit (h) and the number spaces to add (n).
 	 * If the h parameter is not specified, default values are used.
-	 * @param $tagvs (array) array of tags and relative vertical spaces.
+	 * @param array $tagvs array of tags and relative vertical spaces.
 	 * @public
 	 * @since 4.2.001 (2008-10-30)
 	 */
@@ -20284,7 +20393,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Set custom width for list indentation.
-	 * @param $width (float) width of the indentation. Use negative value to disable it.
+	 * @param float $width width of the indentation. Use negative value to disable it.
 	 * @public
 	 * @since 4.2.007 (2008-11-12)
 	 */
@@ -20294,7 +20403,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Set the top/bottom cell sides to be open or closed when the cell cross the page.
-	 * @param $isopen (boolean) if true keeps the top/bottom border open for the cell sides that cross the page.
+	 * @param boolean $isopen if true keeps the top/bottom border open for the cell sides that cross the page.
 	 * @public
 	 * @since 4.2.010 (2008-11-14)
 	 */
@@ -20304,8 +20413,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Set the color and font style for HTML links.
-	 * @param $color (array) RGB array of colors
-	 * @param $fontstyle (string) additional font styles to add
+	 * @param array $color RGB array of colors
+	 * @param string $fontstyle additional font styles to add
 	 * @public
 	 * @since 4.4.003 (2008-12-09)
 	 */
@@ -20316,10 +20425,10 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Convert HTML string containing value and unit of measure to user's units or points.
-	 * @param $htmlval (string) String containing values and unit.
-	 * @param $refsize (string) Reference value in points.
-	 * @param $defaultunit (string) Default unit (can be one of the following: %, em, ex, px, in, mm, pc, pt).
-	 * @param $points (boolean) If true returns points, otherwise returns value in user's units.
+	 * @param string $htmlval String containing values and unit.
+	 * @param string $refsize Reference value in points.
+	 * @param string $defaultunit Default unit (can be one of the following: %, em, ex, px, in, mm, pc, pt).
+	 * @param boolean $points If true returns points, otherwise returns value in user's units.
 	 * @return float value in user's unit or point if $points=true
 	 * @public
 	 * @since 4.4.004 (2008-12-10)
@@ -20402,9 +20511,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Output an HTML list bullet or ordered item symbol
-	 * @param $listdepth (int) list nesting level
-	 * @param $listtype (string) type of list
-	 * @param $size (float) current font size
+	 * @param int $listdepth list nesting level
+	 * @param string $listtype type of list
+	 * @param float $size current font size
 	 * @protected
 	 * @since 4.4.004 (2008-12-10)
 	 */
@@ -20599,9 +20708,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 		$this->x = $tmpx;
 		$this->lispacer = '^';
 		// restore colors
-		$this->SetFillColorArray($bgcolor);
-		$this->SetDrawColorArray($strokecolor);
-		$this->SettextColorArray($color);
+		$this->setFillColorArray($bgcolor);
+		$this->setDrawColorArray($strokecolor);
+		$this->settextColorArray($color);
 	}
 
 	/**
@@ -20666,8 +20775,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Set graphic variables.
-	 * @param $gvars (array) array of graphic variablesto restore
-	 * @param $extended (boolean) if true restore extended graphic variables
+	 * @param array $gvars array of graphic variablesto restore
+	 * @param boolean $extended if true restore extended graphic variables
 	 * @protected
 	 * @since 4.2.010 (2008-11-14)
 	 */
@@ -20727,7 +20836,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 		}
 		$this->_out(''.$this->linestyleWidth.' '.$this->linestyleCap.' '.$this->linestyleJoin.' '.$this->linestyleDash.' '.$this->DrawColor.' '.$this->FillColor.'');
 		if (!TCPDF_STATIC::empty_string($this->FontFamily)) {
-			$this->SetFont($this->FontFamily, $this->FontStyle, $this->FontSizePt);
+			$this->setFont($this->FontFamily, $this->FontStyle, $this->FontSizePt);
 		}
 	}
 
@@ -20749,7 +20858,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Set buffer content (always append data).
-	 * @param $data (string) data
+	 * @param string $data data
 	 * @protected
 	 * @since 4.5.000 (2009-01-02)
 	 */
@@ -20760,7 +20869,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Replace the buffer content
-	 * @param $data (string) data
+	 * @param string $data data
 	 * @protected
 	 * @since 5.5.000 (2010-06-22)
 	 */
@@ -20781,9 +20890,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Set page buffer content.
-	 * @param $page (int) page number
-	 * @param $data (string) page data
-	 * @param $append (boolean) if true append data, false replace.
+	 * @param int $page page number
+	 * @param string $data page data
+	 * @param boolean $append if true append data, false replace.
 	 * @protected
 	 * @since 4.5.000 (2008-12-31)
 	 */
@@ -20802,7 +20911,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Get page buffer content.
-	 * @param $page (int) page number
+	 * @param int $page page number
 	 * @return string page buffer content or false in case of error
 	 * @protected
 	 * @since 4.5.000 (2008-12-31)
@@ -20816,8 +20925,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Set image buffer content.
-	 * @param $image (string) image key
-	 * @param $data (array) image data
+	 * @param string $image image key
+	 * @param array $data image data
 	 * @return int image index number
 	 * @protected
 	 * @since 4.5.000 (2008-12-31)
@@ -20834,9 +20943,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Set image buffer content for a specified sub-key.
-	 * @param $image (string) image key
-	 * @param $key (string) image sub-key
-	 * @param $data (array) image data
+	 * @param string $image image key
+	 * @param string $key image sub-key
+	 * @param array $data image data
 	 * @protected
 	 * @since 4.5.000 (2008-12-31)
 	 */
@@ -20849,8 +20958,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Get image buffer content.
-	 * @param $image (string) image key
-	 * @return string image buffer content or false in case of error
+	 * @param string $image image key
+	 * @return string|false image buffer content or false in case of error
 	 * @protected
 	 * @since 4.5.000 (2008-12-31)
 	 */
@@ -20863,8 +20972,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Set font buffer content.
-	 * @param $font (string) font key
-	 * @param $data (array) font data
+	 * @param string $font font key
+	 * @param array $data font data
 	 * @protected
 	 * @since 4.5.000 (2009-01-02)
 	 */
@@ -20881,9 +20990,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Set font buffer content.
-	 * @param $font (string) font key
-	 * @param $key (string) font sub-key
-	 * @param $data (array) font data
+	 * @param string $font font key
+	 * @param string $key font sub-key
+	 * @param mixed $data font data
 	 * @protected
 	 * @since 4.5.000 (2009-01-02)
 	 */
@@ -20896,8 +21005,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Get font buffer content.
-	 * @param $font (string) font key
-	 * @return string font buffer content or false in case of error
+	 * @param string $font font key
+	 * @return string|false font buffer content or false in case of error
 	 * @protected
 	 * @since 4.5.000 (2009-01-02)
 	 */
@@ -20910,9 +21019,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Move a page to a previous position.
-	 * @param $frompage (int) number of the source page
-	 * @param $topage (int) number of the destination page (must be less than $frompage)
-	 * @return true in case of success, false in case of error.
+	 * @param int $frompage number of the source page
+	 * @param int $topage number of the destination page (must be less than $frompage)
+	 * @return bool true in case of success, false in case of error.
 	 * @public
 	 * @since 4.5.000 (2009-01-02)
 	 */
@@ -21082,8 +21191,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Remove the specified page.
-	 * @param $page (int) page to remove
-	 * @return true in case of success, false in case of error.
+	 * @param int $page page to remove
+	 * @return bool true in case of success, false in case of error.
 	 * @public
 	 * @since 4.6.004 (2009-04-23)
 	 */
@@ -21272,8 +21381,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Clone the specified page to a new page.
-	 * @param $page (int) number of page to copy (0 = current page)
-	 * @return true in case of success, false in case of error.
+	 * @param int $page number of page to copy (0 = current page)
+	 * @return bool true in case of success, false in case of error.
 	 * @public
 	 * @since 4.9.015 (2010-04-20)
 	 */
@@ -21343,18 +21452,18 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * Before calling this method you have to open the page using the addTOCPage() method.
 	 * After calling this method you have to call endTOCPage() to close the TOC page.
 	 * You can override this method to achieve different styles.
-	 * @param $page (int) page number where this TOC should be inserted (leave empty for current page).
-	 * @param $numbersfont (string) set the font for page numbers (please use monospaced font for better alignment).
-	 * @param $filler (string) string used to fill the space between text and page number.
-	 * @param $toc_name (string) name to use for TOC bookmark.
-	 * @param $style (string) Font style for title: B = Bold, I = Italic, BI = Bold + Italic.
-	 * @param $color (array) RGB color array for bookmark title (values from 0 to 255).
+	 * @param int|null $page page number where this TOC should be inserted (leave empty for current page).
+	 * @param string $numbersfont set the font for page numbers (please use monospaced font for better alignment).
+	 * @param string $filler string used to fill the space between text and page number.
+	 * @param string $toc_name name to use for TOC bookmark.
+	 * @param string $style Font style for title: B = Bold, I = Italic, BI = Bold + Italic.
+	 * @param array $color RGB color array for bookmark title (values from 0 to 255).
 	 * @public
 	 * @author Nicola Asuni
 	 * @since 4.5.000 (2009-01-02)
 	 * @see addTOCPage(), endTOCPage(), addHTMLTOC()
 	 */
-	public function addTOC($page='', $numbersfont='', $filler='.', $toc_name='TOC', $style='', $color=array(0,0,0)) {
+	public function addTOC($page=null, $numbersfont='', $filler='.', $toc_name='TOC', $style='', $color=array(0,0,0)) {
 		$fontsize = $this->FontSizePt;
 		$fontfamily = $this->FontFamily;
 		$fontstyle = $this->FontStyle;
@@ -21382,7 +21491,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 				$page = 1;
 			}
 		}
-		$this->SetFont($numbersfont, $fontstyle, $fontsize);
+		$this->setFont($numbersfont, $fontstyle, $fontsize);
 		$numwidth = $this->GetStringWidth('00000');
 		$maxpage = 0; //used for pages on attached documents
 		foreach ($this->outlines as $key => $outline) {
@@ -21398,11 +21507,11 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 				$alignnum = 'R';
 			}
 			if ($outline['l'] == 0) {
-				$this->SetFont($fontfamily, $outline['s'].'B', $fontsize);
+				$this->setFont($fontfamily, $outline['s'].'B', $fontsize);
 			} else {
-				$this->SetFont($fontfamily, $outline['s'], $fontsize - $outline['l']);
+				$this->setFont($fontfamily, $outline['s'], $fontsize - $outline['l']);
 			}
-			$this->SetTextColorArray($outline['c']);
+			$this->setTextColorArray($outline['c']);
 			// check for page break
 			$this->checkPageBreak(2 * $this->getCellHeight($this->FontSize));
 			// set margins and X position
@@ -21422,7 +21531,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 				$current_page = $this->page;
 				$current_column = $this->current_column;
 			}
-			$this->SetX($x_start);
+			$this->setX($x_start);
 			$indent = ($spacer * $outline['l']);
 			if ($this->rtl) {
 				$this->x -= $indent;
@@ -21432,7 +21541,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 				$this->lMargin = $this->x;
 			}
 			$link = $this->AddLink();
-			$this->SetLink($link, $outline['y'], $outline['p']);
+			$this->setLink($link, $outline['y'], $outline['p']);
 			// write the text
 			if ($this->rtl) {
 				$txt = ' '.$outline['t'];
@@ -21445,7 +21554,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 			} else {
 				$tw = $this->w - $this->rMargin - $this->x;
 			}
-			$this->SetFont($numbersfont, $fontstyle, $fontsize);
+			$this->setFont($numbersfont, $fontstyle, $fontsize);
 			if (TCPDF_STATIC::empty_string($page)) {
 				$pagenum = $outline['p'];
 			} else {
@@ -21553,18 +21662,18 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * This method must be called after all Bookmarks were set.
 	 * Before calling this method you have to open the page using the addTOCPage() method.
 	 * After calling this method you have to call endTOCPage() to close the TOC page.
-	 * @param $page (int) page number where this TOC should be inserted (leave empty for current page).
-	 * @param $toc_name (string) name to use for TOC bookmark.
-	 * @param $templates (array) array of html templates. Use: "#TOC_DESCRIPTION#" for bookmark title, "#TOC_PAGE_NUMBER#" for page number.
-	 * @param $correct_align (boolean) if true correct the number alignment (numbers must be in monospaced font like courier and right aligned on LTR, or left aligned on RTL)
-	 * @param $style (string) Font style for title: B = Bold, I = Italic, BI = Bold + Italic.
-	 * @param $color (array) RGB color array for title (values from 0 to 255).
+	 * @param int|null $page page number where this TOC should be inserted (leave empty for current page).
+	 * @param string $toc_name name to use for TOC bookmark.
+	 * @param array $templates array of html templates. Use: "#TOC_DESCRIPTION#" for bookmark title, "#TOC_PAGE_NUMBER#" for page number.
+	 * @param boolean $correct_align if true correct the number alignment (numbers must be in monospaced font like courier and right aligned on LTR, or left aligned on RTL)
+	 * @param string $style Font style for title: B = Bold, I = Italic, BI = Bold + Italic.
+	 * @param array $color RGB color array for title (values from 0 to 255).
 	 * @public
 	 * @author Nicola Asuni
 	 * @since 5.0.001 (2010-05-06)
 	 * @see addTOCPage(), endTOCPage(), addTOC()
 	 */
-	public function addHTMLTOC($page='', $toc_name='TOC', $templates=array(), $correct_align=true, $style='', $color=array(0,0,0)) {
+	public function addHTMLTOC($page=null, $toc_name='TOC', $templates=array(), $correct_align=true, $style='', $color=array(0,0,0)) {
 		$filler = ' ';
 		$prev_htmlLinkColorArray = $this->htmlLinkColorArray;
 		$prev_htmlLinkFontStyle = $this->htmlLinkFontStyle;
@@ -21580,12 +21689,12 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 			$dom = $this->getHtmlDomArray($html);
 			foreach ($dom as $key => $value) {
 				if ($value['value'] == '#TOC_PAGE_NUMBER#') {
-					$this->SetFont($dom[($key - 1)]['fontname']);
+					$this->setFont($dom[($key - 1)]['fontname']);
 					$templates['F'.$level] = $this->isUnicodeFont();
 				}
 			}
 		}
-		$this->SetFont($current_font);
+		$this->setFont($current_font);
 		$maxpage = 0; //used for pages on attached documents
 		foreach ($this->outlines as $key => $outline) {
 			// get HTML template
@@ -21717,27 +21826,37 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	public function commitTransaction() {
 		if (isset($this->objcopy)) {
 			$this->objcopy->_destroy(true, true);
+			/* The unique file_id should not be used during cleanup again */
+			$this->objcopy->file_id = NULL;
 			unset($this->objcopy);
 		}
 	}
 
 	/**
 	 * This method allows to undo the latest transaction by returning the latest saved TCPDF object with startTransaction().
-	 * @param $self (boolean) if true restores current class object to previous state without the need of reassignment via the returned value.
+	 * @param boolean $self if true restores current class object to previous state without the need of reassignment via the returned value.
 	 * @return TCPDF object.
 	 * @public
 	 * @since 4.5.029 (2009-03-19)
 	 */
 	public function rollbackTransaction($self=false) {
 		if (isset($this->objcopy)) {
+			$objcopy = $this->objcopy;
 			$this->_destroy(true, true);
 			if ($self) {
-				$objvars = get_object_vars($this->objcopy);
+				$objvars = get_object_vars($objcopy);
 				foreach ($objvars as $key => $value) {
 					$this->$key = $value;
 				}
+				$objcopy->_destroy(true, true);
+				/* The unique file_id should not be used during cleanup again */
+				$objcopy->file_id = NULL;
+				unset($objcopy);
+				return $this;
 			}
-			return $this->objcopy;
+			/* The unique file_id should not be used during cleanup again */
+			$this->file_id = NULL;
+			return $objcopy;
 		}
 		return $this;
 	}
@@ -21746,13 +21865,13 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Set multiple columns of the same size
-	 * @param $numcols (int) number of columns (set to zero to disable columns mode)
-	 * @param $width (int) column width
-	 * @param $y (int) column starting Y position (leave empty for current Y position)
+	 * @param int $numcols number of columns (set to zero to disable columns mode)
+	 * @param int $width column width
+	 * @param int|null $y column starting Y position (leave empty for current Y position)
 	 * @public
 	 * @since 4.9.001 (2010-03-28)
 	 */
-	public function setEqualColumns($numcols=0, $width=0, $y='') {
+	public function setEqualColumns($numcols=0, $width=0, $y=null) {
 		$this->columns = array();
 		if ($numcols < 2) {
 			$numcols = 0;
@@ -21793,7 +21912,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	/**
 	 * Set columns array.
 	 * Each column is represented by an array of arrays with the following keys: (w = width, s = space between columns, y = column top position).
-	 * @param $columns (array)
+	 * @param array $columns
 	 * @public
 	 * @since 4.9.001 (2010-03-28)
 	 */
@@ -21807,12 +21926,12 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Set position at a given column
-	 * @param $col (int) column number (from 0 to getNumberOfColumns()-1); empty string = current column.
+	 * @param int|null $col column number (from 0 to getNumberOfColumns()-1); empty string = current column.
 	 * @public
 	 * @since 4.9.001 (2010-03-28)
 	 */
-	public function selectColumn($col='') {
-		if (is_string($col)) {
+	public function selectColumn($col=null) {
+		if (TCPDF_STATIC::empty_string($col)) {
 			$col = $this->current_column;
 		} elseif ($col >= $this->num_columns) {
 			$col = 0;
@@ -21906,9 +22025,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Set Text rendering mode.
-	 * @param $stroke (int) outline size in user units (0 = disable).
-	 * @param $fill (boolean) if true fills the text (default).
-	 * @param $clip (boolean) if true activate clipping mode
+	 * @param int $stroke outline size in user units (0 = disable).
+	 * @param boolean $fill if true fills the text (default).
+	 * @param boolean $clip if true activate clipping mode
 	 * @public
 	 * @since 4.9.008 (2009-04-02)
 	 */
@@ -21963,7 +22082,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Set parameters for drop shadow effect for text.
-	 * @param $params (array) Array of parameters: enabled (boolean) set to true to enable shadow; depth_w (float) shadow width in user units; depth_h (float) shadow height in user units; color (array) shadow color or false to use the stroke color; opacity (float) Alpha value: real value from 0 (transparent) to 1 (opaque); blend_mode (string) blend mode, one of the following: Normal, Multiply, Screen, Overlay, Darken, Lighten, ColorDodge, ColorBurn, HardLight, SoftLight, Difference, Exclusion, Hue, Saturation, Color, Luminosity.
+	 * @param array $params Array of parameters: enabled (boolean) set to true to enable shadow; depth_w (float) shadow width in user units; depth_h (float) shadow height in user units; color (array) shadow color or false to use the stroke color; opacity (float) Alpha value: real value from 0 (transparent) to 1 (opaque); blend_mode (string) blend mode, one of the following: Normal, Multiply, Screen, Overlay, Darken, Lighten, ColorDodge, ColorBurn, HardLight, SoftLight, Difference, Exclusion, Hue, Saturation, Color, Luminosity.
 	 * @since 5.9.174 (2012-07-25)
 	 * @public
 	*/
@@ -22005,7 +22124,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Return the text shadow parameters array.
-	 * @return Array of parameters.
+	 * @return array array of parameters.
 	 * @since 5.9.174 (2012-07-25)
 	 * @public
 	 */
@@ -22015,13 +22134,13 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Returns an array of chars containing soft hyphens.
-	 * @param $word (array) array of chars
-	 * @param $patterns (array) Array of hypenation patterns.
-	 * @param $dictionary (array) Array of words to be returned without applying the hyphenation algorithm.
-	 * @param $leftmin (int) Minimum number of character to leave on the left of the word without applying the hyphens.
-	 * @param $rightmin (int) Minimum number of character to leave on the right of the word without applying the hyphens.
-	 * @param $charmin (int) Minimum word length to apply the hyphenation algorithm.
-	 * @param $charmax (int) Maximum length of broken piece of word.
+	 * @param array $word array of chars
+	 * @param array $patterns Array of hypenation patterns.
+	 * @param array $dictionary Array of words to be returned without applying the hyphenation algorithm.
+	 * @param int $leftmin Minimum number of character to leave on the left of the word without applying the hyphens.
+	 * @param int $rightmin Minimum number of character to leave on the right of the word without applying the hyphens.
+	 * @param int $charmin Minimum word length to apply the hyphenation algorithm.
+	 * @param int $charmax Maximum length of broken piece of word.
 	 * @return array text with soft hyphens
 	 * @author Nicola Asuni
 	 * @since 4.9.012 (2010-04-12)
@@ -22095,14 +22214,14 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Returns text with soft hyphens.
-	 * @param $text (string) text to process
-	 * @param $patterns (mixed) Array of hypenation patterns or a TEX file containing hypenation patterns. TEX patterns can be downloaded from http://www.ctan.org/tex-archive/language/hyph-utf8/tex/generic/hyph-utf8/patterns/
-	 * @param $dictionary (array) Array of words to be returned without applying the hyphenation algorithm.
-	 * @param $leftmin (int) Minimum number of character to leave on the left of the word without applying the hyphens.
-	 * @param $rightmin (int) Minimum number of character to leave on the right of the word without applying the hyphens.
-	 * @param $charmin (int) Minimum word length to apply the hyphenation algorithm.
-	 * @param $charmax (int) Maximum length of broken piece of word.
-	 * @return array text with soft hyphens
+	 * @param string $text text to process
+	 * @param mixed $patterns Array of hypenation patterns or a TEX file containing hypenation patterns. TEX patterns can be downloaded from http://www.ctan.org/tex-archive/language/hyph-utf8/tex/generic/hyph-utf8/patterns/
+	 * @param array $dictionary Array of words to be returned without applying the hyphenation algorithm.
+	 * @param int $leftmin Minimum number of character to leave on the left of the word without applying the hyphens.
+	 * @param int $rightmin Minimum number of character to leave on the right of the word without applying the hyphens.
+	 * @param int $charmin Minimum word length to apply the hyphenation algorithm.
+	 * @param int $charmax Maximum length of broken piece of word.
+	 * @return string text with soft hyphens
 	 * @author Nicola Asuni
 	 * @since 4.9.012 (2010-04-12)
 	 * @public
@@ -22167,7 +22286,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Enable/disable rasterization of vector images using ImageMagick library.
-	 * @param $mode (boolean) if true enable rasterization, false otherwise.
+	 * @param boolean $mode if true enable rasterization, false otherwise.
 	 * @public
 	 * @since 5.0.000 (2010-04-27)
 	 */
@@ -22177,7 +22296,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Enable or disable default option for font subsetting.
-	 * @param $enable (boolean) if true enable font subsetting by default.
+	 * @param boolean $enable if true enable font subsetting by default.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 5.3.002 (2010-06-07)
@@ -22192,7 +22311,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Return the default option for font subsetting.
-	 * @return boolean default font subsetting state.
+	 * @return bool default font subsetting state.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 5.3.002 (2010-06-07)
@@ -22203,9 +22322,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Left trim the input string
-	 * @param $str (string) string to trim
-	 * @param $replace (string) string that replace spaces.
-	 * @return left trimmed string
+	 * @param string $str string to trim
+	 * @param string $replace string that replace spaces.
+	 * @return string left trimmed string
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 5.8.000 (2010-08-11)
@@ -22216,9 +22335,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Right trim the input string
-	 * @param $str (string) string to trim
-	 * @param $replace (string) string that replace spaces.
-	 * @return right trimmed string
+	 * @param string $str string to trim
+	 * @param string $replace string that replace spaces.
+	 * @return string right trimmed string
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 5.8.000 (2010-08-11)
@@ -22229,9 +22348,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Trim the input string
-	 * @param $str (string) string to trim
-	 * @param $replace (string) string that replace spaces.
-	 * @return trimmed string
+	 * @param string $str string to trim
+	 * @param string $replace string that replace spaces.
+	 * @return string trimmed string
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 5.8.000 (2010-08-11)
@@ -22244,7 +22363,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Return true if the current font is unicode type.
-	 * @return true for unicode font, false otherwise.
+	 * @return bool true for unicode font, false otherwise.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 5.8.002 (2010-08-14)
@@ -22255,7 +22374,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Return normalized font name
-	 * @param $fontfamily (string) property string containing font family names
+	 * @param string $fontfamily property string containing font family names
 	 * @return string normalized font name
 	 * @author Nicola Asuni
 	 * @public
@@ -22296,10 +22415,10 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * An XObject Template is a PDF block that is a self-contained description of any sequence of graphics objects (including path objects, text objects, and sampled images).
 	 * An XObject Template may be painted multiple times, either on several pages or at several locations on the same page and produces the same results each time, subject only to the graphics state at the time it is invoked.
 	 * Note: X,Y coordinates will be reset to 0,0.
-	 * @param $w (int) Template width in user units (empty string or zero = page width less margins).
-	 * @param $h (int) Template height in user units (empty string or zero = page height less margins).
-	 * @param $group (mixed) Set transparency group. Can be a boolean value or an array specifying optional parameters: 'CS' (solour space name), 'I' (boolean flag to indicate isolated group) and 'K' (boolean flag to indicate knockout group).
-	 * @return int the XObject Template ID in case of success or false in case of error.
+	 * @param int $w Template width in user units (empty string or zero = page width less margins).
+	 * @param int $h Template height in user units (empty string or zero = page height less margins).
+	 * @param mixed $group Set transparency group. Can be a boolean value or an array specifying optional parameters: 'CS' (solour space name), 'I' (boolean flag to indicate isolated group) and 'K' (boolean flag to indicate knockout group).
+	 * @return string|false the XObject Template ID in case of success or false in case of error.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 5.8.017 (2010-08-24)
@@ -22332,7 +22451,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 		// set new environment
 		$this->num_columns = 1;
 		$this->current_column = 0;
-		$this->SetAutoPageBreak(false);
+		$this->setAutoPageBreak(false);
 		if (($w === '') OR ($w <= 0)) {
 			$w = $this->w - $this->lMargin - $this->rMargin;
 		}
@@ -22364,7 +22483,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * End the current XObject Template started with startTemplate() and restore the previous graphic state.
 	 * An XObject Template is a PDF block that is a self-contained description of any sequence of graphics objects (including path objects, text objects, and sampled images).
 	 * An XObject Template may be painted multiple times, either on several pages or at several locations on the same page and produces the same results each time, subject only to the graphics state at the time it is invoked.
-	 * @return int the XObject Template ID in case of success or false in case of error.
+	 * @return string|false the XObject Template ID in case of success or false in case of error.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 5.8.017 (2010-08-24)
@@ -22386,20 +22505,20 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * You can print an XObject Template inside the currently opened Template.
 	 * An XObject Template is a PDF block that is a self-contained description of any sequence of graphics objects (including path objects, text objects, and sampled images).
 	 * An XObject Template may be painted multiple times, either on several pages or at several locations on the same page and produces the same results each time, subject only to the graphics state at the time it is invoked.
-	 * @param $id (string) The ID of XObject Template to print.
-	 * @param $x (int) X position in user units (empty string = current x position)
-	 * @param $y (int) Y position in user units (empty string = current y position)
-	 * @param $w (int) Width in user units (zero = remaining page width)
-	 * @param $h (int) Height in user units (zero = remaining page height)
-	 * @param $align (string) Indicates the alignment of the pointer next to template insertion relative to template height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
-	 * @param $palign (string) Allows to center or align the template on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-	 * @param $fitonpage (boolean) If true the template is resized to not exceed page dimensions.
+	 * @param string $id The ID of XObject Template to print.
+	 * @param float|null $x X position in user units (empty string = current x position)
+	 * @param float|null $y Y position in user units (empty string = current y position)
+	 * @param float $w Width in user units (zero = remaining page width)
+	 * @param float $h Height in user units (zero = remaining page height)
+	 * @param string $align Indicates the alignment of the pointer next to template insertion relative to template height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul>
+	 * @param string $palign Allows to center or align the template on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
+	 * @param boolean $fitonpage If true the template is resized to not exceed page dimensions.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 5.8.017 (2010-08-24)
 	 * @see startTemplate(), endTemplate()
 	 */
-	public function printTemplate($id, $x='', $y='', $w=0, $h=0, $align='', $palign='', $fitonpage=false) {
+	public function printTemplate($id, $x=null, $y=null, $w=0, $h=0, $align='', $palign='', $fitonpage=false) {
 		if ($this->state != 2) {
 			 return;
 		}
@@ -22416,10 +22535,10 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 			}
 		}
 		// set default values
-		if ($x === '') {
+		if (TCPDF_STATIC::empty_string($x)) {
 			$x = $this->x;
 		}
-		if ($y === '') {
+		if (TCPDF_STATIC::empty_string($y)) {
 			$y = $this->y;
 		}
 		// check page for no-write regions and adapt page margins if necessary
@@ -22516,7 +22635,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 				break;
 			}
 			case 'N': {
-				$this->SetY($rb_y);
+				$this->setY($rb_y);
 				break;
 			}
 			default:{
@@ -22527,7 +22646,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Set the percentage of character stretching.
-	 * @param $perc (int) percentage of stretching (100 = no stretching)
+	 * @param int $perc percentage of stretching (100 = no stretching)
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 5.9.000 (2010-09-29)
@@ -22549,7 +22668,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Set the amount to increase or decrease the space between characters in a text.
-	 * @param $spacing (float) amount to increase or decrease the space between characters in a text (0 = default spacing)
+	 * @param float $spacing amount to increase or decrease the space between characters in a text (0 = default spacing)
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 5.9.000 (2010-09-29)
@@ -22586,7 +22705,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * A no-write region is a portion of the page with a rectangular or trapezium shape that will not be covered when writing text or html code.
 	 * A region is always aligned on the left or right side of the page ad is defined using a vertical segment.
 	 * You can set multiple regions for the same page.
-	 * @param $regions (array) array of no-write regions. For each region you can define an array as follow: ('page' => page number or empy for current page, 'xt' => X top, 'yt' => Y top, 'xb' => X bottom, 'yb' => Y bottom, 'side' => page side 'L' = left or 'R' = right). Omit this parameter to remove all regions.
+	 * @param array $regions array of no-write regions. For each region you can define an array as follow: ('page' => page number or empy for current page, 'xt' => X top, 'yt' => Y top, 'xb' => X bottom, 'yb' => Y bottom, 'side' => page side 'L' = left or 'R' = right). Omit this parameter to remove all regions.
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 5.9.003 (2010-10-13)
@@ -22606,7 +22725,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * A no-write region is a portion of the page with a rectangular or trapezium shape that will not be covered when writing text or html code.
 	 * A region is always aligned on the left or right side of the page ad is defined using a vertical segment.
 	 * You can set multiple regions for the same page.
-	 * @param $region (array) array of a single no-write region array: ('page' => page number or empy for current page, 'xt' => X top, 'yt' => Y top, 'xb' => X bottom, 'yb' => Y bottom, 'side' => page side 'L' = left or 'R' = right).
+	 * @param array $region array of a single no-write region array: ('page' => page number or empy for current page, 'xt' => X top, 'yt' => Y top, 'xb' => X bottom, 'yb' => Y bottom, 'side' => page side 'L' = left or 'R' = right).
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 5.9.003 (2010-10-13)
@@ -22625,7 +22744,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Remove a single no-write region.
-	 * @param $key (int) region key
+	 * @param int $key region key
 	 * @author Nicola Asuni
 	 * @public
 	 * @since 5.9.003 (2010-10-13)
@@ -22641,10 +22760,10 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	 * Check page for no-write regions and adapt current coordinates and page margins if necessary.
 	 * A no-write region is a portion of the page with a rectangular or trapezium shape that will not be covered when writing text or html code.
 	 * A region is always aligned on the left or right side of the page ad is defined using a vertical segment.
-	 * @param $h (float) height of the text/image/object to print in user units
-	 * @param $x (float) current X coordinate in user units
-	 * @param $y (float) current Y coordinate in user units
-	 * @return array($x, $y)
+	 * @param float $h height of the text/image/object to print in user units
+	 * @param float $x current X coordinate in user units
+	 * @param float $y current Y coordinate in user units
+	 * @return float[] array($x, $y)
 	 * @author Nicola Asuni
 	 * @protected
 	 * @since 5.9.003 (2010-10-13)
@@ -22738,21 +22857,21 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 	/**
 	 * Embedd a Scalable Vector Graphics (SVG) image.
 	 * NOTE: SVG standard is not yet fully implemented, use the setRasterizeVectorImages() method to enable/disable rasterization of vector images using ImageMagick library.
-	 * @param $file (string) Name of the SVG file or a '@' character followed by the SVG data string.
-	 * @param $x (float) Abscissa of the upper-left corner.
-	 * @param $y (float) Ordinate of the upper-left corner.
-	 * @param $w (float) Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param $h (float) Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
-	 * @param $link (mixed) URL or identifier returned by AddLink().
-	 * @param $align (string) Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul> If the alignment is an empty string, then the pointer will be restored on the starting SVG position.
-	 * @param $palign (string) Allows to center or align the image on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
-	 * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
-	 * @param $fitonpage (boolean) if true the image is resized to not exceed page dimensions.
+	 * @param string $file Name of the SVG file or a '@' character followed by the SVG data string.
+	 * @param float|null $x Abscissa of the upper-left corner.
+	 * @param float|null $y Ordinate of the upper-left corner.
+	 * @param float $w Width of the image in the page. If not specified or equal to zero, it is automatically calculated.
+	 * @param float $h Height of the image in the page. If not specified or equal to zero, it is automatically calculated.
+	 * @param mixed $link URL or identifier returned by AddLink().
+	 * @param string $align Indicates the alignment of the pointer next to image insertion relative to image height. The value can be:<ul><li>T: top-right for LTR or top-left for RTL</li><li>M: middle-right for LTR or middle-left for RTL</li><li>B: bottom-right for LTR or bottom-left for RTL</li><li>N: next line</li></ul> If the alignment is an empty string, then the pointer will be restored on the starting SVG position.
+	 * @param string $palign Allows to center or align the image on the current line. Possible values are:<ul><li>L : left align</li><li>C : center</li><li>R : right align</li><li>'' : empty string : left for LTR or right for RTL</li></ul>
+	 * @param mixed $border Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
+	 * @param boolean $fitonpage if true the image is resized to not exceed page dimensions.
 	 * @author Nicola Asuni
 	 * @since 5.0.000 (2010-05-02)
 	 * @public
 	 */
-	public function ImageSVG($file, $x='', $y='', $w=0, $h=0, $link='', $align='', $palign='', $border=0, $fitonpage=false) {
+	public function ImageSVG($file, $x=null, $y=null, $w=0, $h=0, $link='', $align='', $palign='', $border=0, $fitonpage=false) {
 		if ($this->state != 2) {
 			 return;
 		}
@@ -22776,15 +22895,15 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 			$svgdata = substr($file, 1);
 		} else { // SVG file
 			$this->svgdir = dirname($file);
-			$svgdata = TCPDF_STATIC::fileGetContents($file);
+            $svgdata = $this->getCachedFileContents($file);
 		}
 		if ($svgdata === FALSE) {
 			$this->Error('SVG file not found: '.$file);
 		}
-		if ($x === '') {
+		if (TCPDF_STATIC::empty_string($x)) {
 			$x = $this->x;
 		}
-		if ($y === '') {
+		if (TCPDF_STATIC::empty_string($y)) {
 			$y = $this->y;
 		}
 		// check page for no-write regions and adapt page margins if necessary
@@ -22975,8 +23094,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 		$page_break_mode = $this->AutoPageBreak;
 		$page_break_margin = $this->getBreakMargin();
 		$cell_padding = $this->cell_padding;
-		$this->SetCellPadding(0);
-		$this->SetAutoPageBreak(false);
+		$this->setCellPadding(0);
+		$this->setAutoPageBreak(false);
 		// save the current graphic state
 		$this->_out('q'.$this->epsmarker);
 		// set initial clipping mask
@@ -22986,22 +23105,26 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 		$f = ($this->h - $oy) * $this->k * (1 - $svgscale_y);
 		$this->_out(sprintf('%F %F %F %F %F %F cm', $svgscale_x, 0, 0, $svgscale_y, ($e + $svgoffset_x), ($f + $svgoffset_y)));
 		// creates a new XML parser to be used by the other XML functions
-		$this->parser = xml_parser_create('UTF-8');
+		$parser = xml_parser_create('UTF-8');
 		// the following function allows to use parser inside object
-		xml_set_object($this->parser, $this);
+		xml_set_object($parser, $this);
 		// disable case-folding for this XML parser
-		xml_parser_set_option($this->parser, XML_OPTION_CASE_FOLDING, 0);
+		xml_parser_set_option($parser, XML_OPTION_CASE_FOLDING, 0);
 		// sets the element handler functions for the XML parser
-		xml_set_element_handler($this->parser, 'startSVGElementHandler', 'endSVGElementHandler');
+		xml_set_element_handler($parser, 'startSVGElementHandler', 'endSVGElementHandler');
 		// sets the character data handler function for the XML parser
-		xml_set_character_data_handler($this->parser, 'segSVGContentHandler');
+		xml_set_character_data_handler($parser, 'segSVGContentHandler');
 		// start parsing an XML document
-		if (!xml_parse($this->parser, $svgdata)) {
-			$error_message = sprintf('SVG Error: %s at line %d', xml_error_string(xml_get_error_code($this->parser)), xml_get_current_line_number($this->parser));
+		if (!xml_parse($parser, $svgdata)) {
+			$error_message = sprintf('SVG Error: %s at line %d', xml_error_string(xml_get_error_code($parser)), xml_get_current_line_number($parser));
 			$this->Error($error_message);
 		}
 		// free this XML parser
-		xml_parser_free($this->parser);
+		xml_parser_free($parser);
+
+		// >= PHP 7.0.0 "explicitly unset the reference to parser to avoid memory leaks"
+		unset($parser);
+
 		// restore previous graphic state
 		$this->_out($this->epsmarker.'Q');
 		// restore graphic vars
@@ -23040,7 +23163,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 				break;
 			}
 			case 'N':{
-				$this->SetY($this->img_rb_y);
+				$this->setY($this->img_rb_y);
 				break;
 			}
 			default:{
@@ -23062,13 +23185,13 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 		}
 		$this->endlinex = $this->img_rb_x;
 		// restore page break
-		$this->SetAutoPageBreak($page_break_mode, $page_break_margin);
+		$this->setAutoPageBreak($page_break_mode, $page_break_margin);
 		$this->cell_padding = $cell_padding;
 	}
 
 	/**
 	 * Convert SVG transformation matrix to PDF.
-	 * @param $tm (array) original SVG transformation matrix
+	 * @param array $tm original SVG transformation matrix
 	 * @return array transformation matrix
 	 * @protected
 	 * @since 5.0.000 (2010-05-02)
@@ -23089,7 +23212,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Apply SVG graphic transformation matrix.
-	 * @param $tm (array) original SVG transformation matrix
+	 * @param array $tm original SVG transformation matrix
 	 * @protected
 	 * @since 5.0.000 (2010-05-02)
 	 */
@@ -23099,15 +23222,15 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Apply the requested SVG styles (*** TO BE COMPLETED ***)
-	 * @param $svgstyle (array) array of SVG styles to apply
-	 * @param $prevsvgstyle (array) array of previous SVG style
-	 * @param $x (int) X origin of the bounding box
-	 * @param $y (int) Y origin of the bounding box
-	 * @param $w (int) width of the bounding box
-	 * @param $h (int) height of the bounding box
-	 * @param $clip_function (string) clip function
-	 * @param $clip_params (array) array of parameters for clipping function
-	 * @return object style
+	 * @param array $svgstyle array of SVG styles to apply
+	 * @param array $prevsvgstyle array of previous SVG style
+	 * @param int $x X origin of the bounding box
+	 * @param int $y Y origin of the bounding box
+	 * @param int $w width of the bounding box
+	 * @param int $h height of the bounding box
+	 * @param string $clip_function clip function
+	 * @param array $clip_params array of parameters for clipping function
+	 * @return string style
 	 * @author Nicola Asuni
 	 * @since 5.0.000 (2010-05-02)
 	 * @protected
@@ -23135,10 +23258,10 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 		}
 		// color
 		$fill_color = TCPDF_COLORS::convertHTMLColorToDec($svgstyle['color'], $this->spot_colors);
-		$this->SetFillColorArray($fill_color);
+		$this->setFillColorArray($fill_color);
 		// text color
 		$text_color = TCPDF_COLORS::convertHTMLColorToDec($svgstyle['text-color'], $this->spot_colors);
-		$this->SetTextColorArray($text_color);
+		$this->setTextColorArray($text_color);
 		// clip
 		if (preg_match('/rect\(([a-z0-9\-\.]*)[\s]*([a-z0-9\-\.]*)[\s]*([a-z0-9\-\.]*)[\s]*([a-z0-9\-\.]*)\)/si', $svgstyle['clip'], $regs)) {
 			$top = (isset($regs[1])?$this->getHTMLUnitToUnits($regs[1], 0, $this->svgunit, false):0);
@@ -23265,7 +23388,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 			if ($svgstyle['fill-opacity'] != 1) {
 				$this->setAlpha($this->alpha['CA'], 'Normal', $svgstyle['fill-opacity'], false);
 			}
-			$this->SetFillColorArray($fill_color);
+			$this->setFillColorArray($fill_color);
 			if ($svgstyle['fill-rule'] == 'evenodd') {
 				$objstyle .= 'F*';
 			} else {
@@ -23288,7 +23411,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 			if (isset($svgstyle['stroke-dasharray']) AND !empty($svgstyle['stroke-dasharray']) AND ($svgstyle['stroke-dasharray'] != 'none')) {
 				$stroke_style['dash'] = $svgstyle['stroke-dasharray'];
 			}
-			$this->SetLineStyle($stroke_style);
+			$this->setLineStyle($stroke_style);
 			$objstyle .= 'D';
 		}
 		// font
@@ -23383,7 +23506,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 				break;
 			}
 		}
-		$this->SetFont($font_family, $font_style, $font_size);
+		$this->setFont($font_family, $font_style, $font_size);
 		$this->setFontStretching($font_stretch);
 		$this->setFontSpacing($font_spacing);
 		return $objstyle;
@@ -23391,8 +23514,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Draws an SVG path
-	 * @param $d (string) attribute d of the path SVG element
-	 * @param $style (string) Style of rendering. Possible values are:
+	 * @param string $d attribute d of the path SVG element
+	 * @param string $style Style of rendering. Possible values are:
 	 * <ul>
 	 *	 <li>D or empty string: Draw (default).</li>
 	 *	 <li>F: Fill.</li>
@@ -23418,6 +23541,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 		}
 		$paths = array();
 		$d = preg_replace('/([0-9ACHLMQSTVZ])([\-\+])/si', '\\1 \\2', $d);
+		$d = preg_replace('/(\.[0-9]+)(\.)/s', '\\1 \\2', $d);
 		preg_match_all('/([ACHLMQSTVZ])[\s]*([^ACHLMQSTVZ\"]*)/si', $d, $paths, PREG_SET_ORDER);
 		$x = 0;
 		$y = 0;
@@ -23767,7 +23891,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Return the tag name without the namespace
-	 * @param $name (string) Tag name
+	 * @param string $name Tag name
 	 * @protected
 	 */
 	protected function removeTagNamespace($name) {
@@ -23780,10 +23904,10 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Sets the opening SVG element handler function for the XML parser. (*** TO BE COMPLETED ***)
-	 * @param $parser (resource) The first parameter, parser, is a reference to the XML parser calling the handler.
-	 * @param $name (string) The second parameter, name, contains the name of the element for which this handler is called. If case-folding is in effect for this parser, the element name will be in uppercase letters.
-	 * @param $attribs (array) The third parameter, attribs, contains an associative array with the element's attributes (if any). The keys of this array are the attribute names, the values are the attribute values. Attribute names are case-folded on the same criteria as element names. Attribute values are not case-folded. The original order of the attributes can be retrieved by walking through attribs the normal way, using each(). The first key in the array was the first attribute, and so on.
-	 * @param $ctm (array) tranformation matrix for clipping mode (starting transformation matrix).
+	 * @param resource|string $parser The first parameter, parser, is a reference to the XML parser calling the handler.
+	 * @param string $name The second parameter, name, contains the name of the element for which this handler is called. If case-folding is in effect for this parser, the element name will be in uppercase letters.
+	 * @param array $attribs The third parameter, attribs, contains an associative array with the element's attributes (if any). The keys of this array are the attribute names, the values are the attribute values. Attribute names are case-folded on the same criteria as element names. Attribute values are not case-folded. The original order of the attributes can be retrieved by walking through attribs the normal way, using each(). The first key in the array was the first attribute, and so on.
+	 * @param array $ctm tranformation matrix for clipping mode (starting transformation matrix).
 	 * @author Nicola Asuni
 	 * @since 5.0.000 (2010-05-02)
 	 * @protected
@@ -23978,7 +24102,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 				break;
 			}
 			case 'linearGradient': {
-				if ($this->pdfa_mode) {
+				if ($this->pdfa_mode && $this->pdfa_version < 2) {
 					break;
 				}
 				if (!isset($attribs['id'])) {
@@ -24018,7 +24142,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 				break;
 			}
 			case 'radialGradient': {
-				if ($this->pdfa_mode) {
+				if ($this->pdfa_mode && $this->pdfa_version < 2) {
 					break;
 				}
 				if (!isset($attribs['id'])) {
@@ -24452,8 +24576,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Sets the closing SVG element handler function for the XML parser.
-	 * @param $parser (resource) The first parameter, parser, is a reference to the XML parser calling the handler.
-	 * @param $name (string) The second parameter, name, contains the name of the element for which this handler is called. If case-folding is in effect for this parser, the element name will be in uppercase letters.
+	 * @param resource|string $parser The first parameter, parser, is a reference to the XML parser calling the handler.
+	 * @param string $name The second parameter, name, contains the name of the element for which this handler is called. If case-folding is in effect for this parser, the element name will be in uppercase letters.
 	 * @author Nicola Asuni
 	 * @since 5.0.000 (2010-05-02)
 	 * @protected
@@ -24559,8 +24683,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	/**
 	 * Sets the character data handler function for the XML parser.
-	 * @param $parser (resource) The first parameter, parser, is a reference to the XML parser calling the handler.
-	 * @param $data (string) The second parameter, data, contains the character data as a string.
+	 * @param resource $parser The first parameter, parser, is a reference to the XML parser calling the handler.
+	 * @param string $data The second parameter, data, contains the character data as a string.
 	 * @author Nicola Asuni
 	 * @since 5.0.000 (2010-05-02)
 	 * @protected
@@ -24571,6 +24695,33 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
 
 	// --- END SVG METHODS -----------------------------------------------------
 
+    /**
+     * Keeps files in memory, so it doesn't need to downloaded everytime in a loop
+     * @param string $file
+     * @return string
+     */
+    protected function getCachedFileContents($file)
+    {
+        if (!isset($this->fileContentCache[$file])) {
+            $this->fileContentCache[$file] = TCPDF_STATIC::fileGetContents($file);
+        }
+        return $this->fileContentCache[$file];
+    }
+
+    /**
+     * Avoid multiple calls to an external server to see if a file exists
+     * @param string $file
+     * @return bool
+     */
+    protected function fileExists($file)
+    {
+        if (isset($this->fileContentCache[$file]) || false !== $this->getImageBuffer($file)) {
+            return true;
+        }
+
+        return TCPDF_STATIC::file_exists($file);
+    }
+
 } // END OF TCPDF CLASS
 
 //============================================================+
diff --git a/lib/combodo/tcpdf/tcpdf_barcodes_1d.php b/lib/combodo/tcpdf/tcpdf_barcodes_1d.php
index 78bfc5b5b..10a79a72e 100644
--- a/lib/combodo/tcpdf/tcpdf_barcodes_1d.php
+++ b/lib/combodo/tcpdf/tcpdf_barcodes_1d.php
@@ -53,7 +53,7 @@ class TCPDFBarcode {
 	 * Array representation of barcode.
 	 * @protected
 	 */
-	protected $barcode_array;
+	protected $barcode_array = array();
 
 	/**
 	 * This is the class constructor.
@@ -66,8 +66,8 @@ class TCPDFBarcode {
 	 * <li>$arrcode['bcode'][$k]['w'] bar width in units.</li>
 	 * <li>$arrcode['bcode'][$k]['h'] bar height in units.</li>
 	 * <li>$arrcode['bcode'][$k]['p'] bar top position (0 = top, 1 = middle)</li></ul>
-	 * @param $code (string) code to print
- 	 * @param $type (string) type of barcode: <ul><li>C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.</li><li>C39+ : CODE 39 with checksum</li><li>C39E : CODE 39 EXTENDED</li><li>C39E+ : CODE 39 EXTENDED + CHECKSUM</li><li>C93 : CODE 93 - USS-93</li><li>S25 : Standard 2 of 5</li><li>S25+ : Standard 2 of 5 + CHECKSUM</li><li>I25 : Interleaved 2 of 5</li><li>I25+ : Interleaved 2 of 5 + CHECKSUM</li><li>C128 : CODE 128</li><li>C128A : CODE 128 A</li><li>C128B : CODE 128 B</li><li>C128C : CODE 128 C</li><li>EAN2 : 2-Digits UPC-Based Extension</li><li>EAN5 : 5-Digits UPC-Based Extension</li><li>EAN8 : EAN 8</li><li>EAN13 : EAN 13</li><li>UPCA : UPC-A</li><li>UPCE : UPC-E</li><li>MSI : MSI (Variation of Plessey code)</li><li>MSI+ : MSI + CHECKSUM (modulo 11)</li><li>POSTNET : POSTNET</li><li>PLANET : PLANET</li><li>RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)</li><li>KIX : KIX (Klant index - Customer index)</li><li>IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200</li><li>CODABAR : CODABAR</li><li>CODE11 : CODE 11</li><li>PHARMA : PHARMACODE</li><li>PHARMA2T : PHARMACODE TWO-TRACKS</li></ul>
+	 * @param string $code code to print
+ 	 * @param string $type type of barcode: <ul><li>C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.</li><li>C39+ : CODE 39 with checksum</li><li>C39E : CODE 39 EXTENDED</li><li>C39E+ : CODE 39 EXTENDED + CHECKSUM</li><li>C93 : CODE 93 - USS-93</li><li>S25 : Standard 2 of 5</li><li>S25+ : Standard 2 of 5 + CHECKSUM</li><li>I25 : Interleaved 2 of 5</li><li>I25+ : Interleaved 2 of 5 + CHECKSUM</li><li>C128 : CODE 128</li><li>C128A : CODE 128 A</li><li>C128B : CODE 128 B</li><li>C128C : CODE 128 C</li><li>EAN2 : 2-Digits UPC-Based Extension</li><li>EAN5 : 5-Digits UPC-Based Extension</li><li>EAN8 : EAN 8</li><li>EAN13 : EAN 13</li><li>UPCA : UPC-A</li><li>UPCE : UPC-E</li><li>MSI : MSI (Variation of Plessey code)</li><li>MSI+ : MSI + CHECKSUM (modulo 11)</li><li>POSTNET : POSTNET</li><li>PLANET : PLANET</li><li>RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)</li><li>KIX : KIX (Klant index - Customer index)</li><li>IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200</li><li>CODABAR : CODABAR</li><li>CODE11 : CODE 11</li><li>PHARMA : PHARMACODE</li><li>PHARMA2T : PHARMACODE TWO-TRACKS</li></ul>
  	 * @public
 	 */
 	public function __construct($code, $type) {
@@ -85,9 +85,9 @@ class TCPDFBarcode {
 
 	/**
 	 * Send barcode as SVG image object to the standard output.
-	 * @param $w (int) Minimum width of a single bar in user units.
-	 * @param $h (int) Height of barcode in user units.
-	 * @param $color (string) Foreground color (in SVG format) for bar elements (background is transparent).
+	 * @param int $w Minimum width of a single bar in user units.
+	 * @param int $h Height of barcode in user units.
+	 * @param string $color Foreground color (in SVG format) for bar elements (background is transparent).
  	 * @public
 	 */
 	public function getBarcodeSVG($w=2, $h=30, $color='black') {
@@ -105,9 +105,9 @@ class TCPDFBarcode {
 
 	/**
 	 * Return a SVG string representation of barcode.
-	 * @param $w (int) Minimum width of a single bar in user units.
-	 * @param $h (int) Height of barcode in user units.
-	 * @param $color (string) Foreground color (in SVG format) for bar elements (background is transparent).
+	 * @param int $w Minimum width of a single bar in user units.
+	 * @param int $h Height of barcode in user units.
+	 * @param string $color Foreground color (in SVG format) for bar elements (background is transparent).
  	 * @return string SVG code.
  	 * @public
 	 */
@@ -138,9 +138,9 @@ class TCPDFBarcode {
 
 	/**
 	 * Return an HTML representation of barcode.
-	 * @param $w (int) Width of a single bar element in pixels.
-	 * @param $h (int) Height of a single bar element in pixels.
-	 * @param $color (string) Foreground color for bar elements (background is transparent).
+	 * @param int $w Width of a single bar element in pixels.
+	 * @param int $h Height of a single bar element in pixels.
+	 * @param string $color Foreground color for bar elements (background is transparent).
  	 * @return string HTML code.
  	 * @public
 	 */
@@ -164,9 +164,9 @@ class TCPDFBarcode {
 
 	/**
 	 * Send a PNG image representation of barcode (requires GD or Imagick library).
-	 * @param $w (int) Width of a single bar element in pixels.
-	 * @param $h (int) Height of a single bar element in pixels.
-	 * @param $color (array) RGB (0-255) foreground color for bar elements (background is transparent).
+	 * @param int $w Width of a single bar element in pixels.
+	 * @param int $h Height of a single bar element in pixels.
+	 * @param array $color RGB (0-255) foreground color for bar elements (background is transparent).
  	 * @public
 	 */
 	public function getBarcodePNG($w=2, $h=30, $color=array(0,0,0)) {
@@ -183,10 +183,10 @@ class TCPDFBarcode {
 
 	/**
 	 * Return a PNG image representation of barcode (requires GD or Imagick library).
-	 * @param $w (int) Width of a single bar element in pixels.
-	 * @param $h (int) Height of a single bar element in pixels.
-	 * @param $color (array) RGB (0-255) foreground color for bar elements (background is transparent).
- 	 * @return image or false in case of error.
+	 * @param int $w Width of a single bar element in pixels.
+	 * @param int $h Height of a single bar element in pixels.
+	 * @param array $color RGB (0-255) foreground color for bar elements (background is transparent).
+ 	 * @return string|Imagick|false image or false in case of error.
  	 * @public
 	 */
 	public function getBarcodePngData($w=2, $h=30, $color=array(0,0,0)) {
@@ -241,9 +241,9 @@ class TCPDFBarcode {
 
 	/**
 	 * Set the barcode.
-	 * @param $code (string) code to print
- 	 * @param $type (string) type of barcode: <ul><li>C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.</li><li>C39+ : CODE 39 with checksum</li><li>C39E : CODE 39 EXTENDED</li><li>C39E+ : CODE 39 EXTENDED + CHECKSUM</li><li>C93 : CODE 93 - USS-93</li><li>S25 : Standard 2 of 5</li><li>S25+ : Standard 2 of 5 + CHECKSUM</li><li>I25 : Interleaved 2 of 5</li><li>I25+ : Interleaved 2 of 5 + CHECKSUM</li><li>C128 : CODE 128</li><li>C128A : CODE 128 A</li><li>C128B : CODE 128 B</li><li>C128C : CODE 128 C</li><li>EAN2 : 2-Digits UPC-Based Extension</li><li>EAN5 : 5-Digits UPC-Based Extension</li><li>EAN8 : EAN 8</li><li>EAN13 : EAN 13</li><li>UPCA : UPC-A</li><li>UPCE : UPC-E</li><li>MSI : MSI (Variation of Plessey code)</li><li>MSI+ : MSI + CHECKSUM (modulo 11)</li><li>POSTNET : POSTNET</li><li>PLANET : PLANET</li><li>RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)</li><li>KIX : KIX (Klant index - Customer index)</li><li>IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200</li><li>IMBPRE: Pre-processed Intelligent Mail Barcode - Onecode - USPS-B-3200, using only F,A,D,T letters</li><li>CODABAR : CODABAR</li><li>CODE11 : CODE 11</li><li>PHARMA : PHARMACODE</li><li>PHARMA2T : PHARMACODE TWO-TRACKS</li></ul>
- 	 * @return array barcode array
+	 * @param string $code code to print
+ 	 * @param string $type type of barcode: <ul><li>C39 : CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.</li><li>C39+ : CODE 39 with checksum</li><li>C39E : CODE 39 EXTENDED</li><li>C39E+ : CODE 39 EXTENDED + CHECKSUM</li><li>C93 : CODE 93 - USS-93</li><li>S25 : Standard 2 of 5</li><li>S25+ : Standard 2 of 5 + CHECKSUM</li><li>I25 : Interleaved 2 of 5</li><li>I25+ : Interleaved 2 of 5 + CHECKSUM</li><li>C128 : CODE 128</li><li>C128A : CODE 128 A</li><li>C128B : CODE 128 B</li><li>C128C : CODE 128 C</li><li>EAN2 : 2-Digits UPC-Based Extension</li><li>EAN5 : 5-Digits UPC-Based Extension</li><li>EAN8 : EAN 8</li><li>EAN13 : EAN 13</li><li>UPCA : UPC-A</li><li>UPCE : UPC-E</li><li>MSI : MSI (Variation of Plessey code)</li><li>MSI+ : MSI + CHECKSUM (modulo 11)</li><li>POSTNET : POSTNET</li><li>PLANET : PLANET</li><li>RMS4CC : RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code)</li><li>KIX : KIX (Klant index - Customer index)</li><li>IMB: Intelligent Mail Barcode - Onecode - USPS-B-3200</li><li>IMBPRE: Pre-processed Intelligent Mail Barcode - Onecode - USPS-B-3200, using only F,A,D,T letters</li><li>CODABAR : CODABAR</li><li>CODE11 : CODE 11</li><li>PHARMA : PHARMACODE</li><li>PHARMA2T : PHARMACODE TWO-TRACKS</li></ul>
+ 	 * @return void
  	 * @public
 	 */
 	public function setBarcode($code, $type) {
@@ -373,7 +373,7 @@ class TCPDFBarcode {
 				break;
 			}
 			default: {
-				$this->barcode_array = false;
+				$this->barcode_array = array();
 				$arrcode = false;
 				break;
 			}
@@ -384,9 +384,9 @@ class TCPDFBarcode {
 	/**
 	 * CODE 39 - ANSI MH10.8M-1983 - USD-3 - 3 of 9.
 	 * General-purpose code in very wide use world-wide
-	 * @param $code (string) code to represent.
-	 * @param $extended (boolean) if true uses the extended mode.
-	 * @param $checksum (boolean) if true add a checksum to the code.
+	 * @param string $code code to represent.
+	 * @param boolean $extended if true uses the extended mode.
+	 * @param boolean $checksum if true add a checksum to the code.
 	 * @return array barcode representation.
 	 * @protected
 	 */
@@ -479,8 +479,8 @@ class TCPDFBarcode {
 
 	/**
 	 * Encode a string to be used for CODE 39 Extended mode.
-	 * @param $code (string) code to represent.
-	 * @return encoded string.
+	 * @param string $code code to represent.
+	 * @return string encoded string.
 	 * @protected
 	 */
 	protected function encode_code39_ext($code) {
@@ -530,8 +530,8 @@ class TCPDFBarcode {
 
 	/**
 	 * Calculate CODE 39 checksum (modulo 43).
-	 * @param $code (string) code to represent.
-	 * @return char checksum.
+	 * @param string $code code to represent.
+	 * @return string char checksum.
 	 * @protected
 	 */
 	protected function checksum_code39($code) {
@@ -553,7 +553,7 @@ class TCPDFBarcode {
 	/**
 	 * CODE 93 - USS-93
 	 * Compact code similar to Code 39
-	 * @param $code (string) code to represent.
+	 * @param string $code code to represent.
 	 * @return array barcode representation.
 	 * @protected
 	 */
@@ -681,7 +681,7 @@ class TCPDFBarcode {
 
 	/**
 	 * Calculate CODE 93 checksum (modulo 47).
-	 * @param $code (string) code to represent.
+	 * @param string $code code to represent.
 	 * @return string checksum code.
 	 * @protected
 	 */
@@ -730,7 +730,7 @@ class TCPDFBarcode {
 
 	/**
 	 * Checksum for standard 2 of 5 barcodes.
-	 * @param $code (string) code to process.
+	 * @param string $code code to process.
 	 * @return int checksum.
 	 * @protected
 	 */
@@ -755,8 +755,8 @@ class TCPDFBarcode {
 	 * MSI.
 	 * Variation of Plessey code, with similar applications
 	 * Contains digits (0 to 9) and encodes the data only in the width of bars.
-	 * @param $code (string) code to represent.
-	 * @param $checksum (boolean) if true add a checksum to the code (modulo 11)
+	 * @param string $code code to represent.
+	 * @param boolean $checksum if true add a checksum to the code (modulo 11)
 	 * @return array barcode representation.
 	 * @protected
 	 */
@@ -814,8 +814,8 @@ class TCPDFBarcode {
 	 * Standard 2 of 5 barcodes.
 	 * Used in airline ticket marking, photofinishing
 	 * Contains digits (0 to 9) and encodes the data only in the width of bars.
-	 * @param $code (string) code to represent.
-	 * @param $checksum (boolean) if true add a checksum to the code
+	 * @param string $code code to represent.
+	 * @param boolean $checksum if true add a checksum to the code
 	 * @return array barcode representation.
 	 * @protected
 	 */
@@ -854,10 +854,9 @@ class TCPDFBarcode {
 	}
 
 	/**
-	 * Convert binary barcode sequence to TCPDF barcode array.
-	 * @param $seq (string) barcode as binary sequence.
-	 * @param $bararray (array) barcode array.
-	 * òparam array $bararray TCPDF barcode array to fill up
+	 * Convert binary barcode sequence to WarnockPDF barcode array.
+	 * @param string $seq barcode as binary sequence.
+	 * @param array $bararray barcode array to fill up
 	 * @return array barcode representation.
 	 * @protected
 	 */
@@ -886,8 +885,8 @@ class TCPDFBarcode {
 	 * Interleaved 2 of 5 barcodes.
 	 * Compact numeric code, widely used in industry, air cargo
 	 * Contains digits (0 to 9) and encodes the data in the width of both bars and spaces.
-	 * @param $code (string) code to represent.
-	 * @param $checksum (boolean) if true add a checksum to the code
+	 * @param string $code code to represent.
+	 * @param boolean $checksum if true add a checksum to the code
 	 * @return array barcode representation.
 	 * @protected
 	 */
@@ -938,7 +937,7 @@ class TCPDFBarcode {
 				} else {
 					$t = false; // space
 				}
-				$w = $seq[$j];
+				$w = (float)$seq[$j];
 				$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
 				$bararray['maxw'] += $w;
 				++$k;
@@ -950,8 +949,8 @@ class TCPDFBarcode {
 	/**
 	 * C128 barcodes.
 	 * Very capable code, excellent density, high reliability; in very wide use world-wide
-	 * @param $code (string) code to represent.
-	 * @param $type (string) barcode type: A, B, C or empty for automatic switch (AUTO mode)
+	 * @param string $code code to represent.
+	 * @param string $type barcode type: A, B, C or empty for automatic switch (AUTO mode)
 	 * @return array barcode representation.
 	 * @protected
 	 */
@@ -1271,7 +1270,7 @@ class TCPDFBarcode {
 				} else {
 					$t = false; // space
 				}
-				$w = $seq[$j];
+				$w = (float)$seq[$j];
 				$bararray['bcode'][] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
 				$bararray['maxw'] += $w;
 			}
@@ -1281,7 +1280,7 @@ class TCPDFBarcode {
 
 	/**
 	 * Split text code in A/B sequence for 128 code
-	 * @param $code (string) code to split.
+	 * @param string $code code to split.
 	 * @return array sequence
 	 * @protected
 	 */
@@ -1319,8 +1318,8 @@ class TCPDFBarcode {
 	 * EAN13: European Article Numbering international retail product code
 	 * UPC-A: Universal product code seen on almost all retail products in the USA and Canada
 	 * UPC-E: Short version of UPC symbol
-	 * @param $code (string) code to represent.
-	 * @param $len (string) barcode type: 6 = UPC-E, 8 = EAN8, 13 = EAN13, 12 = UPC-A
+	 * @param string $code code to represent.
+	 * @param string $len barcode type: 6 = UPC-E, 8 = EAN8, 13 = EAN13, 12 = UPC-A
 	 * @return array barcode representation.
 	 * @protected
 	 */
@@ -1512,8 +1511,8 @@ class TCPDFBarcode {
 	 * UPC-Based Extensions
 	 * 2-Digit Ext.: Used to indicate magazines and newspaper issue numbers
 	 * 5-Digit Ext.: Used to mark suggested retail price of books
-	 * @param $code (string) code to represent.
-	 * @param $len (string) barcode type: 2 = 2-Digit, 5 = 5-Digit
+	 * @param string $code code to represent.
+	 * @param string $len barcode type: 2 = 2-Digit, 5 = 5-Digit
 	 * @return array barcode representation.
 	 * @protected
 	 */
@@ -1587,8 +1586,8 @@ class TCPDFBarcode {
 	/**
 	 * POSTNET and PLANET barcodes.
 	 * Used by U.S. Postal Service for automated mail sorting
-	 * @param $code (string) zip code to represent. Must be a string containing a zip code of the form DDDDD or DDDDD-DDDD.
-	 * @param $planet (boolean) if true print the PLANET barcode, otherwise print POSTNET
+	 * @param string $code zip code to represent. Must be a string containing a zip code of the form DDDDD or DDDDD-DDDD.
+	 * @param boolean $planet if true print the PLANET barcode, otherwise print POSTNET
 	 * @return array barcode representation.
 	 * @protected
 	 */
@@ -1660,8 +1659,8 @@ class TCPDFBarcode {
 	 * RMS4CC - CBC - KIX
 	 * RMS4CC (Royal Mail 4-state Customer Code) - CBC (Customer Bar Code) - KIX (Klant index - Customer index)
 	 * RM4SCC is the name of the barcode symbology used by the Royal Mail for its Cleanmail service.
-	 * @param $code (string) code to print
-	 * @param $kix (boolean) if true prints the KIX variation (doesn't use the start and end symbols, and the checksum) - in this case the house number must be sufficed with an X and placed at the end of the code.
+	 * @param string $code code to print
+	 * @param boolean $kix if true prints the KIX variation (doesn't use the start and end symbols, and the checksum) - in this case the house number must be sufficed with an X and placed at the end of the code.
 	 * @return array barcode representation.
 	 * @protected
 	 */
@@ -1812,7 +1811,7 @@ class TCPDFBarcode {
 	/**
 	 * CODABAR barcodes.
 	 * Older code often used in library systems, sometimes in blood banks
-	 * @param $code (string) code to represent.
+	 * @param string $code code to represent.
 	 * @return array barcode representation.
 	 * @protected
 	 */
@@ -1856,7 +1855,7 @@ class TCPDFBarcode {
 				} else {
 					$t = false; // space
 				}
-				$w = $seq[$j];
+				$w = (float)$seq[$j];
 				$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
 				$bararray['maxw'] += $w;
 				++$k;
@@ -1868,7 +1867,7 @@ class TCPDFBarcode {
 	/**
 	 * CODE11 barcodes.
 	 * Used primarily for labeling telecommunications equipment
-	 * @param $code (string) code to represent.
+	 * @param string $code code to represent.
 	 * @return array barcode representation.
 	 * @protected
 	 */
@@ -1947,7 +1946,7 @@ class TCPDFBarcode {
 				} else {
 					$t = false; // space
 				}
-				$w = $seq[$j];
+				$w = (float)$seq[$j];
 				$bararray['bcode'][$k] = array('t' => $t, 'w' => $w, 'h' => 1, 'p' => 0);
 				$bararray['maxw'] += $w;
 				++$k;
@@ -1959,7 +1958,7 @@ class TCPDFBarcode {
 	/**
 	 * Pharmacode
 	 * Contains digits (0 to 9)
-	 * @param $code (string) code to represent.
+	 * @param string $code code to represent.
 	 * @return array barcode representation.
 	 * @protected
 	 */
@@ -1985,7 +1984,7 @@ class TCPDFBarcode {
 	/**
 	 * Pharmacode two-track
 	 * Contains digits (0 to 9)
-	 * @param $code (string) code to represent.
+	 * @param string $code code to represent.
 	 * @return array barcode representation.
 	 * @protected
 	 */
@@ -2047,7 +2046,7 @@ class TCPDFBarcode {
 	 * (requires PHP bcmath extension)
 	 * Intelligent Mail barcode is a 65-bar code for use on mail in the United States.
 	 * The fields are described as follows:<ul><li>The Barcode Identifier shall be assigned by USPS to encode the presort identification that is currently printed in human readable form on the optional endorsement line (OEL) as well as for future USPS use. This shall be two digits, with the second digit in the range of 0–4. The allowable encoding ranges shall be 00–04, 10–14, 20–24, 30–34, 40–44, 50–54, 60–64, 70–74, 80–84, and 90–94.</li><li>The Service Type Identifier shall be assigned by USPS for any combination of services requested on the mailpiece. The allowable encoding range shall be 000http://it2.php.net/manual/en/function.dechex.php–999. Each 3-digit value shall correspond to a particular mail class with a particular combination of service(s). Each service program, such as OneCode Confirm and OneCode ACS, shall provide the list of Service Type Identifier values.</li><li>The Mailer or Customer Identifier shall be assigned by USPS as a unique, 6 or 9 digit number that identifies a business entity. The allowable encoding range for the 6 digit Mailer ID shall be 000000- 899999, while the allowable encoding range for the 9 digit Mailer ID shall be 900000000-999999999.</li><li>The Serial or Sequence Number shall be assigned by the mailer for uniquely identifying and tracking mailpieces. The allowable encoding range shall be 000000000–999999999 when used with a 6 digit Mailer ID and 000000-999999 when used with a 9 digit Mailer ID. e. The Delivery Point ZIP Code shall be assigned by the mailer for routing the mailpiece. This shall replace POSTNET for routing the mailpiece to its final delivery point. The length may be 0, 5, 9, or 11 digits. The allowable encoding ranges shall be no ZIP Code, 00000–99999,  000000000–999999999, and 00000000000–99999999999.</li></ul>
-	 * @param $code (string) code to print, separate the ZIP (routing code) from the rest using a minus char '-' (BarcodeID_ServiceTypeID_MailerID_SerialNumber-RoutingCode)
+	 * @param string $code code to print, separate the ZIP (routing code) from the rest using a minus char '-' (BarcodeID_ServiceTypeID_MailerID_SerialNumber-RoutingCode)
 	 * @return array barcode representation.
 	 * @protected
 	 */
@@ -2171,8 +2170,8 @@ class TCPDFBarcode {
 
 	/**
 	 * IMB - Intelligent Mail Barcode - Onecode - USPS-B-3200
-	 * 
-	 * @param $code (string) pre-formatted IMB barcode (65 chars "FADT")
+	 *
+	 * @param string $code pre-formatted IMB barcode (65 chars "FADT")
 	 * @return array barcode representation.
 	 * @protected
 	 */
@@ -2223,7 +2222,7 @@ class TCPDFBarcode {
 	/**
 	 * Convert large integer number to hexadecimal representation.
 	 * (requires PHP bcmath extension)
-	 * @param $number (string) number to convert specified as a string
+	 * @param string $number number to convert specified as a string
 	 * @return string hexadecimal representation
 	 */
 	public function dec_to_hex($number) {
@@ -2247,7 +2246,7 @@ class TCPDFBarcode {
 	/**
 	 * Convert large hexadecimal number to decimal representation (string).
 	 * (requires PHP bcmath extension)
-	 * @param $hex (string) hexadecimal number to convert specified as a string
+	 * @param string $hex hexadecimal number to convert specified as a string
 	 * @return string hexadecimal representation
 	 */
 	public function hex_to_dec($hex) {
@@ -2263,7 +2262,7 @@ class TCPDFBarcode {
 
 	/**
 	 * Intelligent Mail Barcode calculation of Frame Check Sequence
-	 * @param $code_arr (string) array of hexadecimal values (13 bytes holding 102 bits right justified).
+	 * @param string $code_arr array of hexadecimal values (13 bytes holding 102 bits right justified).
 	 * @return int 11 bit Frame Check Sequence as integer (decimal base)
 	 * @protected
 	 */
@@ -2299,7 +2298,7 @@ class TCPDFBarcode {
 
 	/**
 	 * Reverse unsigned short value
-	 * @param $num (int) value to reversr
+	 * @param int $num value to reversr
 	 * @return int reversed value
 	 * @protected
 	 */
@@ -2315,8 +2314,8 @@ class TCPDFBarcode {
 
 	/**
 	 * generate Nof13 tables used for Intelligent Mail Barcode
-	 * @param $n (int) is the type of table: 2 for 2of13 table, 5 for 5of13table
-	 * @param $size (int) size of table (78 for n=2 and 1287 for n=5)
+	 * @param int $n is the type of table: 2 for 2of13 table, 5 for 5of13table
+	 * @param int $size size of table (78 for n=2 and 1287 for n=5)
 	 * @return array requested table
 	 * @protected
 	 */
diff --git a/lib/combodo/tcpdf/tcpdf_barcodes_2d.php b/lib/combodo/tcpdf/tcpdf_barcodes_2d.php
index 13e236552..730361bd8 100644
--- a/lib/combodo/tcpdf/tcpdf_barcodes_2d.php
+++ b/lib/combodo/tcpdf/tcpdf_barcodes_2d.php
@@ -53,7 +53,7 @@ class TCPDF2DBarcode {
 	 * Array representation of barcode.
 	 * @protected
 	 */
-	protected $barcode_array = false;
+	protected $barcode_array = array();
 
 	/**
 	 * This is the class constructor.
@@ -62,8 +62,8 @@ class TCPDF2DBarcode {
 	 * <li>$arrcode['num_rows'] required number of rows</li>
 	 * <li>$arrcode['num_cols'] required number of columns</li>
 	 * <li>$arrcode['bcode'][$r][$c] value of the cell is $r row and $c column (0 = transparent, 1 = black)</li></ul>
-	 * @param $code (string) code to print
- 	 * @param $type (string) type of barcode: <ul><li>DATAMATRIX : Datamatrix (ISO/IEC 16022)</li><li>PDF417 : PDF417 (ISO/IEC 15438:2006)</li><li>PDF417,a,e,t,s,f,o0,o1,o2,o3,o4,o5,o6 : PDF417 with parameters: a = aspect ratio (width/height); e = error correction level (0-8); t = total number of macro segments; s = macro segment index (0-99998); f = file ID; o0 = File Name (text); o1 = Segment Count (numeric); o2 = Time Stamp (numeric); o3 = Sender (text); o4 = Addressee (text); o5 = File Size (numeric); o6 = Checksum (numeric). NOTES: Parameters t, s and f are required for a Macro Control Block, all other parametrs are optional. To use a comma character ',' on text options, replace it with the character 255: "\xff".</li><li>QRCODE : QRcode Low error correction</li><li>QRCODE,L : QRcode Low error correction</li><li>QRCODE,M : QRcode Medium error correction</li><li>QRCODE,Q : QRcode Better error correction</li><li>QRCODE,H : QR-CODE Best error correction</li><li>RAW: raw mode - comma-separad list of array rows</li><li>RAW2: raw mode - array rows are surrounded by square parenthesis.</li><li>TEST : Test matrix</li></ul>
+	 * @param string $code code to print
+ 	 * @param string $type type of barcode: <ul><li>DATAMATRIX : Datamatrix (ISO/IEC 16022)</li><li>PDF417 : PDF417 (ISO/IEC 15438:2006)</li><li>PDF417,a,e,t,s,f,o0,o1,o2,o3,o4,o5,o6 : PDF417 with parameters: a = aspect ratio (width/height); e = error correction level (0-8); t = total number of macro segments; s = macro segment index (0-99998); f = file ID; o0 = File Name (text); o1 = Segment Count (numeric); o2 = Time Stamp (numeric); o3 = Sender (text); o4 = Addressee (text); o5 = File Size (numeric); o6 = Checksum (numeric). NOTES: Parameters t, s and f are required for a Macro Control Block, all other parameters are optional. To use a comma character ',' on text options, replace it with the character 255: "\xff".</li><li>QRCODE : QRcode Low error correction</li><li>QRCODE,L : QRcode Low error correction</li><li>QRCODE,M : QRcode Medium error correction</li><li>QRCODE,Q : QRcode Better error correction</li><li>QRCODE,H : QR-CODE Best error correction</li><li>RAW: raw mode - comma-separad list of array rows</li><li>RAW2: raw mode - array rows are surrounded by square parenthesis.</li><li>TEST : Test matrix</li></ul>
 	 */
 	public function __construct($code, $type) {
 		$this->setBarcode($code, $type);
@@ -79,9 +79,9 @@ class TCPDF2DBarcode {
 
 	/**
 	 * Send barcode as SVG image object to the standard output.
-	 * @param $w (int) Width of a single rectangle element in user units.
-	 * @param $h (int) Height of a single rectangle element in user units.
-	 * @param $color (string) Foreground color (in SVG format) for bar elements (background is transparent).
+	 * @param int $w Width of a single rectangle element in user units.
+	 * @param int $h Height of a single rectangle element in user units.
+	 * @param string $color Foreground color (in SVG format) for bar elements (background is transparent).
  	 * @public
 	 */
 	public function getBarcodeSVG($w=3, $h=3, $color='black') {
@@ -99,9 +99,9 @@ class TCPDF2DBarcode {
 
 	/**
 	 * Return a SVG string representation of barcode.
-	 * @param $w (int) Width of a single rectangle element in user units.
-	 * @param $h (int) Height of a single rectangle element in user units.
-	 * @param $color (string) Foreground color (in SVG format) for bar elements (background is transparent).
+	 * @param int $w Width of a single rectangle element in user units.
+	 * @param int $h Height of a single rectangle element in user units.
+	 * @param string $color Foreground color (in SVG format) for bar elements (background is transparent).
  	 * @return string SVG code.
  	 * @public
 	 */
@@ -135,9 +135,9 @@ class TCPDF2DBarcode {
 
 	/**
 	 * Return an HTML representation of barcode.
-	 * @param $w (int) Width of a single rectangle element in pixels.
-	 * @param $h (int) Height of a single rectangle element in pixels.
-	 * @param $color (string) Foreground color for bar elements (background is transparent).
+	 * @param int $w Width of a single rectangle element in pixels.
+	 * @param int $h Height of a single rectangle element in pixels.
+	 * @param string $color Foreground color for bar elements (background is transparent).
  	 * @return string HTML code.
  	 * @public
 	 */
@@ -164,9 +164,9 @@ class TCPDF2DBarcode {
 
 	/**
 	 * Send a PNG image representation of barcode (requires GD or Imagick library).
-	 * @param $w (int) Width of a single rectangle element in pixels.
-	 * @param $h (int) Height of a single rectangle element in pixels.
-	 * @param $color (array) RGB (0-255) foreground color for bar elements (background is transparent).
+	 * @param int $w Width of a single rectangle element in pixels.
+	 * @param int $h Height of a single rectangle element in pixels.
+	 * @param array $color RGB (0-255) foreground color for bar elements (background is transparent).
  	 * @public
 	 */
 	public function getBarcodePNG($w=3, $h=3, $color=array(0,0,0)) {
@@ -184,10 +184,10 @@ class TCPDF2DBarcode {
 
 	/**
 	 * Return a PNG image representation of barcode (requires GD or Imagick library).
-	 * @param $w (int) Width of a single rectangle element in pixels.
-	 * @param $h (int) Height of a single rectangle element in pixels.
-	 * @param $color (array) RGB (0-255) foreground color for bar elements (background is transparent).
- 	 * @return image or false in case of error.
+	 * @param int $w Width of a single rectangle element in pixels.
+	 * @param int $h Height of a single rectangle element in pixels.
+	 * @param array $color RGB (0-255) foreground color for bar elements (background is transparent).
+ 	 * @return string|Imagick|false image or false in case of error.
  	 * @public
 	 */
 	public function getBarcodePngData($w=3, $h=3, $color=array(0,0,0)) {
@@ -245,9 +245,9 @@ class TCPDF2DBarcode {
 
 	/**
 	 * Set the barcode.
-	 * @param $code (string) code to print
- 	 * @param $type (string) type of barcode: <ul><li>DATAMATRIX : Datamatrix (ISO/IEC 16022)</li><li>PDF417 : PDF417 (ISO/IEC 15438:2006)</li><li>PDF417,a,e,t,s,f,o0,o1,o2,o3,o4,o5,o6 : PDF417 with parameters: a = aspect ratio (width/height); e = error correction level (0-8); t = total number of macro segments; s = macro segment index (0-99998); f = file ID; o0 = File Name (text); o1 = Segment Count (numeric); o2 = Time Stamp (numeric); o3 = Sender (text); o4 = Addressee (text); o5 = File Size (numeric); o6 = Checksum (numeric). NOTES: Parameters t, s and f are required for a Macro Control Block, all other parametrs are optional. To use a comma character ',' on text options, replace it with the character 255: "\xff".</li><li>QRCODE : QRcode Low error correction</li><li>QRCODE,L : QRcode Low error correction</li><li>QRCODE,M : QRcode Medium error correction</li><li>QRCODE,Q : QRcode Better error correction</li><li>QRCODE,H : QR-CODE Best error correction</li><li>RAW: raw mode - comma-separad list of array rows</li><li>RAW2: raw mode - array rows are surrounded by square parenthesis.</li><li>TEST : Test matrix</li></ul>
- 	 * @return array
+	 * @param string $code code to print
+ 	 * @param string $type type of barcode: <ul><li>DATAMATRIX : Datamatrix (ISO/IEC 16022)</li><li>PDF417 : PDF417 (ISO/IEC 15438:2006)</li><li>PDF417,a,e,t,s,f,o0,o1,o2,o3,o4,o5,o6 : PDF417 with parameters: a = aspect ratio (width/height); e = error correction level (0-8); t = total number of macro segments; s = macro segment index (0-99998); f = file ID; o0 = File Name (text); o1 = Segment Count (numeric); o2 = Time Stamp (numeric); o3 = Sender (text); o4 = Addressee (text); o5 = File Size (numeric); o6 = Checksum (numeric). NOTES: Parameters t, s and f are required for a Macro Control Block, all other parameters are optional. To use a comma character ',' on text options, replace it with the character 255: "\xff".</li><li>QRCODE : QRcode Low error correction</li><li>QRCODE,L : QRcode Low error correction</li><li>QRCODE,M : QRcode Medium error correction</li><li>QRCODE,Q : QRcode Better error correction</li><li>QRCODE,H : QR-CODE Best error correction</li><li>RAW: raw mode - comma-separad list of array rows</li><li>RAW2: raw mode - array rows are surrounded by square parenthesis.</li><li>TEST : Test matrix</li></ul>
+ 	 * @return void
 	 */
 	public function setBarcode($code, $type) {
 		$mode = explode(',', $type);
@@ -338,7 +338,7 @@ class TCPDF2DBarcode {
 				break;
 			}
 			default: {
-				$this->barcode_array = false;
+				$this->barcode_array = array();
 			}
 		}
 	}
diff --git a/lib/combodo/tcpdf/tcpdf_import.php b/lib/combodo/tcpdf/tcpdf_import.php
index 09d726ba0..cc6fda780 100644
--- a/lib/combodo/tcpdf/tcpdf_import.php
+++ b/lib/combodo/tcpdf/tcpdf_import.php
@@ -60,7 +60,7 @@ class TCPDF_IMPORT extends TCPDF {
 
 	/**
 	 * Import an existing PDF document
-	 * @param $filename (string) Filename of the PDF document to import.
+	 * @param string $filename Filename of the PDF document to import.
 	 * @return true in case of success, false otherwise
 	 * @public
 	 * @since 1.0.000 (2011-05-24)
diff --git a/lib/combodo/tcpdf/tcpdf_parser.php b/lib/combodo/tcpdf/tcpdf_parser.php
index bd3d719c7..4156230a3 100644
--- a/lib/combodo/tcpdf/tcpdf_parser.php
+++ b/lib/combodo/tcpdf/tcpdf_parser.php
@@ -91,8 +91,8 @@ class TCPDF_PARSER {
 
 	/**
 	 * Parse a PDF document an return an array of objects.
-	 * @param $data (string) PDF data to parse.
-	 * @param $cfg (array) Array of configuration parameters:
+	 * @param string $data PDF data to parse.
+	 * @param array $cfg Array of configuration parameters:
 	 * 			'die_for_errors' : if true termitate the program execution in case of error, otherwise thows an exception;
 	 * 			'ignore_filter_decoding_errors' : if true ignore filter decoding errors;
 	 * 			'ignore_missing_filter_decoders' : if true ignore missing filter decoding errors.
@@ -130,7 +130,7 @@ class TCPDF_PARSER {
 
 	/**
 	 * Set the configuration parameters.
-	 * @param $cfg (array) Array of configuration parameters:
+	 * @param array $cfg Array of configuration parameters:
 	 * 			'die_for_errors' : if true termitate the program execution in case of error, otherwise thows an exception;
 	 * 			'ignore_filter_decoding_errors' : if true ignore filter decoding errors;
 	 * 			'ignore_missing_filter_decoders' : if true ignore missing filter decoding errors.
@@ -150,7 +150,7 @@ class TCPDF_PARSER {
 
 	/**
 	 * Return an array of parsed PDF document objects.
-	 * @return (array) Array of parsed PDF document objects.
+	 * @return array Array of parsed PDF document objects.
 	 * @public
 	 * @since 1.0.000 (2011-06-26)
 	 */
@@ -160,9 +160,9 @@ class TCPDF_PARSER {
 
 	/**
 	 * Get Cross-Reference (xref) table and trailer data from PDF document data.
-	 * @param $offset (int) xref offset (if know).
-	 * @param $xref (array) previous xref array (if any).
-	 * @return Array containing xref and trailer data.
+	 * @param int $offset xref offset (if know).
+	 * @param array $xref previous xref array (if any).
+	 * @return array containing xref and trailer data.
 	 * @protected
 	 * @since 1.0.000 (2011-05-24)
 	 */
@@ -202,9 +202,9 @@ class TCPDF_PARSER {
 
 	/**
 	 * Decode the Cross-Reference section
-	 * @param $startxref (int) Offset at which the xref section starts (position of the 'xref' keyword).
-	 * @param $xref (array) Previous xref array (if any).
-	 * @return Array containing xref and trailer data.
+	 * @param int $startxref Offset at which the xref section starts (position of the 'xref' keyword).
+	 * @param array $xref Previous xref array (if any).
+	 * @return array containing xref and trailer data.
 	 * @protected
 	 * @since 1.0.000 (2011-06-20)
 	 */
@@ -274,9 +274,9 @@ class TCPDF_PARSER {
 
 	/**
 	 * Decode the Cross-Reference Stream section
-	 * @param $startxref (int) Offset at which the xref section starts.
-	 * @param $xref (array) Previous xref array (if any).
-	 * @return Array containing xref and trailer data.
+	 * @param int $startxref Offset at which the xref section starts.
+	 * @param array $xref Previous xref array (if any).
+	 * @return array containing xref and trailer data.
 	 * @protected
 	 * @since 1.0.003 (2013-03-16)
 	 */
@@ -489,7 +489,7 @@ class TCPDF_PARSER {
 
 	/**
 	 * Get object type, raw value and offset to next object
-	 * @param $offset (int) Object offset.
+	 * @param int $offset Object offset.
 	 * @return array containing object type, raw value and offset to next object
 	 * @protected
 	 * @since 1.0.000 (2011-06-20)
@@ -667,9 +667,9 @@ class TCPDF_PARSER {
 
 	/**
 	 * Get content of indirect object.
-	 * @param $obj_ref (string) Object number and generation number separated by underscore character.
-	 * @param $offset (int) Object offset.
-	 * @param $decoding (boolean) If true decode streams.
+	 * @param string $obj_ref Object number and generation number separated by underscore character.
+	 * @param int $offset Object offset.
+	 * @param boolean $decoding If true decode streams.
 	 * @return array containing object data.
 	 * @protected
 	 * @since 1.0.000 (2011-05-24)
@@ -712,7 +712,7 @@ class TCPDF_PARSER {
 
 	/**
 	 * Get the content of object, resolving indect object reference if necessary.
-	 * @param $obj (string) Object value.
+	 * @param string $obj Object value.
 	 * @return array containing object data.
 	 * @protected
 	 * @since 1.0.000 (2011-06-26)
@@ -734,8 +734,8 @@ class TCPDF_PARSER {
 
 	/**
 	 * Decode the specified stream.
-	 * @param $sdic (array) Stream's dictionary array.
-	 * @param $stream (string) Stream to decode.
+	 * @param array $sdic Stream's dictionary array.
+	 * @param string $stream Stream to decode.
 	 * @return array containing decoded stream data and remaining filters.
 	 * @protected
 	 * @since 1.0.000 (2011-06-22)
@@ -796,7 +796,7 @@ class TCPDF_PARSER {
 
 	/**
 	 * Throw an exception or print an error message and die if the K_TCPDF_PARSER_THROW_EXCEPTION_ERROR constant is set to true.
-	 * @param $msg (string) The error message
+	 * @param string $msg The error message
 	 * @public
 	 * @since 1.0.000 (2011-05-23)
 	 */
diff --git a/lib/composer/installed.json b/lib/composer/installed.json
index 87a25eb41..2e88f259b 100644
--- a/lib/composer/installed.json
+++ b/lib/composer/installed.json
@@ -2,17 +2,17 @@
     "packages": [
         {
             "name": "combodo/tcpdf",
-            "version": "6.3.5",
-            "version_normalized": "6.3.5.0",
+            "version": "6.4.4",
+            "version_normalized": "6.4.4.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/combodo-itop-libs/TCPDF.git",
-                "reference": "aedd4b7b8cf7fcc24e617c405c9d3304150f4b94"
+                "reference": "0e31c013ccd000aa6762e9186778aa6e259ac8e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/combodo-itop-libs/TCPDF/zipball/aedd4b7b8cf7fcc24e617c405c9d3304150f4b94",
-                "reference": "aedd4b7b8cf7fcc24e617c405c9d3304150f4b94",
+                "url": "https://api.github.com/repos/combodo-itop-libs/TCPDF/zipball/0e31c013ccd000aa6762e9186778aa6e259ac8e8",
+                "reference": "0e31c013ccd000aa6762e9186778aa6e259ac8e8",
                 "shasum": ""
             },
             "require": {
@@ -21,7 +21,7 @@
             "replace": {
                 "tecnickcom/tcpdf": "self.version"
             },
-            "time": "2020-09-28T12:19:09+00:00",
+            "time": "2022-03-10T14:36:39+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -59,8 +59,26 @@
                     "email": "contact@combodo.com"
                 }
             ],
-            "description": "TCPDF fork adding requirements for iTop: Specific fonts.",
+            "description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
             "homepage": "https://github.com/combodo-itop-libs/TCPDF",
+            "keywords": [
+                "PDFD32000-2008",
+                "TCPDF",
+                "barcodes",
+                "datamatrix",
+                "pdf",
+                "pdf417",
+                "qrcode"
+            ],
+            "support": {
+                "source": "https://github.com/combodo-itop-libs/TCPDF/tree/6.4.4"
+            },
+            "funding": [
+                {
+                    "url": "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&currency_code=GBP&business=paypal@tecnick.com&item_name=donation%20for%20tcpdf%20project",
+                    "type": "custom"
+                }
+            ],
             "install-path": "../combodo/tcpdf"
         },
         {
diff --git a/lib/composer/installed.php b/lib/composer/installed.php
index 4850fad9c..fbe3522ca 100644
--- a/lib/composer/installed.php
+++ b/lib/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '9f9560f322ed091f816fa7c0b03442a02bb82325',
+        'reference' => '33afa208a306f8486092ad9520344138ce45e780',
         'name' => '__root__',
         'dev' => true,
     ),
@@ -16,16 +16,16 @@
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '9f9560f322ed091f816fa7c0b03442a02bb82325',
+            'reference' => '33afa208a306f8486092ad9520344138ce45e780',
             'dev_requirement' => false,
         ),
         'combodo/tcpdf' => array(
-            'pretty_version' => '6.3.5',
-            'version' => '6.3.5.0',
+            'pretty_version' => '6.4.4',
+            'version' => '6.4.4.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../combodo/tcpdf',
             'aliases' => array(),
-            'reference' => 'aedd4b7b8cf7fcc24e617c405c9d3304150f4b94',
+            'reference' => '0e31c013ccd000aa6762e9186778aa6e259ac8e8',
             'dev_requirement' => false,
         ),
         'nikic/php-parser' => array(
@@ -421,7 +421,7 @@
         'tecnickcom/tcpdf' => array(
             'dev_requirement' => false,
             'replaced' => array(
-                0 => '6.3.5',
+                0 => '6.4.4',
             ),
         ),
         'twig/twig' => array(

From b19c73a36e356065d102b60ac59a965ae5b306f1 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Fri, 29 Apr 2022 12:24:23 +0200
Subject: [PATCH 05/15] =?UTF-8?q?:arrow=5Fup:=20N=C2=B04284=20Composer=20l?=
 =?UTF-8?q?ibs=20:=20update=20nikic/php-parser=20Was=20done=20in=203.0.0?=
 =?UTF-8?q?=20with=20N=C2=B03867?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.json                                 |    2 +-
 composer.lock                                 |   21 +-
 lib/composer/autoload_classmap.php            |   58 +-
 lib/composer/autoload_static.php              |   58 +-
 lib/composer/installed.json                   |   23 +-
 lib/composer/installed.php                    |   10 +-
 lib/nikic/php-parser/.gitignore               |    4 -
 lib/nikic/php-parser/.travis.yml              |   31 -
 lib/nikic/php-parser/CHANGELOG.md             |  422 --
 lib/nikic/php-parser/LICENSE                  |   44 +-
 lib/nikic/php-parser/README.md                |  238 +-
 lib/nikic/php-parser/UPGRADE-1.0.md           |  121 -
 lib/nikic/php-parser/UPGRADE-2.0.md           |   74 -
 lib/nikic/php-parser/UPGRADE-3.0.md           |  160 -
 lib/nikic/php-parser/bin/php-parse            |   55 +-
 lib/nikic/php-parser/composer.json            |   29 +-
 .../php-parser/doc/0_Introduction.markdown    |   80 -
 .../doc/2_Usage_of_basic_components.markdown  |  438 --
 ...3_Other_node_tree_representations.markdown |  330 -
 .../php-parser/doc/4_Code_generation.markdown |   84 -
 .../doc/component/Error_handling.markdown     |   75 -
 .../php-parser/doc/component/Lexer.markdown   |  152 -
 lib/nikic/php-parser/grammar/README.md        |   12 +-
 lib/nikic/php-parser/grammar/parser.template  |   27 +-
 lib/nikic/php-parser/grammar/php5.y           |  245 +-
 lib/nikic/php-parser/grammar/php7.y           |  571 +-
 lib/nikic/php-parser/grammar/phpyLang.php     |  192 +
 .../php-parser/grammar/rebuildParsers.php     |  218 +-
 lib/nikic/php-parser/grammar/tokens.y         |   24 +-
 .../php-parser/lib/PhpParser/Autoloader.php   |   40 -
 .../php-parser/lib/PhpParser/Builder.php      |    6 +-
 .../lib/PhpParser/Builder/ClassConst.php      |  132 +
 .../lib/PhpParser/Builder/Class_.php          |   75 +-
 .../lib/PhpParser/Builder/Declaration.php     |   15 +-
 .../lib/PhpParser/Builder/EnumCase.php        |   85 +
 .../lib/PhpParser/Builder/Enum_.php           |  117 +
 .../lib/PhpParser/Builder/FunctionLike.php    |   16 +-
 .../lib/PhpParser/Builder/Function_.php       |   32 +-
 .../lib/PhpParser/Builder/Interface_.php      |   67 +-
 .../lib/PhpParser/Builder/Method.php          |   44 +-
 .../lib/PhpParser/Builder/Namespace_.php      |   13 +-
 .../lib/PhpParser/Builder/Param.php           |   55 +-
 .../lib/PhpParser/Builder/Property.php        |   84 +-
 .../lib/PhpParser/Builder/TraitUse.php        |   64 +
 .../PhpParser/Builder/TraitUseAdaptation.php  |  148 +
 .../lib/PhpParser/Builder/Trait_.php          |   43 +-
 .../php-parser/lib/PhpParser/Builder/Use_.php |   35 +-
 .../lib/PhpParser/BuilderAbstract.php         |  175 -
 .../lib/PhpParser/BuilderFactory.php          |  328 +-
 .../lib/PhpParser/BuilderHelpers.php          |  313 +
 .../php-parser/lib/PhpParser/Comment.php      |  143 +-
 .../php-parser/lib/PhpParser/Comment/Doc.php  |    4 +-
 .../ConstExprEvaluationException.php          |    6 +
 .../lib/PhpParser/ConstExprEvaluator.php      |  229 +
 lib/nikic/php-parser/lib/PhpParser/Error.php  |   58 +-
 .../php-parser/lib/PhpParser/ErrorHandler.php |    4 +-
 .../lib/PhpParser/ErrorHandler/Collecting.php |    8 +-
 .../lib/PhpParser/ErrorHandler/Throwing.php   |    4 +-
 .../lib/PhpParser/Internal/DiffElem.php       |   27 +
 .../lib/PhpParser/Internal/Differ.php         |  164 +
 .../Internal/PrintableNewAnonClassNode.php    |   61 +
 .../lib/PhpParser/Internal/TokenStream.php    |  281 +
 .../php-parser/lib/PhpParser/JsonDecoder.php  |  103 +
 lib/nikic/php-parser/lib/PhpParser/Lexer.php  |  349 +-
 .../lib/PhpParser/Lexer/Emulative.php         |  354 +-
 .../Lexer/TokenEmulator/AttributeEmulator.php |   56 +
 .../CoaleseEqualTokenEmulator.php             |   47 +
 .../Lexer/TokenEmulator/EnumTokenEmulator.php |   31 +
 .../TokenEmulator/ExplicitOctalEmulator.php   |   44 +
 .../FlexibleDocStringEmulator.php             |   76 +
 .../Lexer/TokenEmulator/FnTokenEmulator.php   |   23 +
 .../Lexer/TokenEmulator/KeywordEmulator.php   |   62 +
 .../TokenEmulator/MatchTokenEmulator.php      |   23 +
 .../TokenEmulator/NullsafeTokenEmulator.php   |   67 +
 .../NumericLiteralSeparatorEmulator.php       |  105 +
 .../TokenEmulator/ReadonlyTokenEmulator.php   |   23 +
 .../Lexer/TokenEmulator/ReverseEmulator.php   |   36 +
 .../Lexer/TokenEmulator/TokenEmulator.php     |   25 +
 .../php-parser/lib/PhpParser/NameContext.php  |  285 +
 lib/nikic/php-parser/lib/PhpParser/Node.php   |   97 +-
 .../php-parser/lib/PhpParser/Node/Arg.php     |   22 +-
 .../lib/PhpParser/Node/Attribute.php          |   34 +
 .../lib/PhpParser/Node/AttributeGroup.php     |   29 +
 .../lib/PhpParser/Node/ComplexType.php        |   14 +
 .../php-parser/lib/PhpParser/Node/Const_.php  |   27 +-
 .../php-parser/lib/PhpParser/Node/Expr.php    |    4 +-
 .../lib/PhpParser/Node/Expr/ArrayDimFetch.php |   14 +-
 .../lib/PhpParser/Node/Expr/ArrayItem.php     |   17 +-
 .../lib/PhpParser/Node/Expr/Array_.php        |   18 +-
 .../lib/PhpParser/Node/Expr/ArrowFunction.php |   79 +
 .../lib/PhpParser/Node/Expr/Assign.php        |   14 +-
 .../lib/PhpParser/Node/Expr/AssignOp.php      |   10 +-
 .../Node/Expr/AssignOp/BitwiseAnd.php         |    7 +-
 .../Node/Expr/AssignOp/BitwiseOr.php          |    7 +-
 .../Node/Expr/AssignOp/BitwiseXor.php         |    7 +-
 .../PhpParser/Node/Expr/AssignOp/Coalesce.php |   12 +
 .../PhpParser/Node/Expr/AssignOp/Concat.php   |    7 +-
 .../lib/PhpParser/Node/Expr/AssignOp/Div.php  |    7 +-
 .../PhpParser/Node/Expr/AssignOp/Minus.php    |    7 +-
 .../lib/PhpParser/Node/Expr/AssignOp/Mod.php  |    7 +-
 .../lib/PhpParser/Node/Expr/AssignOp/Mul.php  |    7 +-
 .../lib/PhpParser/Node/Expr/AssignOp/Plus.php |    7 +-
 .../lib/PhpParser/Node/Expr/AssignOp/Pow.php  |    7 +-
 .../Node/Expr/AssignOp/ShiftLeft.php          |    7 +-
 .../Node/Expr/AssignOp/ShiftRight.php         |    7 +-
 .../lib/PhpParser/Node/Expr/AssignRef.php     |   14 +-
 .../lib/PhpParser/Node/Expr/BinaryOp.php      |   22 +-
 .../Node/Expr/BinaryOp/BitwiseAnd.php         |   11 +-
 .../Node/Expr/BinaryOp/BitwiseOr.php          |   11 +-
 .../Node/Expr/BinaryOp/BitwiseXor.php         |   11 +-
 .../Node/Expr/BinaryOp/BooleanAnd.php         |   11 +-
 .../Node/Expr/BinaryOp/BooleanOr.php          |   11 +-
 .../PhpParser/Node/Expr/BinaryOp/Coalesce.php |    9 +-
 .../PhpParser/Node/Expr/BinaryOp/Concat.php   |   11 +-
 .../lib/PhpParser/Node/Expr/BinaryOp/Div.php  |   11 +-
 .../PhpParser/Node/Expr/BinaryOp/Equal.php    |   11 +-
 .../PhpParser/Node/Expr/BinaryOp/Greater.php  |   11 +-
 .../Node/Expr/BinaryOp/GreaterOrEqual.php     |   11 +-
 .../Node/Expr/BinaryOp/Identical.php          |   11 +-
 .../Node/Expr/BinaryOp/LogicalAnd.php         |   11 +-
 .../Node/Expr/BinaryOp/LogicalOr.php          |   11 +-
 .../Node/Expr/BinaryOp/LogicalXor.php         |   11 +-
 .../PhpParser/Node/Expr/BinaryOp/Minus.php    |   11 +-
 .../lib/PhpParser/Node/Expr/BinaryOp/Mod.php  |   11 +-
 .../lib/PhpParser/Node/Expr/BinaryOp/Mul.php  |   11 +-
 .../PhpParser/Node/Expr/BinaryOp/NotEqual.php |   11 +-
 .../Node/Expr/BinaryOp/NotIdentical.php       |   11 +-
 .../lib/PhpParser/Node/Expr/BinaryOp/Plus.php |   11 +-
 .../lib/PhpParser/Node/Expr/BinaryOp/Pow.php  |   11 +-
 .../Node/Expr/BinaryOp/ShiftLeft.php          |   11 +-
 .../Node/Expr/BinaryOp/ShiftRight.php         |   11 +-
 .../PhpParser/Node/Expr/BinaryOp/Smaller.php  |   11 +-
 .../Node/Expr/BinaryOp/SmallerOrEqual.php     |   11 +-
 .../Node/Expr/BinaryOp/Spaceship.php          |    9 +-
 .../lib/PhpParser/Node/Expr/BitwiseNot.php    |   14 +-
 .../lib/PhpParser/Node/Expr/BooleanNot.php    |   14 +-
 .../lib/PhpParser/Node/Expr/CallLike.php      |   39 +
 .../lib/PhpParser/Node/Expr/Cast.php          |   10 +-
 .../lib/PhpParser/Node/Expr/Cast/Array_.php   |    7 +-
 .../lib/PhpParser/Node/Expr/Cast/Bool_.php    |    5 +-
 .../lib/PhpParser/Node/Expr/Cast/Double.php   |   10 +-
 .../lib/PhpParser/Node/Expr/Cast/Int_.php     |    5 +-
 .../lib/PhpParser/Node/Expr/Cast/Object_.php  |    5 +-
 .../lib/PhpParser/Node/Expr/Cast/String_.php  |    5 +-
 .../lib/PhpParser/Node/Expr/Cast/Unset_.php   |    7 +-
 .../PhpParser/Node/Expr/ClassConstFetch.php   |   25 +-
 .../lib/PhpParser/Node/Expr/Clone_.php        |   14 +-
 .../lib/PhpParser/Node/Expr/Closure.php       |   46 +-
 .../lib/PhpParser/Node/Expr/ClosureUse.php    |   22 +-
 .../lib/PhpParser/Node/Expr/ConstFetch.php    |   14 +-
 .../lib/PhpParser/Node/Expr/Empty_.php        |   14 +-
 .../lib/PhpParser/Node/Expr/Error.php         |   14 +-
 .../lib/PhpParser/Node/Expr/ErrorSuppress.php |   14 +-
 .../lib/PhpParser/Node/Expr/Eval_.php         |   14 +-
 .../lib/PhpParser/Node/Expr/Exit_.php         |   14 +-
 .../lib/PhpParser/Node/Expr/FuncCall.php      |   28 +-
 .../lib/PhpParser/Node/Expr/Include_.php      |   14 +-
 .../lib/PhpParser/Node/Expr/Instanceof_.php   |   14 +-
 .../lib/PhpParser/Node/Expr/Isset_.php        |   14 +-
 .../lib/PhpParser/Node/Expr/List_.php         |   20 +-
 .../lib/PhpParser/Node/Expr/Match_.php        |   31 +
 .../lib/PhpParser/Node/Expr/MethodCall.php    |   36 +-
 .../lib/PhpParser/Node/Expr/New_.php          |   26 +-
 .../Node/Expr/NullsafeMethodCall.php          |   45 +
 .../Node/Expr/NullsafePropertyFetch.php       |   35 +
 .../lib/PhpParser/Node/Expr/PostDec.php       |   14 +-
 .../lib/PhpParser/Node/Expr/PostInc.php       |   14 +-
 .../lib/PhpParser/Node/Expr/PreDec.php        |   14 +-
 .../lib/PhpParser/Node/Expr/PreInc.php        |   14 +-
 .../lib/PhpParser/Node/Expr/Print_.php        |   14 +-
 .../lib/PhpParser/Node/Expr/PropertyFetch.php |   25 +-
 .../lib/PhpParser/Node/Expr/ShellExec.php     |   14 +-
 .../lib/PhpParser/Node/Expr/StaticCall.php    |   37 +-
 .../Node/Expr/StaticPropertyFetch.php         |   25 +-
 .../lib/PhpParser/Node/Expr/Ternary.php       |   14 +-
 .../lib/PhpParser/Node/Expr/Throw_.php        |   30 +
 .../lib/PhpParser/Node/Expr/UnaryMinus.php    |   14 +-
 .../lib/PhpParser/Node/Expr/UnaryPlus.php     |   14 +-
 .../lib/PhpParser/Node/Expr/Variable.php      |   16 +-
 .../lib/PhpParser/Node/Expr/YieldFrom.php     |   14 +-
 .../lib/PhpParser/Node/Expr/Yield_.php        |   14 +-
 .../lib/PhpParser/Node/FunctionLike.php       |   21 +-
 .../lib/PhpParser/Node/Identifier.php         |   75 +
 .../lib/PhpParser/Node/IntersectionType.php   |   30 +
 .../lib/PhpParser/Node/MatchArm.php           |   31 +
 .../php-parser/lib/PhpParser/Node/Name.php    |  104 +-
 .../PhpParser/Node/Name/FullyQualified.php    |   20 +-
 .../lib/PhpParser/Node/Name/Relative.php      |   20 +-
 .../lib/PhpParser/Node/NullableType.php       |   26 +-
 .../php-parser/lib/PhpParser/Node/Param.php   |   50 +-
 .../php-parser/lib/PhpParser/Node/Scalar.php  |    4 +-
 .../lib/PhpParser/Node/Scalar/DNumber.php     |   18 +-
 .../lib/PhpParser/Node/Scalar/Encapsed.php    |   18 +-
 .../Node/Scalar/EncapsedStringPart.php        |   14 +-
 .../lib/PhpParser/Node/Scalar/LNumber.php     |   23 +-
 .../lib/PhpParser/Node/Scalar/MagicConst.php  |   12 +-
 .../Node/Scalar/MagicConst/Class_.php         |   10 +-
 .../PhpParser/Node/Scalar/MagicConst/Dir.php  |   10 +-
 .../PhpParser/Node/Scalar/MagicConst/File.php |   10 +-
 .../Node/Scalar/MagicConst/Function_.php      |   10 +-
 .../PhpParser/Node/Scalar/MagicConst/Line.php |   10 +-
 .../Node/Scalar/MagicConst/Method.php         |   10 +-
 .../Node/Scalar/MagicConst/Namespace_.php     |   10 +-
 .../Node/Scalar/MagicConst/Trait_.php         |   10 +-
 .../lib/PhpParser/Node/Scalar/String_.php     |   56 +-
 .../php-parser/lib/PhpParser/Node/Stmt.php    |    4 +-
 .../lib/PhpParser/Node/Stmt/Break_.php        |   14 +-
 .../lib/PhpParser/Node/Stmt/Case_.php         |   20 +-
 .../lib/PhpParser/Node/Stmt/Catch_.php        |   29 +-
 .../lib/PhpParser/Node/Stmt/ClassConst.php    |   59 +-
 .../lib/PhpParser/Node/Stmt/ClassLike.php     |   81 +-
 .../lib/PhpParser/Node/Stmt/ClassMethod.php   |  133 +-
 .../lib/PhpParser/Node/Stmt/Class_.php        |   75 +-
 .../lib/PhpParser/Node/Stmt/Const_.php        |   14 +-
 .../lib/PhpParser/Node/Stmt/Continue_.php     |   14 +-
 .../PhpParser/Node/Stmt/DeclareDeclare.php    |   24 +-
 .../lib/PhpParser/Node/Stmt/Declare_.php      |   18 +-
 .../lib/PhpParser/Node/Stmt/Do_.php           |   24 +-
 .../lib/PhpParser/Node/Stmt/Echo_.php         |   14 +-
 .../lib/PhpParser/Node/Stmt/ElseIf_.php       |   22 +-
 .../lib/PhpParser/Node/Stmt/Else_.php         |   20 +-
 .../lib/PhpParser/Node/Stmt/EnumCase.php      |   37 +
 .../lib/PhpParser/Node/Stmt/Enum_.php         |   40 +
 .../lib/PhpParser/Node/Stmt/Expression.php    |   33 +
 .../lib/PhpParser/Node/Stmt/Finally_.php      |   20 +-
 .../lib/PhpParser/Node/Stmt/For_.php          |   24 +-
 .../lib/PhpParser/Node/Stmt/Foreach_.php      |   22 +-
 .../lib/PhpParser/Node/Stmt/Function_.php     |   51 +-
 .../lib/PhpParser/Node/Stmt/Global_.php       |   14 +-
 .../lib/PhpParser/Node/Stmt/Goto_.php         |   23 +-
 .../lib/PhpParser/Node/Stmt/GroupUse.php      |   14 +-
 .../lib/PhpParser/Node/Stmt/HaltCompiler.php  |   14 +-
 .../lib/PhpParser/Node/Stmt/If_.php           |   22 +-
 .../lib/PhpParser/Node/Stmt/InlineHTML.php    |   14 +-
 .../lib/PhpParser/Node/Stmt/Interface_.php    |   28 +-
 .../lib/PhpParser/Node/Stmt/Label.php         |   23 +-
 .../lib/PhpParser/Node/Stmt/Namespace_.php    |   22 +-
 .../lib/PhpParser/Node/Stmt/Nop.php           |   10 +-
 .../lib/PhpParser/Node/Stmt/Property.php      |   70 +-
 .../PhpParser/Node/Stmt/PropertyProperty.php  |   24 +-
 .../lib/PhpParser/Node/Stmt/Return_.php       |   14 +-
 .../lib/PhpParser/Node/Stmt/StaticVar.php     |   25 +-
 .../lib/PhpParser/Node/Stmt/Static_.php       |   14 +-
 .../lib/PhpParser/Node/Stmt/Switch_.php       |   14 +-
 .../lib/PhpParser/Node/Stmt/Throw_.php        |   16 +-
 .../lib/PhpParser/Node/Stmt/TraitUse.php      |   15 +-
 .../Node/Stmt/TraitUseAdaptation.php          |    6 +-
 .../Node/Stmt/TraitUseAdaptation/Alias.php    |   30 +-
 .../Stmt/TraitUseAdaptation/Precedence.php    |   24 +-
 .../lib/PhpParser/Node/Stmt/Trait_.php        |   24 +-
 .../lib/PhpParser/Node/Stmt/TryCatch.php      |   22 +-
 .../lib/PhpParser/Node/Stmt/Unset_.php        |   14 +-
 .../lib/PhpParser/Node/Stmt/UseUse.php        |   44 +-
 .../lib/PhpParser/Node/Stmt/Use_.php          |   14 +-
 .../lib/PhpParser/Node/Stmt/While_.php        |   22 +-
 .../lib/PhpParser/Node/UnionType.php          |   28 +
 .../lib/PhpParser/Node/VarLikeIdentifier.php  |   17 +
 .../PhpParser/Node/VariadicPlaceholder.php    |   27 +
 .../php-parser/lib/PhpParser/NodeAbstract.php |  156 +-
 .../php-parser/lib/PhpParser/NodeDumper.php   |   30 +-
 .../php-parser/lib/PhpParser/NodeFinder.php   |   81 +
 .../lib/PhpParser/NodeTraverser.php           |  191 +-
 .../lib/PhpParser/NodeTraverserInterface.php  |    9 +-
 .../php-parser/lib/PhpParser/NodeVisitor.php  |    8 +-
 .../PhpParser/NodeVisitor/CloningVisitor.php  |   20 +
 .../PhpParser/NodeVisitor/FindingVisitor.php  |   48 +
 .../NodeVisitor/FirstFindingVisitor.php       |   50 +
 .../PhpParser/NodeVisitor/NameResolver.php    |  237 +-
 .../NodeVisitor/NodeConnectingVisitor.php     |   52 +
 .../NodeVisitor/ParentConnectingVisitor.php   |   41 +
 .../lib/PhpParser/NodeVisitorAbstract.php     |   23 +-
 lib/nikic/php-parser/lib/PhpParser/Parser.php |   11 +-
 .../lib/PhpParser/Parser/Multiple.php         |    7 +-
 .../php-parser/lib/PhpParser/Parser/Php5.php  | 5301 ++++++++---------
 .../php-parser/lib/PhpParser/Parser/Php7.php  | 5148 ++++++++--------
 .../lib/PhpParser/Parser/Tokens.php           |  254 +-
 .../lib/PhpParser/ParserAbstract.php          |  572 +-
 .../lib/PhpParser/ParserFactory.php           |    7 +-
 .../lib/PhpParser/PrettyPrinter/Standard.php  |  480 +-
 .../lib/PhpParser/PrettyPrinterAbstract.php   | 1406 ++++-
 .../php-parser/lib/PhpParser/Serializer.php   |   18 -
 .../lib/PhpParser/Serializer/XML.php          |   89 -
 .../php-parser/lib/PhpParser/Unserializer.php |   18 -
 .../lib/PhpParser/Unserializer/XML.php        |  155 -
 lib/nikic/php-parser/lib/bootstrap.php        |    6 -
 lib/nikic/php-parser/phpunit.xml.dist         |   24 -
 lib/nikic/php-parser/test_old/run-php-src.sh  |    4 -
 lib/nikic/php-parser/test_old/run.php         |  220 -
 288 files changed, 15609 insertions(+), 11148 deletions(-)
 delete mode 100644 lib/nikic/php-parser/.gitignore
 delete mode 100644 lib/nikic/php-parser/.travis.yml
 delete mode 100644 lib/nikic/php-parser/CHANGELOG.md
 delete mode 100644 lib/nikic/php-parser/UPGRADE-1.0.md
 delete mode 100644 lib/nikic/php-parser/UPGRADE-2.0.md
 delete mode 100644 lib/nikic/php-parser/UPGRADE-3.0.md
 delete mode 100644 lib/nikic/php-parser/doc/0_Introduction.markdown
 delete mode 100644 lib/nikic/php-parser/doc/2_Usage_of_basic_components.markdown
 delete mode 100644 lib/nikic/php-parser/doc/3_Other_node_tree_representations.markdown
 delete mode 100644 lib/nikic/php-parser/doc/4_Code_generation.markdown
 delete mode 100644 lib/nikic/php-parser/doc/component/Error_handling.markdown
 delete mode 100644 lib/nikic/php-parser/doc/component/Lexer.markdown
 create mode 100644 lib/nikic/php-parser/grammar/phpyLang.php
 delete mode 100644 lib/nikic/php-parser/lib/PhpParser/Autoloader.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Builder/ClassConst.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Builder/EnumCase.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Builder/Enum_.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Builder/TraitUse.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Builder/TraitUseAdaptation.php
 delete mode 100644 lib/nikic/php-parser/lib/PhpParser/BuilderAbstract.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/BuilderHelpers.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/ConstExprEvaluationException.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Internal/DiffElem.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Internal/Differ.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Internal/PrintableNewAnonClassNode.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Internal/TokenStream.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/JsonDecoder.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/AttributeEmulator.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/CoaleseEqualTokenEmulator.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/EnumTokenEmulator.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ExplicitOctalEmulator.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/FlexibleDocStringEmulator.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/FnTokenEmulator.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/KeywordEmulator.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/MatchTokenEmulator.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NullsafeTokenEmulator.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NumericLiteralSeparatorEmulator.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReadonlyTokenEmulator.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReverseEmulator.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/TokenEmulator.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/NameContext.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Node/Attribute.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Node/AttributeGroup.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Node/ComplexType.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrowFunction.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Coalesce.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Node/Expr/CallLike.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Node/Expr/Match_.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Node/Expr/NullsafeMethodCall.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Node/Expr/NullsafePropertyFetch.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Node/Expr/Throw_.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Node/Identifier.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Node/IntersectionType.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Node/MatchArm.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Node/Stmt/EnumCase.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Enum_.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Expression.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Node/UnionType.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Node/VarLikeIdentifier.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/Node/VariadicPlaceholder.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/NodeFinder.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/NodeVisitor/CloningVisitor.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/NodeVisitor/FindingVisitor.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/NodeVisitor/FirstFindingVisitor.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/NodeVisitor/NodeConnectingVisitor.php
 create mode 100644 lib/nikic/php-parser/lib/PhpParser/NodeVisitor/ParentConnectingVisitor.php
 delete mode 100644 lib/nikic/php-parser/lib/PhpParser/Serializer.php
 delete mode 100644 lib/nikic/php-parser/lib/PhpParser/Serializer/XML.php
 delete mode 100644 lib/nikic/php-parser/lib/PhpParser/Unserializer.php
 delete mode 100644 lib/nikic/php-parser/lib/PhpParser/Unserializer/XML.php
 delete mode 100644 lib/nikic/php-parser/lib/bootstrap.php
 delete mode 100644 lib/nikic/php-parser/phpunit.xml.dist
 delete mode 100755 lib/nikic/php-parser/test_old/run-php-src.sh
 delete mode 100644 lib/nikic/php-parser/test_old/run.php

diff --git a/composer.json b/composer.json
index 707ad5051..be32dcb4b 100644
--- a/composer.json
+++ b/composer.json
@@ -11,7 +11,7 @@
     "ext-mysqli": "*",
     "ext-soap": "*",
     "combodo/tcpdf": "~6.4.4",
-    "nikic/php-parser": "^3.1",
+    "nikic/php-parser": "~4.13.2",
     "pear/archive_tar": "1.4.14",
     "pelago/emogrifier": "2.1.0",
     "scssphp/scssphp": "1.0.6",
diff --git a/composer.lock b/composer.lock
index f6e6277e3..b36f69a74 100644
--- a/composer.lock
+++ b/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": "8efc1677968f1aeda2977543982242e6",
+    "content-hash": "2dff3cf0e45834a895b6f81f1af4016c",
     "packages": [
         {
             "name": "combodo/tcpdf",
@@ -86,24 +86,25 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v3.1.5",
+            "version": "v4.13.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce"
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
-                "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": ">=5.5"
+                "php": ">=7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0|~5.0"
+                "ircmaxell/php-yacc": "^0.0.7",
+                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -111,7 +112,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "4.9-dev"
                 }
             },
             "autoload": {
@@ -135,9 +136,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v3.1.5"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2"
             },
-            "time": "2018-02-28T20:30:58+00:00"
+            "time": "2021-11-30T19:35:32+00:00"
         },
         {
             "name": "paragonie/random_compat",
diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index 0961e54e0..6cc6fef1e 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -390,12 +390,14 @@ return array(
     'Pelago\\Emogrifier\\HtmlProcessor\\AbstractHtmlProcessor' => $vendorDir . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/AbstractHtmlProcessor.php',
     'Pelago\\Emogrifier\\HtmlProcessor\\CssToAttributeConverter' => $vendorDir . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/CssToAttributeConverter.php',
     'Pelago\\Emogrifier\\HtmlProcessor\\HtmlNormalizer' => $vendorDir . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/HtmlNormalizer.php',
-    'PhpParser\\Autoloader' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Autoloader.php',
     'PhpParser\\Builder' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder.php',
-    'PhpParser\\BuilderAbstract' => $vendorDir . '/nikic/php-parser/lib/PhpParser/BuilderAbstract.php',
     'PhpParser\\BuilderFactory' => $vendorDir . '/nikic/php-parser/lib/PhpParser/BuilderFactory.php',
+    'PhpParser\\BuilderHelpers' => $vendorDir . '/nikic/php-parser/lib/PhpParser/BuilderHelpers.php',
+    'PhpParser\\Builder\\ClassConst' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/ClassConst.php',
     'PhpParser\\Builder\\Class_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Class_.php',
     'PhpParser\\Builder\\Declaration' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Declaration.php',
+    'PhpParser\\Builder\\EnumCase' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/EnumCase.php',
+    'PhpParser\\Builder\\Enum_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Enum_.php',
     'PhpParser\\Builder\\FunctionLike' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/FunctionLike.php',
     'PhpParser\\Builder\\Function_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Function_.php',
     'PhpParser\\Builder\\Interface_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Interface_.php',
@@ -403,35 +405,69 @@ return array(
     'PhpParser\\Builder\\Namespace_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Namespace_.php',
     'PhpParser\\Builder\\Param' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Param.php',
     'PhpParser\\Builder\\Property' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Property.php',
+    'PhpParser\\Builder\\TraitUse' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/TraitUse.php',
+    'PhpParser\\Builder\\TraitUseAdaptation' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/TraitUseAdaptation.php',
     'PhpParser\\Builder\\Trait_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Trait_.php',
     'PhpParser\\Builder\\Use_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder/Use_.php',
     'PhpParser\\Comment' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Comment.php',
     'PhpParser\\Comment\\Doc' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Comment/Doc.php',
+    'PhpParser\\ConstExprEvaluationException' => $vendorDir . '/nikic/php-parser/lib/PhpParser/ConstExprEvaluationException.php',
+    'PhpParser\\ConstExprEvaluator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php',
     'PhpParser\\Error' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Error.php',
     'PhpParser\\ErrorHandler' => $vendorDir . '/nikic/php-parser/lib/PhpParser/ErrorHandler.php',
     'PhpParser\\ErrorHandler\\Collecting' => $vendorDir . '/nikic/php-parser/lib/PhpParser/ErrorHandler/Collecting.php',
     'PhpParser\\ErrorHandler\\Throwing' => $vendorDir . '/nikic/php-parser/lib/PhpParser/ErrorHandler/Throwing.php',
+    'PhpParser\\Internal\\DiffElem' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Internal/DiffElem.php',
+    'PhpParser\\Internal\\Differ' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Internal/Differ.php',
+    'PhpParser\\Internal\\PrintableNewAnonClassNode' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Internal/PrintableNewAnonClassNode.php',
+    'PhpParser\\Internal\\TokenStream' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Internal/TokenStream.php',
+    'PhpParser\\JsonDecoder' => $vendorDir . '/nikic/php-parser/lib/PhpParser/JsonDecoder.php',
     'PhpParser\\Lexer' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer.php',
     'PhpParser\\Lexer\\Emulative' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php',
+    'PhpParser\\Lexer\\TokenEmulator\\AttributeEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/AttributeEmulator.php',
+    'PhpParser\\Lexer\\TokenEmulator\\CoaleseEqualTokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/CoaleseEqualTokenEmulator.php',
+    'PhpParser\\Lexer\\TokenEmulator\\EnumTokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/EnumTokenEmulator.php',
+    'PhpParser\\Lexer\\TokenEmulator\\ExplicitOctalEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ExplicitOctalEmulator.php',
+    'PhpParser\\Lexer\\TokenEmulator\\FlexibleDocStringEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/FlexibleDocStringEmulator.php',
+    'PhpParser\\Lexer\\TokenEmulator\\FnTokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/FnTokenEmulator.php',
+    'PhpParser\\Lexer\\TokenEmulator\\KeywordEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/KeywordEmulator.php',
+    'PhpParser\\Lexer\\TokenEmulator\\MatchTokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/MatchTokenEmulator.php',
+    'PhpParser\\Lexer\\TokenEmulator\\NullsafeTokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NullsafeTokenEmulator.php',
+    'PhpParser\\Lexer\\TokenEmulator\\NumericLiteralSeparatorEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NumericLiteralSeparatorEmulator.php',
+    'PhpParser\\Lexer\\TokenEmulator\\ReadonlyTokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReadonlyTokenEmulator.php',
+    'PhpParser\\Lexer\\TokenEmulator\\ReverseEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReverseEmulator.php',
+    'PhpParser\\Lexer\\TokenEmulator\\TokenEmulator' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/TokenEmulator.php',
+    'PhpParser\\NameContext' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NameContext.php',
     'PhpParser\\Node' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node.php',
     'PhpParser\\NodeAbstract' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeAbstract.php',
     'PhpParser\\NodeDumper' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeDumper.php',
+    'PhpParser\\NodeFinder' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeFinder.php',
     'PhpParser\\NodeTraverser' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeTraverser.php',
     'PhpParser\\NodeTraverserInterface' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeTraverserInterface.php',
     'PhpParser\\NodeVisitor' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeVisitor.php',
     'PhpParser\\NodeVisitorAbstract' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeVisitorAbstract.php',
+    'PhpParser\\NodeVisitor\\CloningVisitor' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeVisitor/CloningVisitor.php',
+    'PhpParser\\NodeVisitor\\FindingVisitor' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeVisitor/FindingVisitor.php',
+    'PhpParser\\NodeVisitor\\FirstFindingVisitor' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeVisitor/FirstFindingVisitor.php',
     'PhpParser\\NodeVisitor\\NameResolver' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php',
+    'PhpParser\\NodeVisitor\\NodeConnectingVisitor' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeVisitor/NodeConnectingVisitor.php',
+    'PhpParser\\NodeVisitor\\ParentConnectingVisitor' => $vendorDir . '/nikic/php-parser/lib/PhpParser/NodeVisitor/ParentConnectingVisitor.php',
     'PhpParser\\Node\\Arg' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Arg.php',
+    'PhpParser\\Node\\Attribute' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Attribute.php',
+    'PhpParser\\Node\\AttributeGroup' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/AttributeGroup.php',
+    'PhpParser\\Node\\ComplexType' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/ComplexType.php',
     'PhpParser\\Node\\Const_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Const_.php',
     'PhpParser\\Node\\Expr' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr.php',
     'PhpParser\\Node\\Expr\\ArrayDimFetch' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayDimFetch.php',
     'PhpParser\\Node\\Expr\\ArrayItem' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayItem.php',
     'PhpParser\\Node\\Expr\\Array_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Array_.php',
+    'PhpParser\\Node\\Expr\\ArrowFunction' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/ArrowFunction.php',
     'PhpParser\\Node\\Expr\\Assign' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Assign.php',
     'PhpParser\\Node\\Expr\\AssignOp' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp.php',
     'PhpParser\\Node\\Expr\\AssignOp\\BitwiseAnd' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseAnd.php',
     'PhpParser\\Node\\Expr\\AssignOp\\BitwiseOr' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseOr.php',
     'PhpParser\\Node\\Expr\\AssignOp\\BitwiseXor' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseXor.php',
+    'PhpParser\\Node\\Expr\\AssignOp\\Coalesce' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Coalesce.php',
     'PhpParser\\Node\\Expr\\AssignOp\\Concat' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Concat.php',
     'PhpParser\\Node\\Expr\\AssignOp\\Div' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Div.php',
     'PhpParser\\Node\\Expr\\AssignOp\\Minus' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Minus.php',
@@ -472,6 +508,7 @@ return array(
     'PhpParser\\Node\\Expr\\BinaryOp\\Spaceship' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Spaceship.php',
     'PhpParser\\Node\\Expr\\BitwiseNot' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BitwiseNot.php',
     'PhpParser\\Node\\Expr\\BooleanNot' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/BooleanNot.php',
+    'PhpParser\\Node\\Expr\\CallLike' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/CallLike.php',
     'PhpParser\\Node\\Expr\\Cast' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast.php',
     'PhpParser\\Node\\Expr\\Cast\\Array_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Array_.php',
     'PhpParser\\Node\\Expr\\Cast\\Bool_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Bool_.php',
@@ -495,8 +532,11 @@ return array(
     'PhpParser\\Node\\Expr\\Instanceof_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Instanceof_.php',
     'PhpParser\\Node\\Expr\\Isset_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Isset_.php',
     'PhpParser\\Node\\Expr\\List_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/List_.php',
+    'PhpParser\\Node\\Expr\\Match_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Match_.php',
     'PhpParser\\Node\\Expr\\MethodCall' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/MethodCall.php',
     'PhpParser\\Node\\Expr\\New_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/New_.php',
+    'PhpParser\\Node\\Expr\\NullsafeMethodCall' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/NullsafeMethodCall.php',
+    'PhpParser\\Node\\Expr\\NullsafePropertyFetch' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/NullsafePropertyFetch.php',
     'PhpParser\\Node\\Expr\\PostDec' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/PostDec.php',
     'PhpParser\\Node\\Expr\\PostInc' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/PostInc.php',
     'PhpParser\\Node\\Expr\\PreDec' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/PreDec.php',
@@ -507,12 +547,16 @@ return array(
     'PhpParser\\Node\\Expr\\StaticCall' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php',
     'PhpParser\\Node\\Expr\\StaticPropertyFetch' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/StaticPropertyFetch.php',
     'PhpParser\\Node\\Expr\\Ternary' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Ternary.php',
+    'PhpParser\\Node\\Expr\\Throw_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Throw_.php',
     'PhpParser\\Node\\Expr\\UnaryMinus' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryMinus.php',
     'PhpParser\\Node\\Expr\\UnaryPlus' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryPlus.php',
     'PhpParser\\Node\\Expr\\Variable' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Variable.php',
     'PhpParser\\Node\\Expr\\YieldFrom' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/YieldFrom.php',
     'PhpParser\\Node\\Expr\\Yield_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Expr/Yield_.php',
     'PhpParser\\Node\\FunctionLike' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/FunctionLike.php',
+    'PhpParser\\Node\\Identifier' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Identifier.php',
+    'PhpParser\\Node\\IntersectionType' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/IntersectionType.php',
+    'PhpParser\\Node\\MatchArm' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/MatchArm.php',
     'PhpParser\\Node\\Name' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Name.php',
     'PhpParser\\Node\\Name\\FullyQualified' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Name/FullyQualified.php',
     'PhpParser\\Node\\Name\\Relative' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Name/Relative.php',
@@ -549,6 +593,9 @@ return array(
     'PhpParser\\Node\\Stmt\\Echo_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Echo_.php',
     'PhpParser\\Node\\Stmt\\ElseIf_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/ElseIf_.php',
     'PhpParser\\Node\\Stmt\\Else_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Else_.php',
+    'PhpParser\\Node\\Stmt\\EnumCase' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/EnumCase.php',
+    'PhpParser\\Node\\Stmt\\Enum_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Enum_.php',
+    'PhpParser\\Node\\Stmt\\Expression' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Expression.php',
     'PhpParser\\Node\\Stmt\\Finally_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Finally_.php',
     'PhpParser\\Node\\Stmt\\For_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/For_.php',
     'PhpParser\\Node\\Stmt\\Foreach_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Foreach_.php',
@@ -580,6 +627,9 @@ return array(
     'PhpParser\\Node\\Stmt\\UseUse' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/UseUse.php',
     'PhpParser\\Node\\Stmt\\Use_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Use_.php',
     'PhpParser\\Node\\Stmt\\While_' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/Stmt/While_.php',
+    'PhpParser\\Node\\UnionType' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/UnionType.php',
+    'PhpParser\\Node\\VarLikeIdentifier' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/VarLikeIdentifier.php',
+    'PhpParser\\Node\\VariadicPlaceholder' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Node/VariadicPlaceholder.php',
     'PhpParser\\Parser' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Parser.php',
     'PhpParser\\ParserAbstract' => $vendorDir . '/nikic/php-parser/lib/PhpParser/ParserAbstract.php',
     'PhpParser\\ParserFactory' => $vendorDir . '/nikic/php-parser/lib/PhpParser/ParserFactory.php',
@@ -589,10 +639,6 @@ return array(
     'PhpParser\\Parser\\Tokens' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Parser/Tokens.php',
     'PhpParser\\PrettyPrinterAbstract' => $vendorDir . '/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php',
     'PhpParser\\PrettyPrinter\\Standard' => $vendorDir . '/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php',
-    'PhpParser\\Serializer' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Serializer.php',
-    'PhpParser\\Serializer\\XML' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Serializer/XML.php',
-    'PhpParser\\Unserializer' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Unserializer.php',
-    'PhpParser\\Unserializer\\XML' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Unserializer/XML.php',
     'PortalDispatcher' => $baseDir . '/application/portaldispatcher.class.inc.php',
     'PortalURLMaker' => $baseDir . '/application/applicationcontext.class.inc.php',
     'PrintableDataTable' => $baseDir . '/application/datatable.class.inc.php',
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index 8afe4c51d..642367c39 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -620,12 +620,14 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'Pelago\\Emogrifier\\HtmlProcessor\\AbstractHtmlProcessor' => __DIR__ . '/..' . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/AbstractHtmlProcessor.php',
         'Pelago\\Emogrifier\\HtmlProcessor\\CssToAttributeConverter' => __DIR__ . '/..' . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/CssToAttributeConverter.php',
         'Pelago\\Emogrifier\\HtmlProcessor\\HtmlNormalizer' => __DIR__ . '/..' . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/HtmlNormalizer.php',
-        'PhpParser\\Autoloader' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Autoloader.php',
         'PhpParser\\Builder' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder.php',
-        'PhpParser\\BuilderAbstract' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/BuilderAbstract.php',
         'PhpParser\\BuilderFactory' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/BuilderFactory.php',
+        'PhpParser\\BuilderHelpers' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/BuilderHelpers.php',
+        'PhpParser\\Builder\\ClassConst' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/ClassConst.php',
         'PhpParser\\Builder\\Class_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Class_.php',
         'PhpParser\\Builder\\Declaration' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Declaration.php',
+        'PhpParser\\Builder\\EnumCase' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/EnumCase.php',
+        'PhpParser\\Builder\\Enum_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Enum_.php',
         'PhpParser\\Builder\\FunctionLike' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/FunctionLike.php',
         'PhpParser\\Builder\\Function_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Function_.php',
         'PhpParser\\Builder\\Interface_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Interface_.php',
@@ -633,35 +635,69 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'PhpParser\\Builder\\Namespace_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Namespace_.php',
         'PhpParser\\Builder\\Param' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Param.php',
         'PhpParser\\Builder\\Property' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Property.php',
+        'PhpParser\\Builder\\TraitUse' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/TraitUse.php',
+        'PhpParser\\Builder\\TraitUseAdaptation' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/TraitUseAdaptation.php',
         'PhpParser\\Builder\\Trait_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Trait_.php',
         'PhpParser\\Builder\\Use_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder/Use_.php',
         'PhpParser\\Comment' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Comment.php',
         'PhpParser\\Comment\\Doc' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Comment/Doc.php',
+        'PhpParser\\ConstExprEvaluationException' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/ConstExprEvaluationException.php',
+        'PhpParser\\ConstExprEvaluator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php',
         'PhpParser\\Error' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Error.php',
         'PhpParser\\ErrorHandler' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/ErrorHandler.php',
         'PhpParser\\ErrorHandler\\Collecting' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/ErrorHandler/Collecting.php',
         'PhpParser\\ErrorHandler\\Throwing' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/ErrorHandler/Throwing.php',
+        'PhpParser\\Internal\\DiffElem' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Internal/DiffElem.php',
+        'PhpParser\\Internal\\Differ' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Internal/Differ.php',
+        'PhpParser\\Internal\\PrintableNewAnonClassNode' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Internal/PrintableNewAnonClassNode.php',
+        'PhpParser\\Internal\\TokenStream' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Internal/TokenStream.php',
+        'PhpParser\\JsonDecoder' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/JsonDecoder.php',
         'PhpParser\\Lexer' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer.php',
         'PhpParser\\Lexer\\Emulative' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php',
+        'PhpParser\\Lexer\\TokenEmulator\\AttributeEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/AttributeEmulator.php',
+        'PhpParser\\Lexer\\TokenEmulator\\CoaleseEqualTokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/CoaleseEqualTokenEmulator.php',
+        'PhpParser\\Lexer\\TokenEmulator\\EnumTokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/EnumTokenEmulator.php',
+        'PhpParser\\Lexer\\TokenEmulator\\ExplicitOctalEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ExplicitOctalEmulator.php',
+        'PhpParser\\Lexer\\TokenEmulator\\FlexibleDocStringEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/FlexibleDocStringEmulator.php',
+        'PhpParser\\Lexer\\TokenEmulator\\FnTokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/FnTokenEmulator.php',
+        'PhpParser\\Lexer\\TokenEmulator\\KeywordEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/KeywordEmulator.php',
+        'PhpParser\\Lexer\\TokenEmulator\\MatchTokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/MatchTokenEmulator.php',
+        'PhpParser\\Lexer\\TokenEmulator\\NullsafeTokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NullsafeTokenEmulator.php',
+        'PhpParser\\Lexer\\TokenEmulator\\NumericLiteralSeparatorEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NumericLiteralSeparatorEmulator.php',
+        'PhpParser\\Lexer\\TokenEmulator\\ReadonlyTokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReadonlyTokenEmulator.php',
+        'PhpParser\\Lexer\\TokenEmulator\\ReverseEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReverseEmulator.php',
+        'PhpParser\\Lexer\\TokenEmulator\\TokenEmulator' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/TokenEmulator.php',
+        'PhpParser\\NameContext' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NameContext.php',
         'PhpParser\\Node' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node.php',
         'PhpParser\\NodeAbstract' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeAbstract.php',
         'PhpParser\\NodeDumper' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeDumper.php',
+        'PhpParser\\NodeFinder' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeFinder.php',
         'PhpParser\\NodeTraverser' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeTraverser.php',
         'PhpParser\\NodeTraverserInterface' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeTraverserInterface.php',
         'PhpParser\\NodeVisitor' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeVisitor.php',
         'PhpParser\\NodeVisitorAbstract' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeVisitorAbstract.php',
+        'PhpParser\\NodeVisitor\\CloningVisitor' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeVisitor/CloningVisitor.php',
+        'PhpParser\\NodeVisitor\\FindingVisitor' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeVisitor/FindingVisitor.php',
+        'PhpParser\\NodeVisitor\\FirstFindingVisitor' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeVisitor/FirstFindingVisitor.php',
         'PhpParser\\NodeVisitor\\NameResolver' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php',
+        'PhpParser\\NodeVisitor\\NodeConnectingVisitor' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeVisitor/NodeConnectingVisitor.php',
+        'PhpParser\\NodeVisitor\\ParentConnectingVisitor' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/NodeVisitor/ParentConnectingVisitor.php',
         'PhpParser\\Node\\Arg' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Arg.php',
+        'PhpParser\\Node\\Attribute' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Attribute.php',
+        'PhpParser\\Node\\AttributeGroup' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/AttributeGroup.php',
+        'PhpParser\\Node\\ComplexType' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/ComplexType.php',
         'PhpParser\\Node\\Const_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Const_.php',
         'PhpParser\\Node\\Expr' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr.php',
         'PhpParser\\Node\\Expr\\ArrayDimFetch' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayDimFetch.php',
         'PhpParser\\Node\\Expr\\ArrayItem' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayItem.php',
         'PhpParser\\Node\\Expr\\Array_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Array_.php',
+        'PhpParser\\Node\\Expr\\ArrowFunction' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/ArrowFunction.php',
         'PhpParser\\Node\\Expr\\Assign' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Assign.php',
         'PhpParser\\Node\\Expr\\AssignOp' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp.php',
         'PhpParser\\Node\\Expr\\AssignOp\\BitwiseAnd' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseAnd.php',
         'PhpParser\\Node\\Expr\\AssignOp\\BitwiseOr' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseOr.php',
         'PhpParser\\Node\\Expr\\AssignOp\\BitwiseXor' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseXor.php',
+        'PhpParser\\Node\\Expr\\AssignOp\\Coalesce' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Coalesce.php',
         'PhpParser\\Node\\Expr\\AssignOp\\Concat' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Concat.php',
         'PhpParser\\Node\\Expr\\AssignOp\\Div' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Div.php',
         'PhpParser\\Node\\Expr\\AssignOp\\Minus' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Minus.php',
@@ -702,6 +738,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'PhpParser\\Node\\Expr\\BinaryOp\\Spaceship' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Spaceship.php',
         'PhpParser\\Node\\Expr\\BitwiseNot' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BitwiseNot.php',
         'PhpParser\\Node\\Expr\\BooleanNot' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/BooleanNot.php',
+        'PhpParser\\Node\\Expr\\CallLike' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/CallLike.php',
         'PhpParser\\Node\\Expr\\Cast' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast.php',
         'PhpParser\\Node\\Expr\\Cast\\Array_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Array_.php',
         'PhpParser\\Node\\Expr\\Cast\\Bool_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Bool_.php',
@@ -725,8 +762,11 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'PhpParser\\Node\\Expr\\Instanceof_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Instanceof_.php',
         'PhpParser\\Node\\Expr\\Isset_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Isset_.php',
         'PhpParser\\Node\\Expr\\List_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/List_.php',
+        'PhpParser\\Node\\Expr\\Match_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Match_.php',
         'PhpParser\\Node\\Expr\\MethodCall' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/MethodCall.php',
         'PhpParser\\Node\\Expr\\New_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/New_.php',
+        'PhpParser\\Node\\Expr\\NullsafeMethodCall' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/NullsafeMethodCall.php',
+        'PhpParser\\Node\\Expr\\NullsafePropertyFetch' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/NullsafePropertyFetch.php',
         'PhpParser\\Node\\Expr\\PostDec' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/PostDec.php',
         'PhpParser\\Node\\Expr\\PostInc' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/PostInc.php',
         'PhpParser\\Node\\Expr\\PreDec' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/PreDec.php',
@@ -737,12 +777,16 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'PhpParser\\Node\\Expr\\StaticCall' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php',
         'PhpParser\\Node\\Expr\\StaticPropertyFetch' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/StaticPropertyFetch.php',
         'PhpParser\\Node\\Expr\\Ternary' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Ternary.php',
+        'PhpParser\\Node\\Expr\\Throw_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Throw_.php',
         'PhpParser\\Node\\Expr\\UnaryMinus' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryMinus.php',
         'PhpParser\\Node\\Expr\\UnaryPlus' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryPlus.php',
         'PhpParser\\Node\\Expr\\Variable' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Variable.php',
         'PhpParser\\Node\\Expr\\YieldFrom' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/YieldFrom.php',
         'PhpParser\\Node\\Expr\\Yield_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Expr/Yield_.php',
         'PhpParser\\Node\\FunctionLike' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/FunctionLike.php',
+        'PhpParser\\Node\\Identifier' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Identifier.php',
+        'PhpParser\\Node\\IntersectionType' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/IntersectionType.php',
+        'PhpParser\\Node\\MatchArm' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/MatchArm.php',
         'PhpParser\\Node\\Name' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Name.php',
         'PhpParser\\Node\\Name\\FullyQualified' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Name/FullyQualified.php',
         'PhpParser\\Node\\Name\\Relative' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Name/Relative.php',
@@ -779,6 +823,9 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'PhpParser\\Node\\Stmt\\Echo_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Echo_.php',
         'PhpParser\\Node\\Stmt\\ElseIf_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/ElseIf_.php',
         'PhpParser\\Node\\Stmt\\Else_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Else_.php',
+        'PhpParser\\Node\\Stmt\\EnumCase' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/EnumCase.php',
+        'PhpParser\\Node\\Stmt\\Enum_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Enum_.php',
+        'PhpParser\\Node\\Stmt\\Expression' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Expression.php',
         'PhpParser\\Node\\Stmt\\Finally_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Finally_.php',
         'PhpParser\\Node\\Stmt\\For_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/For_.php',
         'PhpParser\\Node\\Stmt\\Foreach_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Foreach_.php',
@@ -810,6 +857,9 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'PhpParser\\Node\\Stmt\\UseUse' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/UseUse.php',
         'PhpParser\\Node\\Stmt\\Use_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/Use_.php',
         'PhpParser\\Node\\Stmt\\While_' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/Stmt/While_.php',
+        'PhpParser\\Node\\UnionType' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/UnionType.php',
+        'PhpParser\\Node\\VarLikeIdentifier' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/VarLikeIdentifier.php',
+        'PhpParser\\Node\\VariadicPlaceholder' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Node/VariadicPlaceholder.php',
         'PhpParser\\Parser' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Parser.php',
         'PhpParser\\ParserAbstract' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/ParserAbstract.php',
         'PhpParser\\ParserFactory' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/ParserFactory.php',
@@ -819,10 +869,6 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'PhpParser\\Parser\\Tokens' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Parser/Tokens.php',
         'PhpParser\\PrettyPrinterAbstract' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php',
         'PhpParser\\PrettyPrinter\\Standard' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php',
-        'PhpParser\\Serializer' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Serializer.php',
-        'PhpParser\\Serializer\\XML' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Serializer/XML.php',
-        'PhpParser\\Unserializer' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Unserializer.php',
-        'PhpParser\\Unserializer\\XML' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Unserializer/XML.php',
         'PortalDispatcher' => __DIR__ . '/../..' . '/application/portaldispatcher.class.inc.php',
         'PortalURLMaker' => __DIR__ . '/../..' . '/application/applicationcontext.class.inc.php',
         'PrintableDataTable' => __DIR__ . '/../..' . '/application/datatable.class.inc.php',
diff --git a/lib/composer/installed.json b/lib/composer/installed.json
index 2e88f259b..4ada053c3 100644
--- a/lib/composer/installed.json
+++ b/lib/composer/installed.json
@@ -83,34 +83,35 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v3.1.5",
-            "version_normalized": "3.1.5.0",
+            "version": "v4.13.2",
+            "version_normalized": "4.13.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce"
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
-                "reference": "bb87e28e7d7b8d9a7fda231d37457c9210faf6ce",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/210577fe3cf7badcc5814d99455df46564f3c077",
+                "reference": "210577fe3cf7badcc5814d99455df46564f3c077",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": ">=5.5"
+                "php": ">=7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0|~5.0"
+                "ircmaxell/php-yacc": "^0.0.7",
+                "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0"
             },
-            "time": "2018-02-28T20:30:58+00:00",
+            "time": "2021-11-30T19:35:32+00:00",
             "bin": [
                 "bin/php-parse"
             ],
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "4.9-dev"
                 }
             },
             "installation-source": "dist",
@@ -133,6 +134,10 @@
                 "parser",
                 "php"
             ],
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.13.2"
+            },
             "install-path": "../nikic/php-parser"
         },
         {
diff --git a/lib/composer/installed.php b/lib/composer/installed.php
index fbe3522ca..e46a0ff33 100644
--- a/lib/composer/installed.php
+++ b/lib/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '33afa208a306f8486092ad9520344138ce45e780',
+        'reference' => '1882b696c58d1e8e3d687196b0974e6b9ec64312',
         'name' => '__root__',
         'dev' => true,
     ),
@@ -16,7 +16,7 @@
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '33afa208a306f8486092ad9520344138ce45e780',
+            'reference' => '1882b696c58d1e8e3d687196b0974e6b9ec64312',
             'dev_requirement' => false,
         ),
         'combodo/tcpdf' => array(
@@ -29,12 +29,12 @@
             'dev_requirement' => false,
         ),
         'nikic/php-parser' => array(
-            'pretty_version' => 'v3.1.5',
-            'version' => '3.1.5.0',
+            'pretty_version' => 'v4.13.2',
+            'version' => '4.13.2.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../nikic/php-parser',
             'aliases' => array(),
-            'reference' => 'bb87e28e7d7b8d9a7fda231d37457c9210faf6ce',
+            'reference' => '210577fe3cf7badcc5814d99455df46564f3c077',
             'dev_requirement' => false,
         ),
         'paragonie/random_compat' => array(
diff --git a/lib/nikic/php-parser/.gitignore b/lib/nikic/php-parser/.gitignore
deleted file mode 100644
index 8c7db2a6e..000000000
--- a/lib/nikic/php-parser/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-vendor/
-composer.lock
-grammar/kmyacc.exe
-grammar/y.output
diff --git a/lib/nikic/php-parser/.travis.yml b/lib/nikic/php-parser/.travis.yml
deleted file mode 100644
index 9cd00253e..000000000
--- a/lib/nikic/php-parser/.travis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-language: php
-dist: trusty
-sudo: false
-
-cache:
-  directories:
-    - $HOME/.composer/cache
-
-php:
-  - 5.5
-  - 5.6
-  - 7.0
-  - nightly
-  - hhvm
-
-install:
-  - if [ $TRAVIS_PHP_VERSION = '5.6' ]; then composer require satooshi/php-coveralls '~1.0'; fi
-  - composer install --prefer-dist
-
-matrix:
-  allow_failures:
-    - php: nightly
-  fast_finish: true
-
-script:
-  - if [ $TRAVIS_PHP_VERSION = '5.6' ]; then vendor/bin/phpunit --coverage-clover build/logs/clover.xml; else vendor/bin/phpunit; fi
-  - if [ $TRAVIS_PHP_VERSION = '7.0' ]; then test_old/run-php-src.sh; fi
-
-after_success:
-  if [ $TRAVIS_PHP_VERSION = '5.6' ]; then php vendor/bin/coveralls; fi
-
diff --git a/lib/nikic/php-parser/CHANGELOG.md b/lib/nikic/php-parser/CHANGELOG.md
deleted file mode 100644
index c2d953393..000000000
--- a/lib/nikic/php-parser/CHANGELOG.md
+++ /dev/null
@@ -1,422 +0,0 @@
-Version 3.1.6-dev
------------------
-
-Nothing yet.
-
-Version 3.1.5 (2018-02-28)
---------------------------
-
-### Fixed
-
-* Fixed duplicate comment assignment in switch statements. (#469)
-* Improve compatibility with PHP-Scoper. (#477)
-
-Version 3.1.4 (2018-01-25)
---------------------------
-
-### Fixed
-
-* Fixed pretty printing of `-(-$x)` and `+(+$x)`. (#459)
-
-Version 3.1.3 (2017-12-26)
---------------------------
-
-### Fixed
-
-* Improve compatibility with php-scoper, by supporting prefixed namespaces in
-  `NodeAbstract::getType()`.
-
-Version 3.1.2 (2017-11-04)
---------------------------
-
-### Fixed
-
-* Comments on empty blocks are now preserved on a `Stmt\Nop` node. (#382)
-
-### Added
-
-* Added `kind` attribute for `Stmt\Namespace_` node, which is one of `KIND_SEMICOLON` or
-  `KIND_BRACED`. (#417)
-* Added `setDocComment()` method to namespace builder. (#437)
-
-Version 3.1.1 (2017-09-02)
---------------------------
-
-### Fixed
-
-* Fixed syntax error on comment after brace-style namespace declaration. (#412)
-* Added support for TraitUse statements in trait builder. (#413)
-
-Version 3.1.0 (2017-07-28)
---------------------------
-
-### Added
-
-* [PHP 7.2] Added support for trailing comma in group use statements.
-* [PHP 7.2] Added support for `object` type. This means `object` types will now be represented as a
-  builtin type (a simple `"object"` string), rather than a class `Name`.
-  
-### Fixed
-
-* Floating-point numbers are now printed correctly if the LC_NUMERIC locale uses a comma as decimal
-  separator.
-
-### Changed
-
-* `Name::$parts` is no longer deprecated.
-
-Version 3.0.6 (2017-06-28)
---------------------------
-
-### Fixed
-
-* Fixed the spelling of `Class_::VISIBILITY_MODIFIER_MASK`. The previous spelling of
-  `Class_::VISIBILITY_MODIFER_MASK` is preserved for backwards compatibility.
-* The pretty printing will now preserve comments inside array literals and function calls by
-  printing the array items / function arguments on separate lines. Array literals and functions that
-  do not contain comments are not affected.
-
-### Added
-
-* Added `Builder\Param::makeVariadic()`.
-
-### Deprecated
-
-* The `Node::setLine()` method has been deprecated.
-
-Version 3.0.5 (2017-03-05)
---------------------------
-
-### Fixed
-
-* Name resolution of `NullableType`s is now performed earlier, so that a fully resolved signature is
-  available when a function is entered. (#360)
-* `Error` nodes are now considered empty, while previously they extended until the token where the
-  error occurred. This made some nodes larger than expected. (#359)
-* Fixed notices being thrown during error recovery in some situations. (#362)
-
-Version 3.0.4 (2017-02-10)
---------------------------
-
-### Fixed
-
-* Fixed some extensibility issues in pretty printer (`pUseType()` is now public and `pPrec()` calls
-  into `p()`, instead of directly dispatching to the type-specific printing method).
-* Fixed notice in `bin/php-parse` script.
-
-### Added
-
-* Error recovery from missing semicolons is now supported in more cases.
-* Error recovery from trailing commas in positions where PHP does not support them is now supported.
-
-Version 3.0.3 (2017-02-03)
---------------------------
-
-### Fixed
-
-* In `"$foo[0]"` the `0` is now parsed as an `LNumber` rather than `String`. (#325)
-* Ensure integers and floats are always pretty printed preserving semantics, even if the particular
-  value can only be manually constructed.
-* Throw a `LogicException` when trying to pretty-print an `Error` node. Previously this resulted in
-  an undefined method exception or fatal error.
-
-### Added
-
-* [PHP 7.1] Added support for negative interpolated offsets: `"$foo[-1]"`
-* Added `preserveOriginalNames` option to `NameResolver`. If this option is enabled, an
-  `originalName` attribute, containing the unresolved name, will be added to each resolved name.
-* Added `php-parse --with-positions` option, which dumps nodes with position information.
-
-### Deprecated
-
-* The XML serializer has been deprecated. In particular, the classes `Serializer\XML`,
-  `Unserializer\XML`, as well as the interfaces `Serializer` and `Unserializer` are deprecated.
-
-Version 3.0.2 (2016-12-06)
---------------------------
-
-### Fixed
-
-* Fixed name resolution of nullable types. (#324)
-* Fixed pretty-printing of nullable types.
-
-Version 3.0.1 (2016-12-01)
---------------------------
-
-### Fixed
-
-* Fixed handling of nested `list()`s: If the nested list was unkeyed, it was directly included in
-  the list items. If it was keyed, it was wrapped in `ArrayItem`. Now nested `List_` nodes are
-  always wrapped in `ArrayItem`s. (#321)
-
-Version 3.0.0 (2016-11-30)
---------------------------
-
-### Added
-
-* Added support for dumping node positions in the NodeDumper through the `dumpPositions` option.
-* Added error recovery support for `$`, `new`, `Foo::`.
-
-Version 3.0.0-beta2 (2016-10-29)
---------------------------------
-
-This release primarily improves our support for error recovery.
-
-### Added
-
-* Added `Node::setDocComment()` method.
-* Added `Error::getMessageWithColumnInfo()` method.
-* Added support for recovery from lexer errors.
-* Added support for recovering from "special" errors (i.e. non-syntax parse errors).
-* Added precise location information for lexer errors.
-* Added `ErrorHandler` interface, and `ErrorHandler\Throwing` and `ErrorHandler\Collecting` as
-  specific implementations. These provide a general mechanism for handling error recovery.
-* Added optional `ErrorHandler` argument to `Parser::parse()`, `Lexer::startLexing()` and
-  `NameResolver::__construct()`.
-* The `NameResolver` now adds a `namespacedName` attribute on name nodes that cannot be statically
-  resolved (unqualified unaliased function or constant names in namespaces).
-  
-### Fixed
-
-* Fixed attribute assignment for `GroupUse` prefix and variables in interpolated strings.
-
-### Changed
-
-* The constants on `NameTraverserInterface` have been moved into the `NameTraverser` class.
-* Due to the error handling changes, the `Parser` interface and `Lexer` API have changed.
-* The emulative lexer now directly postprocesses tokens, instead of using `~__EMU__~` sequences.
-  This changes the protected API of the lexer.
-* The `Name::slice()` method now returns `null` for empty slices, previously `new Name([])` was
-  used. `Name::concat()` now also supports concatenation with `null`.
-
-### Removed
-
-* Removed `Name::append()` and `Name::prepend()`. These mutable methods have been superseded by
-  the immutable `Name::concat()`.
-* Removed `Error::getRawLine()` and `Error::setRawLine()`. These methods have been superseded by
-  `Error::getStartLine()` and `Error::setStartLine()`.
-* Removed support for node cloning in the `NodeTraverser`.
-* Removed `$separator` argument from `Name::toString()`.
-* Removed `throw_on_error` parser option and `Parser::getErrors()` method. Use the `ErrorHandler`
-  mechanism instead.
-
-Version 3.0.0-beta1 (2016-09-16)
---------------------------------
-
-### Added
-
-* [7.1] Function/method and parameter builders now support PHP 7.1 type hints (void, iterable and
-  nullable types).
-* Nodes and Comments now implement `JsonSerializable`. The node kind is stored in a `nodeType`
-  property.
-* The `InlineHTML` node now has an `hasLeadingNewline` attribute, that specifies whether the
-  preceding closing tag contained a newline. The pretty printer honors this attribute.
-* Partial parsing of `$obj->` (with missing property name) is now supported in error recovery mode.
-* The error recovery mode is now exposed in the `php-parse` script through the `--with-recovery`
-  or `-r` flags.
-
-The following changes are also part of PHP-Parser 2.1.1:
-
-* The PHP 7 parser will now generate a parse error for `$var =& new Obj` assignments.
-* Comments on free-standing code blocks will now be retained as comments on the first statement in
-  the code block.
-
-Version 3.0.0-alpha1 (2016-07-25)
----------------------------------
-
-### Added
-
-* [7.1] Added support for `void` and `iterable` types. These will now be represented as strings
-  (instead of `Name` instances) similar to other builtin types.
-* [7.1] Added support for class constant visibility. The `ClassConst` node now has a `flags` subnode
-  holding the visibility modifier, as well as `isPublic()`, `isProtected()` and `isPrivate()`
-  methods. The constructor changed to accept the additional subnode.
-* [7.1] Added support for nullable types. These are represented using a new `NullableType` node
-  with a single `type` subnode.
-* [7.1] Added support for short array destructuring syntax. This means that `Array` nodes may now
-  appear as the left-hand-side of assignments and foreach value targets. Additionally the array
-  items may now contain `null` values if elements are skipped.
-* [7.1] Added support for keys in list() destructuring. The `List` subnode `vars` has been renamed
-  to `items` and now contains `ArrayItem`s instead of plain variables.
-* [7.1] Added support for multi-catch. The `Catch` subnode `type` has been renamed to `types` and
-  is now an array of `Name`s.
-* `Name::slice()` now supports lengths and negative offsets. This brings it in line with
-  `array_slice()` functionality.
-
-### Changed
-
-Due to PHP 7.1 support additions described above, the node structure changed as follows:
-
-* `void` and `iterable` types are now stored as strings if the PHP 7 parser is used.
-* The `ClassConst` constructor changed to accept an additional `flags` subnode.
-* The `Array` subnode `items` may now contain `null` elements (destructuring).
-* The `List` subnode `vars` has been renamed to `items` and now contains `ArrayItem`s instead of
-  plain variables.
-* The `Catch` subnode `type` has been renamed to `types` and is now an array of `Name`s.
-
-Additionally the following changes were made:
-
-* The `type` subnode on `Class`, `ClassMethod` and `Property` has been renamed to `flags`. The
-  `type` subnode has retained for backwards compatibility and is populated to the same value as
-  `flags`. However, writes to `type` will not update `flags`.
-* The `TryCatch` subnode `finallyStmts` has been replaced with a `finally` subnode that holds an
-  explicit `Finally` node. This allows for more accurate attribute assignment.
-* The `Trait` constructor now has the same form as the `Class` and `Interface` constructors: It
-  takes an array of subnodes. Unlike classes/interfaces, traits can only have a `stmts` subnode.
-* The `NodeDumper` now prints class/method/property/constant modifiers, as well as the include and
-  use type in a textual representation, instead of only showing the number.
-* All methods on `PrettyPrinter\Standard` are now protected. Previoulsy most of them were public.
-
-### Removed
-
-* Removed support for running on PHP 5.4. It is however still possible to parse PHP 5.2-5.4 code
-  while running on a newer version.
-* The deprecated `Comment::setLine()` and `Comment::setText()` methods have been removed.
-* The deprecated `Name::set()`, `Name::setFirst()` and `Name::setLast()` methods have been removed.
-
-Version 2.1.1 (2016-09-16)
---------------------------
-
-### Changed
-
-* The pretty printer will now escape all control characters in the range `\x00-\x1F` inside double
-  quoted strings. If no special escape sequence is available, an octal escape will be used.
-* The quality of the error recovery has been improved. In particular unterminated expressions should
-  be handled more gracefully.
-* The PHP 7 parser will now generate a parse error for `$var =& new Obj` assignments.
-* Comments on free-standing code blocks will no be retained as comments on the first statement in
-  the code block.
-
-Version 2.1.0 (2016-04-19)
---------------------------
-
-### Fixed
-
-* Properly support `B""` strings (with uppercase `B`) in a number of places.
-* Fixed reformatting of indented parts in a certain non-standard comment style.
-
-### Added
-
-* Added `dumpComments` option to node dumper, to enable dumping of comments associated with nodes.
-* Added `Stmt\Nop` node, that is used to collect comments located at the end of a block or at the
-  end of a file (without a following node with which they could otherwise be associated).
-* Added `kind` attribute to `Expr\Exit` to distinguish between `exit` and `die`.
-* Added `kind` attribute to `Scalar\LNumber` to distinguish between decimal, binary, octal and
-  hexadecimal numbers.
-* Added `kind` attribtue to `Expr\Array` to distinguish between `array()` and `[]`.
-* Added `kind` attribute to `Scalar\String` and `Scalar\Encapsed` to distinguish between
-  single-quoted, double-quoted, heredoc and nowdoc string.
-* Added `docLabel` attribute to `Scalar\String` and `Scalar\Encapsed`, if it is a heredoc or
-  nowdoc string.
-* Added start file offset information to `Comment` nodes.
-* Added `setReturnType()` method to function and method builders.
-* Added `-h` and `--help` options to `php-parse` script.
-
-### Changed
-
-* Invalid octal literals now throw a parse error in PHP 7 mode.
-* The pretty printer takes all the new attributes mentioned in the previous section into account.
-* The protected `AbstractPrettyPrinter::pComments()` method no longer returns a trailing newline.
-* The bundled autoloader supports library files being stored in a different directory than
-  `PhpParser` for easier downstream distribution.
-
-### Deprecated
-
-* The `Comment::setLine()` and `Comment::setText()` methods have been deprecated. Construct new
-  objects instead.
-
-### Removed
-
-* The internal (but public) method `Scalar\LNumber::parse()` has been removed. A non-internal
-  `LNumber::fromString()` method has been added instead.
-
-Version 2.0.1 (2016-02-28)
---------------------------
-
-### Fixed
-
-* `declare() {}` and `declare();` are not semantically equivalent and will now result in different
-  ASTs. The format case will have an empty `stmts` array, while the latter will set `stmts` to
-  `null`.
-* Magic constants are now supported as semi-reserved keywords.
-* A shebang line like `#!/usr/bin/env php` is now allowed at the start of a namespaced file.
-  Previously this generated an exception.
-* The `prettyPrintFile()` method will not strip a trailing `?>` from the raw data that follows a
-  `__halt_compiler()` statement.
-* The `prettyPrintFile()` method will not strip an opening `<?php` if the file starts with a
-  comment followed by InlineHTML.
-
-Version 2.0.0 (2015-12-04)
---------------------------
-
-### Changed
-
-* String parts of encapsed strings are now represented using `Scalar\EncapsStringPart` nodes.
-  Previously raw strings were used. This affects the `parts` child of `Scalar\Encaps` and
-  `Expr\ShellExec`. The change has been done to allow assignment of attributes to encapsed string
-  parts.
-
-Version 2.0.0-beta1 (2015-10-21)
---------------------------------
-
-### Fixed
-
-* Fixed issue with too many newlines being stripped at the end of heredoc/nowdoc strings in some
-  cases. (#227)
-
-### Changed
-
-* Update group use support to be in line with recent PHP 7.0 builds.
-* Renamed `php-parse.php` to `php-parse` and registered it as a composer bin.
-* Use composer PSR-4 autoloader instead of custom autoloader.
-* Specify phpunit as a dev dependency.
-
-### Added
-
-* Added `shortArraySyntax` option to pretty printer, to print all arrays using short syntax.
-
-Version 2.0.0-alpha1 (2015-07-14)
----------------------------------
-
-A more detailed description of backwards incompatible changes can be found in the
-[upgrading guide](UPGRADE-2.0.md).
-
-### Removed
-
-* Removed support for running on PHP 5.3. It is however still possible to parse PHP 5.2 and PHP 5.3
-  code while running on a newer version.
-* Removed legacy class name aliases. This includes the old non-namespaced class names and the old
-  names for classes that were renamed for PHP 7 compatibility.
-* Removed support for legacy node format. All nodes must have a `getSubNodeNames()` method now.
-
-### Added
-
-* Added support for remaining PHP 7 features that were not present in 1.x:
-  * Group use declarations. These are represented using `Stmt\GroupUse` nodes. Furthermore a `type`
-    attribute was added to `Stmt\UseUse` to handle mixed group use declarations.
-  * Uniform variable syntax.
-  * Generalized yield operator.
-  * Scalar type declarations. These are presented using `'bool'`, `'int'`, `'float'` and `'string'`
-    as the type. The PHP 5 parser also accepts these, however they'll be `Name` instances there.
-  * Unicode escape sequences.
-* Added `PhpParser\ParserFactory` class, which should be used to create parser instances.
-* Added `Name::concat()` which concatenates two names.
-* Added `Name->slice()` which takes a subslice of a name.
-
-### Changed
-
-* `PhpParser\Parser` is now an interface, implemented by `Parser\Php5`, `Parser\Php7` and
-  `Parser\Multiple`. The `Multiple` parser will try multiple parsers, until one succeeds.
-* Token constants are now defined on `PhpParser\Parser\Tokens` rather than `PhpParser\Parser`.
-* The `Name->set()`, `Name->append()`, `Name->prepend()` and `Name->setFirst()` methods are
-  deprecated in favor of `Name::concat()` and `Name->slice()`.
-* The `NodeTraverser` no longer clones nodes by default. The old behavior can be restored by
-  passing `true` to the constructor.
-* The constructor for `Scalar` nodes no longer has a default value. E.g. `new LNumber()` should now
-  be written as `new LNumber(0)`.
-
----
-
-**This changelog only includes changes from the 2.0 series. For older changes see the
-[1.x series changelog](https://github.com/nikic/PHP-Parser/blob/1.x/CHANGELOG.md) and the
-[0.9 series changelog](https://github.com/nikic/PHP-Parser/blob/0.9/CHANGELOG.md).**
\ No newline at end of file
diff --git a/lib/nikic/php-parser/LICENSE b/lib/nikic/php-parser/LICENSE
index 920cc5b1f..2e5671835 100644
--- a/lib/nikic/php-parser/LICENSE
+++ b/lib/nikic/php-parser/LICENSE
@@ -1,31 +1,29 @@
-Copyright (c) 2011-2018 by Nikita Popov.
+BSD 3-Clause License
 
-Some rights reserved.
+Copyright (c) 2011, Nikita Popov
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+modification, are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
 
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
 
-    * The names of the contributors may not be used to endorse or
-      promote products derived from this software without specific
-      prior written permission.
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/lib/nikic/php-parser/README.md b/lib/nikic/php-parser/README.md
index 2f62754ce..e5b26bf5c 100644
--- a/lib/nikic/php-parser/README.md
+++ b/lib/nikic/php-parser/README.md
@@ -1,99 +1,225 @@
 PHP Parser
 ==========
 
-[![Build Status](https://travis-ci.org/nikic/PHP-Parser.svg?branch=master)](https://travis-ci.org/nikic/PHP-Parser) [![Coverage Status](https://coveralls.io/repos/github/nikic/PHP-Parser/badge.svg?branch=master)](https://coveralls.io/github/nikic/PHP-Parser?branch=master)
+[![Coverage Status](https://coveralls.io/repos/github/nikic/PHP-Parser/badge.svg?branch=master)](https://coveralls.io/github/nikic/PHP-Parser?branch=master)
 
-This is a PHP 5.2 to PHP 7.1 parser written in PHP. Its purpose is to simplify static code analysis and
+This is a PHP 5.2 to PHP 8.0 parser written in PHP. Its purpose is to simplify static code analysis and
 manipulation.
 
-[**Documentation for version 3.x**][doc_master] (stable; for running on PHP >= 5.5; for parsing PHP 5.2 to PHP 7.1).
+[**Documentation for version 4.x**][doc_master] (stable; for running on PHP >= 7.0; for parsing PHP 5.2 to PHP 8.0).
 
-[Documentation for version 2.x][doc_2_x] (stable; for running on PHP >= 5.4; for parsing PHP 5.2 to PHP 7.0).
+[Documentation for version 3.x][doc_3_x] (unsupported; for running on PHP >= 5.5; for parsing PHP 5.2 to PHP 7.2).
 
-[Documentation for version 1.x][doc_1_x] (unsupported; for running on PHP >= 5.3; for parsing PHP 5.2 to PHP 5.6).
+Features
+--------
 
-In a Nutshell
--------------
+The main features provided by this library are:
 
-The parser turns PHP source code into an abstract syntax tree. For example, if you pass the following code into the
-parser:
+ * Parsing PHP 5, PHP 7, and PHP 8 code into an abstract syntax tree (AST).
+   * Invalid code can be parsed into a partial AST.
+   * The AST contains accurate location information.
+ * Dumping the AST in human-readable form.
+ * Converting an AST back to PHP code.
+   * Experimental: Formatting can be preserved for partially changed ASTs.
+ * Infrastructure to traverse and modify ASTs.
+ * Resolution of namespaced names.
+ * Evaluation of constant expressions.
+ * Builders to simplify AST construction for code generation.
+ * Converting an AST into JSON and back.
+
+Quick Start
+-----------
+
+Install the library using [composer](https://getcomposer.org):
+
+    php composer.phar require nikic/php-parser
+
+Parse some PHP code into an AST and dump the result in human-readable form:
 
 ```php
 <?php
-echo 'Hi', 'World';
-hello\world('foo', 'bar' . 'baz');
+use PhpParser\Error;
+use PhpParser\NodeDumper;
+use PhpParser\ParserFactory;
+
+$code = <<<'CODE'
+<?php
+
+function test($foo)
+{
+    var_dump($foo);
+}
+CODE;
+
+$parser = (new ParserFactory)->create(ParserFactory::PREFER_PHP7);
+try {
+    $ast = $parser->parse($code);
+} catch (Error $error) {
+    echo "Parse error: {$error->getMessage()}\n";
+    return;
+}
+
+$dumper = new NodeDumper;
+echo $dumper->dump($ast) . "\n";
 ```
 
-You'll get a syntax tree looking roughly like this:
+This dumps an AST looking something like this:
 
-```php
+```
 array(
-    0: Stmt_Echo(
-        exprs: array(
-            0: Scalar_String(
-                value: Hi
-            )
-            1: Scalar_String(
-                value: World
+    0: Stmt_Function(
+        byRef: false
+        name: Identifier(
+            name: test
+        )
+        params: array(
+            0: Param(
+                type: null
+                byRef: false
+                variadic: false
+                var: Expr_Variable(
+                    name: foo
+                )
+                default: null
             )
         )
-    )
-    1: Expr_FuncCall(
-        name: Name(
-            parts: array(
-                0: hello
-                1: world
-            )
-        )
-        args: array(
-            0: Arg(
-                value: Scalar_String(
-                    value: foo
-                )
-                byRef: false
-            )
-            1: Arg(
-                value: Expr_Concat(
-                    left: Scalar_String(
-                        value: bar
+        returnType: null
+        stmts: array(
+            0: Stmt_Expression(
+                expr: Expr_FuncCall(
+                    name: Name(
+                        parts: array(
+                            0: var_dump
+                        )
                     )
-                    right: Scalar_String(
-                        value: baz
+                    args: array(
+                        0: Arg(
+                            value: Expr_Variable(
+                                name: foo
+                            )
+                            byRef: false
+                            unpack: false
+                        )
                     )
                 )
-                byRef: false
             )
         )
     )
 )
 ```
 
-You can then work with this syntax tree, for example to statically analyze the code (e.g. to find
-programming errors or security issues).
+Let's traverse the AST and perform some kind of modification. For example, drop all function bodies:
 
-Additionally, you can convert a syntax tree back to PHP code. This allows you to do code preprocessing
-(like automatedly porting code to older PHP versions).
+```php
+use PhpParser\Node;
+use PhpParser\Node\Stmt\Function_;
+use PhpParser\NodeTraverser;
+use PhpParser\NodeVisitorAbstract;
 
-Installation
-------------
+$traverser = new NodeTraverser();
+$traverser->addVisitor(new class extends NodeVisitorAbstract {
+    public function enterNode(Node $node) {
+        if ($node instanceof Function_) {
+            // Clean out the function body
+            $node->stmts = [];
+        }
+    }
+});
 
-The preferred installation method is [composer](https://getcomposer.org):
+$ast = $traverser->traverse($ast);
+echo $dumper->dump($ast) . "\n";
+```
 
-    php composer.phar require nikic/php-parser
+This gives us an AST where the `Function_::$stmts` are empty:
+
+```
+array(
+    0: Stmt_Function(
+        byRef: false
+        name: Identifier(
+            name: test
+        )
+        params: array(
+            0: Param(
+                type: null
+                byRef: false
+                variadic: false
+                var: Expr_Variable(
+                    name: foo
+                )
+                default: null
+            )
+        )
+        returnType: null
+        stmts: array(
+        )
+    )
+)
+```
+
+Finally, we can convert the new AST back to PHP code:
+
+```php
+use PhpParser\PrettyPrinter;
+
+$prettyPrinter = new PrettyPrinter\Standard;
+echo $prettyPrinter->prettyPrintFile($ast);
+```
+
+This gives us our original code, minus the `var_dump()` call inside the function:
+
+```php
+<?php
+
+function test($foo)
+{
+}
+```
+
+For a more comprehensive introduction, see the documentation.
 
 Documentation
 -------------
 
  1. [Introduction](doc/0_Introduction.markdown)
  2. [Usage of basic components](doc/2_Usage_of_basic_components.markdown)
- 3. [Other node tree representations](doc/3_Other_node_tree_representations.markdown)
- 4. [Code generation](doc/4_Code_generation.markdown)
 
 Component documentation:
 
- 1. [Error handling](doc/component/Error_handling.markdown)
- 2. [Lexer](doc/component/Lexer.markdown)
+ * [Walking the AST](doc/component/Walking_the_AST.markdown)
+   * Node visitors
+   * Modifying the AST from a visitor
+   * Short-circuiting traversals
+   * Interleaved visitors
+   * Simple node finding API
+   * Parent and sibling references
+ * [Name resolution](doc/component/Name_resolution.markdown)
+   * Name resolver options
+   * Name resolution context
+ * [Pretty printing](doc/component/Pretty_printing.markdown)
+   * Converting AST back to PHP code
+   * Customizing formatting
+   * Formatting-preserving code transformations
+ * [AST builders](doc/component/AST_builders.markdown)
+   * Fluent builders for AST nodes
+ * [Lexer](doc/component/Lexer.markdown)
+   * Lexer options
+   * Token and file positions for nodes
+   * Custom attributes
+ * [Error handling](doc/component/Error_handling.markdown)
+   * Column information for errors
+   * Error recovery (parsing of syntactically incorrect code)
+ * [Constant expression evaluation](doc/component/Constant_expression_evaluation.markdown)
+   * Evaluating constant/property/etc initializers
+   * Handling errors and unsupported expressions
+ * [JSON representation](doc/component/JSON_representation.markdown)
+   * JSON encoding and decoding of ASTs
+ * [Performance](doc/component/Performance.markdown)
+   * Disabling Xdebug
+   * Reusing objects
+   * Garbage collection impact
+ * [Frequently asked questions](doc/component/FAQ.markdown)
+   * Parent and sibling references
 
- [doc_1_x]: https://github.com/nikic/PHP-Parser/tree/1.x/doc
- [doc_2_x]: https://github.com/nikic/PHP-Parser/tree/2.x/doc
+ [doc_3_x]: https://github.com/nikic/PHP-Parser/tree/3.x/doc
  [doc_master]: https://github.com/nikic/PHP-Parser/tree/master/doc
diff --git a/lib/nikic/php-parser/UPGRADE-1.0.md b/lib/nikic/php-parser/UPGRADE-1.0.md
deleted file mode 100644
index 6a9ee2622..000000000
--- a/lib/nikic/php-parser/UPGRADE-1.0.md
+++ /dev/null
@@ -1,121 +0,0 @@
-Upgrading from PHP-Parser 0.9 to 1.0
-====================================
-
-### PHP version requirements
-
-PHP-Parser now requires PHP 5.3 or newer to run. It is however still possible to *parse* PHP 5.2 source code, while
-running on a newer version.
-
-### Move to namespaced names
-
-The library has been moved to use namespaces with the `PhpParser` vendor prefix. However, the old names using
-underscores are still available as aliases, as such most code should continue running on the new version without
-further changes.
-
-Old (still works, but discouraged):
-
-```php
-$parser = new \PHPParser_Parser(new \PHPParser_Lexer_Emulative);
-$prettyPrinter = new \PHPParser_PrettyPrinter_Default;
-```
-
-New:
-
-```php
-$parser = new \PhpParser\Parser(new PhpParser\Lexer\Emulative);
-$prettyPrinter = new \PhpParser\PrettyPrinter\Standard;
-```
-
-Note that the `PHPParser` prefix was changed to `PhpParser`. While PHP class names are technically case-insensitive,
-the autoloader will not be able to load `PHPParser\Parser` or other case variants.
-
-Due to conflicts with reserved keywords, some class names now end with an underscore, e.g. `PHPParser_Node_Stmt_Class`
-is now `PhpParser\Node\Stmt\Class_`. (But as usual, the old name is still available.)
-
-### Changes to `Node::getType()`
-
-The `Node::getType()` method continues to return names using underscores instead of namespace separators and also does
-not contain the trailing underscore that may be present in the class name. As such its output will not change in many
-cases.
-
-However, some node classes have been moved to a different namespace or renamed, which will result in a different
-`Node::getType()` output:
-
-```
-Expr_AssignBitwiseAnd => Expr_AssignOp_BitwiseAnd
-Expr_AssignBitwiseOr  => Expr_AssignOp_BitwiseOr
-Expr_AssignBitwiseXor => Expr_AssignOp_BitwiseXor
-Expr_AssignConcat     => Expr_AssignOp_Concat
-Expr_AssignDiv        => Expr_AssignOp_Div
-Expr_AssignMinus      => Expr_AssignOp_Minus
-Expr_AssignMod        => Expr_AssignOp_Mod
-Expr_AssignMul        => Expr_AssignOp_Mul
-Expr_AssignPlus       => Expr_AssignOp_Plus
-Expr_AssignShiftLeft  => Expr_AssignOp_ShiftLeft
-Expr_AssignShiftRight => Expr_AssignOp_ShiftRight
-
-Expr_BitwiseAnd       => Expr_BinaryOp_BitwiseAnd
-Expr_BitwiseOr        => Expr_BinaryOp_BitwiseOr
-Expr_BitwiseXor       => Expr_BinaryOp_BitwiseXor
-Expr_BooleanAnd       => Expr_BinaryOp_BooleanAnd
-Expr_BooleanOr        => Expr_BinaryOp_BooleanOr
-Expr_Concat           => Expr_BinaryOp_Concat
-Expr_Div              => Expr_BinaryOp_Div
-Expr_Equal            => Expr_BinaryOp_Equal
-Expr_Greater          => Expr_BinaryOp_Greater
-Expr_GreaterOrEqual   => Expr_BinaryOp_GreaterOrEqual
-Expr_Identical        => Expr_BinaryOp_Identical
-Expr_LogicalAnd       => Expr_BinaryOp_LogicalAnd
-Expr_LogicalOr        => Expr_BinaryOp_LogicalOr
-Expr_LogicalXor       => Expr_BinaryOp_LogicalXor
-Expr_Minus            => Expr_BinaryOp_Minus
-Expr_Mod              => Expr_BinaryOp_Mod
-Expr_Mul              => Expr_BinaryOp_Mul
-Expr_NotEqual         => Expr_BinaryOp_NotEqual
-Expr_NotIdentical     => Expr_BinaryOp_NotIdentical
-Expr_Plus             => Expr_BinaryOp_Plus
-Expr_ShiftLeft        => Expr_BinaryOp_ShiftLeft
-Expr_ShiftRight       => Expr_BinaryOp_ShiftRight
-Expr_Smaller          => Expr_BinaryOp_Smaller
-Expr_SmallerOrEqual   => Expr_BinaryOp_SmallerOrEqual
-
-Scalar_ClassConst     => Scalar_MagicConst_Class
-Scalar_DirConst       => Scalar_MagicConst_Dir
-Scalar_FileConst      => Scalar_MagicConst_File
-Scalar_FuncConst      => Scalar_MagicConst_Function
-Scalar_LineConst      => Scalar_MagicConst_Line
-Scalar_MethodConst    => Scalar_MagicConst_Method
-Scalar_NSConst        => Scalar_MagicConst_Namespace
-Scalar_TraitConst     => Scalar_MagicConst_Trait
-```
-
-These changes may affect custom pretty printers and code comparing the return value of `Node::getType()` to specific
-strings.
-
-### Miscellaneous
-
-  * The classes `Template` and `TemplateLoader` have been removed. You should use some other [code generation][code_gen]
-    project built on top of PHP-Parser instead.
-
-  * The `PrettyPrinterAbstract::pStmts()` method now emits a leading newline if the statement list is not empty.
-    Custom pretty printers should remove the explicit newline before `pStmts()` calls.
-
-    Old:
-
-    ```php
-    public function pStmt_Trait(PHPParser_Node_Stmt_Trait $node) {
-        return 'trait ' . $node->name
-             . "\n" . '{' . "\n" . $this->pStmts($node->stmts) . "\n" . '}';
-    }
-    ```
-
-    New:
-
-    ```php
-    public function pStmt_Trait(Stmt\Trait_ $node) {
-        return 'trait ' . $node->name
-             . "\n" . '{' . $this->pStmts($node->stmts) . "\n" . '}';
-    }
-    ```
-
-  [code_gen]: https://github.com/nikic/PHP-Parser/wiki/Projects-using-the-PHP-Parser#code-generation
\ No newline at end of file
diff --git a/lib/nikic/php-parser/UPGRADE-2.0.md b/lib/nikic/php-parser/UPGRADE-2.0.md
deleted file mode 100644
index 1c61de54f..000000000
--- a/lib/nikic/php-parser/UPGRADE-2.0.md
+++ /dev/null
@@ -1,74 +0,0 @@
-Upgrading from PHP-Parser 1.x to 2.0
-====================================
-
-### PHP version requirements
-
-PHP-Parser now requires PHP 5.4 or newer to run. It is however still possible to *parse* PHP 5.2 and
-PHP 5.3 source code, while running on a newer version.
-
-### Creating a parser instance
-
-Parser instances should now be created through the `ParserFactory`. Old direct instantiation code
-will not work, because the parser class was renamed.
-
-Old:
-
-```php
-use PhpParser\Parser, PhpParser\Lexer;
-$parser = new Parser(new Lexer\Emulative);
-```
-
-New:
-
-```php
-use PhpParser\ParserFactory;
-$parser = (new ParserFactory)->create(ParserFactory::PREFER_PHP7);
-```
-
-The first argument to `ParserFactory` determines how different PHP versions are handled. The
-possible values are:
-
- * `ParserFactory::PREFER_PHP7`: Try to parse code as PHP 7. If this fails, try to parse it as PHP 5.
- * `ParserFactory::PREFER_PHP5`: Try to parse code as PHP 5. If this fails, try to parse it as PHP 7.
- * `ParserFactory::ONLY_PHP7`: Parse code as PHP 7.
- * `ParserFactory::ONLY_PHP5`: Parse code as PHP 5.
-
-For most practical purposes the difference between `PREFER_PHP7` and `PREFER_PHP5` is mainly whether
-a scalar type hint like `string` will be stored as `'string'` (PHP 7) or as `new Name('string')`
-(PHP 5).
-
-To use a custom lexer, pass it as the second argument to the `create()` method:
-
-```php
-use PhpParser\ParserFactory;
-$lexer = new MyLexer;
-$parser = (new ParserFactory)->create(ParserFactory::PREFER_PHP7, $lexer);
-```
-
-### Rename of the `PhpParser\Parser` class
-
-`PhpParser\Parser` is now an interface, which is implemented by `Parser\Php5`, `Parser\Php7` and
-`Parser\Multiple`. Parser tokens are now defined in `Parser\Tokens`. If you use the `ParserFactory`
-described above to create your parser instance, these changes should have no further impact on you.
-
-### Removal of legacy aliases
-
-All legacy aliases for classes have been removed. This includes the old non-namespaced `PHPParser_`
-classes, as well as the classes that had to be renamed for PHP 7 support.
-
-### Deprecations
-
-The `set()`, `setFirst()`, `append()` and `prepend()` methods of the `Node\Name` class have been
-deprecated. Instead `Name::concat()` and `Name->slice()` should be used.
-
-### Miscellaneous
-
-* The `NodeTraverser` no longer clones nodes by default. If you want to restore the old behavior,
-  pass `true` to the constructor.
-* The legacy node format has been removed. If you use custom nodes, they are now expected to
-  implement a `getSubNodeNames()` method.
-* The default value for `Scalar` node constructors was removed. This means that something like
-  `new LNumber()` should be replaced by `new LNumber(0)`.
-* String parts of encapsed strings are now represented using `Scalar\EncapsStringPart` nodes, while
-  previously raw strings were used. This affects the `parts` child of `Scalar\Encaps` and
-  `Expr\ShellExec`.
\ No newline at end of file
diff --git a/lib/nikic/php-parser/UPGRADE-3.0.md b/lib/nikic/php-parser/UPGRADE-3.0.md
deleted file mode 100644
index 9e04f2afd..000000000
--- a/lib/nikic/php-parser/UPGRADE-3.0.md
+++ /dev/null
@@ -1,160 +0,0 @@
-Upgrading from PHP-Parser 2.x to 3.0
-====================================
-
-The backwards-incompatible changes in this release may be summarized as follows:
-
- * The specific details of the node representation have changed in some cases, primarily to
-   accomodate new PHP 7.1 features.
- * There have been significant changes to the error recovery implementation. This may affect you,
-   if you used the error recovery mode or have a custom lexer implementation.
- * A number of deprecated methods were removed.
-
-### PHP version requirements
-
-PHP-Parser now requires PHP 5.5 or newer to run. It is however still possible to *parse* PHP 5.2,
-5.3 and 5.4 source code, while running on a newer version.
-
-### Changes to the node structure
-
-The following changes are likely to require code changes if the respective nodes are used:
-
- * The `List` subnode `vars` has been renamed to `items` and now contains `ArrayItem`s instead of
-   plain variables.
- * The `Catch` subnode `type` has been renamed to `types` and is now an array of `Name`s.
- * The `TryCatch` subnode `finallyStmts` has been replaced with a `finally` subnode that holds an
-   explicit `Finally` node.
- * The `type` subnode on `Class`, `ClassMethod` and `Property` has been renamed to `flags`. The
-   `type` subnode has retained for backwards compatibility and is populated to the same value as
-   `flags`. However, writes to `type` will not update `flags` and use of `type` is discouraged.
-
-The following changes are unlikely to require code changes:
-
- * The `ClassConst` constructor changed to accept an additional `flags` subnode.
- * The `Trait` constructor now has the same form as the `Class` and `Interface` constructors: It
-   takes an array of subnodes. Unlike classes/interfaces, traits can only have a `stmts` subnode.
- * The `Array` subnode `items` may now contain `null` elements (due to destructuring).
- * `void` and `iterable` types are now stored as strings if the PHP 7 parser is used. Previously
-   these would have been represented as `Name` instances.
-
-### Changes to error recovery mode
-
-Previously, error recovery mode was enabled by setting the `throwOnError` option to `false` when
-creating the parser, while collected errors were retrieved using the `getErrors()` method:
-
-```php
-$lexer = ...;
-$parser = (new ParserFactory)->create(ParserFactor::ONLY_PHP7, $lexer, [
-    'throwOnError' => true,
-]);
-
-$stmts = $parser->parse($code);
-$errors = $parser->getErrors();
-if ($errors) {
-    handleErrors($errors);
-}
-processAst($stmts);
-```
-
-Both the `throwOnError` option and the `getErrors()` method have been removed in PHP-Parser 3.0.
-Instead an instance of `ErrorHandler\Collecting` should be passed to the `parse()` method:
-
-```php
-$lexer = ...;
-$parser = (new ParserFactory)->create(ParserFactor::ONLY_PHP7, $lexer);
-
-$errorHandler = new ErrorHandler\Collecting;
-$stmts = $parser->parse($code, $errorHandler);
-if ($errorHandler->hasErrors()) {
-    handleErrors($errorHandler->getErrors());
-}
-processAst($stmts);
-```
-
-#### Multiple parser fallback in error recovery mode
-
-As a result of this change, if a `Multiple` parser is used (e.g. through the `ParserFactory` using
-`PREFER_PHP7` or `PREFER_PHP5`), it will now return the result of the first *non-throwing* parse. As
-parsing never throws in error recovery mode, the result from the first parser will always be
-returned.
-
-The PHP 7 parser is a superset of the PHP 5 parser, with the exceptions that `=& new` and
-`global $$foo->bar` are not supported (other differences are in representation only). The PHP 7
-parser will be able to recover from the error in both cases. For this reason, this change will
-likely pass unnoticed if you do not specifically test for this syntax.
-
-It is possible to restore the precise previous behavior with the following code:
-
-```php
-$lexer = ...;
-$parser7 = new Parser\Php7($lexer);
-$parser5 = new Parser\Php5($lexer);
-
-$errors7 = new ErrorHandler\Collecting();
-$stmts7 = $parser7->parse($code, $errors7);
-if ($errors7->hasErrors()) {
-    $errors5 = new ErrorHandler\Collecting();
-    $stmts5 = $parser5->parse($code, $errors5);
-    if (!$errors5->hasErrors()) {
-        // If PHP 7 parse has errors but PHP 5 parse has no errors, use PHP 5 result
-        return [$stmts5, $errors5];
-    }
-}
-// If PHP 7 succeeds or both fail use PHP 7 result
-return [$stmts7, $errors7];
-```
-
-#### Error handling in the lexer
-
-In order to support recovery from lexer errors, the signature of the `startLexing()` method changed
-to optionally accept an `ErrorHandler`:
-
-```php
-// OLD
-public function startLexing($code);
-// NEW
-public function startLexing($code, ErrorHandler $errorHandler = null);
-```
-
-If you use a custom lexer with overriden `startLexing()` method, it needs to be changed to accept
-the extra parameter. The value should be passed on to the parent method.
-
-#### Error checks in node constructors
-
-The constructors of certain nodes used to contain additional checks for semantic errors, such as
-creating a try block without either catch or finally. These checks have been moved from the node
-constructors into the parser. This allows recovery from such errors, as well as representing the
-resulting (invalid) AST.
-
-This means that certain error conditions are no longer checked for manually constructed nodes.
-
-### Removed methods, arguments, options
-
-The following methods, arguments or options have been removed:
-
- * `Comment::setLine()`, `Comment::setText()`: Create new `Comment` instances instead.
- * `Name::set()`, `Name::setFirst()`, `Name::setLast()`, `Name::append()`, `Name::prepend()`:
-    Use `Name::concat()` in combination with `Name::slice()` instead.
- * `Error::getRawLine()`, `Error::setRawLine()`. Use `Error::getStartLine()` and
-   `Error::setStartLine()` instead.
- * `Parser::getErrors()`. Use `ErrorHandler\Collecting` instead.
- * `$separator` argument of `Name::toString()`. Use `strtr()` instead, if you really need it.
- * `$cloneNodes` argument of `NodeTraverser::__construct()`. Explicitly clone nodes in the visitor
-   instead.
- * `throwOnError` parser option. Use `ErrorHandler\Collecting` instead.
-
-### Miscellaneous
-
- * The `NameResolver` will now resolve unqualified function and constant names in the global
-   namespace into fully qualified names. For example `foo()` in the global namespace resolves to
-   `\foo()`. For names where no static resolution is possible, a `namespacedName` attribute is
-   added now, containing the namespaced variant of the name.
- * All methods on `PrettyPrinter\Standard` are now protected. Previoulsy most of them were public.
-   The pretty printer should only be invoked using the `prettyPrint()`, `prettyPrintFile()` and
-   `prettyPrintExpr()` methods.
- * The node dumper now prints numeric values that act as enums/flags in a string representation.
-   If node dumper results are used in tests, updates may be needed to account for this.
- * The constants on `NameTraverserInterface` have been moved into the `NameTraverser` class.
- * The emulative lexer now directly postprocesses tokens, instead of using `~__EMU__~` sequences.
-   This changes the protected API of the emulative lexer.
- * The `Name::slice()` method now returns `null` for empty slices, previously `new Name([])` was
-   used. `Name::concat()` now also supports concatenation with `null`.
diff --git a/lib/nikic/php-parser/bin/php-parse b/lib/nikic/php-parser/bin/php-parse
index 1760e758d..bb3e46df4 100755
--- a/lib/nikic/php-parser/bin/php-parse
+++ b/lib/nikic/php-parser/bin/php-parse
@@ -10,7 +10,7 @@ foreach ([__DIR__ . '/../../../autoload.php', __DIR__ . '/../vendor/autoload.php
 
 ini_set('xdebug.max_nesting_level', 3000);
 
-// Disable XDebug var_dump() output truncation
+// Disable Xdebug var_dump() output truncation
 ini_set('xdebug.var_display_max_children', -1);
 ini_set('xdebug.var_display_max_data', -1);
 ini_set('xdebug.var_display_max_depth', -1);
@@ -26,9 +26,9 @@ if (empty($files)) {
     showHelp("Must specify at least one file.");
 }
 
-$lexer = new PhpParser\Lexer\Emulative(array('usedAttributes' => array(
+$lexer = new PhpParser\Lexer\Emulative(['usedAttributes' => [
     'startLine', 'endLine', 'startFilePos', 'endFilePos', 'comments'
-)));
+]]);
 $parser = (new PhpParser\ParserFactory)->create(
     PhpParser\ParserFactory::PREFER_PHP7,
     $lexer
@@ -38,7 +38,6 @@ $dumper = new PhpParser\NodeDumper([
     'dumpPositions' => $attributes['with-positions'],
 ]);
 $prettyPrinter = new PhpParser\PrettyPrinter\Standard;
-$serializer = new PhpParser\Serializer\XML;
 
 $traverser = new PhpParser\NodeTraverser();
 $traverser->addVisitor(new PhpParser\NodeVisitor\NameResolver);
@@ -46,14 +45,15 @@ $traverser->addVisitor(new PhpParser\NodeVisitor\NameResolver);
 foreach ($files as $file) {
     if (strpos($file, '<?php') === 0) {
         $code = $file;
-        echo "====> Code $code\n";
+        fwrite(STDERR, "====> Code $code\n");
     } else {
         if (!file_exists($file)) {
-            die("File $file does not exist.\n");
+            fwrite(STDERR, "File $file does not exist.\n");
+            exit(1);
         }
 
         $code = file_get_contents($file);
-        echo "====> File $file:\n";
+        fwrite(STDERR, "====> File $file:\n");
     }
 
     if ($attributes['with-recovery']) {
@@ -61,7 +61,7 @@ foreach ($files as $file) {
         $stmts = $parser->parse($code, $errorHandler);
         foreach ($errorHandler->getErrors() as $error) {
             $message = formatErrorMessage($error, $code, $attributes['with-column-info']);
-            echo $message . "\n";
+            fwrite(STDERR, $message . "\n");
         }
         if (null === $stmts) {
             continue;
@@ -71,25 +71,26 @@ foreach ($files as $file) {
             $stmts = $parser->parse($code);
         } catch (PhpParser\Error $error) {
             $message = formatErrorMessage($error, $code, $attributes['with-column-info']);
-            die($message . "\n");
+            fwrite(STDERR, $message . "\n");
+            exit(1);
         }
     }
 
     foreach ($operations as $operation) {
         if ('dump' === $operation) {
-            echo "==> Node dump:\n";
+            fwrite(STDERR, "==> Node dump:\n");
             echo $dumper->dump($stmts, $code), "\n";
         } elseif ('pretty-print' === $operation) {
-            echo "==> Pretty print:\n";
+            fwrite(STDERR, "==> Pretty print:\n");
             echo $prettyPrinter->prettyPrintFile($stmts), "\n";
-        } elseif ('serialize-xml' === $operation) {
-            echo "==> Serialized XML:\n";
-            echo $serializer->serialize($stmts), "\n";
+        } elseif ('json-dump' === $operation) {
+            fwrite(STDERR, "==> JSON dump:\n");
+            echo json_encode($stmts, JSON_PRETTY_PRINT), "\n";
         } elseif ('var-dump' === $operation) {
-            echo "==> var_dump():\n";
+            fwrite(STDERR, "==> var_dump():\n");
             var_dump($stmts);
         } elseif ('resolve-names' === $operation) {
-            echo "==> Resolved names.\n";
+            fwrite(STDERR, "==> Resolved names.\n");
             $stmts = $traverser->traverse($stmts);
         }
     }
@@ -105,9 +106,9 @@ function formatErrorMessage(PhpParser\Error $e, $code, $withColumnInfo) {
 
 function showHelp($error = '') {
     if ($error) {
-        echo $error . "\n\n";
+        fwrite(STDERR, $error . "\n\n");
     }
-    die(<<<OUTPUT
+    fwrite($error ? STDERR : STDOUT, <<<OUTPUT
 Usage: php-parse [operations] file1.php [file2.php ...]
    or: php-parse [operations] "<?php code"
 Turn PHP source code into an abstract syntax tree.
@@ -116,7 +117,7 @@ Operations is a list of the following options (--dump by default):
 
     -d, --dump              Dump nodes using NodeDumper
     -p, --pretty-print      Pretty print file using PrettyPrinter\Standard
-        --serialize-xml     Serialize nodes using Serializer\XML
+    -j, --json-dump         Print json_encode() result
         --var-dump          var_dump() nodes (for exact structure)
     -N, --resolve-names     Resolve names using NodeVisitor\NameResolver
     -c, --with-column-info  Show column-numbers for errors (if available)
@@ -132,16 +133,17 @@ Example:
 
 OUTPUT
     );
+    exit($error ? 1 : 0);
 }
 
 function parseArgs($args) {
-    $operations = array();
-    $files = array();
-    $attributes = array(
+    $operations = [];
+    $files = [];
+    $attributes = [
         'with-column-info' => false,
         'with-positions' => false,
         'with-recovery' => false,
-    );
+    ];
 
     array_shift($args);
     $parseOptions = true;
@@ -160,8 +162,9 @@ function parseArgs($args) {
             case '-p':
                 $operations[] = 'pretty-print';
                 break;
-            case '--serialize-xml':
-                $operations[] = 'serialize-xml';
+            case '--json-dump':
+            case '-j':
+                $operations[] = 'json-dump';
                 break;
             case '--var-dump':
                 $operations[] = 'var-dump';
@@ -198,5 +201,5 @@ function parseArgs($args) {
         }
     }
 
-    return array($operations, $files, $attributes);
+    return [$operations, $files, $attributes];
 }
diff --git a/lib/nikic/php-parser/composer.json b/lib/nikic/php-parser/composer.json
index 66df90a8f..2fd064a21 100644
--- a/lib/nikic/php-parser/composer.json
+++ b/lib/nikic/php-parser/composer.json
@@ -1,8 +1,11 @@
 {
     "name": "nikic/php-parser",
-    "description": "A PHP parser written in PHP",
-    "keywords": ["php", "parser"],
     "type": "library",
+    "description": "A PHP parser written in PHP",
+    "keywords": [
+        "php",
+        "parser"
+    ],
     "license": "BSD-3-Clause",
     "authors": [
         {
@@ -10,21 +13,29 @@
         }
     ],
     "require": {
-        "php": ">=5.5",
+        "php": ">=7.0",
         "ext-tokenizer": "*"
     },
     "require-dev": {
-        "phpunit/phpunit": "~4.0|~5.0"
+        "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0",
+        "ircmaxell/php-yacc": "^0.0.7"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "4.9-dev"
+        }
     },
     "autoload": {
         "psr-4": {
             "PhpParser\\": "lib/PhpParser"
         }
     },
-    "bin": ["bin/php-parse"],
-    "extra": {
-        "branch-alias": {
-            "dev-master": "3.0-dev"
+    "autoload-dev": {
+        "psr-4": {
+            "PhpParser\\": "test/PhpParser/"
         }
-    }
+    },
+    "bin": [
+        "bin/php-parse"
+    ]
 }
diff --git a/lib/nikic/php-parser/doc/0_Introduction.markdown b/lib/nikic/php-parser/doc/0_Introduction.markdown
deleted file mode 100644
index ca1ceb2ec..000000000
--- a/lib/nikic/php-parser/doc/0_Introduction.markdown
+++ /dev/null
@@ -1,80 +0,0 @@
-Introduction
-============
-
-This project is a PHP 5.2 to PHP 7.1 parser **written in PHP itself**.
-
-What is this for?
------------------
-
-A parser is useful for [static analysis][0], manipulation of code and basically any other
-application dealing with code programmatically. A parser constructs an [Abstract Syntax Tree][1]
-(AST) of the code and thus allows dealing with it in an abstract and robust way.
-
-There are other ways of processing source code. One that PHP supports natively is using the
-token stream generated by [`token_get_all`][2]. The token stream is much more low level than
-the AST and thus has different applications: It allows to also analyze the exact formatting of
-a file. On the other hand the token stream is much harder to deal with for more complex analysis.
-For example an AST abstracts away the fact that in PHP variables can be written as `$foo`, but also
-as `$$bar`, `${'foobar'}` or even `${!${''}=barfoo()}`. You don't have to worry about recognizing
-all the different syntaxes from a stream of tokens.
-
-Another question is: Why would I want to have a PHP parser *written in PHP*? Well, PHP might not be
-a language especially suited for fast parsing, but processing the AST is much easier in PHP than it
-would be in other, faster languages like C. Furthermore the people most probably wanting to do
-programmatic PHP code analysis are incidentally PHP developers, not C developers.
-
-What can it parse?
-------------------
-
-The parser supports parsing PHP 5.2-5.6 and PHP 7.
-
-As the parser is based on the tokens returned by `token_get_all` (which is only able to lex the PHP
-version it runs on), additionally a wrapper for emulating tokens from newer versions is provided.
-This allows to parse PHP 7.1 source code running on PHP 5.5, for example. This emulation is somewhat
-hacky and not perfect, but it should work well on any sane code.
-
-What output does it produce?
-----------------------------
-
-The parser produces an [Abstract Syntax Tree][1] (AST) also known as a node tree. How this looks like
-can best be seen in an example. The program `<?php echo 'Hi', 'World';` will give you a node tree
-roughly looking like this:
-
-```
-array(
-    0: Stmt_Echo(
-        exprs: array(
-            0: Scalar_String(
-                value: Hi
-            )
-            1: Scalar_String(
-                value: World
-            )
-        )
-    )
-)
-```
-
-This matches the structure of the code: An echo statement, which takes two strings as expressions,
-with the values `Hi` and `World!`.
-
-You can also see that the AST does not contain any whitespace information (but most comments are saved).
-So using it for formatting analysis is not possible.
-
-What else can it do?
---------------------
-
-Apart from the parser itself this package also bundles support for some other, related features:
-
- * Support for pretty printing, which is the act of converting an AST into PHP code. Please note
-   that "pretty printing" does not imply that the output is especially pretty. It's just how it's
-   called ;)
- * Support for serializing and unserializing the node tree to XML
- * Support for dumping the node tree in a human readable form (see the section above for an
-   example of how the output looks like)
- * Infrastructure for traversing and changing the AST (node traverser and node visitors)
- * A node visitor for resolving namespaced names
-
- [0]: http://en.wikipedia.org/wiki/Static_program_analysis
- [1]: http://en.wikipedia.org/wiki/Abstract_syntax_tree
- [2]: http://php.net/token_get_all
diff --git a/lib/nikic/php-parser/doc/2_Usage_of_basic_components.markdown b/lib/nikic/php-parser/doc/2_Usage_of_basic_components.markdown
deleted file mode 100644
index f91a5bb2f..000000000
--- a/lib/nikic/php-parser/doc/2_Usage_of_basic_components.markdown
+++ /dev/null
@@ -1,438 +0,0 @@
-Usage of basic components
-=========================
-
-This document explains how to use the parser, the pretty printer and the node traverser.
-
-Bootstrapping
--------------
-
-To bootstrap the library, include the autoloader generated by composer:
-
-```php
-require 'path/to/vendor/autoload.php';
-```
-
-Additionally you may want to set the `xdebug.max_nesting_level` ini option to a higher value:
-
-```php
-ini_set('xdebug.max_nesting_level', 3000);
-```
-
-This ensures that there will be no errors when traversing highly nested node trees. However, it is
-preferable to disable XDebug completely, as it can easily make this library more than five times
-slower.
-
-Parsing
--------
-
-In order to parse code, you first have to create a parser instance:
-
-```php
-use PhpParser\ParserFactory;
-$parser = (new ParserFactory)->create(ParserFactory::PREFER_PHP7);
-```
-
-The factory accepts a kind argument, that determines how different PHP versions are treated:
-
-Kind | Behavior
------|---------
-`ParserFactory::PREFER_PHP7` | Try to parse code as PHP 7. If this fails, try to parse it as PHP 5.
-`ParserFactory::PREFER_PHP5` | Try to parse code as PHP 5. If this fails, try to parse it as PHP 7.
-`ParserFactory::ONLY_PHP7` | Parse code as PHP 7.
-`ParserFactory::ONLY_PHP5` | Parse code as PHP 5.
-
-Unless you have strong reason to use something else, `PREFER_PHP7` is a reasonable default.
-
-The `create()` method optionally accepts a `Lexer` instance as the second argument. Some use cases
-that require customized lexers are discussed in the [lexer documentation](component/Lexer.markdown).
-
-Subsequently you can pass PHP code (including the opening `<?php` tag) to the `parse` method in order to
-create a syntax tree. If a syntax error is encountered, an `PhpParser\Error` exception will be thrown:
-
-```php
-use PhpParser\Error;
-use PhpParser\ParserFactory;
-
-$code = '<?php // some code';
-$parser = (new ParserFactory)->create(ParserFactory::PREFER_PHP7);
-
-try {
-    $stmts = $parser->parse($code);
-    // $stmts is an array of statement nodes
-} catch (Error $e) {
-    echo 'Parse Error: ', $e->getMessage();
-}
-```
-
-A parser instance can be reused to parse multiple files.
-
-Node tree
----------
-
-If you use the above code with `$code = "<?php echo 'Hi ', hi\\getTarget();"` the parser will
-generate a node tree looking like this:
-
-```
-array(
-    0: Stmt_Echo(
-        exprs: array(
-            0: Scalar_String(
-                value: Hi
-            )
-            1: Expr_FuncCall(
-                name: Name(
-                    parts: array(
-                        0: hi
-                        1: getTarget
-                    )
-                )
-                args: array(
-                )
-            )
-        )
-    )
-)
-```
-
-Thus `$stmts` will contain an array with only one node, with this node being an instance of
-`PhpParser\Node\Stmt\Echo_`.
-
-As PHP is a large language there are approximately 140 different nodes. In order to make work
-with them easier they are grouped into three categories:
-
- * `PhpParser\Node\Stmt`s are statement nodes, i.e. language constructs that do not return
-   a value and can not occur in an expression. For example a class definition is a statement.
-   It doesn't return a value and you can't write something like `func(class A {});`.
- * `PhpParser\Node\Expr`s are expression nodes, i.e. language constructs that return a value
-   and thus can occur in other expressions. Examples of expressions are `$var`
-   (`PhpParser\Node\Expr\Variable`) and `func()` (`PhpParser\Node\Expr\FuncCall`).
- * `PhpParser\Node\Scalar`s are nodes representing scalar values, like `'string'`
-   (`PhpParser\Node\Scalar\String_`), `0` (`PhpParser\Node\Scalar\LNumber`) or magic constants
-   like `__FILE__` (`PhpParser\Node\Scalar\MagicConst\File`). All `PhpParser\Node\Scalar`s extend
-   `PhpParser\Node\Expr`, as scalars are expressions, too.
- * There are some nodes not in either of these groups, for example names (`PhpParser\Node\Name`)
-   and call arguments (`PhpParser\Node\Arg`).
-
-Some node class names have a trailing `_`. This is used whenever the class name would otherwise clash
-with a PHP keyword.
-
-Every node has a (possibly zero) number of subnodes. You can access subnodes by writing
-`$node->subNodeName`. The `Stmt\Echo_` node has only one subnode `exprs`. So in order to access it
-in the above example you would write `$stmts[0]->exprs`. If you wanted to access the name of the function
-call, you would write `$stmts[0]->exprs[1]->name`.
-
-All nodes also define a `getType()` method that returns the node type. The type is the class name
-without the `PhpParser\Node\` prefix and `\` replaced with `_`. It also does not contain a trailing
-`_` for reserved-keyword class names.
-
-It is possible to associate custom metadata with a node using the `setAttribute()` method. This data
-can then be retrieved using `hasAttribute()`, `getAttribute()` and `getAttributes()`.
-
-By default the lexer adds the `startLine`, `endLine` and `comments` attributes. `comments` is an array
-of `PhpParser\Comment[\Doc]` instances.
-
-The start line can also be accessed using `getLine()`/`setLine()` (instead of `getAttribute('startLine')`).
-The last doc comment from the `comments` attribute can be obtained using `getDocComment()`.
-
-Pretty printer
---------------
-
-The pretty printer component compiles the AST back to PHP code. As the parser does not retain formatting
-information the formatting is done using a specified scheme. Currently there is only one scheme available,
-namely `PhpParser\PrettyPrinter\Standard`.
-
-```php
-use PhpParser\Error;
-use PhpParser\ParserFactory;
-use PhpParser\PrettyPrinter;
-
-$code = "<?php echo 'Hi ', hi\\getTarget();";
-
-$parser = (new ParserFactory)->create(ParserFactory::PREFER_PHP7);
-$prettyPrinter = new PrettyPrinter\Standard;
-
-try {
-    // parse
-    $stmts = $parser->parse($code);
-
-    // change
-    $stmts[0]         // the echo statement
-          ->exprs     // sub expressions
-          [0]         // the first of them (the string node)
-          ->value     // it's value, i.e. 'Hi '
-          = 'Hello '; // change to 'Hello '
-
-    // pretty print
-    $code = $prettyPrinter->prettyPrint($stmts);
-
-    echo $code;
-} catch (Error $e) {
-    echo 'Parse Error: ', $e->getMessage();
-}
-```
-
-The above code will output:
-
-    <?php echo 'Hello ', hi\getTarget();
-
-As you can see the source code was first parsed using `PhpParser\Parser->parse()`, then changed and then
-again converted to code using `PhpParser\PrettyPrinter\Standard->prettyPrint()`.
-
-The `prettyPrint()` method pretty prints a statements array. It is also possible to pretty print only a
-single expression using `prettyPrintExpr()`.
-
-The `prettyPrintFile()` method can be used to print an entire file. This will include the opening `<?php` tag
-and handle inline HTML as the first/last statement more gracefully.
-
-Node traversation
------------------
-
-The above pretty printing example used the fact that the source code was known and thus it was easy to
-write code that accesses a certain part of a node tree and changes it. Normally this is not the case.
-Usually you want to change / analyze code in a generic way, where you don't know how the node tree is
-going to look like.
-
-For this purpose the parser provides a component for traversing and visiting the node tree. The basic
-structure of a program using this `PhpParser\NodeTraverser` looks like this:
-
-```php
-use PhpParser\NodeTraverser;
-use PhpParser\ParserFactory;
-use PhpParser\PrettyPrinter;
-
-$parser        = (new ParserFactory)->create(ParserFactory::PREFER_PHP7);
-$traverser     = new NodeTraverser;
-$prettyPrinter = new PrettyPrinter\Standard;
-
-// add your visitor
-$traverser->addVisitor(new MyNodeVisitor);
-
-try {
-    $code = file_get_contents($fileName);
-
-    // parse
-    $stmts = $parser->parse($code);
-
-    // traverse
-    $stmts = $traverser->traverse($stmts);
-
-    // pretty print
-    $code = $prettyPrinter->prettyPrintFile($stmts);
-
-    echo $code;
-} catch (PhpParser\Error $e) {
-    echo 'Parse Error: ', $e->getMessage();
-}
-```
-
-The corresponding node visitor might look like this:
-
-```php
-use PhpParser\Node;
-use PhpParser\NodeVisitorAbstract;
-
-class MyNodeVisitor extends NodeVisitorAbstract
-{
-    public function leaveNode(Node $node) {
-        if ($node instanceof Node\Scalar\String_) {
-            $node->value = 'foo';
-        }
-    }
-}
-```
-
-The above node visitor would change all string literals in the program to `'foo'`.
-
-All visitors must implement the `PhpParser\NodeVisitor` interface, which defines the following four
-methods:
-
-```php
-public function beforeTraverse(array $nodes);
-public function enterNode(\PhpParser\Node $node);
-public function leaveNode(\PhpParser\Node $node);
-public function afterTraverse(array $nodes);
-```
-
-The `beforeTraverse()` method is called once before the traversal begins and is passed the nodes the
-traverser was called with. This method can be used for resetting values before traversation or
-preparing the tree for traversal.
-
-The `afterTraverse()` method is similar to the `beforeTraverse()` method, with the only difference that
-it is called once after the traversal.
-
-The `enterNode()` and `leaveNode()` methods are called on every node, the former when it is entered,
-i.e. before its subnodes are traversed, the latter when it is left.
-
-All four methods can either return the changed node or not return at all (i.e. `null`) in which
-case the current node is not changed.
-
-The `enterNode()` method can additionally return the value `NodeTraverser::DONT_TRAVERSE_CHILDREN`,
-which instructs the traverser to skip all children of the current node.
-
-The `leaveNode()` method can additionally return the value `NodeTraverser::REMOVE_NODE`, in which
-case the current node will be removed from the parent array. Furthermore it is possible to return
-an array of nodes, which will be merged into the parent array at the offset of the current node.
-I.e. if in `array(A, B, C)` the node `B` should be replaced with `array(X, Y, Z)` the result will
-be `array(A, X, Y, Z, C)`.
-
-Instead of manually implementing the `NodeVisitor` interface you can also extend the `NodeVisitorAbstract`
-class, which will define empty default implementations for all the above methods.
-
-The NameResolver node visitor
------------------------------
-
-One visitor is already bundled with the package: `PhpParser\NodeVisitor\NameResolver`. This visitor
-helps you work with namespaced code by trying to resolve most names to fully qualified ones.
-
-For example, consider the following code:
-
-    use A as B;
-    new B\C();
-
-In order to know that `B\C` really is `A\C` you would need to track aliases and namespaces yourself.
-The `NameResolver` takes care of that and resolves names as far as possible.
-
-After running it most names will be fully qualified. The only names that will stay unqualified are
-unqualified function and constant names. These are resolved at runtime and thus the visitor can't
-know which function they are referring to. In most cases this is a non-issue as the global functions
-are meant.
-
-Also the `NameResolver` adds a `namespacedName` subnode to class, function and constant declarations
-that contains the namespaced name instead of only the shortname that is available via `name`.
-
-Example: Converting namespaced code to pseudo namespaces
---------------------------------------------------------
-
-A small example to understand the concept: We want to convert namespaced code to pseudo namespaces
-so it works on 5.2, i.e. names like `A\\B` should be converted to `A_B`. Note that such conversions
-are fairly complicated if you take PHP's dynamic features into account, so our conversion will
-assume that no dynamic features are used.
-
-We start off with the following base code:
-
-```php
-use PhpParser\ParserFactory;
-use PhpParser\PrettyPrinter;
-use PhpParser\NodeTraverser;
-use PhpParser\NodeVisitor\NameResolver;
-
-$inDir  = '/some/path';
-$outDir = '/some/other/path';
-
-$parser        = (new ParserFactory)->create(ParserFactory::PREFER_PHP7);
-$traverser     = new NodeTraverser;
-$prettyPrinter = new PrettyPrinter\Standard;
-
-$traverser->addVisitor(new NameResolver); // we will need resolved names
-$traverser->addVisitor(new NamespaceConverter); // our own node visitor
-
-// iterate over all .php files in the directory
-$files = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($inDir));
-$files = new \RegexIterator($files, '/\.php$/');
-
-foreach ($files as $file) {
-    try {
-        // read the file that should be converted
-        $code = file_get_contents($file);
-
-        // parse
-        $stmts = $parser->parse($code);
-
-        // traverse
-        $stmts = $traverser->traverse($stmts);
-
-        // pretty print
-        $code = $prettyPrinter->prettyPrintFile($stmts);
-
-        // write the converted file to the target directory
-        file_put_contents(
-            substr_replace($file->getPathname(), $outDir, 0, strlen($inDir)),
-            $code
-        );
-    } catch (PhpParser\Error $e) {
-        echo 'Parse Error: ', $e->getMessage();
-    }
-}
-```
-
-Now lets start with the main code, the `NodeVisitor\NamespaceConverter`. One thing it needs to do
-is convert `A\\B` style names to `A_B` style ones.
-
-```php
-use PhpParser\Node;
-
-class NamespaceConverter extends \PhpParser\NodeVisitorAbstract
-{
-    public function leaveNode(Node $node) {
-        if ($node instanceof Node\Name) {
-            return new Node\Name($node->toString('_'));
-        }
-    }
-}
-```
-
-The above code profits from the fact that the `NameResolver` already resolved all names as far as
-possible, so we don't need to do that. We only need to create a string with the name parts separated
-by underscores instead of backslashes. This is what `$node->toString('_')` does. (If you want to
-create a name with backslashes either write `$node->toString()` or `(string) $node`.) Then we create
-a new name from the string and return it. Returning a new node replaces the old node.
-
-Another thing we need to do is change the class/function/const declarations. Currently they contain
-only the shortname (i.e. the last part of the name), but they need to contain the complete name including
-the namespace prefix:
-
-```php
-use PhpParser\Node;
-use PhpParser\Node\Stmt;
-
-class NodeVisitor_NamespaceConverter extends \PhpParser\NodeVisitorAbstract
-{
-    public function leaveNode(Node $node) {
-        if ($node instanceof Node\Name) {
-            return new Node\Name($node->toString('_'));
-        } elseif ($node instanceof Stmt\Class_
-                  || $node instanceof Stmt\Interface_
-                  || $node instanceof Stmt\Function_) {
-            $node->name = $node->namespacedName->toString('_');
-        } elseif ($node instanceof Stmt\Const_) {
-            foreach ($node->consts as $const) {
-                $const->name = $const->namespacedName->toString('_');
-            }
-        }
-    }
-}
-```
-
-There is not much more to it than converting the namespaced name to string with `_` as separator.
-
-The last thing we need to do is remove the `namespace` and `use` statements:
-
-```php
-use PhpParser\Node;
-use PhpParser\Node\Stmt;
-
-class NodeVisitor_NamespaceConverter extends \PhpParser\NodeVisitorAbstract
-{
-    public function leaveNode(Node $node) {
-        if ($node instanceof Node\Name) {
-            return new Node\Name($node->toString('_'));
-        } elseif ($node instanceof Stmt\Class_
-                  || $node instanceof Stmt\Interface_
-                  || $node instanceof Stmt\Function_) {
-            $node->name = $node->namespacedName->toString('_');
-        } elseif ($node instanceof Stmt\Const_) {
-            foreach ($node->consts as $const) {
-                $const->name = $const->namespacedName->toString('_');
-            }
-        } elseif ($node instanceof Stmt\Namespace_) {
-            // returning an array merges is into the parent array
-            return $node->stmts;
-        } elseif ($node instanceof Stmt\Use_) {
-            // returning false removed the node altogether
-            return false;
-        }
-    }
-}
-```
-
-That's all.
diff --git a/lib/nikic/php-parser/doc/3_Other_node_tree_representations.markdown b/lib/nikic/php-parser/doc/3_Other_node_tree_representations.markdown
deleted file mode 100644
index 0830f399c..000000000
--- a/lib/nikic/php-parser/doc/3_Other_node_tree_representations.markdown
+++ /dev/null
@@ -1,330 +0,0 @@
-Other node tree representations
-===============================
-
-It is possible to convert the AST into several textual representations, which serve different uses.
-
-Simple serialization
---------------------
-
-It is possible to serialize the node tree using `serialize()` and also unserialize it using
-`unserialize()`. The output is not human readable and not easily processable from anything
-but PHP, but it is compact and generates quickly. The main application thus is in caching.
-
-Human readable dumping
-----------------------
-
-Furthermore it is possible to dump nodes into a human readable format using the `dump` method of
-`PhpParser\NodeDumper`. This can be used for debugging.
-
-```php
-$code = <<<'CODE'
-<?php
-
-function printLine($msg) {
-    echo $msg, "\n";
-}
-
-printLine('Hello World!!!');
-CODE;
-
-$parser = (new PhpParser\ParserFactory)->create(PhpParser\ParserFactory::PREFER_PHP7);
-$nodeDumper = new PhpParser\NodeDumper;
-
-try {
-    $stmts = $parser->parse($code);
-
-    echo $nodeDumper->dump($stmts), "\n";
-} catch (PhpParser\Error $e) {
-    echo 'Parse Error: ', $e->getMessage();
-}
-```
-
-The above script will have an output looking roughly like this:
-
-```
-array(
-    0: Stmt_Function(
-        byRef: false
-        params: array(
-            0: Param(
-                name: msg
-                default: null
-                type: null
-                byRef: false
-            )
-        )
-        stmts: array(
-            0: Stmt_Echo(
-                exprs: array(
-                    0: Expr_Variable(
-                        name: msg
-                    )
-                    1: Scalar_String(
-                        value:
-
-                    )
-                )
-            )
-        )
-        name: printLine
-    )
-    1: Expr_FuncCall(
-        name: Name(
-            parts: array(
-                0: printLine
-            )
-        )
-        args: array(
-            0: Arg(
-                value: Scalar_String(
-                    value: Hello World!!!
-                )
-                byRef: false
-            )
-        )
-    )
-)
-```
-
-JSON encoding
--------------
-
-Nodes (and comments) implement the `JsonSerializable` interface. As such, it is possible to JSON
-encode the AST directly using `json_encode()`:
-
-```php
-$code = <<<'CODE'
-<?php
-
-function printLine($msg) {
-    echo $msg, "\n";
-}
-
-printLine('Hello World!!!');
-CODE;
-
-$parser = (new PhpParser\ParserFactory)->create(PhpParser\ParserFactory::PREFER_PHP7);
-$nodeDumper = new PhpParser\NodeDumper;
-
-try {
-    $stmts = $parser->parse($code);
-
-    echo json_encode($stmts, JSON_PRETTY_PRINT), "\n";
-} catch (PhpParser\Error $e) {
-    echo 'Parse Error: ', $e->getMessage();
-}
-```
-
-This will result in the following output (which includes attributes):
-
-```json
-[
-    {
-        "nodeType": "Stmt_Function",
-        "byRef": false,
-        "name": "printLine",
-        "params": [
-            {
-                "nodeType": "Param",
-                "type": null,
-                "byRef": false,
-                "variadic": false,
-                "name": "msg",
-                "default": null,
-                "attributes": {
-                    "startLine": 3,
-                    "endLine": 3
-                }
-            }
-        ],
-        "returnType": null,
-        "stmts": [
-            {
-                "nodeType": "Stmt_Echo",
-                "exprs": [
-                    {
-                        "nodeType": "Expr_Variable",
-                        "name": "msg",
-                        "attributes": {
-                            "startLine": 4,
-                            "endLine": 4
-                        }
-                    },
-                    {
-                        "nodeType": "Scalar_String",
-                        "value": "\n",
-                        "attributes": {
-                            "startLine": 4,
-                            "endLine": 4,
-                            "kind": 2
-                        }
-                    }
-                ],
-                "attributes": {
-                    "startLine": 4,
-                    "endLine": 4
-                }
-            }
-        ],
-        "attributes": {
-            "startLine": 3,
-            "endLine": 5
-        }
-    },
-    {
-        "nodeType": "Expr_FuncCall",
-        "name": {
-            "nodeType": "Name",
-            "parts": [
-                "printLine"
-            ],
-            "attributes": {
-                "startLine": 7,
-                "endLine": 7
-            }
-        },
-        "args": [
-            {
-                "nodeType": "Arg",
-                "value": {
-                    "nodeType": "Scalar_String",
-                    "value": "Hello World!!!",
-                    "attributes": {
-                        "startLine": 7,
-                        "endLine": 7,
-                        "kind": 1
-                    }
-                },
-                "byRef": false,
-                "unpack": false,
-                "attributes": {
-                    "startLine": 7,
-                    "endLine": 7
-                }
-            }
-        ],
-        "attributes": {
-            "startLine": 7,
-            "endLine": 7
-        }
-    }
-]
-```
-
-There is currently no mechanism to convert JSON back into a node tree. Furthermore, not all ASTs
-can be JSON encoded. In particular, JSON only supports UTF-8 strings.
-
-Serialization to XML
---------------------
-
-It is also possible to serialize the node tree to XML using `PhpParser\Serializer\XML->serialize()`
-and to unserialize it using `PhpParser\Unserializer\XML->unserialize()`. This is useful for
-interfacing with other languages and applications or for doing transformation using XSLT.
-
-```php
-<?php
-$code = <<<'CODE'
-<?php
-
-function printLine($msg) {
-    echo $msg, "\n";
-}
-
-printLine('Hello World!!!');
-CODE;
-
-$parser = (new PhpParser\ParserFactory)->create(PhpParser\ParserFactory::PREFER_PHP7);
-$serializer = new PhpParser\Serializer\XML;
-
-try {
-    $stmts = $parser->parse($code);
-
-    echo $serializer->serialize($stmts);
-} catch (PhpParser\Error $e) {
-    echo 'Parse Error: ', $e->getMessage();
-}
-```
-
-Produces:
-
-```xml
-<?xml version="1.0" encoding="UTF-8"?>
-<AST xmlns:node="http://nikic.github.com/PHPParser/XML/node" xmlns:subNode="http://nikic.github.com/PHPParser/XML/subNode" xmlns:scalar="http://nikic.github.com/PHPParser/XML/scalar">
- <scalar:array>
-  <node:Stmt_Function line="2">
-   <subNode:byRef>
-    <scalar:false/>
-   </subNode:byRef>
-   <subNode:params>
-    <scalar:array>
-     <node:Param line="2">
-      <subNode:name>
-       <scalar:string>msg</scalar:string>
-      </subNode:name>
-      <subNode:default>
-       <scalar:null/>
-      </subNode:default>
-      <subNode:type>
-       <scalar:null/>
-      </subNode:type>
-      <subNode:byRef>
-       <scalar:false/>
-      </subNode:byRef>
-     </node:Param>
-    </scalar:array>
-   </subNode:params>
-   <subNode:stmts>
-    <scalar:array>
-     <node:Stmt_Echo line="3">
-      <subNode:exprs>
-       <scalar:array>
-        <node:Expr_Variable line="3">
-         <subNode:name>
-          <scalar:string>msg</scalar:string>
-         </subNode:name>
-        </node:Expr_Variable>
-        <node:Scalar_String line="3">
-         <subNode:value>
-          <scalar:string>
-</scalar:string>
-         </subNode:value>
-        </node:Scalar_String>
-       </scalar:array>
-      </subNode:exprs>
-     </node:Stmt_Echo>
-    </scalar:array>
-   </subNode:stmts>
-   <subNode:name>
-    <scalar:string>printLine</scalar:string>
-   </subNode:name>
-  </node:Stmt_Function>
-  <node:Expr_FuncCall line="6">
-   <subNode:name>
-    <node:Name line="6">
-     <subNode:parts>
-      <scalar:array>
-       <scalar:string>printLine</scalar:string>
-      </scalar:array>
-     </subNode:parts>
-    </node:Name>
-   </subNode:name>
-   <subNode:args>
-    <scalar:array>
-     <node:Arg line="6">
-      <subNode:value>
-       <node:Scalar_String line="6">
-        <subNode:value>
-         <scalar:string>Hello World!!!</scalar:string>
-        </subNode:value>
-       </node:Scalar_String>
-      </subNode:value>
-      <subNode:byRef>
-       <scalar:false/>
-      </subNode:byRef>
-     </node:Arg>
-    </scalar:array>
-   </subNode:args>
-  </node:Expr_FuncCall>
- </scalar:array>
-</AST>
-```
\ No newline at end of file
diff --git a/lib/nikic/php-parser/doc/4_Code_generation.markdown b/lib/nikic/php-parser/doc/4_Code_generation.markdown
deleted file mode 100644
index 2c0aa0ede..000000000
--- a/lib/nikic/php-parser/doc/4_Code_generation.markdown
+++ /dev/null
@@ -1,84 +0,0 @@
-Code generation
-===============
-
-It is also possible to generate code using the parser, by first creating an Abstract Syntax Tree and then using the
-pretty printer to convert it to PHP code. To simplify code generation, the project comes with builders which allow
-creating node trees using a fluid interface, instead of instantiating all nodes manually. Builders are available for
-the following syntactic elements:
-
- * namespaces and use statements
- * classes, interfaces and traits
- * methods, functions and parameters
- * properties
-
-Here is an example:
-
-```php
-use PhpParser\BuilderFactory;
-use PhpParser\PrettyPrinter;
-use PhpParser\Node;
-
-$factory = new BuilderFactory;
-$node = $factory->namespace('Name\Space')
-    ->addStmt($factory->use('Some\Other\Thingy')->as('SomeOtherClass'))
-    ->addStmt($factory->class('SomeClass')
-        ->extend('SomeOtherClass')
-        ->implement('A\Few', '\Interfaces')
-        ->makeAbstract() // ->makeFinal()
-
-        ->addStmt($factory->method('someMethod')
-            ->makePublic()
-            ->makeAbstract() // ->makeFinal()
-            ->setReturnType('bool')
-            ->addParam($factory->param('someParam')->setTypeHint('SomeClass'))
-            ->setDocComment('/**
-                              * This method does something.
-                              *
-                              * @param SomeClass And takes a parameter
-                              */')
-        )
-
-        ->addStmt($factory->method('anotherMethod')
-            ->makeProtected() // ->makePublic() [default], ->makePrivate()
-            ->addParam($factory->param('someParam')->setDefault('test'))
-            // it is possible to add manually created nodes
-            ->addStmt(new Node\Expr\Print_(new Node\Expr\Variable('someParam')))
-        )
-
-        // properties will be correctly reordered above the methods
-        ->addStmt($factory->property('someProperty')->makeProtected())
-        ->addStmt($factory->property('anotherProperty')->makePrivate()->setDefault(array(1, 2, 3)))
-    )
-
-    ->getNode()
-;
-
-$stmts = array($node);
-$prettyPrinter = new PrettyPrinter\Standard();
-echo $prettyPrinter->prettyPrintFile($stmts);
-```
-
-This will produce the following output with the standard pretty printer:
-
-```php
-<?php
-
-namespace Name\Space;
-
-use Some\Other\Thingy as SomeClass;
-abstract class SomeClass extends SomeOtherClass implements A\Few, \Interfaces
-{
-    protected $someProperty;
-    private $anotherProperty = array(1, 2, 3);
-    /**
-     * This method does something.
-     *
-     * @param SomeClass And takes a parameter
-     */
-    public abstract function someMethod(SomeClass $someParam) : bool;
-    protected function anotherMethod($someParam = 'test')
-    {
-        print $someParam;
-    }
-}
-```
diff --git a/lib/nikic/php-parser/doc/component/Error_handling.markdown b/lib/nikic/php-parser/doc/component/Error_handling.markdown
deleted file mode 100644
index c1579e9d1..000000000
--- a/lib/nikic/php-parser/doc/component/Error_handling.markdown
+++ /dev/null
@@ -1,75 +0,0 @@
-Error handling
-==============
-
-Errors during parsing or analysis are represented using the `PhpParser\Error` exception class. In addition to an error
-message, an error can also store additional information about the location the error occurred at.
-
-How much location information is available depends on the origin of the error and how many lexer attributes have been
-enabled. At a minimum the start line of the error is usually available.
-
-Column information
-------------------
-
-In order to receive information about not only the line, but also the column span an error occurred at, the file
-position attributes in the lexer need to be enabled:
-
-```php
-$lexer = new PhpParser\Lexer(array(
-    'usedAttributes' => array('comments', 'startLine', 'endLine', 'startFilePos', 'endFilePos'),
-));
-$parser = (new PhpParser\ParserFactory)->create(PhpParser\ParserFactory::PREFER_PHP7, $lexer);
-
-try {
-    $stmts = $parser->parse($code);
-    // ...
-} catch (PhpParser\Error $e) {
-    // ...
-}
-```
-
-Before using column information its availability needs to be checked with `$e->hasColumnInfo()`, as the precise
-location of an error cannot always be determined. The methods for retrieving column information also have to be passed
-the source code of the parsed file. An example for printing an error:
-
-```php
-if ($e->hasColumnInfo()) {
-    echo $e->getRawMessage() . ' from ' . $e->getStartLine() . ':' . $e->getStartColumn($code)
-        . ' to ' . $e->getEndLine() . ':' . $e->getEndColumn($code);
-    // or:
-    echo $e->getMessageWithColumnInfo();
-} else {
-    echo $e->getMessage();
-}
-```
-
-Both line numbers and column numbers are 1-based. EOF errors will be located at the position one past the end of the
-file.
-
-Error recovery
---------------
-
-The error behavior of the parser (and other components) is controlled by an `ErrorHandler`. Whenever an error is
-encountered, `ErrorHandler::handleError()` is invoked. The default error handling strategy is `ErrorHandler\Throwing`,
-which will immediately throw when an error is encountered.
-
-To instead collect all encountered errors into an array, while trying to continue parsing the rest of the source code,
-an instance of `ErrorHandler\Collecting` can be passed to the `Parser::parse()` method. A usage example:
-
-```php
-$parser = (new PhpParser\ParserFactory)->create(PhpParser\ParserFactory::ONLY_PHP7);
-$errorHandler = new PhpParser\ErrorHandler\Collecting;
-
-$stmts = $parser->parse($code, $errorHandler);
-
-if ($errorHandler->hasErrors()) {
-    foreach ($errorHandler->getErrors() as $error) {
-        // $error is an ordinary PhpParser\Error
-    }
-}
-
-if (null !== $stmts) {
-    // $stmts is a best-effort partial AST
-}
-```
-
-The `NameResolver` visitor also accepts an `ErrorHandler` as a constructor argument.
\ No newline at end of file
diff --git a/lib/nikic/php-parser/doc/component/Lexer.markdown b/lib/nikic/php-parser/doc/component/Lexer.markdown
deleted file mode 100644
index b22942dd1..000000000
--- a/lib/nikic/php-parser/doc/component/Lexer.markdown
+++ /dev/null
@@ -1,152 +0,0 @@
-Lexer component documentation
-=============================
-
-The lexer is responsible for providing tokens to the parser. The project comes with two lexers: `PhpParser\Lexer` and
-`PhpParser\Lexer\Emulative`. The latter is an extension of the former, which adds the ability to emulate tokens of
-newer PHP versions and thus allows parsing of new code on older versions.
-
-This documentation discusses options available for the default lexers and explains how lexers can be extended.
-
-Lexer options
--------------
-
-The two default lexers accept an `$options` array in the constructor. Currently only the `'usedAttributes'` option is
-supported, which allows you to specify which attributes will be added to the AST nodes. The attributes can then be
-accessed using `$node->getAttribute()`, `$node->setAttribute()`, `$node->hasAttribute()` and `$node->getAttributes()`
-methods. A sample options array:
-
-```php
-$lexer = new PhpParser\Lexer(array(
-    'usedAttributes' => array(
-        'comments', 'startLine', 'endLine'
-    )
-));
-```
-
-The attributes used in this example match the default behavior of the lexer. The following attributes are supported:
-
- * `comments`: Array of `PhpParser\Comment` or `PhpParser\Comment\Doc` instances, representing all comments that occurred
-   between the previous non-discarded token and the current one. Use of this attribute is required for the
-   `$node->getDocComment()` method to work. The attribute is also needed if you wish the pretty printer to retain
-   comments present in the original code.
- * `startLine`: Line in which the node starts. This attribute is required for the `$node->getLine()` to work. It is also
-   required if syntax errors should contain line number information.
- * `endLine`: Line in which the node ends.
- * `startTokenPos`: Offset into the token array of the first token in the node.
- * `endTokenPos`: Offset into the token array of the last token in the node.
- * `startFilePos`: Offset into the code string of the first character that is part of the node.
- * `endFilePos`: Offset into the code string of the last character that is part of the node.
-
-### Using token positions
-
-The token offset information is useful if you wish to examine the exact formatting used for a node. For example the AST
-does not distinguish whether a property was declared using `public` or using `var`, but you can retrieve this
-information based on the token position:
-
-```php
-function isDeclaredUsingVar(array $tokens, PhpParser\Node\Stmt\Property $prop) {
-    $i = $prop->getAttribute('startTokenPos');
-    return $tokens[$i][0] === T_VAR;
-}
-```
-
-In order to make use of this function, you will have to provide the tokens from the lexer to your node visitor using
-code similar to the following:
-
-```php
-class MyNodeVisitor extends PhpParser\NodeVisitorAbstract {
-    private $tokens;
-    public function setTokens(array $tokens) {
-        $this->tokens = $tokens;
-    }
-
-    public function leaveNode(PhpParser\Node $node) {
-        if ($node instanceof PhpParser\Node\Stmt\Property) {
-            var_dump(isDeclaredUsingVar($this->tokens, $node));
-        }
-    }
-}
-
-$lexer = new PhpParser\Lexer(array(
-    'usedAttributes' => array(
-        'comments', 'startLine', 'endLine', 'startTokenPos', 'endTokenPos'
-    )
-));
-$parser = (new PhpParser\ParserFactory)->create(PhpParser\ParserFactory::PREFER_PHP7, $lexer);
-
-$visitor = new MyNodeVisitor();
-$traverser = new PhpParser\NodeTraverser();
-$traverser->addVisitor($visitor);
-
-try {
-    $stmts = $parser->parse($code);
-    $visitor->setTokens($lexer->getTokens());
-    $stmts = $traverser->traverse($stmts);
-} catch (PhpParser\Error $e) {
-    echo 'Parse Error: ', $e->getMessage();
-}
-```
-
-The same approach can also be used to perform specific modifications in the code, without changing the formatting in
-other places (which is the case when using the pretty printer).
-
-Lexer extension
----------------
-
-A lexer has to define the following public interface:
-
-    void startLexing(string $code, ErrorHandler $errorHandler = null);
-    array getTokens();
-    string handleHaltCompiler();
-    int getNextToken(string &$value = null, array &$startAttributes = null, array &$endAttributes = null);
-
-The `startLexing()` method is invoked with the source code that is to be lexed (including the opening tag) whenever the
-`parse()` method of the parser is called. It can be used to reset state or preprocess the source code or tokens. The
-passes `ErrorHandler` should be used to report lexing errors.
-
-The `getTokens()` method returns the current token array, in the usual `token_get_all()` format. This method is not
-used by the parser (which uses `getNextToken()`), but is useful in combination with the token position attributes.
-
-The `handleHaltCompiler()` method is called whenever a `T_HALT_COMPILER` token is encountered. It has to return the
-remaining string after the construct (not including `();`).
-
-The `getNextToken()` method returns the ID of the next token (as defined by the `Parser::T_*` constants). If no more
-tokens are available it must return `0`, which is the ID of the `EOF` token. Furthermore the string content of the
-token should be written into the by-reference `$value` parameter (which will then be available as `$n` in the parser).
-
-### Attribute handling
-
-The other two by-ref variables `$startAttributes` and `$endAttributes` define which attributes will eventually be
-assigned to the generated nodes: The parser will take the `$startAttributes` from the first token which is part of the
-node and the `$endAttributes` from the last token that is part of the node.
-
-E.g. if the tokens `T_FUNCTION T_STRING ... '{' ... '}'` constitute a node, then the `$startAttributes` from the
-`T_FUNCTION` token will be taken and the `$endAttributes` from the `'}'` token.
-
-An application of custom attributes is storing the exact original formatting of literals: While the parser does retain
-some information about the formatting of integers (like decimal vs. hexadecimal) or strings (like used quote type), it
-does not preserve the exact original formatting (e.g. leading zeros for integers or escape sequences in strings). This
-can be remedied by storing the original value in an attribute:
-
-```php
-use PhpParser\Lexer;
-use PhpParser\Parser\Tokens;
-
-class KeepOriginalValueLexer extends Lexer // or Lexer\Emulative
-{
-    public function getNextToken(&$value = null, &$startAttributes = null, &$endAttributes = null) {
-        $tokenId = parent::getNextToken($value, $startAttributes, $endAttributes);
-
-        if ($tokenId == Tokens::T_CONSTANT_ENCAPSED_STRING   // non-interpolated string
-            || $tokenId == Tokens::T_ENCAPSED_AND_WHITESPACE // interpolated string
-            || $tokenId == Tokens::T_LNUMBER                 // integer
-            || $tokenId == Tokens::T_DNUMBER                 // floating point number
-        ) {
-            // could also use $startAttributes, doesn't really matter here
-            $endAttributes['originalValue'] = $value;
-        }
-
-        return $tokenId;
-    }
-}
-```
diff --git a/lib/nikic/php-parser/grammar/README.md b/lib/nikic/php-parser/grammar/README.md
index 3f1698a68..4bae11d82 100644
--- a/lib/nikic/php-parser/grammar/README.md
+++ b/lib/nikic/php-parser/grammar/README.md
@@ -11,7 +11,7 @@ What do all those files mean?
 .phpy pseudo language
 =====================
 
-The `.y` file is a normal grammer in `kmyacc` (`yacc`) style, with some transformations
+The `.y` file is a normal grammar in `kmyacc` (`yacc`) style, with some transformations
 applied to it:
 
  * Nodes are created using the syntax `Name[..., ...]`. This is transformed into
@@ -21,8 +21,10 @@ applied to it:
 Building the parser
 ===================
 
-In order to rebuild the parser, you need [moriyoshi's fork of kmyacc](https://github.com/moriyoshi/kmyacc-forked).
-After you compiled/installed it, run the `rebuildParsers.php` script.
+Run `php grammar/rebuildParsers.php` to rebuild the parsers. Additional options:
 
-By default only the `Parser.php` is built. If you want to additionally emit debug symbols and create `y.output`, run the
-script with `--debug`. If you want to retain the preprocessed grammar pass `--keep-tmp-grammar`.
+ * The `KMYACC` environment variable can be used to specify an alternative `kmyacc` binary.
+   By default the `phpyacc` dev dependency will be used. To use the original `kmyacc`, you
+   need to compile [moriyoshi's fork](https://github.com/moriyoshi/kmyacc-forked).
+ * The `--debug` option enables emission of debug symbols and creates the `y.output` file.
+ * The `--keep-tmp-grammar` option preserves the preprocessed grammar file.
diff --git a/lib/nikic/php-parser/grammar/parser.template b/lib/nikic/php-parser/grammar/parser.template
index fff893ff4..6166607c9 100644
--- a/lib/nikic/php-parser/grammar/parser.template
+++ b/lib/nikic/php-parser/grammar/parser.template
@@ -2,8 +2,8 @@
 $meta #
 #semval($) $this->semValue
 #semval($,%t) $this->semValue
-#semval(%n) $this->stackPos-(%l-%n)
-#semval(%n,%t) $this->stackPos-(%l-%n)
+#semval(%n) $stackPos-(%l-%n)
+#semval(%n,%t) $stackPos-(%l-%n)
 
 namespace PhpParser\Parser;
 
@@ -32,8 +32,8 @@ class #(-p) extends \PhpParser\ParserAbstract
     protected $defaultAction = #(YYDEFAULT);
     protected $unexpectedTokenRule = #(YYUNEXPECTED);
 
-    protected $YY2TBLSTATE  = #(YY2TBLSTATE);
-    protected $YYNLSTATES   = #(YYNLSTATES);
+    protected $YY2TBLSTATE = #(YY2TBLSTATE);
+    protected $numNonLeafStates = #(YYNLSTATES);
 
     protected $symbolToName = array(
         #listvar terminals
@@ -88,16 +88,19 @@ class #(-p) extends \PhpParser\ParserAbstract
         #production-strings;
     );
 #endif
+
+    protected function initReduceCallbacks() {
+        $this->reduceCallbacks = [
 #reduce
-
-    protected function reduceRule%n() {
-        %b
-    }
+            %n => function ($stackPos) {
+                %b
+            },
 #noact
-
-    protected function reduceRule%n() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
+            %n => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
 #endreduce
+        ];
+    }
 }
 #tailcode;
diff --git a/lib/nikic/php-parser/grammar/php5.y b/lib/nikic/php-parser/grammar/php5.y
index 79384381f..f9e7e7dd1 100644
--- a/lib/nikic/php-parser/grammar/php5.y
+++ b/lib/nikic/php-parser/grammar/php5.y
@@ -16,10 +16,15 @@ top_statement_list_ex:
 
 top_statement_list:
       top_statement_list_ex
-          { makeNop($nop, $this->lookaheadStartAttributes);
+          { makeZeroLengthNop($nop, $this->lookaheadStartAttributes);
             if ($nop !== null) { $1[] = $nop; } $$ = $1; }
 ;
 
+ampersand:
+      T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG
+    | T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG
+;
+
 reserved_non_modifiers:
       T_INCLUDE | T_INCLUDE_ONCE | T_EVAL | T_REQUIRE | T_REQUIRE_ONCE | T_LOGICAL_OR | T_LOGICAL_XOR | T_LOGICAL_AND
     | T_INSTANCEOF | T_NEW | T_CLONE | T_EXIT | T_IF | T_ELSEIF | T_ELSE | T_ENDIF | T_ECHO | T_DO | T_WHILE
@@ -27,7 +32,8 @@ reserved_non_modifiers:
     | T_FINALLY | T_THROW | T_USE | T_INSTEADOF | T_GLOBAL | T_VAR | T_UNSET | T_ISSET | T_EMPTY | T_CONTINUE | T_GOTO
     | T_FUNCTION | T_CONST | T_RETURN | T_PRINT | T_YIELD | T_LIST | T_SWITCH | T_ENDSWITCH | T_CASE | T_DEFAULT
     | T_BREAK | T_ARRAY | T_CALLABLE | T_EXTENDS | T_IMPLEMENTS | T_NAMESPACE | T_TRAIT | T_INTERFACE | T_CLASS
-    | T_CLASS_C | T_TRAIT_C | T_FUNC_C | T_METHOD_C | T_LINE | T_FILE | T_DIR | T_NS_C | T_HALT_COMPILER
+    | T_CLASS_C | T_TRAIT_C | T_FUNC_C | T_METHOD_C | T_LINE | T_FILE | T_DIR | T_NS_C | T_HALT_COMPILER | T_FN
+    | T_MATCH
 ;
 
 semi_reserved:
@@ -35,18 +41,31 @@ semi_reserved:
     | T_STATIC | T_ABSTRACT | T_FINAL | T_PRIVATE | T_PROTECTED | T_PUBLIC
 ;
 
-identifier:
-      T_STRING                                              { $$ = $1; }
-    | semi_reserved                                         { $$ = $1; }
+identifier_ex:
+      T_STRING                                              { $$ = Node\Identifier[$1]; }
+    | semi_reserved                                         { $$ = Node\Identifier[$1]; }
 ;
 
-namespace_name_parts:
-      T_STRING                                              { init($1); }
-    | namespace_name_parts T_NS_SEPARATOR T_STRING          { push($1, $3); }
+identifier:
+      T_STRING                                              { $$ = Node\Identifier[$1]; }
+;
+
+reserved_non_modifiers_identifier:
+      reserved_non_modifiers                                { $$ = Node\Identifier[$1]; }
 ;
 
 namespace_name:
-      namespace_name_parts                                  { $$ = Name[$1]; }
+      T_STRING                                              { $$ = Name[$1]; }
+    | T_NAME_QUALIFIED                                      { $$ = Name[$1]; }
+;
+
+legacy_namespace_name:
+      namespace_name                                        { $$ = $1; }
+    | T_NAME_FULLY_QUALIFIED                                { $$ = Name[substr($1, 1)]; }
+;
+
+plain_variable:
+      T_VARIABLE                                            { $$ = Expr\Variable[parseVar($1)]; }
 ;
 
 top_statement:
@@ -78,16 +97,11 @@ use_type:
     | T_CONST                                               { $$ = Stmt\Use_::TYPE_CONSTANT; }
 ;
 
-/* Using namespace_name_parts here to avoid s/r conflict on T_NS_SEPARATOR */
 group_use_declaration:
-      T_USE use_type namespace_name_parts T_NS_SEPARATOR '{' unprefixed_use_declarations '}'
-          { $$ = Stmt\GroupUse[new Name($3, stackAttributes(#3)), $6, $2]; }
-    | T_USE use_type T_NS_SEPARATOR namespace_name_parts T_NS_SEPARATOR '{' unprefixed_use_declarations '}'
-          { $$ = Stmt\GroupUse[new Name($4, stackAttributes(#4)), $7, $2]; }
-    | T_USE namespace_name_parts T_NS_SEPARATOR '{' inline_use_declarations '}'
-          { $$ = Stmt\GroupUse[new Name($2, stackAttributes(#2)), $5, Stmt\Use_::TYPE_UNKNOWN]; }
-    | T_USE T_NS_SEPARATOR namespace_name_parts T_NS_SEPARATOR '{' inline_use_declarations '}'
-          { $$ = Stmt\GroupUse[new Name($3, stackAttributes(#3)), $6, Stmt\Use_::TYPE_UNKNOWN]; }
+      T_USE use_type legacy_namespace_name T_NS_SEPARATOR '{' unprefixed_use_declarations '}'
+          { $$ = Stmt\GroupUse[$3, $6, $2]; }
+    | T_USE legacy_namespace_name T_NS_SEPARATOR '{' inline_use_declarations '}'
+          { $$ = Stmt\GroupUse[$2, $5, Stmt\Use_::TYPE_UNKNOWN]; }
 ;
 
 unprefixed_use_declarations:
@@ -109,13 +123,15 @@ inline_use_declarations:
 unprefixed_use_declaration:
       namespace_name
           { $$ = Stmt\UseUse[$1, null, Stmt\Use_::TYPE_UNKNOWN]; $this->checkUseUse($$, #1); }
-    | namespace_name T_AS T_STRING
+    | namespace_name T_AS identifier
           { $$ = Stmt\UseUse[$1, $3, Stmt\Use_::TYPE_UNKNOWN]; $this->checkUseUse($$, #3); }
 ;
 
 use_declaration:
-      unprefixed_use_declaration                            { $$ = $1; }
-    | T_NS_SEPARATOR unprefixed_use_declaration             { $$ = $2; }
+      legacy_namespace_name
+          { $$ = Stmt\UseUse[$1, null, Stmt\Use_::TYPE_UNKNOWN]; $this->checkUseUse($$, #1); }
+    | legacy_namespace_name T_AS identifier
+          { $$ = Stmt\UseUse[$1, $3, Stmt\Use_::TYPE_UNKNOWN]; $this->checkUseUse($$, #3); }
 ;
 
 inline_use_declaration:
@@ -129,7 +145,7 @@ constant_declaration_list:
 ;
 
 constant_declaration:
-    T_STRING '=' static_scalar                              { $$ = Node\Const_[$1, $3]; }
+    identifier '=' static_scalar                            { $$ = Node\Const_[$1, $3]; }
 ;
 
 class_const_list:
@@ -138,7 +154,7 @@ class_const_list:
 ;
 
 class_const:
-    identifier '=' static_scalar                            { $$ = Node\Const_[$1, $3]; }
+    identifier_ex '=' static_scalar                         { $$ = Node\Const_[$1, $3]; }
 ;
 
 inner_statement_list_ex:
@@ -148,7 +164,7 @@ inner_statement_list_ex:
 
 inner_statement_list:
       inner_statement_list_ex
-          { makeNop($nop, $this->lookaheadStartAttributes);
+          { makeZeroLengthNop($nop, $this->lookaheadStartAttributes);
             if ($nop !== null) { $1[] = $nop; } $$ = $1; }
 ;
 
@@ -166,7 +182,7 @@ non_empty_statement:
         if ($2) {
             $$ = $2; prependLeadingComments($$);
         } else {
-            makeNop($$, $this->startAttributeStack[#1]);
+            makeNop($$, $this->startAttributeStack[#1], $this->endAttributes);
             if (null === $$) { $$ = array(); }
         }
     }
@@ -185,12 +201,12 @@ non_empty_statement:
     | T_CONTINUE expr ';'                                   { $$ = Stmt\Continue_[$2]; }
     | T_RETURN ';'                                          { $$ = Stmt\Return_[null]; }
     | T_RETURN expr ';'                                     { $$ = Stmt\Return_[$2]; }
-    | yield_expr ';'                                        { $$ = $1; }
     | T_GLOBAL global_var_list ';'                          { $$ = Stmt\Global_[$2]; }
     | T_STATIC static_var_list ';'                          { $$ = Stmt\Static_[$2]; }
     | T_ECHO expr_list ';'                                  { $$ = Stmt\Echo_[$2]; }
     | T_INLINE_HTML                                         { $$ = Stmt\InlineHTML[$1]; }
-    | expr ';'                                              { $$ = $1; }
+    | yield_expr ';'                                        { $$ = Stmt\Expression[$1]; }
+    | expr ';'                                              { $$ = Stmt\Expression[$1]; }
     | T_UNSET '(' variables_list ')' ';'                    { $$ = Stmt\Unset_[$3]; }
     | T_FOREACH '(' expr T_AS foreach_variable ')' foreach_statement
           { $$ = Stmt\Foreach_[$3, $5[0], ['keyVar' => null, 'byRef' => $5[1], 'stmts' => $7]]; }
@@ -200,16 +216,16 @@ non_empty_statement:
     | T_TRY '{' inner_statement_list '}' catches optional_finally
           { $$ = Stmt\TryCatch[$3, $5, $6]; $this->checkTryCatch($$); }
     | T_THROW expr ';'                                      { $$ = Stmt\Throw_[$2]; }
-    | T_GOTO T_STRING ';'                                   { $$ = Stmt\Goto_[$2]; }
-    | T_STRING ':'                                          { $$ = Stmt\Label[$1]; }
-    | expr error                                            { $$ = $1; }
+    | T_GOTO identifier ';'                                 { $$ = Stmt\Goto_[$2]; }
+    | identifier ':'                                        { $$ = Stmt\Label[$1]; }
+    | expr error                                            { $$ = Stmt\Expression[$1]; }
     | error                                                 { $$ = array(); /* means: no statement */ }
 ;
 
 statement:
       non_empty_statement                                   { $$ = $1; }
     | ';'
-          { makeNop($$, $this->startAttributeStack[#1]);
+          { makeNop($$, $this->startAttributeStack[#1], $this->endAttributes);
             if ($$ === null) $$ = array(); /* means: no statement */ }
 ;
 
@@ -219,8 +235,8 @@ catches:
 ;
 
 catch:
-    T_CATCH '(' name T_VARIABLE ')' '{' inner_statement_list '}'
-        { $$ = Stmt\Catch_[array($3), parseVar($4), $7]; }
+    T_CATCH '(' name plain_variable ')' '{' inner_statement_list '}'
+        { $$ = Stmt\Catch_[array($3), $4, $7]; }
 ;
 
 optional_finally:
@@ -235,7 +251,12 @@ variables_list:
 
 optional_ref:
       /* empty */                                           { $$ = false; }
-    | '&'                                                   { $$ = true; }
+    | ampersand                                             { $$ = true; }
+;
+
+optional_arg_ref:
+      /* empty */                                           { $$ = false; }
+    | T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG                 { $$ = true; }
 ;
 
 optional_ellipsis:
@@ -244,18 +265,18 @@ optional_ellipsis:
 ;
 
 function_declaration_statement:
-    T_FUNCTION optional_ref T_STRING '(' parameter_list ')' optional_return_type '{' inner_statement_list '}'
+    T_FUNCTION optional_ref identifier '(' parameter_list ')' optional_return_type '{' inner_statement_list '}'
         { $$ = Stmt\Function_[$3, ['byRef' => $2, 'params' => $5, 'returnType' => $7, 'stmts' => $9]]; }
 ;
 
 class_declaration_statement:
-      class_entry_type T_STRING extends_from implements_list '{' class_statement_list '}'
+      class_entry_type identifier extends_from implements_list '{' class_statement_list '}'
           { $$ = Stmt\Class_[$2, ['type' => $1, 'extends' => $3, 'implements' => $4, 'stmts' => $6]];
             $this->checkClass($$, #2); }
-    | T_INTERFACE T_STRING interface_extends_list '{' class_statement_list '}'
+    | T_INTERFACE identifier interface_extends_list '{' class_statement_list '}'
           { $$ = Stmt\Interface_[$2, ['extends' => $3, 'stmts' => $5]];
             $this->checkInterface($$, #2); }
-    | T_TRAIT T_STRING '{' class_statement_list '}'
+    | T_TRAIT identifier '{' class_statement_list '}'
           { $$ = Stmt\Trait_[$2, ['stmts' => $4]]; }
 ;
 
@@ -307,7 +328,7 @@ declare_list:
 ;
 
 declare_list_element:
-      T_STRING '=' static_scalar                            { $$ = Stmt\DeclareDeclare[$1, $3]; }
+      identifier '=' static_scalar                          { $$ = Stmt\DeclareDeclare[$1, $3]; }
 ;
 
 switch_case_list:
@@ -367,7 +388,7 @@ new_else_single:
 
 foreach_variable:
       variable                                              { $$ = array($1, false); }
-    | '&' variable                                          { $$ = array($2, true); }
+    | ampersand variable                                    { $$ = array($2, true); }
     | list_expr                                             { $$ = array($1, false); }
 ;
 
@@ -382,16 +403,16 @@ non_empty_parameter_list:
 ;
 
 parameter:
-      optional_param_type optional_ref optional_ellipsis T_VARIABLE
-          { $$ = Node\Param[parseVar($4), null, $1, $2, $3]; $this->checkParam($$); }
-    | optional_param_type optional_ref optional_ellipsis T_VARIABLE '=' static_scalar
-          { $$ = Node\Param[parseVar($4), $6, $1, $2, $3]; $this->checkParam($$); }
+      optional_param_type optional_arg_ref optional_ellipsis plain_variable
+          { $$ = Node\Param[$4, null, $1, $2, $3]; $this->checkParam($$); }
+    | optional_param_type optional_arg_ref optional_ellipsis plain_variable '=' static_scalar
+          { $$ = Node\Param[$4, $6, $1, $2, $3]; $this->checkParam($$); }
 ;
 
 type:
       name                                                  { $$ = $1; }
-    | T_ARRAY                                               { $$ = 'array'; }
-    | T_CALLABLE                                            { $$ = 'callable'; }
+    | T_ARRAY                                               { $$ = Node\Identifier['array']; }
+    | T_CALLABLE                                            { $$ = Node\Identifier['callable']; }
 ;
 
 optional_param_type:
@@ -417,7 +438,7 @@ non_empty_argument_list:
 
 argument:
       expr                                                  { $$ = Node\Arg[$1, false, false]; }
-    | '&' variable                                          { $$ = Node\Arg[$2, true, false]; }
+    | ampersand variable                                    { $$ = Node\Arg[$2, true, false]; }
     | T_ELLIPSIS expr                                       { $$ = Node\Arg[$2, false, true]; }
 ;
 
@@ -427,7 +448,7 @@ global_var_list:
 ;
 
 global_var:
-      T_VARIABLE                                            { $$ = Expr\Variable[parseVar($1)]; }
+      plain_variable                                        { $$ = $1; }
     | '$' variable                                          { $$ = Expr\Variable[$2]; }
     | '$' '{' expr '}'                                      { $$ = Expr\Variable[$3]; }
 ;
@@ -438,20 +459,26 @@ static_var_list:
 ;
 
 static_var:
-      T_VARIABLE                                            { $$ = Stmt\StaticVar[parseVar($1), null]; }
-    | T_VARIABLE '=' static_scalar                          { $$ = Stmt\StaticVar[parseVar($1), $3]; }
+      plain_variable                                        { $$ = Stmt\StaticVar[$1, null]; }
+    | plain_variable '=' static_scalar                      { $$ = Stmt\StaticVar[$1, $3]; }
+;
+
+class_statement_list_ex:
+      class_statement_list_ex class_statement               { if ($2 !== null) { push($1, $2); } }
+    | /* empty */                                           { init(); }
 ;
 
 class_statement_list:
-      class_statement_list class_statement                  { push($1, $2); }
-    | /* empty */                                           { init(); }
+      class_statement_list_ex
+          { makeZeroLengthNop($nop, $this->lookaheadStartAttributes);
+            if ($nop !== null) { $1[] = $nop; } $$ = $1; }
 ;
 
 class_statement:
       variable_modifiers property_declaration_list ';'
           { $$ = Stmt\Property[$1, $2]; $this->checkProperty($$, #1); }
     | T_CONST class_const_list ';'                          { $$ = Stmt\ClassConst[$2, 0]; }
-    | method_modifiers T_FUNCTION optional_ref identifier '(' parameter_list ')' optional_return_type method_body
+    | method_modifiers T_FUNCTION optional_ref identifier_ex '(' parameter_list ')' optional_return_type method_body
           { $$ = Stmt\ClassMethod[$4, ['type' => $1, 'byRef' => $3, 'params' => $6, 'returnType' => $8, 'stmts' => $9]];
             $this->checkClassMethod($$, #1); }
     | T_USE class_name_list trait_adaptations               { $$ = Stmt\TraitUse[$2, $3]; }
@@ -470,22 +497,22 @@ trait_adaptation_list:
 trait_adaptation:
       trait_method_reference_fully_qualified T_INSTEADOF class_name_list ';'
           { $$ = Stmt\TraitUseAdaptation\Precedence[$1[0], $1[1], $3]; }
-    | trait_method_reference T_AS member_modifier identifier ';'
+    | trait_method_reference T_AS member_modifier identifier_ex ';'
           { $$ = Stmt\TraitUseAdaptation\Alias[$1[0], $1[1], $3, $4]; }
     | trait_method_reference T_AS member_modifier ';'
           { $$ = Stmt\TraitUseAdaptation\Alias[$1[0], $1[1], $3, null]; }
-    | trait_method_reference T_AS T_STRING ';'
+    | trait_method_reference T_AS identifier ';'
           { $$ = Stmt\TraitUseAdaptation\Alias[$1[0], $1[1], null, $3]; }
-    | trait_method_reference T_AS reserved_non_modifiers ';'
+    | trait_method_reference T_AS reserved_non_modifiers_identifier ';'
           { $$ = Stmt\TraitUseAdaptation\Alias[$1[0], $1[1], null, $3]; }
 ;
 
 trait_method_reference_fully_qualified:
-      name T_PAAMAYIM_NEKUDOTAYIM identifier                { $$ = array($1, $3); }
+      name T_PAAMAYIM_NEKUDOTAYIM identifier_ex             { $$ = array($1, $3); }
 ;
 trait_method_reference:
       trait_method_reference_fully_qualified                { $$ = $1; }
-    | identifier                                            { $$ = array(null, $1); }
+    | identifier_ex                                         { $$ = array(null, $1); }
 ;
 
 method_body:
@@ -522,9 +549,13 @@ property_declaration_list:
     | property_declaration_list ',' property_declaration    { push($1, $3); }
 ;
 
+property_decl_name:
+      T_VARIABLE                                            { $$ = Node\VarLikeIdentifier[parseVar($1)]; }
+;
+
 property_declaration:
-      T_VARIABLE                                            { $$ = Stmt\PropertyProperty[parseVar($1), null]; }
-    | T_VARIABLE '=' static_scalar                          { $$ = Stmt\PropertyProperty[parseVar($1), $3]; }
+      property_decl_name                                    { $$ = Stmt\PropertyProperty[$1, null]; }
+    | property_decl_name '=' static_scalar                  { $$ = Stmt\PropertyProperty[$1, $3]; }
 ;
 
 expr_list:
@@ -541,8 +572,8 @@ expr:
       variable                                              { $$ = $1; }
     | list_expr '=' expr                                    { $$ = Expr\Assign[$1, $3]; }
     | variable '=' expr                                     { $$ = Expr\Assign[$1, $3]; }
-    | variable '=' '&' variable                             { $$ = Expr\AssignRef[$1, $4]; }
-    | variable '=' '&' new_expr                             { $$ = Expr\AssignRef[$1, $4]; }
+    | variable '=' ampersand variable                       { $$ = Expr\AssignRef[$1, $4]; }
+    | variable '=' ampersand new_expr                       { $$ = Expr\AssignRef[$1, $4]; }
     | new_expr                                              { $$ = $1; }
     | T_CLONE expr                                          { $$ = Expr\Clone_[$2]; }
     | variable T_PLUS_EQUAL expr                            { $$ = Expr\AssignOp\Plus      [$1, $3]; }
@@ -557,6 +588,7 @@ expr:
     | variable T_SL_EQUAL expr                              { $$ = Expr\AssignOp\ShiftLeft [$1, $3]; }
     | variable T_SR_EQUAL expr                              { $$ = Expr\AssignOp\ShiftRight[$1, $3]; }
     | variable T_POW_EQUAL expr                             { $$ = Expr\AssignOp\Pow       [$1, $3]; }
+    | variable T_COALESCE_EQUAL expr                        { $$ = Expr\AssignOp\Coalesce  [$1, $3]; }
     | variable T_INC                                        { $$ = Expr\PostInc[$1]; }
     | T_INC variable                                        { $$ = Expr\PreInc [$2]; }
     | variable T_DEC                                        { $$ = Expr\PostDec[$1]; }
@@ -567,7 +599,8 @@ expr:
     | expr T_LOGICAL_AND expr                               { $$ = Expr\BinaryOp\LogicalAnd[$1, $3]; }
     | expr T_LOGICAL_XOR expr                               { $$ = Expr\BinaryOp\LogicalXor[$1, $3]; }
     | expr '|' expr                                         { $$ = Expr\BinaryOp\BitwiseOr [$1, $3]; }
-    | expr '&' expr                                         { $$ = Expr\BinaryOp\BitwiseAnd[$1, $3]; }
+    | expr T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG expr   { $$ = Expr\BinaryOp\BitwiseAnd[$1, $3]; }
+    | expr T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG expr       { $$ = Expr\BinaryOp\BitwiseAnd[$1, $3]; }
     | expr '^' expr                                         { $$ = Expr\BinaryOp\BitwiseXor[$1, $3]; }
     | expr '.' expr                                         { $$ = Expr\BinaryOp\Concat    [$1, $3]; }
     | expr '+' expr                                         { $$ = Expr\BinaryOp\Plus      [$1, $3]; }
@@ -606,7 +639,10 @@ expr:
     | T_REQUIRE expr                                        { $$ = Expr\Include_[$2, Expr\Include_::TYPE_REQUIRE]; }
     | T_REQUIRE_ONCE expr                                   { $$ = Expr\Include_[$2, Expr\Include_::TYPE_REQUIRE_ONCE]; }
     | T_INT_CAST expr                                       { $$ = Expr\Cast\Int_    [$2]; }
-    | T_DOUBLE_CAST expr                                    { $$ = Expr\Cast\Double  [$2]; }
+    | T_DOUBLE_CAST expr
+          { $attrs = attributes();
+            $attrs['kind'] = $this->getFloatCastKind($1);
+            $$ = new Expr\Cast\Double($2, $attrs); }
     | T_STRING_CAST expr                                    { $$ = Expr\Cast\String_ [$2]; }
     | T_ARRAY_CAST expr                                     { $$ = Expr\Cast\Array_  [$2]; }
     | T_OBJECT_CAST expr                                    { $$ = Expr\Cast\Object_ [$2]; }
@@ -665,6 +701,7 @@ anonymous_class:
       T_CLASS ctor_arguments extends_from implements_list '{' class_statement_list '}'
           { $$ = array(Stmt\Class_[null, ['type' => 0, 'extends' => $3, 'implements' => $4, 'stmts' => $6]], $2);
             $this->checkClass($$[0], -1); }
+;
 
 new_expr:
       T_NEW class_name_reference ctor_arguments             { $$ = Expr\New_[$2, $3]; }
@@ -683,30 +720,17 @@ lexical_var_list:
 ;
 
 lexical_var:
-      optional_ref T_VARIABLE                               { $$ = Expr\ClosureUse[parseVar($2), $1]; }
+      optional_ref plain_variable                           { $$ = Expr\ClosureUse[$2, $1]; }
 ;
 
 function_call:
       name argument_list                                    { $$ = Expr\FuncCall[$1, $2]; }
-    | class_name_or_var T_PAAMAYIM_NEKUDOTAYIM identifier argument_list
+    | class_name_or_var T_PAAMAYIM_NEKUDOTAYIM identifier_ex argument_list
           { $$ = Expr\StaticCall[$1, $3, $4]; }
     | class_name_or_var T_PAAMAYIM_NEKUDOTAYIM '{' expr '}' argument_list
           { $$ = Expr\StaticCall[$1, $4, $6]; }
-    | static_property argument_list {
-            if ($1 instanceof Node\Expr\StaticPropertyFetch) {
-                $$ = Expr\StaticCall[$1->class, Expr\Variable[$1->name], $2];
-            } elseif ($1 instanceof Node\Expr\ArrayDimFetch) {
-                $tmp = $1;
-                while ($tmp->var instanceof Node\Expr\ArrayDimFetch) {
-                    $tmp = $tmp->var;
-                }
-
-                $$ = Expr\StaticCall[$tmp->var->class, $1, $2];
-                $tmp->var = Expr\Variable[$tmp->var->name];
-            } else {
-                throw new \Exception;
-            }
-          }
+    | static_property argument_list
+          { $$ = $this->fixupPhp5StaticPropCall($1, $2, attributes()); }
     | variable_without_objects argument_list
           { $$ = Expr\FuncCall[$1, $2]; }
     | function_call '[' dim_offset ']'                      { $$ = Expr\ArrayDimFetch[$1, $3]; }
@@ -719,9 +743,10 @@ class_name:
 ;
 
 name:
-      namespace_name_parts                                  { $$ = Name[$1]; }
-    | T_NS_SEPARATOR namespace_name_parts                   { $$ = Name\FullyQualified[$2]; }
-    | T_NAMESPACE T_NS_SEPARATOR namespace_name_parts       { $$ = Name\Relative[$3]; }
+      T_STRING                                              { $$ = Name[$1]; }
+    | T_NAME_QUALIFIED                                      { $$ = Name[$1]; }
+    | T_NAME_FULLY_QUALIFIED                                { $$ = Name\FullyQualified[substr($1, 1)]; }
+    | T_NAME_RELATIVE                                       { $$ = Name\Relative[substr($1, 10)]; }
 ;
 
 class_name_reference:
@@ -781,16 +806,14 @@ common_scalar:
     | T_FUNC_C                                              { $$ = Scalar\MagicConst\Function_[]; }
     | T_NS_C                                                { $$ = Scalar\MagicConst\Namespace_[]; }
     | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC
-          { $attrs = attributes(); setDocStringAttrs($attrs, $1);
-            $$ = new Scalar\String_(Scalar\String_::parseDocString($1, $2, false), $attrs); }
+          { $$ = $this->parseDocString($1, $2, $3, attributes(), stackAttributes(#3), false); }
     | T_START_HEREDOC T_END_HEREDOC
-          { $attrs = attributes(); setDocStringAttrs($attrs, $1);
-            $$ = new Scalar\String_('', $attrs); }
+          { $$ = $this->parseDocString($1, '', $2, attributes(), stackAttributes(#2), false); }
 ;
 
 static_scalar:
       common_scalar                                         { $$ = $1; }
-    | class_name T_PAAMAYIM_NEKUDOTAYIM identifier          { $$ = Expr\ClassConstFetch[$1, $3]; }
+    | class_name T_PAAMAYIM_NEKUDOTAYIM identifier_ex       { $$ = Expr\ClassConstFetch[$1, $3]; }
     | name                                                  { $$ = Expr\ConstFetch[$1]; }
     | T_ARRAY '(' static_array_pair_list ')'                { $$ = Expr\Array_[$3]; }
     | '[' static_array_pair_list ']'                        { $$ = Expr\Array_[$2]; }
@@ -804,7 +827,10 @@ static_operation:
     | static_scalar T_LOGICAL_AND static_scalar             { $$ = Expr\BinaryOp\LogicalAnd[$1, $3]; }
     | static_scalar T_LOGICAL_XOR static_scalar             { $$ = Expr\BinaryOp\LogicalXor[$1, $3]; }
     | static_scalar '|' static_scalar                       { $$ = Expr\BinaryOp\BitwiseOr [$1, $3]; }
-    | static_scalar '&' static_scalar                       { $$ = Expr\BinaryOp\BitwiseAnd[$1, $3]; }
+    | static_scalar T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG static_scalar
+          { $$ = Expr\BinaryOp\BitwiseAnd[$1, $3]; }
+    | static_scalar T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG static_scalar
+          { $$ = Expr\BinaryOp\BitwiseAnd[$1, $3]; }
     | static_scalar '^' static_scalar                       { $$ = Expr\BinaryOp\BitwiseXor[$1, $3]; }
     | static_scalar '.' static_scalar                       { $$ = Expr\BinaryOp\Concat    [$1, $3]; }
     | static_scalar '+' static_scalar                       { $$ = Expr\BinaryOp\Plus      [$1, $3]; }
@@ -835,7 +861,7 @@ static_operation:
 
 constant:
       name                                                  { $$ = Expr\ConstFetch[$1]; }
-    | class_name_or_var T_PAAMAYIM_NEKUDOTAYIM identifier
+    | class_name_or_var T_PAAMAYIM_NEKUDOTAYIM identifier_ex
           { $$ = Expr\ClassConstFetch[$1, $3]; }
 ;
 
@@ -846,8 +872,7 @@ scalar:
           { $attrs = attributes(); $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED;
             parseEncapsed($2, '"', true); $$ = new Scalar\Encapsed($2, $attrs); }
     | T_START_HEREDOC encaps_list T_END_HEREDOC
-          { $attrs = attributes(); setDocStringAttrs($attrs, $1);
-            parseEncapsedDoc($2, true); $$ = new Scalar\Encapsed($2, $attrs); }
+          { $$ = $this->parseDocString($1, $2, $3, attributes(), stackAttributes(#3), true); }
 ;
 
 static_array_pair_list:
@@ -914,9 +939,14 @@ static_property:
     | static_property_with_arrays                           { $$ = $1; }
 ;
 
+static_property_simple_name:
+      T_VARIABLE
+          { $var = parseVar($1); $$ = \is_string($var) ? Node\VarLikeIdentifier[$var] : $var; }
+;
+
 static_property_with_arrays:
-      class_name_or_var T_PAAMAYIM_NEKUDOTAYIM T_VARIABLE
-          { $$ = Expr\StaticPropertyFetch[$1, parseVar($3)]; }
+      class_name_or_var T_PAAMAYIM_NEKUDOTAYIM static_property_simple_name
+          { $$ = Expr\StaticPropertyFetch[$1, $3]; }
     | class_name_or_var T_PAAMAYIM_NEKUDOTAYIM '$' '{' expr '}'
           { $$ = Expr\StaticPropertyFetch[$1, $5]; }
     | static_property_with_arrays '[' dim_offset ']'        { $$ = Expr\ArrayDimFetch[$1, $3]; }
@@ -926,7 +956,7 @@ static_property_with_arrays:
 reference_variable:
       reference_variable '[' dim_offset ']'                 { $$ = Expr\ArrayDimFetch[$1, $3]; }
     | reference_variable '{' expr '}'                       { $$ = Expr\ArrayDimFetch[$1, $3]; }
-    | T_VARIABLE                                            { $$ = Expr\Variable[parseVar($1)]; }
+    | plain_variable                                        { $$ = $1; }
     | '$' '{' expr '}'                                      { $$ = Expr\Variable[$3]; }
 ;
 
@@ -936,7 +966,7 @@ dim_offset:
 ;
 
 object_property:
-      T_STRING                                              { $$ = $1; }
+      identifier                                            { $$ = $1; }
     | '{' expr '}'                                          { $$ = $2; }
     | variable_without_objects                              { $$ = $1; }
     | error                                                 { $$ = Expr\Error[]; $this->errorState = 2; }
@@ -970,8 +1000,9 @@ non_empty_array_pair_list:
 array_pair:
       expr T_DOUBLE_ARROW expr                              { $$ = Expr\ArrayItem[$3, $1,   false]; }
     | expr                                                  { $$ = Expr\ArrayItem[$1, null, false]; }
-    | expr T_DOUBLE_ARROW '&' variable                      { $$ = Expr\ArrayItem[$4, $1,   true]; }
-    | '&' variable                                          { $$ = Expr\ArrayItem[$2, null, true]; }
+    | expr T_DOUBLE_ARROW ampersand variable                { $$ = Expr\ArrayItem[$4, $1,   true]; }
+    | ampersand variable                                    { $$ = Expr\ArrayItem[$2, null, true]; }
+    | T_ELLIPSIS expr                                       { $$ = Expr\ArrayItem[$2, null, false, attributes(), true]; }
 ;
 
 encaps_list:
@@ -985,25 +1016,25 @@ encaps_string_part:
       T_ENCAPSED_AND_WHITESPACE                             { $$ = Scalar\EncapsedStringPart[$1]; }
 ;
 
-encaps_base_var:
-      T_VARIABLE                                            { $$ = Expr\Variable[parseVar($1)]; }
+encaps_str_varname:
+      T_STRING_VARNAME                                      { $$ = Expr\Variable[$1]; }
 ;
 
 encaps_var:
-      encaps_base_var                                       { $$ = $1; }
-    | encaps_base_var '[' encaps_var_offset ']'             { $$ = Expr\ArrayDimFetch[$1, $3]; }
-    | encaps_base_var T_OBJECT_OPERATOR T_STRING            { $$ = Expr\PropertyFetch[$1, $3]; }
+      plain_variable                                        { $$ = $1; }
+    | plain_variable '[' encaps_var_offset ']'              { $$ = Expr\ArrayDimFetch[$1, $3]; }
+    | plain_variable T_OBJECT_OPERATOR identifier           { $$ = Expr\PropertyFetch[$1, $3]; }
     | T_DOLLAR_OPEN_CURLY_BRACES expr '}'                   { $$ = Expr\Variable[$2]; }
     | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '}'       { $$ = Expr\Variable[$2]; }
-    | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '[' expr ']' '}'
-          { $$ = Expr\ArrayDimFetch[Expr\Variable[$2], $4]; }
+    | T_DOLLAR_OPEN_CURLY_BRACES encaps_str_varname '[' expr ']' '}'
+          { $$ = Expr\ArrayDimFetch[$2, $4]; }
     | T_CURLY_OPEN variable '}'                             { $$ = $2; }
 ;
 
 encaps_var_offset:
       T_STRING                                              { $$ = Scalar\String_[$1]; }
     | T_NUM_STRING                                          { $$ = $this->parseNumString($1, attributes()); }
-    | T_VARIABLE                                            { $$ = Expr\Variable[parseVar($1)]; }
+    | plain_variable                                        { $$ = $1; }
 ;
 
 %%
diff --git a/lib/nikic/php-parser/grammar/php7.y b/lib/nikic/php-parser/grammar/php7.y
index f9b599b8d..eac68d095 100644
--- a/lib/nikic/php-parser/grammar/php7.y
+++ b/lib/nikic/php-parser/grammar/php7.y
@@ -16,10 +16,15 @@ top_statement_list_ex:
 
 top_statement_list:
       top_statement_list_ex
-          { makeNop($nop, $this->lookaheadStartAttributes);
+          { makeZeroLengthNop($nop, $this->lookaheadStartAttributes);
             if ($nop !== null) { $1[] = $nop; } $$ = $1; }
 ;
 
+ampersand:
+      T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG
+    | T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG
+;
+
 reserved_non_modifiers:
       T_INCLUDE | T_INCLUDE_ONCE | T_EVAL | T_REQUIRE | T_REQUIRE_ONCE | T_LOGICAL_OR | T_LOGICAL_XOR | T_LOGICAL_AND
     | T_INSTANCEOF | T_NEW | T_CLONE | T_EXIT | T_IF | T_ELSEIF | T_ELSE | T_ENDIF | T_ECHO | T_DO | T_WHILE
@@ -27,26 +32,46 @@ reserved_non_modifiers:
     | T_FINALLY | T_THROW | T_USE | T_INSTEADOF | T_GLOBAL | T_VAR | T_UNSET | T_ISSET | T_EMPTY | T_CONTINUE | T_GOTO
     | T_FUNCTION | T_CONST | T_RETURN | T_PRINT | T_YIELD | T_LIST | T_SWITCH | T_ENDSWITCH | T_CASE | T_DEFAULT
     | T_BREAK | T_ARRAY | T_CALLABLE | T_EXTENDS | T_IMPLEMENTS | T_NAMESPACE | T_TRAIT | T_INTERFACE | T_CLASS
-    | T_CLASS_C | T_TRAIT_C | T_FUNC_C | T_METHOD_C | T_LINE | T_FILE | T_DIR | T_NS_C | T_HALT_COMPILER
+    | T_CLASS_C | T_TRAIT_C | T_FUNC_C | T_METHOD_C | T_LINE | T_FILE | T_DIR | T_NS_C | T_HALT_COMPILER | T_FN
+    | T_MATCH | T_ENUM
 ;
 
 semi_reserved:
       reserved_non_modifiers
-    | T_STATIC | T_ABSTRACT | T_FINAL | T_PRIVATE | T_PROTECTED | T_PUBLIC
+    | T_STATIC | T_ABSTRACT | T_FINAL | T_PRIVATE | T_PROTECTED | T_PUBLIC | T_READONLY
 ;
 
-identifier:
-      T_STRING                                              { $$ = $1; }
-    | semi_reserved                                         { $$ = $1; }
+identifier_maybe_reserved:
+      T_STRING                                              { $$ = Node\Identifier[$1]; }
+    | semi_reserved                                         { $$ = Node\Identifier[$1]; }
 ;
 
-namespace_name_parts:
-      T_STRING                                              { init($1); }
-    | namespace_name_parts T_NS_SEPARATOR T_STRING          { push($1, $3); }
+identifier_not_reserved:
+      T_STRING                                              { $$ = Node\Identifier[$1]; }
+;
+
+reserved_non_modifiers_identifier:
+      reserved_non_modifiers                                { $$ = Node\Identifier[$1]; }
+;
+
+namespace_declaration_name:
+      T_STRING                                              { $$ = Name[$1]; }
+    | semi_reserved                                         { $$ = Name[$1]; }
+    | T_NAME_QUALIFIED                                      { $$ = Name[$1]; }
 ;
 
 namespace_name:
-      namespace_name_parts                                  { $$ = Name[$1]; }
+      T_STRING                                              { $$ = Name[$1]; }
+    | T_NAME_QUALIFIED                                      { $$ = Name[$1]; }
+;
+
+legacy_namespace_name:
+      namespace_name                                        { $$ = $1; }
+    | T_NAME_FULLY_QUALIFIED                                { $$ = Name[substr($1, 1)]; }
+;
+
+plain_variable:
+      T_VARIABLE                                            { $$ = Expr\Variable[parseVar($1)]; }
 ;
 
 semi:
@@ -62,6 +87,31 @@ no_comma:
 optional_comma:
       /* empty */
     | ','
+;
+
+attribute_decl:
+      class_name                                            { $$ = Node\Attribute[$1, []]; }
+    | class_name argument_list                              { $$ = Node\Attribute[$1, $2]; }
+;
+
+attribute_group:
+      attribute_decl                                        { init($1); }
+    | attribute_group ',' attribute_decl                    { push($1, $3); }
+;
+
+attribute:
+      T_ATTRIBUTE attribute_group optional_comma ']'        { $$ = Node\AttributeGroup[$2]; }
+;
+
+attributes:
+      attribute                                             { init($1); }
+    | attributes attribute                                  { push($1, $2); }
+;
+
+optional_attributes:
+      /* empty */                                           { $$ = []; }
+    | attributes                                            { $$ = $1; }
+;
 
 top_statement:
       statement                                             { $$ = $1; }
@@ -69,11 +119,11 @@ top_statement:
     | class_declaration_statement                           { $$ = $1; }
     | T_HALT_COMPILER
           { $$ = Stmt\HaltCompiler[$this->lexer->handleHaltCompiler()]; }
-    | T_NAMESPACE namespace_name semi
+    | T_NAMESPACE namespace_declaration_name semi
           { $$ = Stmt\Namespace_[$2, null];
             $$->setAttribute('kind', Stmt\Namespace_::KIND_SEMICOLON);
             $this->checkNamespace($$); }
-    | T_NAMESPACE namespace_name '{' top_statement_list '}'
+    | T_NAMESPACE namespace_declaration_name '{' top_statement_list '}'
           { $$ = Stmt\Namespace_[$2, $4];
             $$->setAttribute('kind', Stmt\Namespace_::KIND_BRACED);
             $this->checkNamespace($$); }
@@ -92,16 +142,11 @@ use_type:
     | T_CONST                                               { $$ = Stmt\Use_::TYPE_CONSTANT; }
 ;
 
-/* Using namespace_name_parts here to avoid s/r conflict on T_NS_SEPARATOR */
 group_use_declaration:
-      T_USE use_type namespace_name_parts T_NS_SEPARATOR '{' unprefixed_use_declarations '}'
-          { $$ = Stmt\GroupUse[new Name($3, stackAttributes(#3)), $6, $2]; }
-    | T_USE use_type T_NS_SEPARATOR namespace_name_parts T_NS_SEPARATOR '{' unprefixed_use_declarations '}'
-          { $$ = Stmt\GroupUse[new Name($4, stackAttributes(#4)), $7, $2]; }
-    | T_USE namespace_name_parts T_NS_SEPARATOR '{' inline_use_declarations '}'
-          { $$ = Stmt\GroupUse[new Name($2, stackAttributes(#2)), $5, Stmt\Use_::TYPE_UNKNOWN]; }
-    | T_USE T_NS_SEPARATOR namespace_name_parts T_NS_SEPARATOR '{' inline_use_declarations '}'
-          { $$ = Stmt\GroupUse[new Name($3, stackAttributes(#3)), $6, Stmt\Use_::TYPE_UNKNOWN]; }
+      T_USE use_type legacy_namespace_name T_NS_SEPARATOR '{' unprefixed_use_declarations '}'
+          { $$ = Stmt\GroupUse[$3, $6, $2]; }
+    | T_USE legacy_namespace_name T_NS_SEPARATOR '{' inline_use_declarations '}'
+          { $$ = Stmt\GroupUse[$2, $5, Stmt\Use_::TYPE_UNKNOWN]; }
 ;
 
 unprefixed_use_declarations:
@@ -136,13 +181,15 @@ non_empty_inline_use_declarations:
 unprefixed_use_declaration:
       namespace_name
           { $$ = Stmt\UseUse[$1, null, Stmt\Use_::TYPE_UNKNOWN]; $this->checkUseUse($$, #1); }
-    | namespace_name T_AS T_STRING
+    | namespace_name T_AS identifier_not_reserved
           { $$ = Stmt\UseUse[$1, $3, Stmt\Use_::TYPE_UNKNOWN]; $this->checkUseUse($$, #3); }
 ;
 
 use_declaration:
-      unprefixed_use_declaration                            { $$ = $1; }
-    | T_NS_SEPARATOR unprefixed_use_declaration             { $$ = $2; }
+      legacy_namespace_name
+          { $$ = Stmt\UseUse[$1, null, Stmt\Use_::TYPE_UNKNOWN]; $this->checkUseUse($$, #1); }
+    | legacy_namespace_name T_AS identifier_not_reserved
+          { $$ = Stmt\UseUse[$1, $3, Stmt\Use_::TYPE_UNKNOWN]; $this->checkUseUse($$, #3); }
 ;
 
 inline_use_declaration:
@@ -161,7 +208,7 @@ non_empty_constant_declaration_list:
 ;
 
 constant_declaration:
-    T_STRING '=' expr                                       { $$ = Node\Const_[$1, $3]; }
+    identifier_not_reserved '=' expr                        { $$ = Node\Const_[$1, $3]; }
 ;
 
 class_const_list:
@@ -174,7 +221,7 @@ non_empty_class_const_list:
 ;
 
 class_const:
-    identifier '=' expr                                     { $$ = Node\Const_[$1, $3]; }
+    identifier_maybe_reserved '=' expr                      { $$ = Node\Const_[$1, $3]; }
 ;
 
 inner_statement_list_ex:
@@ -184,7 +231,7 @@ inner_statement_list_ex:
 
 inner_statement_list:
       inner_statement_list_ex
-          { makeNop($nop, $this->lookaheadStartAttributes);
+          { makeZeroLengthNop($nop, $this->lookaheadStartAttributes);
             if ($nop !== null) { $1[] = $nop; } $$ = $1; }
 ;
 
@@ -202,7 +249,7 @@ non_empty_statement:
         if ($2) {
             $$ = $2; prependLeadingComments($$);
         } else {
-            makeNop($$, $this->startAttributeStack[#1]);
+            makeNop($$, $this->startAttributeStack[#1], $this->endAttributes);
             if (null === $$) { $$ = array(); }
         }
     }
@@ -220,27 +267,37 @@ non_empty_statement:
     | T_RETURN optional_expr semi                           { $$ = Stmt\Return_[$2]; }
     | T_GLOBAL global_var_list semi                         { $$ = Stmt\Global_[$2]; }
     | T_STATIC static_var_list semi                         { $$ = Stmt\Static_[$2]; }
-    | T_ECHO expr_list semi                                 { $$ = Stmt\Echo_[$2]; }
+    | T_ECHO expr_list_forbid_comma semi                    { $$ = Stmt\Echo_[$2]; }
     | T_INLINE_HTML                                         { $$ = Stmt\InlineHTML[$1]; }
-    | expr semi                                             { $$ = $1; }
+    | expr semi {
+        $e = $1;
+        if ($e instanceof Expr\Throw_) {
+            // For backwards-compatibility reasons, convert throw in statement position into
+            // Stmt\Throw_ rather than Stmt\Expression(Expr\Throw_).
+            $$ = Stmt\Throw_[$e->expr];
+        } else {
+            $$ = Stmt\Expression[$e];
+        }
+    }
     | T_UNSET '(' variables_list ')' semi                   { $$ = Stmt\Unset_[$3]; }
     | T_FOREACH '(' expr T_AS foreach_variable ')' foreach_statement
           { $$ = Stmt\Foreach_[$3, $5[0], ['keyVar' => null, 'byRef' => $5[1], 'stmts' => $7]]; }
     | T_FOREACH '(' expr T_AS variable T_DOUBLE_ARROW foreach_variable ')' foreach_statement
           { $$ = Stmt\Foreach_[$3, $7[0], ['keyVar' => $5, 'byRef' => $7[1], 'stmts' => $9]]; }
+    | T_FOREACH '(' expr error ')' foreach_statement
+          { $$ = Stmt\Foreach_[$3, new Expr\Error(stackAttributes(#4)), ['stmts' => $6]]; }
     | T_DECLARE '(' declare_list ')' declare_statement      { $$ = Stmt\Declare_[$3, $5]; }
     | T_TRY '{' inner_statement_list '}' catches optional_finally
           { $$ = Stmt\TryCatch[$3, $5, $6]; $this->checkTryCatch($$); }
-    | T_THROW expr semi                                     { $$ = Stmt\Throw_[$2]; }
-    | T_GOTO T_STRING semi                                  { $$ = Stmt\Goto_[$2]; }
-    | T_STRING ':'                                          { $$ = Stmt\Label[$1]; }
+    | T_GOTO identifier_not_reserved semi                   { $$ = Stmt\Goto_[$2]; }
+    | identifier_not_reserved ':'                           { $$ = Stmt\Label[$1]; }
     | error                                                 { $$ = array(); /* means: no statement */ }
 ;
 
 statement:
       non_empty_statement                                   { $$ = $1; }
     | ';'
-          { makeNop($$, $this->startAttributeStack[#1]);
+          { makeNop($$, $this->startAttributeStack[#1], $this->endAttributes);
             if ($$ === null) $$ = array(); /* means: no statement */ }
 ;
 
@@ -255,8 +312,8 @@ name_union:
 ;
 
 catch:
-    T_CATCH '(' name_union T_VARIABLE ')' '{' inner_statement_list '}'
-        { $$ = Stmt\Catch_[$3, parseVar($4), $7]; }
+    T_CATCH '(' name_union optional_plain_variable ')' '{' inner_statement_list '}'
+        { $$ = Stmt\Catch_[$3, $4, $7]; }
 ;
 
 optional_finally:
@@ -265,7 +322,7 @@ optional_finally:
 ;
 
 variables_list:
-      non_empty_variables_list no_comma                     { $$ = $1; }
+      non_empty_variables_list optional_comma               { $$ = $1; }
 ;
 
 non_empty_variables_list:
@@ -275,7 +332,12 @@ non_empty_variables_list:
 
 optional_ref:
       /* empty */                                           { $$ = false; }
-    | '&'                                                   { $$ = true; }
+    | ampersand                                             { $$ = true; }
+;
+
+optional_arg_ref:
+      /* empty */                                           { $$ = false; }
+    | T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG                 { $$ = true; }
 ;
 
 optional_ellipsis:
@@ -283,20 +345,39 @@ optional_ellipsis:
     | T_ELLIPSIS                                            { $$ = true; }
 ;
 
+block_or_error:
+      '{' inner_statement_list '}'                          { $$ = $2; }
+    | error                                                 { $$ = []; }
+;
+
 function_declaration_statement:
-    T_FUNCTION optional_ref T_STRING '(' parameter_list ')' optional_return_type '{' inner_statement_list '}'
-        { $$ = Stmt\Function_[$3, ['byRef' => $2, 'params' => $5, 'returnType' => $7, 'stmts' => $9]]; }
+      T_FUNCTION optional_ref identifier_not_reserved '(' parameter_list ')' optional_return_type block_or_error
+          { $$ = Stmt\Function_[$3, ['byRef' => $2, 'params' => $5, 'returnType' => $7, 'stmts' => $8, 'attrGroups' => []]]; }
+    | attributes T_FUNCTION optional_ref identifier_not_reserved '(' parameter_list ')' optional_return_type block_or_error
+          { $$ = Stmt\Function_[$4, ['byRef' => $3, 'params' => $6, 'returnType' => $8, 'stmts' => $9, 'attrGroups' => $1]]; }
 ;
 
 class_declaration_statement:
-      class_entry_type T_STRING extends_from implements_list '{' class_statement_list '}'
-          { $$ = Stmt\Class_[$2, ['type' => $1, 'extends' => $3, 'implements' => $4, 'stmts' => $6]];
-            $this->checkClass($$, #2); }
-    | T_INTERFACE T_STRING interface_extends_list '{' class_statement_list '}'
-          { $$ = Stmt\Interface_[$2, ['extends' => $3, 'stmts' => $5]];
-            $this->checkInterface($$, #2); }
-    | T_TRAIT T_STRING '{' class_statement_list '}'
-          { $$ = Stmt\Trait_[$2, ['stmts' => $4]]; }
+      optional_attributes class_entry_type identifier_not_reserved extends_from implements_list '{' class_statement_list '}'
+          { $$ = Stmt\Class_[$3, ['type' => $2, 'extends' => $4, 'implements' => $5, 'stmts' => $7, 'attrGroups' => $1]];
+            $this->checkClass($$, #3); }
+    | optional_attributes T_INTERFACE identifier_not_reserved interface_extends_list '{' class_statement_list '}'
+          { $$ = Stmt\Interface_[$3, ['extends' => $4, 'stmts' => $6, 'attrGroups' => $1]];
+            $this->checkInterface($$, #3); }
+    | optional_attributes T_TRAIT identifier_not_reserved '{' class_statement_list '}'
+          { $$ = Stmt\Trait_[$3, ['stmts' => $5, 'attrGroups' => $1]]; }
+    | optional_attributes T_ENUM identifier_not_reserved enum_scalar_type implements_list '{' class_statement_list '}'
+          { $$ = Stmt\Enum_[$3, ['scalarType' => $4, 'implements' => $5, 'stmts' => $7, 'attrGroups' => $1]];
+            $this->checkEnum($$, #3); }
+;
+
+enum_scalar_type:
+      /* empty */                                           { $$ = null; }
+    | ':' type                                              { $$ = $2; }
+
+enum_case_expr:
+      /* empty */                                           { $$ = null; }
+    | '=' expr                                              { $$ = $2; }
 ;
 
 class_entry_type:
@@ -355,7 +436,7 @@ non_empty_declare_list:
 ;
 
 declare_list_element:
-      T_STRING '=' expr                                     { $$ = Stmt\DeclareDeclare[$1, $3]; }
+      identifier_not_reserved '=' expr                      { $$ = Stmt\DeclareDeclare[$1, $3]; }
 ;
 
 switch_case_list:
@@ -380,6 +461,25 @@ case_separator:
     | ';'
 ;
 
+match:
+      T_MATCH '(' expr ')' '{' match_arm_list '}'           { $$ = Expr\Match_[$3, $6]; }
+;
+
+match_arm_list:
+      /* empty */                                           { $$ = []; }
+    | non_empty_match_arm_list optional_comma               { $$ = $1; }
+;
+
+non_empty_match_arm_list:
+      match_arm                                             { init($1); }
+    | non_empty_match_arm_list ',' match_arm                { push($1, $3); }
+;
+
+match_arm:
+      expr_list_allow_comma T_DOUBLE_ARROW expr             { $$ = Node\MatchArm[$1, $3]; }
+    | T_DEFAULT optional_comma T_DOUBLE_ARROW expr          { $$ = Node\MatchArm[null, $4]; }
+;
+
 while_statement:
       statement                                             { $$ = toArray($1); }
     | ':' inner_statement_list T_ENDWHILE ';'               { $$ = $2; }
@@ -415,13 +515,13 @@ new_else_single:
 
 foreach_variable:
       variable                                              { $$ = array($1, false); }
-    | '&' variable                                          { $$ = array($2, true); }
+    | ampersand variable                                    { $$ = array($2, true); }
     | list_expr                                             { $$ = array($1, false); }
     | array_short_syntax                                    { $$ = array($1, false); }
 ;
 
 parameter_list:
-      non_empty_parameter_list no_comma                     { $$ = $1; }
+      non_empty_parameter_list optional_comma               { $$ = $1; }
     | /* empty */                                           { $$ = array(); }
 ;
 
@@ -430,37 +530,100 @@ non_empty_parameter_list:
     | non_empty_parameter_list ',' parameter                { push($1, $3); }
 ;
 
+optional_property_modifiers:
+      /* empty */               { $$ = 0; }
+    | optional_property_modifiers property_modifier
+          { $this->checkModifier($1, $2, #2); $$ = $1 | $2; }
+;
+
+property_modifier:
+      T_PUBLIC                  { $$ = Stmt\Class_::MODIFIER_PUBLIC; }
+    | T_PROTECTED               { $$ = Stmt\Class_::MODIFIER_PROTECTED; }
+    | T_PRIVATE                 { $$ = Stmt\Class_::MODIFIER_PRIVATE; }
+    | T_READONLY                { $$ = Stmt\Class_::MODIFIER_READONLY; }
+;
+
 parameter:
-      optional_param_type optional_ref optional_ellipsis T_VARIABLE
-          { $$ = Node\Param[parseVar($4), null, $1, $2, $3]; $this->checkParam($$); }
-    | optional_param_type optional_ref optional_ellipsis T_VARIABLE '=' expr
-          { $$ = Node\Param[parseVar($4), $6, $1, $2, $3]; $this->checkParam($$); }
+      optional_attributes optional_property_modifiers optional_type_without_static
+      optional_arg_ref optional_ellipsis plain_variable
+          { $$ = new Node\Param($6, null, $3, $4, $5, attributes(), $2, $1);
+            $this->checkParam($$); }
+    | optional_attributes optional_property_modifiers optional_type_without_static
+      optional_arg_ref optional_ellipsis plain_variable '=' expr
+          { $$ = new Node\Param($6, $8, $3, $4, $5, attributes(), $2, $1);
+            $this->checkParam($$); }
+    | optional_attributes optional_property_modifiers optional_type_without_static
+      optional_arg_ref optional_ellipsis error
+          { $$ = new Node\Param(Expr\Error[], null, $3, $4, $5, attributes(), $2, $1); }
 ;
 
 type_expr:
       type                                                  { $$ = $1; }
     | '?' type                                              { $$ = Node\NullableType[$2]; }
+    | union_type                                            { $$ = Node\UnionType[$1]; }
+    | intersection_type                                     { $$ = Node\IntersectionType[$1]; }
 ;
 
 type:
-      name                                                  { $$ = $this->handleBuiltinTypes($1); }
-    | T_ARRAY                                               { $$ = 'array'; }
-    | T_CALLABLE                                            { $$ = 'callable'; }
+      type_without_static                                   { $$ = $1; }
+    | T_STATIC                                              { $$ = Node\Name['static']; }
 ;
 
-optional_param_type:
+type_without_static:
+      name                                                  { $$ = $this->handleBuiltinTypes($1); }
+    | T_ARRAY                                               { $$ = Node\Identifier['array']; }
+    | T_CALLABLE                                            { $$ = Node\Identifier['callable']; }
+;
+
+union_type:
+      type '|' type                                         { init($1, $3); }
+    | union_type '|' type                                   { push($1, $3); }
+;
+
+union_type_without_static:
+      type_without_static '|' type_without_static           { init($1, $3); }
+    | union_type_without_static '|' type_without_static     { push($1, $3); }
+;
+
+intersection_type:
+      type T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG type   { init($1, $3); }
+    | intersection_type T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG type
+          { push($1, $3); }
+;
+
+intersection_type_without_static:
+      type_without_static T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG type_without_static
+          { init($1, $3); }
+    | intersection_type_without_static T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG type_without_static
+          { push($1, $3); }
+;
+
+type_expr_without_static:
+      type_without_static                                   { $$ = $1; }
+    | '?' type_without_static                               { $$ = Node\NullableType[$2]; }
+    | union_type_without_static                             { $$ = Node\UnionType[$1]; }
+    | intersection_type_without_static                      { $$ = Node\IntersectionType[$1]; }
+;
+
+optional_type_without_static:
       /* empty */                                           { $$ = null; }
-    | type_expr                                             { $$ = $1; }
+    | type_expr_without_static                              { $$ = $1; }
 ;
 
 optional_return_type:
       /* empty */                                           { $$ = null; }
     | ':' type_expr                                         { $$ = $2; }
+    | ':' error                                             { $$ = null; }
 ;
 
 argument_list:
       '(' ')'                                               { $$ = array(); }
-    | '(' non_empty_argument_list no_comma ')'              { $$ = $2; }
+    | '(' non_empty_argument_list optional_comma ')'        { $$ = $2; }
+    | '(' variadic_placeholder ')'                          { init($2); }
+;
+
+variadic_placeholder:
+      T_ELLIPSIS                                            { $$ = Node\VariadicPlaceholder[]; }
 ;
 
 non_empty_argument_list:
@@ -470,8 +633,10 @@ non_empty_argument_list:
 
 argument:
       expr                                                  { $$ = Node\Arg[$1, false, false]; }
-    | '&' variable                                          { $$ = Node\Arg[$2, true, false]; }
+    | ampersand variable                                    { $$ = Node\Arg[$2, true, false]; }
     | T_ELLIPSIS expr                                       { $$ = Node\Arg[$2, false, true]; }
+    | identifier_maybe_reserved ':' expr
+          { $$ = new Node\Arg($3, false, false, attributes(), $1); }
 ;
 
 global_var_list:
@@ -484,7 +649,7 @@ non_empty_global_var_list:
 ;
 
 global_var:
-      simple_variable                                       { $$ = Expr\Variable[$1]; }
+      simple_variable                                       { $$ = $1; }
 ;
 
 static_var_list:
@@ -497,24 +662,36 @@ non_empty_static_var_list:
 ;
 
 static_var:
-      T_VARIABLE                                            { $$ = Stmt\StaticVar[parseVar($1), null]; }
-    | T_VARIABLE '=' expr                                   { $$ = Stmt\StaticVar[parseVar($1), $3]; }
+      plain_variable                                        { $$ = Stmt\StaticVar[$1, null]; }
+    | plain_variable '=' expr                               { $$ = Stmt\StaticVar[$1, $3]; }
 ;
 
-class_statement_list:
-      class_statement_list class_statement                  { push($1, $2); }
+class_statement_list_ex:
+      class_statement_list_ex class_statement               { if ($2 !== null) { push($1, $2); } }
     | /* empty */                                           { init(); }
 ;
 
+class_statement_list:
+      class_statement_list_ex
+          { makeZeroLengthNop($nop, $this->lookaheadStartAttributes);
+            if ($nop !== null) { $1[] = $nop; } $$ = $1; }
+;
+
 class_statement:
-      variable_modifiers property_declaration_list ';'
-          { $$ = Stmt\Property[$1, $2]; $this->checkProperty($$, #1); }
-    | method_modifiers T_CONST class_const_list ';'
-          { $$ = Stmt\ClassConst[$3, $1]; $this->checkClassConst($$, #1); }
-    | method_modifiers T_FUNCTION optional_ref identifier '(' parameter_list ')' optional_return_type method_body
-          { $$ = Stmt\ClassMethod[$4, ['type' => $1, 'byRef' => $3, 'params' => $6, 'returnType' => $8, 'stmts' => $9]];
-            $this->checkClassMethod($$, #1); }
+      optional_attributes variable_modifiers optional_type_without_static property_declaration_list semi
+          { $$ = new Stmt\Property($2, $4, attributes(), $3, $1);
+            $this->checkProperty($$, #2); }
+    | optional_attributes method_modifiers T_CONST class_const_list semi
+          { $$ = new Stmt\ClassConst($4, $2, attributes(), $1);
+            $this->checkClassConst($$, #2); }
+    | optional_attributes method_modifiers T_FUNCTION optional_ref identifier_maybe_reserved '(' parameter_list ')'
+      optional_return_type method_body
+          { $$ = Stmt\ClassMethod[$5, ['type' => $2, 'byRef' => $4, 'params' => $7, 'returnType' => $9, 'stmts' => $10, 'attrGroups' => $1]];
+            $this->checkClassMethod($$, #2); }
     | T_USE class_name_list trait_adaptations               { $$ = Stmt\TraitUse[$2, $3]; }
+    | optional_attributes T_CASE identifier_maybe_reserved enum_case_expr semi
+         { $$ = Stmt\EnumCase[$3, $4, $1]; }
+    | error                                                 { $$ = null; /* will be skipped */ }
 ;
 
 trait_adaptations:
@@ -530,27 +707,27 @@ trait_adaptation_list:
 trait_adaptation:
       trait_method_reference_fully_qualified T_INSTEADOF class_name_list ';'
           { $$ = Stmt\TraitUseAdaptation\Precedence[$1[0], $1[1], $3]; }
-    | trait_method_reference T_AS member_modifier identifier ';'
+    | trait_method_reference T_AS member_modifier identifier_maybe_reserved ';'
           { $$ = Stmt\TraitUseAdaptation\Alias[$1[0], $1[1], $3, $4]; }
     | trait_method_reference T_AS member_modifier ';'
           { $$ = Stmt\TraitUseAdaptation\Alias[$1[0], $1[1], $3, null]; }
-    | trait_method_reference T_AS T_STRING ';'
+    | trait_method_reference T_AS identifier_not_reserved ';'
           { $$ = Stmt\TraitUseAdaptation\Alias[$1[0], $1[1], null, $3]; }
-    | trait_method_reference T_AS reserved_non_modifiers ';'
+    | trait_method_reference T_AS reserved_non_modifiers_identifier ';'
           { $$ = Stmt\TraitUseAdaptation\Alias[$1[0], $1[1], null, $3]; }
 ;
 
 trait_method_reference_fully_qualified:
-      name T_PAAMAYIM_NEKUDOTAYIM identifier                { $$ = array($1, $3); }
+      name T_PAAMAYIM_NEKUDOTAYIM identifier_maybe_reserved { $$ = array($1, $3); }
 ;
 trait_method_reference:
       trait_method_reference_fully_qualified                { $$ = $1; }
-    | identifier                                            { $$ = array(null, $1); }
+    | identifier_maybe_reserved                             { $$ = array(null, $1); }
 ;
 
 method_body:
       ';' /* abstract method */                             { $$ = null; }
-    | '{' inner_statement_list '}'                          { $$ = $2; }
+    | block_or_error                                        { $$ = $1; }
 ;
 
 variable_modifiers:
@@ -575,6 +752,7 @@ member_modifier:
     | T_STATIC                                              { $$ = Stmt\Class_::MODIFIER_STATIC; }
     | T_ABSTRACT                                            { $$ = Stmt\Class_::MODIFIER_ABSTRACT; }
     | T_FINAL                                               { $$ = Stmt\Class_::MODIFIER_FINAL; }
+    | T_READONLY                                            { $$ = Stmt\Class_::MODIFIER_READONLY; }
 ;
 
 property_declaration_list:
@@ -587,15 +765,23 @@ non_empty_property_declaration_list:
           { push($1, $3); }
 ;
 
-property_declaration:
-      T_VARIABLE                                            { $$ = Stmt\PropertyProperty[parseVar($1), null]; }
-    | T_VARIABLE '=' expr                                   { $$ = Stmt\PropertyProperty[parseVar($1), $3]; }
+property_decl_name:
+      T_VARIABLE                                            { $$ = Node\VarLikeIdentifier[parseVar($1)]; }
 ;
 
-expr_list:
+property_declaration:
+      property_decl_name                                    { $$ = Stmt\PropertyProperty[$1, null]; }
+    | property_decl_name '=' expr                           { $$ = Stmt\PropertyProperty[$1, $3]; }
+;
+
+expr_list_forbid_comma:
       non_empty_expr_list no_comma                          { $$ = $1; }
 ;
 
+expr_list_allow_comma:
+      non_empty_expr_list optional_comma                    { $$ = $1; }
+;
+
 non_empty_expr_list:
       non_empty_expr_list ',' expr                          { push($1, $3); }
     | expr                                                  { init($1); }
@@ -603,7 +789,7 @@ non_empty_expr_list:
 
 for_expr:
       /* empty */                                           { $$ = array(); }
-    | expr_list                                             { $$ = $1; }
+    | expr_list_forbid_comma                                { $$ = $1; }
 ;
 
 expr:
@@ -611,8 +797,9 @@ expr:
     | list_expr '=' expr                                    { $$ = Expr\Assign[$1, $3]; }
     | array_short_syntax '=' expr                           { $$ = Expr\Assign[$1, $3]; }
     | variable '=' expr                                     { $$ = Expr\Assign[$1, $3]; }
-    | variable '=' '&' variable                             { $$ = Expr\AssignRef[$1, $4]; }
+    | variable '=' ampersand variable                       { $$ = Expr\AssignRef[$1, $4]; }
     | new_expr                                              { $$ = $1; }
+    | match                                                 { $$ = $1; }
     | T_CLONE expr                                          { $$ = Expr\Clone_[$2]; }
     | variable T_PLUS_EQUAL expr                            { $$ = Expr\AssignOp\Plus      [$1, $3]; }
     | variable T_MINUS_EQUAL expr                           { $$ = Expr\AssignOp\Minus     [$1, $3]; }
@@ -626,6 +813,7 @@ expr:
     | variable T_SL_EQUAL expr                              { $$ = Expr\AssignOp\ShiftLeft [$1, $3]; }
     | variable T_SR_EQUAL expr                              { $$ = Expr\AssignOp\ShiftRight[$1, $3]; }
     | variable T_POW_EQUAL expr                             { $$ = Expr\AssignOp\Pow       [$1, $3]; }
+    | variable T_COALESCE_EQUAL expr                        { $$ = Expr\AssignOp\Coalesce  [$1, $3]; }
     | variable T_INC                                        { $$ = Expr\PostInc[$1]; }
     | T_INC variable                                        { $$ = Expr\PreInc [$2]; }
     | variable T_DEC                                        { $$ = Expr\PostDec[$1]; }
@@ -636,7 +824,8 @@ expr:
     | expr T_LOGICAL_AND expr                               { $$ = Expr\BinaryOp\LogicalAnd[$1, $3]; }
     | expr T_LOGICAL_XOR expr                               { $$ = Expr\BinaryOp\LogicalXor[$1, $3]; }
     | expr '|' expr                                         { $$ = Expr\BinaryOp\BitwiseOr [$1, $3]; }
-    | expr '&' expr                                         { $$ = Expr\BinaryOp\BitwiseAnd[$1, $3]; }
+    | expr T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG expr   { $$ = Expr\BinaryOp\BitwiseAnd[$1, $3]; }
+    | expr T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG expr       { $$ = Expr\BinaryOp\BitwiseAnd[$1, $3]; }
     | expr '^' expr                                         { $$ = Expr\BinaryOp\BitwiseXor[$1, $3]; }
     | expr '.' expr                                         { $$ = Expr\BinaryOp\Concat    [$1, $3]; }
     | expr '+' expr                                         { $$ = Expr\BinaryOp\Plus      [$1, $3]; }
@@ -665,7 +854,7 @@ expr:
     | expr '?' expr ':' expr                                { $$ = Expr\Ternary[$1, $3,   $5]; }
     | expr '?' ':' expr                                     { $$ = Expr\Ternary[$1, null, $4]; }
     | expr T_COALESCE expr                                  { $$ = Expr\BinaryOp\Coalesce[$1, $3]; }
-    | T_ISSET '(' variables_list ')'                        { $$ = Expr\Isset_[$3]; }
+    | T_ISSET '(' expr_list_allow_comma ')'                 { $$ = Expr\Isset_[$3]; }
     | T_EMPTY '(' expr ')'                                  { $$ = Expr\Empty_[$3]; }
     | T_INCLUDE expr                                        { $$ = Expr\Include_[$2, Expr\Include_::TYPE_INCLUDE]; }
     | T_INCLUDE_ONCE expr                                   { $$ = Expr\Include_[$2, Expr\Include_::TYPE_INCLUDE_ONCE]; }
@@ -673,7 +862,10 @@ expr:
     | T_REQUIRE expr                                        { $$ = Expr\Include_[$2, Expr\Include_::TYPE_REQUIRE]; }
     | T_REQUIRE_ONCE expr                                   { $$ = Expr\Include_[$2, Expr\Include_::TYPE_REQUIRE_ONCE]; }
     | T_INT_CAST expr                                       { $$ = Expr\Cast\Int_    [$2]; }
-    | T_DOUBLE_CAST expr                                    { $$ = Expr\Cast\Double  [$2]; }
+    | T_DOUBLE_CAST expr
+          { $attrs = attributes();
+            $attrs['kind'] = $this->getFloatCastKind($1);
+            $$ = new Expr\Cast\Double($2, $attrs); }
     | T_STRING_CAST expr                                    { $$ = Expr\Cast\String_ [$2]; }
     | T_ARRAY_CAST expr                                     { $$ = Expr\Cast\Array_  [$2]; }
     | T_OBJECT_CAST expr                                    { $$ = Expr\Cast\Object_ [$2]; }
@@ -691,18 +883,32 @@ expr:
     | T_YIELD expr                                          { $$ = Expr\Yield_[$2, null]; }
     | T_YIELD expr T_DOUBLE_ARROW expr                      { $$ = Expr\Yield_[$4, $2]; }
     | T_YIELD_FROM expr                                     { $$ = Expr\YieldFrom[$2]; }
-    | T_FUNCTION optional_ref '(' parameter_list ')' lexical_vars optional_return_type
-      '{' inner_statement_list '}'
-          { $$ = Expr\Closure[['static' => false, 'byRef' => $2, 'params' => $4, 'uses' => $6, 'returnType' => $7, 'stmts' => $9]]; }
-    | T_STATIC T_FUNCTION optional_ref '(' parameter_list ')' lexical_vars optional_return_type
-      '{' inner_statement_list '}'
-          { $$ = Expr\Closure[['static' => true, 'byRef' => $3, 'params' => $5, 'uses' => $7, 'returnType' => $8, 'stmts' => $10]]; }
+    | T_THROW expr                                          { $$ = Expr\Throw_[$2]; }
+
+    | T_FN optional_ref '(' parameter_list ')' optional_return_type T_DOUBLE_ARROW expr %prec T_THROW
+          { $$ = Expr\ArrowFunction[['static' => false, 'byRef' => $2, 'params' => $4, 'returnType' => $6, 'expr' => $8, 'attrGroups' => []]]; }
+    | T_STATIC T_FN optional_ref '(' parameter_list ')' optional_return_type T_DOUBLE_ARROW expr %prec T_THROW
+          { $$ = Expr\ArrowFunction[['static' => true, 'byRef' => $3, 'params' => $5, 'returnType' => $7, 'expr' => $9, 'attrGroups' => []]]; }
+    | T_FUNCTION optional_ref '(' parameter_list ')' lexical_vars optional_return_type block_or_error
+          { $$ = Expr\Closure[['static' => false, 'byRef' => $2, 'params' => $4, 'uses' => $6, 'returnType' => $7, 'stmts' => $8, 'attrGroups' => []]]; }
+    | T_STATIC T_FUNCTION optional_ref '(' parameter_list ')' lexical_vars optional_return_type       block_or_error
+          { $$ = Expr\Closure[['static' => true, 'byRef' => $3, 'params' => $5, 'uses' => $7, 'returnType' => $8, 'stmts' => $9, 'attrGroups' => []]]; }
+
+    | attributes T_FN optional_ref '(' parameter_list ')' optional_return_type T_DOUBLE_ARROW expr %prec T_THROW
+          { $$ = Expr\ArrowFunction[['static' => false, 'byRef' => $3, 'params' => $5, 'returnType' => $7, 'expr' => $9, 'attrGroups' => $1]]; }
+    | attributes T_STATIC T_FN optional_ref '(' parameter_list ')' optional_return_type T_DOUBLE_ARROW expr %prec T_THROW
+          { $$ = Expr\ArrowFunction[['static' => true, 'byRef' => $4, 'params' => $6, 'returnType' => $8, 'expr' => $10, 'attrGroups' => $1]]; }
+    | attributes T_FUNCTION optional_ref '(' parameter_list ')' lexical_vars optional_return_type block_or_error
+          { $$ = Expr\Closure[['static' => false, 'byRef' => $3, 'params' => $5, 'uses' => $7, 'returnType' => $8, 'stmts' => $9, 'attrGroups' => $1]]; }
+    | attributes T_STATIC T_FUNCTION optional_ref '(' parameter_list ')' lexical_vars optional_return_type       block_or_error
+          { $$ = Expr\Closure[['static' => true, 'byRef' => $4, 'params' => $6, 'uses' => $8, 'returnType' => $9, 'stmts' => $10, 'attrGroups' => $1]]; }
 ;
 
 anonymous_class:
-      T_CLASS ctor_arguments extends_from implements_list '{' class_statement_list '}'
-          { $$ = array(Stmt\Class_[null, ['type' => 0, 'extends' => $3, 'implements' => $4, 'stmts' => $6]], $2);
+      optional_attributes T_CLASS ctor_arguments extends_from implements_list '{' class_statement_list '}'
+          { $$ = array(Stmt\Class_[null, ['type' => 0, 'extends' => $4, 'implements' => $5, 'stmts' => $7, 'attrGroups' => $1]], $3);
             $this->checkClass($$[0], -1); }
+;
 
 new_expr:
       T_NEW class_name_reference ctor_arguments             { $$ = Expr\New_[$2, $3]; }
@@ -716,7 +922,7 @@ lexical_vars:
 ;
 
 lexical_var_list:
-      non_empty_lexical_var_list no_comma                   { $$ = $1; }
+      non_empty_lexical_var_list optional_comma             { $$ = $1; }
 ;
 
 non_empty_lexical_var_list:
@@ -725,7 +931,7 @@ non_empty_lexical_var_list:
 ;
 
 lexical_var:
-      optional_ref T_VARIABLE                               { $$ = Expr\ClosureUse[parseVar($2), $1]; }
+      optional_ref plain_variable                           { $$ = Expr\ClosureUse[$2, $1]; }
 ;
 
 function_call:
@@ -741,20 +947,22 @@ class_name:
 ;
 
 name:
-      namespace_name_parts                                  { $$ = Name[$1]; }
-    | T_NS_SEPARATOR namespace_name_parts                   { $$ = Name\FullyQualified[$2]; }
-    | T_NAMESPACE T_NS_SEPARATOR namespace_name_parts       { $$ = Name\Relative[$3]; }
+      T_STRING                                              { $$ = Name[$1]; }
+    | T_NAME_QUALIFIED                                      { $$ = Name[$1]; }
+    | T_NAME_FULLY_QUALIFIED                                { $$ = Name\FullyQualified[substr($1, 1)]; }
+    | T_NAME_RELATIVE                                       { $$ = Name\Relative[substr($1, 10)]; }
 ;
 
 class_name_reference:
       class_name                                            { $$ = $1; }
     | new_variable                                          { $$ = $1; }
+    | '(' expr ')'                                          { $$ = $2; }
     | error                                                 { $$ = Expr\Error[]; $this->errorState = 2; }
 ;
 
 class_name_or_var:
       class_name                                            { $$ = $1; }
-    | dereferencable                                        { $$ = $1; }
+    | fully_dereferencable                                  { $$ = $1; }
 ;
 
 exit_expr:
@@ -776,9 +984,20 @@ ctor_arguments:
 
 constant:
       name                                                  { $$ = Expr\ConstFetch[$1]; }
-    | class_name_or_var T_PAAMAYIM_NEKUDOTAYIM identifier
+    | T_LINE                                                { $$ = Scalar\MagicConst\Line[]; }
+    | T_FILE                                                { $$ = Scalar\MagicConst\File[]; }
+    | T_DIR                                                 { $$ = Scalar\MagicConst\Dir[]; }
+    | T_CLASS_C                                             { $$ = Scalar\MagicConst\Class_[]; }
+    | T_TRAIT_C                                             { $$ = Scalar\MagicConst\Trait_[]; }
+    | T_METHOD_C                                            { $$ = Scalar\MagicConst\Method[]; }
+    | T_FUNC_C                                              { $$ = Scalar\MagicConst\Function_[]; }
+    | T_NS_C                                                { $$ = Scalar\MagicConst\Namespace_[]; }
+;
+
+class_constant:
+      class_name_or_var T_PAAMAYIM_NEKUDOTAYIM identifier_maybe_reserved
           { $$ = Expr\ClassConstFetch[$1, $3]; }
-    /* We interpret and isolated FOO:: as an unfinished class constant fetch. It could also be
+    /* We interpret an isolated FOO:: as an unfinished class constant fetch. It could also be
        an unfinished static property fetch or unfinished scoped call. */
     | class_name_or_var T_PAAMAYIM_NEKUDOTAYIM error
           { $$ = Expr\ClassConstFetch[$1, new Expr\Error(stackAttributes(#3))]; $this->errorState = 2; }
@@ -798,33 +1017,23 @@ dereferencable_scalar:
     | T_CONSTANT_ENCAPSED_STRING
           { $attrs = attributes(); $attrs['kind'] = strKind($1);
             $$ = new Scalar\String_(Scalar\String_::parse($1), $attrs); }
+    | '"' encaps_list '"'
+          { $attrs = attributes(); $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED;
+            parseEncapsed($2, '"', true); $$ = new Scalar\Encapsed($2, $attrs); }
 ;
 
 scalar:
       T_LNUMBER                                             { $$ = $this->parseLNumber($1, attributes()); }
     | T_DNUMBER                                             { $$ = Scalar\DNumber[Scalar\DNumber::parse($1)]; }
-    | T_LINE                                                { $$ = Scalar\MagicConst\Line[]; }
-    | T_FILE                                                { $$ = Scalar\MagicConst\File[]; }
-    | T_DIR                                                 { $$ = Scalar\MagicConst\Dir[]; }
-    | T_CLASS_C                                             { $$ = Scalar\MagicConst\Class_[]; }
-    | T_TRAIT_C                                             { $$ = Scalar\MagicConst\Trait_[]; }
-    | T_METHOD_C                                            { $$ = Scalar\MagicConst\Method[]; }
-    | T_FUNC_C                                              { $$ = Scalar\MagicConst\Function_[]; }
-    | T_NS_C                                                { $$ = Scalar\MagicConst\Namespace_[]; }
     | dereferencable_scalar                                 { $$ = $1; }
     | constant                                              { $$ = $1; }
+    | class_constant                                        { $$ = $1; }
     | T_START_HEREDOC T_ENCAPSED_AND_WHITESPACE T_END_HEREDOC
-          { $attrs = attributes(); setDocStringAttrs($attrs, $1);
-            $$ = new Scalar\String_(Scalar\String_::parseDocString($1, $2), $attrs); }
+          { $$ = $this->parseDocString($1, $2, $3, attributes(), stackAttributes(#3), true); }
     | T_START_HEREDOC T_END_HEREDOC
-          { $attrs = attributes(); setDocStringAttrs($attrs, $1);
-            $$ = new Scalar\String_('', $attrs); }
-    | '"' encaps_list '"'
-          { $attrs = attributes(); $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED;
-            parseEncapsed($2, '"', true); $$ = new Scalar\Encapsed($2, $attrs); }
+          { $$ = $this->parseDocString($1, '', $2, attributes(), stackAttributes(#2), true); }
     | T_START_HEREDOC encaps_list T_END_HEREDOC
-          { $attrs = attributes(); setDocStringAttrs($attrs, $1);
-            parseEncapsedDoc($2, true); $$ = new Scalar\Encapsed($2, $attrs); }
+          { $$ = $this->parseDocString($1, $2, $3, attributes(), stackAttributes(#3), true); }
 ;
 
 optional_expr:
@@ -832,10 +1041,16 @@ optional_expr:
     | expr                                                  { $$ = $1; }
 ;
 
-dereferencable:
+fully_dereferencable:
       variable                                              { $$ = $1; }
     | '(' expr ')'                                          { $$ = $2; }
     | dereferencable_scalar                                 { $$ = $1; }
+    | class_constant                                        { $$ = $1; }
+;
+
+array_object_dereferencable:
+      fully_dereferencable                                  { $$ = $1; }
+    | constant                                              { $$ = $1; }
 ;
 
 callable_expr:
@@ -845,87 +1060,100 @@ callable_expr:
 ;
 
 callable_variable:
-      simple_variable                                       { $$ = Expr\Variable[$1]; }
-    | dereferencable '[' optional_expr ']'                  { $$ = Expr\ArrayDimFetch[$1, $3]; }
-    | constant '[' optional_expr ']'                        { $$ = Expr\ArrayDimFetch[$1, $3]; }
-    | dereferencable '{' expr '}'                           { $$ = Expr\ArrayDimFetch[$1, $3]; }
+      simple_variable                                       { $$ = $1; }
+    | array_object_dereferencable '[' optional_expr ']'     { $$ = Expr\ArrayDimFetch[$1, $3]; }
+    | array_object_dereferencable '{' expr '}'              { $$ = Expr\ArrayDimFetch[$1, $3]; }
     | function_call                                         { $$ = $1; }
-    | dereferencable T_OBJECT_OPERATOR property_name argument_list
+    | array_object_dereferencable T_OBJECT_OPERATOR property_name argument_list
           { $$ = Expr\MethodCall[$1, $3, $4]; }
+    | array_object_dereferencable T_NULLSAFE_OBJECT_OPERATOR property_name argument_list
+          { $$ = Expr\NullsafeMethodCall[$1, $3, $4]; }
+;
+
+optional_plain_variable:
+      /* empty */                                           { $$ = null; }
+    | plain_variable                                        { $$ = $1; }
 ;
 
 variable:
       callable_variable                                     { $$ = $1; }
     | static_member                                         { $$ = $1; }
-    | dereferencable T_OBJECT_OPERATOR property_name        { $$ = Expr\PropertyFetch[$1, $3]; }
+    | array_object_dereferencable T_OBJECT_OPERATOR property_name
+          { $$ = Expr\PropertyFetch[$1, $3]; }
+    | array_object_dereferencable T_NULLSAFE_OBJECT_OPERATOR property_name
+          { $$ = Expr\NullsafePropertyFetch[$1, $3]; }
 ;
 
 simple_variable:
-      T_VARIABLE                                            { $$ = parseVar($1); }
-    | '$' '{' expr '}'                                      { $$ = $3; }
+      plain_variable                                        { $$ = $1; }
+    | '$' '{' expr '}'                                      { $$ = Expr\Variable[$3]; }
     | '$' simple_variable                                   { $$ = Expr\Variable[$2]; }
-    | '$' error                                             { $$ = Expr\Error[]; $this->errorState = 2; }
+    | '$' error                                             { $$ = Expr\Variable[Expr\Error[]]; $this->errorState = 2; }
+;
+
+static_member_prop_name:
+      simple_variable
+          { $var = $1->name; $$ = \is_string($var) ? Node\VarLikeIdentifier[$var] : $var; }
 ;
 
 static_member:
-      class_name_or_var T_PAAMAYIM_NEKUDOTAYIM simple_variable
+      class_name_or_var T_PAAMAYIM_NEKUDOTAYIM static_member_prop_name
           { $$ = Expr\StaticPropertyFetch[$1, $3]; }
 ;
 
 new_variable:
-      simple_variable                                       { $$ = Expr\Variable[$1]; }
+      simple_variable                                       { $$ = $1; }
     | new_variable '[' optional_expr ']'                    { $$ = Expr\ArrayDimFetch[$1, $3]; }
     | new_variable '{' expr '}'                             { $$ = Expr\ArrayDimFetch[$1, $3]; }
     | new_variable T_OBJECT_OPERATOR property_name          { $$ = Expr\PropertyFetch[$1, $3]; }
-    | class_name T_PAAMAYIM_NEKUDOTAYIM simple_variable     { $$ = Expr\StaticPropertyFetch[$1, $3]; }
-    | new_variable T_PAAMAYIM_NEKUDOTAYIM simple_variable   { $$ = Expr\StaticPropertyFetch[$1, $3]; }
+    | new_variable T_NULLSAFE_OBJECT_OPERATOR property_name { $$ = Expr\NullsafePropertyFetch[$1, $3]; }
+    | class_name T_PAAMAYIM_NEKUDOTAYIM static_member_prop_name
+          { $$ = Expr\StaticPropertyFetch[$1, $3]; }
+    | new_variable T_PAAMAYIM_NEKUDOTAYIM static_member_prop_name
+          { $$ = Expr\StaticPropertyFetch[$1, $3]; }
 ;
 
 member_name:
-      identifier                                            { $$ = $1; }
-    | '{' expr '}'	                                        { $$ = $2; }
-    | simple_variable	                                    { $$ = Expr\Variable[$1]; }
+      identifier_maybe_reserved                             { $$ = $1; }
+    | '{' expr '}'                                          { $$ = $2; }
+    | simple_variable                                       { $$ = $1; }
 ;
 
 property_name:
-      T_STRING                                              { $$ = $1; }
-    | '{' expr '}'	                                        { $$ = $2; }
-    | simple_variable	                                    { $$ = Expr\Variable[$1]; }
+      identifier_not_reserved                               { $$ = $1; }
+    | '{' expr '}'                                          { $$ = $2; }
+    | simple_variable                                       { $$ = $1; }
     | error                                                 { $$ = Expr\Error[]; $this->errorState = 2; }
 ;
 
 list_expr:
-      T_LIST '(' list_expr_elements ')'                     { $$ = Expr\List_[$3]; }
-;
-
-list_expr_elements:
-      list_expr_elements ',' list_expr_element              { push($1, $3); }
-    | list_expr_element                                     { init($1); }
-;
-
-list_expr_element:
-      variable                                              { $$ = Expr\ArrayItem[$1, null, false]; }
-    | list_expr                                             { $$ = Expr\ArrayItem[$1, null, false]; }
-    | expr T_DOUBLE_ARROW variable                          { $$ = Expr\ArrayItem[$3, $1, false]; }
-    | expr T_DOUBLE_ARROW list_expr                         { $$ = Expr\ArrayItem[$3, $1, false]; }
-    | /* empty */                                           { $$ = null; }
+      T_LIST '(' inner_array_pair_list ')'                  { $$ = Expr\List_[$3]; }
 ;
 
 array_pair_list:
       inner_array_pair_list
-          { $$ = $1; $end = count($$)-1; if ($$[$end] === null) unset($$[$end]); }
+          { $$ = $1; $end = count($$)-1; if ($$[$end] === null) array_pop($$); }
+;
+
+comma_or_error:
+      ','
+    | error
+          { /* do nothing -- prevent default action of $$=$1. See #551. */ }
 ;
 
 inner_array_pair_list:
-      inner_array_pair_list ',' array_pair                  { push($1, $3); }
+      inner_array_pair_list comma_or_error array_pair       { push($1, $3); }
     | array_pair                                            { init($1); }
 ;
 
 array_pair:
-      expr T_DOUBLE_ARROW expr                              { $$ = Expr\ArrayItem[$3, $1,   false]; }
-    | expr                                                  { $$ = Expr\ArrayItem[$1, null, false]; }
-    | expr T_DOUBLE_ARROW '&' variable                      { $$ = Expr\ArrayItem[$4, $1,   true]; }
-    | '&' variable                                          { $$ = Expr\ArrayItem[$2, null, true]; }
+      expr                                                  { $$ = Expr\ArrayItem[$1, null, false]; }
+    | ampersand variable                                    { $$ = Expr\ArrayItem[$2, null, true]; }
+    | list_expr                                             { $$ = Expr\ArrayItem[$1, null, false]; }
+    | expr T_DOUBLE_ARROW expr                              { $$ = Expr\ArrayItem[$3, $1,   false]; }
+    | expr T_DOUBLE_ARROW ampersand variable                { $$ = Expr\ArrayItem[$4, $1,   true]; }
+    | expr T_DOUBLE_ARROW list_expr                         { $$ = Expr\ArrayItem[$3, $1,   false]; }
+    | T_ELLIPSIS expr                                       { $$ = Expr\ArrayItem[$2, null, false, attributes(), true]; }
     | /* empty */                                           { $$ = null; }
 ;
 
@@ -940,18 +1168,21 @@ encaps_string_part:
       T_ENCAPSED_AND_WHITESPACE                             { $$ = Scalar\EncapsedStringPart[$1]; }
 ;
 
-encaps_base_var:
-      T_VARIABLE                                            { $$ = Expr\Variable[parseVar($1)]; }
+encaps_str_varname:
+      T_STRING_VARNAME                                      { $$ = Expr\Variable[$1]; }
 ;
 
 encaps_var:
-      encaps_base_var                                       { $$ = $1; }
-    | encaps_base_var '[' encaps_var_offset ']'             { $$ = Expr\ArrayDimFetch[$1, $3]; }
-    | encaps_base_var T_OBJECT_OPERATOR T_STRING            { $$ = Expr\PropertyFetch[$1, $3]; }
+      plain_variable                                        { $$ = $1; }
+    | plain_variable '[' encaps_var_offset ']'              { $$ = Expr\ArrayDimFetch[$1, $3]; }
+    | plain_variable T_OBJECT_OPERATOR identifier_not_reserved
+          { $$ = Expr\PropertyFetch[$1, $3]; }
+    | plain_variable T_NULLSAFE_OBJECT_OPERATOR identifier_not_reserved
+          { $$ = Expr\NullsafePropertyFetch[$1, $3]; }
     | T_DOLLAR_OPEN_CURLY_BRACES expr '}'                   { $$ = Expr\Variable[$2]; }
     | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '}'       { $$ = Expr\Variable[$2]; }
-    | T_DOLLAR_OPEN_CURLY_BRACES T_STRING_VARNAME '[' expr ']' '}'
-          { $$ = Expr\ArrayDimFetch[Expr\Variable[$2], $4]; }
+    | T_DOLLAR_OPEN_CURLY_BRACES encaps_str_varname '[' expr ']' '}'
+          { $$ = Expr\ArrayDimFetch[$2, $4]; }
     | T_CURLY_OPEN variable '}'                             { $$ = $2; }
 ;
 
@@ -959,7 +1190,7 @@ encaps_var_offset:
       T_STRING                                              { $$ = Scalar\String_[$1]; }
     | T_NUM_STRING                                          { $$ = $this->parseNumString($1, attributes()); }
     | '-' T_NUM_STRING                                      { $$ = $this->parseNumString('-' . $2, attributes()); }
-    | T_VARIABLE                                            { $$ = Expr\Variable[parseVar($1)]; }
+    | plain_variable                                        { $$ = $1; }
 ;
 
 %%
diff --git a/lib/nikic/php-parser/grammar/phpyLang.php b/lib/nikic/php-parser/grammar/phpyLang.php
new file mode 100644
index 000000000..1a9808dcf
--- /dev/null
+++ b/lib/nikic/php-parser/grammar/phpyLang.php
@@ -0,0 +1,192 @@
+<?php
+
+///////////////////////////////
+/// Utility regex constants ///
+///////////////////////////////
+
+const LIB = '(?(DEFINE)
+    (?<singleQuotedString>\'[^\\\\\']*+(?:\\\\.[^\\\\\']*+)*+\')
+    (?<doubleQuotedString>"[^\\\\"]*+(?:\\\\.[^\\\\"]*+)*+")
+    (?<string>(?&singleQuotedString)|(?&doubleQuotedString))
+    (?<comment>/\*[^*]*+(?:\*(?!/)[^*]*+)*+\*/)
+    (?<code>\{[^\'"/{}]*+(?:(?:(?&string)|(?&comment)|(?&code)|/)[^\'"/{}]*+)*+})
+)';
+
+const PARAMS = '\[(?<params>[^[\]]*+(?:\[(?&params)\][^[\]]*+)*+)\]';
+const ARGS   = '\((?<args>[^()]*+(?:\((?&args)\)[^()]*+)*+)\)';
+
+///////////////////////////////
+/// Preprocessing functions ///
+///////////////////////////////
+
+function preprocessGrammar($code) {
+    $code = resolveNodes($code);
+    $code = resolveMacros($code);
+    $code = resolveStackAccess($code);
+
+    return $code;
+}
+
+function resolveNodes($code) {
+    return preg_replace_callback(
+        '~\b(?<name>[A-Z][a-zA-Z_\\\\]++)\s*' . PARAMS . '~',
+        function($matches) {
+            // recurse
+            $matches['params'] = resolveNodes($matches['params']);
+
+            $params = magicSplit(
+                '(?:' . PARAMS . '|' . ARGS . ')(*SKIP)(*FAIL)|,',
+                $matches['params']
+            );
+
+            $paramCode = '';
+            foreach ($params as $param) {
+                $paramCode .= $param . ', ';
+            }
+
+            return 'new ' . $matches['name'] . '(' . $paramCode . 'attributes())';
+        },
+        $code
+    );
+}
+
+function resolveMacros($code) {
+    return preg_replace_callback(
+        '~\b(?<!::|->)(?!array\()(?<name>[a-z][A-Za-z]++)' . ARGS . '~',
+        function($matches) {
+            // recurse
+            $matches['args'] = resolveMacros($matches['args']);
+
+            $name = $matches['name'];
+            $args = magicSplit(
+                '(?:' . PARAMS . '|' . ARGS . ')(*SKIP)(*FAIL)|,',
+                $matches['args']
+            );
+
+            if ('attributes' === $name) {
+                assertArgs(0, $args, $name);
+                return '$this->startAttributeStack[#1] + $this->endAttributes';
+            }
+
+            if ('stackAttributes' === $name) {
+                assertArgs(1, $args, $name);
+                return '$this->startAttributeStack[' . $args[0] . ']'
+                       . ' + $this->endAttributeStack[' . $args[0] . ']';
+            }
+
+            if ('init' === $name) {
+                return '$$ = array(' . implode(', ', $args) . ')';
+            }
+
+            if ('push' === $name) {
+                assertArgs(2, $args, $name);
+
+                return $args[0] . '[] = ' . $args[1] . '; $$ = ' . $args[0];
+            }
+
+            if ('pushNormalizing' === $name) {
+                assertArgs(2, $args, $name);
+
+                return 'if (is_array(' . $args[1] . ')) { $$ = array_merge(' . $args[0] . ', ' . $args[1] . '); }'
+                       . ' else { ' . $args[0] . '[] = ' . $args[1] . '; $$ = ' . $args[0] . '; }';
+            }
+
+            if ('toArray' == $name) {
+                assertArgs(1, $args, $name);
+
+                return 'is_array(' . $args[0] . ') ? ' . $args[0] . ' : array(' . $args[0] . ')';
+            }
+
+            if ('parseVar' === $name) {
+                assertArgs(1, $args, $name);
+
+                return 'substr(' . $args[0] . ', 1)';
+            }
+
+            if ('parseEncapsed' === $name) {
+                assertArgs(3, $args, $name);
+
+                return 'foreach (' . $args[0] . ' as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) {'
+                       . ' $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, ' . $args[1] . ', ' . $args[2] . '); } }';
+            }
+
+            if ('makeNop' === $name) {
+                assertArgs(3, $args, $name);
+
+                return '$startAttributes = ' . $args[1] . ';'
+                       . ' if (isset($startAttributes[\'comments\']))'
+                       . ' { ' . $args[0] . ' = new Stmt\Nop($startAttributes + ' . $args[2] . '); }'
+                       . ' else { ' . $args[0] . ' = null; }';
+            }
+
+            if ('makeZeroLengthNop' == $name) {
+                assertArgs(2, $args, $name);
+
+                return '$startAttributes = ' . $args[1] . ';'
+                       . ' if (isset($startAttributes[\'comments\']))'
+                       . ' { ' . $args[0] . ' = new Stmt\Nop($this->createCommentNopAttributes($startAttributes[\'comments\'])); }'
+                       . ' else { ' . $args[0] . ' = null; }';
+            }
+
+            if ('strKind' === $name) {
+                assertArgs(1, $args, $name);
+
+                return '(' . $args[0] . '[0] === "\'" || (' . $args[0] . '[1] === "\'" && '
+                       . '(' . $args[0] . '[0] === \'b\' || ' . $args[0] . '[0] === \'B\')) '
+                       . '? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED)';
+            }
+
+            if ('prependLeadingComments' === $name) {
+                assertArgs(1, $args, $name);
+
+                return '$attrs = $this->startAttributeStack[#1]; $stmts = ' . $args[0] . '; '
+                       . 'if (!empty($attrs[\'comments\'])) {'
+                       . '$stmts[0]->setAttribute(\'comments\', '
+                       . 'array_merge($attrs[\'comments\'], $stmts[0]->getAttribute(\'comments\', []))); }';
+            }
+
+            return $matches[0];
+        },
+        $code
+    );
+}
+
+function assertArgs($num, $args, $name) {
+    if ($num != count($args)) {
+        die('Wrong argument count for ' . $name . '().');
+    }
+}
+
+function resolveStackAccess($code) {
+    $code = preg_replace('/\$\d+/', '$this->semStack[$0]', $code);
+    $code = preg_replace('/#(\d+)/', '$$1', $code);
+    return $code;
+}
+
+function removeTrailingWhitespace($code) {
+    $lines = explode("\n", $code);
+    $lines = array_map('rtrim', $lines);
+    return implode("\n", $lines);
+}
+
+//////////////////////////////
+/// Regex helper functions ///
+//////////////////////////////
+
+function regex($regex) {
+    return '~' . LIB . '(?:' . str_replace('~', '\~', $regex) . ')~';
+}
+
+function magicSplit($regex, $string) {
+    $pieces = preg_split(regex('(?:(?&string)|(?&comment)|(?&code))(*SKIP)(*FAIL)|' . $regex), $string);
+
+    foreach ($pieces as &$piece) {
+        $piece = trim($piece);
+    }
+
+    if ($pieces === ['']) {
+        return [];
+    }
+
+    return $pieces;
+}
diff --git a/lib/nikic/php-parser/grammar/rebuildParsers.php b/lib/nikic/php-parser/grammar/rebuildParsers.php
index 340b0eacd..2d0c6b14d 100644
--- a/lib/nikic/php-parser/grammar/rebuildParsers.php
+++ b/lib/nikic/php-parser/grammar/rebuildParsers.php
@@ -1,5 +1,7 @@
 <?php
 
+require __DIR__ . '/phpyLang.php';
+
 $grammarFileToName = [
     __DIR__ . '/php5.y' => 'Php5',
     __DIR__ . '/php7.y' => 'Php7',
@@ -13,31 +15,16 @@ $tmpResultFile  = __DIR__ . '/tmp_parser.php';
 $resultDir = __DIR__ . '/../lib/PhpParser/Parser';
 $tokensResultsFile = $resultDir . '/Tokens.php';
 
-// check for kmyacc.exe binary in this directory, otherwise fall back to global name
-$kmyacc = __DIR__ . '/kmyacc.exe';
-if (!file_exists($kmyacc)) {
-    $kmyacc = 'kmyacc';
+$kmyacc = getenv('KMYACC');
+if (!$kmyacc) {
+    // Use phpyacc from dev dependencies by default.
+    $kmyacc = __DIR__ . '/../vendor/bin/phpyacc';
 }
 
 $options = array_flip($argv);
 $optionDebug = isset($options['--debug']);
 $optionKeepTmpGrammar = isset($options['--keep-tmp-grammar']);
 
-///////////////////////////////
-/// Utility regex constants ///
-///////////////////////////////
-
-const LIB = '(?(DEFINE)
-    (?<singleQuotedString>\'[^\\\\\']*+(?:\\\\.[^\\\\\']*+)*+\')
-    (?<doubleQuotedString>"[^\\\\"]*+(?:\\\\.[^\\\\"]*+)*+")
-    (?<string>(?&singleQuotedString)|(?&doubleQuotedString))
-    (?<comment>/\*[^*]*+(?:\*(?!/)[^*]*+)*+\*/)
-    (?<code>\{[^\'"/{}]*+(?:(?:(?&string)|(?&comment)|(?&code)|/)[^\'"/{}]*+)*+})
-)';
-
-const PARAMS = '\[(?<params>[^[\]]*+(?:\[(?&params)\][^[\]]*+)*+)\]';
-const ARGS   = '\((?<args>[^()]*+(?:\((?&args)\)[^()]*+)*+)\)';
-
 ///////////////////
 /// Main script ///
 ///////////////////
@@ -49,18 +36,14 @@ foreach ($grammarFileToName as $grammarFile => $name) {
 
     $grammarCode = file_get_contents($grammarFile);
     $grammarCode = str_replace('%tokens', $tokens, $grammarCode);
-
-    $grammarCode = resolveNodes($grammarCode);
-    $grammarCode = resolveMacros($grammarCode);
-    $grammarCode = resolveStackAccess($grammarCode);
+    $grammarCode = preprocessGrammar($grammarCode);
 
     file_put_contents($tmpGrammarFile, $grammarCode);
 
     $additionalArgs = $optionDebug ? '-t -v' : '';
 
     echo "Building $name parser.\n";
-    $output = trim(shell_exec("$kmyacc $additionalArgs -l -m $skeletonFile -p $name $tmpGrammarFile 2>&1"));
-    echo "Output: \"$output\"\n";
+    $output = execCmd("$kmyacc $additionalArgs -m $skeletonFile -p $name $tmpGrammarFile");
 
     $resultCode = file_get_contents($tmpResultFile);
     $resultCode = removeTrailingWhitespace($resultCode);
@@ -70,8 +53,7 @@ foreach ($grammarFileToName as $grammarFile => $name) {
     unlink($tmpResultFile);
 
     echo "Building token definition.\n";
-    $output = trim(shell_exec("$kmyacc -l -m $tokensTemplate $tmpGrammarFile 2>&1"));
-    assert($output === '');
+    $output = execCmd("$kmyacc -m $tokensTemplate $tmpGrammarFile");
     rename($tmpResultFile, $tokensResultsFile);
 
     if (!$optionKeepTmpGrammar) {
@@ -79,160 +61,9 @@ foreach ($grammarFileToName as $grammarFile => $name) {
     }
 }
 
-///////////////////////////////
-/// Preprocessing functions ///
-///////////////////////////////
-
-function resolveNodes($code) {
-    return preg_replace_callback(
-        '~\b(?<name>[A-Z][a-zA-Z_\\\\]++)\s*' . PARAMS . '~',
-        function($matches) {
-            // recurse
-            $matches['params'] = resolveNodes($matches['params']);
-
-            $params = magicSplit(
-                '(?:' . PARAMS . '|' . ARGS . ')(*SKIP)(*FAIL)|,',
-                $matches['params']
-            );
-
-            $paramCode = '';
-            foreach ($params as $param) {
-                $paramCode .= $param . ', ';
-            }
-
-            return 'new ' . $matches['name'] . '(' . $paramCode . 'attributes())';
-        },
-        $code
-    );
-}
-
-function resolveMacros($code) {
-    return preg_replace_callback(
-        '~\b(?<!::|->)(?!array\()(?<name>[a-z][A-Za-z]++)' . ARGS . '~',
-        function($matches) {
-            // recurse
-            $matches['args'] = resolveMacros($matches['args']);
-
-            $name = $matches['name'];
-            $args = magicSplit(
-                '(?:' . PARAMS . '|' . ARGS . ')(*SKIP)(*FAIL)|,',
-                $matches['args']
-            );
-
-            if ('attributes' == $name) {
-                assertArgs(0, $args, $name);
-                return '$this->startAttributeStack[#1] + $this->endAttributes';
-            }
-
-            if ('stackAttributes' == $name) {
-                assertArgs(1, $args, $name);
-                return '$this->startAttributeStack[' . $args[0] . ']'
-                     . ' + $this->endAttributeStack[' . $args[0] . ']';
-            }
-
-            if ('init' == $name) {
-                return '$$ = array(' . implode(', ', $args) . ')';
-            }
-
-            if ('push' == $name) {
-                assertArgs(2, $args, $name);
-
-                return $args[0] . '[] = ' . $args[1] . '; $$ = ' . $args[0];
-            }
-
-            if ('pushNormalizing' == $name) {
-                assertArgs(2, $args, $name);
-
-                return 'if (is_array(' . $args[1] . ')) { $$ = array_merge(' . $args[0] . ', ' . $args[1] . '); }'
-                     . ' else { ' . $args[0] . '[] = ' . $args[1] . '; $$ = ' . $args[0] . '; }';
-            }
-
-            if ('toArray' == $name) {
-                assertArgs(1, $args, $name);
-
-                return 'is_array(' . $args[0] . ') ? ' . $args[0] . ' : array(' . $args[0] . ')';
-            }
-
-            if ('parseVar' == $name) {
-                assertArgs(1, $args, $name);
-
-                return 'substr(' . $args[0] . ', 1)';
-            }
-
-            if ('parseEncapsed' == $name) {
-                assertArgs(3, $args, $name);
-
-                return 'foreach (' . $args[0] . ' as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) {'
-                     . ' $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, ' . $args[1] . ', ' . $args[2] . '); } }';
-            }
-
-            if ('parseEncapsedDoc' == $name) {
-                assertArgs(2, $args, $name);
-
-                return 'foreach (' . $args[0] . ' as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) {'
-                     . ' $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, null, ' . $args[1] . '); } }'
-                     . ' $s->value = preg_replace(\'~(\r\n|\n|\r)\z~\', \'\', $s->value);'
-                     . ' if (\'\' === $s->value) array_pop(' . $args[0] . ');';
-            }
-
-            if ('makeNop' == $name) {
-                assertArgs(2, $args, $name);
-
-                return '$startAttributes = ' . $args[1] . ';'
-                . ' if (isset($startAttributes[\'comments\']))'
-                . ' { ' . $args[0] . ' = new Stmt\Nop([\'comments\' => $startAttributes[\'comments\']]); }'
-                . ' else { ' . $args[0] . ' = null; }';
-            }
-
-            if ('strKind' == $name) {
-                assertArgs(1, $args, $name);
-
-                return '(' . $args[0] . '[0] === "\'" || (' . $args[0] . '[1] === "\'" && '
-                     . '(' . $args[0] . '[0] === \'b\' || ' . $args[0] . '[0] === \'B\')) '
-                     . '? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED)';
-            }
-
-            if ('setDocStringAttrs' == $name) {
-                assertArgs(2, $args, $name);
-
-                return $args[0] . '[\'kind\'] = strpos(' . $args[1] . ', "\'") === false '
-                     . '? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; '
-                     . 'preg_match(\'/\A[bB]?<<<[ \t]*[\\\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\\\'"]?(?:\r\n|\n|\r)\z/\', ' . $args[1] . ', $matches); '
-                     . $args[0] . '[\'docLabel\'] = $matches[1];';
-            }
-
-            if ('prependLeadingComments' == $name) {
-                assertArgs(1, $args, $name);
-
-                return '$attrs = $this->startAttributeStack[#1]; $stmts = ' . $args[0] . '; '
-                . 'if (!empty($attrs[\'comments\'])) {'
-                . '$stmts[0]->setAttribute(\'comments\', '
-                . 'array_merge($attrs[\'comments\'], $stmts[0]->getAttribute(\'comments\', []))); }';
-            }
-
-            return $matches[0];
-        },
-        $code
-    );
-}
-
-function assertArgs($num, $args, $name) {
-    if ($num != count($args)) {
-        die('Wrong argument count for ' . $name . '().');
-    }
-}
-
-function resolveStackAccess($code) {
-    $code = preg_replace('/\$\d+/', '$this->semStack[$0]', $code);
-    $code = preg_replace('/#(\d+)/', '$$1', $code);
-    return $code;
-}
-
-function removeTrailingWhitespace($code) {
-    $lines = explode("\n", $code);
-    $lines = array_map('rtrim', $lines);
-    return implode("\n", $lines);
-}
+////////////////////////////////
+/// Utility helper functions ///
+////////////////////////////////
 
 function ensureDirExists($dir) {
     if (!is_dir($dir)) {
@@ -240,24 +71,11 @@ function ensureDirExists($dir) {
     }
 }
 
-//////////////////////////////
-/// Regex helper functions ///
-//////////////////////////////
-
-function regex($regex) {
-    return '~' . LIB . '(?:' . str_replace('~', '\~', $regex) . ')~';
-}
-
-function magicSplit($regex, $string) {
-    $pieces = preg_split(regex('(?:(?&string)|(?&comment)|(?&code))(*SKIP)(*FAIL)|' . $regex), $string);
-
-    foreach ($pieces as &$piece) {
-        $piece = trim($piece);
+function execCmd($cmd) {
+    $output = trim(shell_exec("$cmd 2>&1"));
+    if ($output !== "") {
+        echo "> " . $cmd . "\n";
+        echo $output;
     }
-
-    if ($pieces === ['']) {
-        return [];
-    }
-
-    return $pieces;
+    return $output;
 }
diff --git a/lib/nikic/php-parser/grammar/tokens.y b/lib/nikic/php-parser/grammar/tokens.y
index 2b54f80b4..8f0b21725 100644
--- a/lib/nikic/php-parser/grammar/tokens.y
+++ b/lib/nikic/php-parser/grammar/tokens.y
@@ -1,6 +1,7 @@
 /* We currently rely on the token ID mapping to be the same between PHP 5 and PHP 7 - so the same lexer can be used for
  * both. This is enforced by sharing this token file. */
 
+%right T_THROW
 %left T_INCLUDE T_INCLUDE_ONCE T_EVAL T_REQUIRE T_REQUIRE_ONCE
 %left ','
 %left T_LOGICAL_OR
@@ -10,14 +11,14 @@
 %right T_YIELD
 %right T_DOUBLE_ARROW
 %right T_YIELD_FROM
-%left '=' T_PLUS_EQUAL T_MINUS_EQUAL T_MUL_EQUAL T_DIV_EQUAL T_CONCAT_EQUAL T_MOD_EQUAL T_AND_EQUAL T_OR_EQUAL T_XOR_EQUAL T_SL_EQUAL T_SR_EQUAL T_POW_EQUAL
+%left '=' T_PLUS_EQUAL T_MINUS_EQUAL T_MUL_EQUAL T_DIV_EQUAL T_CONCAT_EQUAL T_MOD_EQUAL T_AND_EQUAL T_OR_EQUAL T_XOR_EQUAL T_SL_EQUAL T_SR_EQUAL T_POW_EQUAL T_COALESCE_EQUAL
 %left '?' ':'
 %right T_COALESCE
 %left T_BOOLEAN_OR
 %left T_BOOLEAN_AND
 %left '|'
 %left '^'
-%left '&'
+%left T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG
 %nonassoc T_IS_EQUAL T_IS_NOT_EQUAL T_IS_IDENTICAL T_IS_NOT_IDENTICAL T_SPACESHIP
 %nonassoc '<' T_IS_SMALLER_OR_EQUAL '>' T_IS_GREATER_OR_EQUAL
 %left T_SL T_SR
@@ -41,8 +42,6 @@
 %token T_VARIABLE
 %token T_NUM_STRING
 %token T_INLINE_HTML
-%token T_CHARACTER
-%token T_BAD_CHARACTER
 %token T_ENCAPSED_AND_WHITESPACE
 %token T_CONSTANT_ENCAPSED_STRING
 %token T_ECHO
@@ -57,6 +56,7 @@
 %token T_ENDDECLARE
 %token T_AS
 %token T_SWITCH
+%token T_MATCH
 %token T_ENDSWITCH
 %token T_CASE
 %token T_DEFAULT
@@ -64,6 +64,7 @@
 %token T_CONTINUE
 %token T_GOTO
 %token T_FUNCTION
+%token T_FN
 %token T_CONST
 %token T_RETURN
 %token T_TRY
@@ -73,7 +74,7 @@
 %token T_USE
 %token T_INSTEADOF
 %token T_GLOBAL
-%right T_STATIC T_ABSTRACT T_FINAL T_PRIVATE T_PROTECTED T_PUBLIC
+%right T_STATIC T_ABSTRACT T_FINAL T_PRIVATE T_PROTECTED T_PUBLIC T_READONLY
 %token T_VAR
 %token T_UNSET
 %token T_ISSET
@@ -82,9 +83,11 @@
 %token T_CLASS
 %token T_TRAIT
 %token T_INTERFACE
+%token T_ENUM
 %token T_EXTENDS
 %token T_IMPLEMENTS
 %token T_OBJECT_OPERATOR
+%token T_NULLSAFE_OBJECT_OPERATOR
 %token T_DOUBLE_ARROW
 %token T_LIST
 %token T_ARRAY
@@ -95,12 +98,6 @@
 %token T_FUNC_C
 %token T_LINE
 %token T_FILE
-%token T_COMMENT
-%token T_DOC_COMMENT
-%token T_OPEN_TAG
-%token T_OPEN_TAG_WITH_ECHO
-%token T_CLOSE_TAG
-%token T_WHITESPACE
 %token T_START_HEREDOC
 %token T_END_HEREDOC
 %token T_DOLLAR_OPEN_CURLY_BRACES
@@ -111,3 +108,8 @@
 %token T_DIR
 %token T_NS_SEPARATOR
 %token T_ELLIPSIS
+%token T_NAME_FULLY_QUALIFIED
+%token T_NAME_QUALIFIED
+%token T_NAME_RELATIVE
+%token T_ATTRIBUTE
+%token T_ENUM
diff --git a/lib/nikic/php-parser/lib/PhpParser/Autoloader.php b/lib/nikic/php-parser/lib/PhpParser/Autoloader.php
deleted file mode 100644
index 809a06ed8..000000000
--- a/lib/nikic/php-parser/lib/PhpParser/Autoloader.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-
-namespace PhpParser;
-
-/**
- * @codeCoverageIgnore
- */
-class Autoloader
-{
-    /** @var bool Whether the autoloader has been registered. */
-    private static $registered = false;
-
-    /**
-     * Registers PhpParser\Autoloader as an SPL autoloader.
-     *
-     * @param bool $prepend Whether to prepend the autoloader instead of appending
-     */
-    static public function register($prepend = false) {
-        if (self::$registered === true) {
-            return;
-        }
-
-        spl_autoload_register(array(__CLASS__, 'autoload'), true, $prepend);
-        self::$registered = true;
-    }
-
-    /**
-     * Handles autoloading of classes.
-     *
-     * @param string $class A class name.
-     */
-    static public function autoload($class) {
-        if (0 === strpos($class, 'PhpParser\\')) {
-            $fileName = __DIR__ . strtr(substr($class, 9), '\\', '/') . '.php';
-            if (file_exists($fileName)) {
-                require $fileName;
-            }
-        }
-    }
-}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Builder.php b/lib/nikic/php-parser/lib/PhpParser/Builder.php
index 95655e820..26d8921ef 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Builder.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Builder.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser;
 
@@ -9,5 +9,5 @@ interface Builder
      *
      * @return Node The built node
      */
-    public function getNode();
-}
\ No newline at end of file
+    public function getNode() : Node;
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Builder/ClassConst.php b/lib/nikic/php-parser/lib/PhpParser/Builder/ClassConst.php
new file mode 100644
index 000000000..f616c6270
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Builder/ClassConst.php
@@ -0,0 +1,132 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpParser\Builder;
+
+use PhpParser;
+use PhpParser\BuilderHelpers;
+use PhpParser\Node;
+use PhpParser\Node\Const_;
+use PhpParser\Node\Identifier;
+use PhpParser\Node\Stmt;
+
+class ClassConst implements PhpParser\Builder
+{
+    protected $flags = 0;
+    protected $attributes = [];
+    protected $constants = [];
+
+    /** @var Node\AttributeGroup[] */
+    protected $attributeGroups = [];
+
+    /**
+     * Creates a class constant builder
+     *
+     * @param string|Identifier                          $name  Name
+     * @param Node\Expr|bool|null|int|float|string|array $value Value
+     */
+    public function __construct($name, $value) {
+        $this->constants = [new Const_($name, BuilderHelpers::normalizeValue($value))];
+    }
+
+    /**
+     * Add another constant to const group
+     *
+     * @param string|Identifier                          $name  Name
+     * @param Node\Expr|bool|null|int|float|string|array $value Value
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function addConst($name, $value) {
+        $this->constants[] = new Const_($name, BuilderHelpers::normalizeValue($value));
+
+        return $this;
+    }
+
+    /**
+     * Makes the constant public.
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function makePublic() {
+        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_PUBLIC);
+
+        return $this;
+    }
+
+    /**
+     * Makes the constant protected.
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function makeProtected() {
+        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_PROTECTED);
+
+        return $this;
+    }
+
+    /**
+     * Makes the constant private.
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function makePrivate() {
+        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_PRIVATE);
+
+        return $this;
+    }
+
+    /**
+     * Makes the constant final.
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function makeFinal() {
+        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_FINAL);
+
+        return $this;
+    }
+
+    /**
+     * Sets doc comment for the constant.
+     *
+     * @param PhpParser\Comment\Doc|string $docComment Doc comment to set
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function setDocComment($docComment) {
+        $this->attributes = [
+            'comments' => [BuilderHelpers::normalizeDocComment($docComment)]
+        ];
+
+        return $this;
+    }
+
+    /**
+     * Adds an attribute group.
+     *
+     * @param Node\Attribute|Node\AttributeGroup $attribute
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function addAttribute($attribute) {
+        $this->attributeGroups[] = BuilderHelpers::normalizeAttribute($attribute);
+
+        return $this;
+    }
+
+    /**
+     * Returns the built class node.
+     *
+     * @return Stmt\ClassConst The built constant node
+     */
+    public function getNode(): PhpParser\Node {
+        return new Stmt\ClassConst(
+            $this->constants,
+            $this->flags,
+            $this->attributes,
+            $this->attributeGroups
+        );
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Builder/Class_.php b/lib/nikic/php-parser/lib/PhpParser/Builder/Class_.php
index f91f6a847..87e2901a9 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Builder/Class_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Builder/Class_.php
@@ -1,8 +1,10 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Builder;
 
 use PhpParser;
+use PhpParser\BuilderHelpers;
+use PhpParser\Node;
 use PhpParser\Node\Name;
 use PhpParser\Node\Stmt;
 
@@ -11,20 +13,23 @@ class Class_ extends Declaration
     protected $name;
 
     protected $extends = null;
-    protected $implements = array();
+    protected $implements = [];
     protected $flags = 0;
 
-    protected $uses = array();
-    protected $constants = array();
-    protected $properties = array();
-    protected $methods = array();
+    protected $uses = [];
+    protected $constants = [];
+    protected $properties = [];
+    protected $methods = [];
+
+    /** @var Node\AttributeGroup[] */
+    protected $attributeGroups = [];
 
     /**
      * Creates a class builder.
      *
      * @param string $name Name of the class
      */
-    public function __construct($name) {
+    public function __construct(string $name) {
         $this->name = $name;
     }
 
@@ -36,7 +41,7 @@ class Class_ extends Declaration
      * @return $this The builder instance (for fluid interface)
      */
     public function extend($class) {
-        $this->extends = $this->normalizeName($class);
+        $this->extends = BuilderHelpers::normalizeName($class);
 
         return $this;
     }
@@ -48,9 +53,9 @@ class Class_ extends Declaration
      *
      * @return $this The builder instance (for fluid interface)
      */
-    public function implement() {
-        foreach (func_get_args() as $interface) {
-            $this->implements[] = $this->normalizeName($interface);
+    public function implement(...$interfaces) {
+        foreach ($interfaces as $interface) {
+            $this->implements[] = BuilderHelpers::normalizeName($interface);
         }
 
         return $this;
@@ -62,7 +67,7 @@ class Class_ extends Declaration
      * @return $this The builder instance (for fluid interface)
      */
     public function makeAbstract() {
-        $this->setModifier(Stmt\Class_::MODIFIER_ABSTRACT);
+        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_ABSTRACT);
 
         return $this;
     }
@@ -73,7 +78,7 @@ class Class_ extends Declaration
      * @return $this The builder instance (for fluid interface)
      */
     public function makeFinal() {
-        $this->setModifier(Stmt\Class_::MODIFIER_FINAL);
+        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_FINAL);
 
         return $this;
     }
@@ -86,21 +91,34 @@ class Class_ extends Declaration
      * @return $this The builder instance (for fluid interface)
      */
     public function addStmt($stmt) {
-        $stmt = $this->normalizeNode($stmt);
+        $stmt = BuilderHelpers::normalizeNode($stmt);
 
-        $targets = array(
-            'Stmt_TraitUse'    => &$this->uses,
-            'Stmt_ClassConst'  => &$this->constants,
-            'Stmt_Property'    => &$this->properties,
-            'Stmt_ClassMethod' => &$this->methods,
-        );
+        $targets = [
+            Stmt\TraitUse::class    => &$this->uses,
+            Stmt\ClassConst::class  => &$this->constants,
+            Stmt\Property::class    => &$this->properties,
+            Stmt\ClassMethod::class => &$this->methods,
+        ];
 
-        $type = $stmt->getType();
-        if (!isset($targets[$type])) {
-            throw new \LogicException(sprintf('Unexpected node of type "%s"', $type));
+        $class = \get_class($stmt);
+        if (!isset($targets[$class])) {
+            throw new \LogicException(sprintf('Unexpected node of type "%s"', $stmt->getType()));
         }
 
-        $targets[$type][] = $stmt;
+        $targets[$class][] = $stmt;
+
+        return $this;
+    }
+
+    /**
+     * Adds an attribute group.
+     *
+     * @param Node\Attribute|Node\AttributeGroup $attribute
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function addAttribute($attribute) {
+        $this->attributeGroups[] = BuilderHelpers::normalizeAttribute($attribute);
 
         return $this;
     }
@@ -110,12 +128,13 @@ class Class_ extends Declaration
      *
      * @return Stmt\Class_ The built class node
      */
-    public function getNode() {
-        return new Stmt\Class_($this->name, array(
+    public function getNode() : PhpParser\Node {
+        return new Stmt\Class_($this->name, [
             'flags' => $this->flags,
             'extends' => $this->extends,
             'implements' => $this->implements,
             'stmts' => array_merge($this->uses, $this->constants, $this->properties, $this->methods),
-        ), $this->attributes);
+            'attrGroups' => $this->attributeGroups,
+        ], $this->attributes);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Builder/Declaration.php b/lib/nikic/php-parser/lib/PhpParser/Builder/Declaration.php
index 30a1937f9..830949928 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Builder/Declaration.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Builder/Declaration.php
@@ -1,12 +1,13 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Builder;
 
 use PhpParser;
+use PhpParser\BuilderHelpers;
 
-abstract class Declaration extends PhpParser\BuilderAbstract
+abstract class Declaration implements PhpParser\Builder
 {
-    protected $attributes = array();
+    protected $attributes = [];
 
     abstract public function addStmt($stmt);
 
@@ -33,10 +34,10 @@ abstract class Declaration extends PhpParser\BuilderAbstract
      * @return $this The builder instance (for fluid interface)
      */
     public function setDocComment($docComment) {
-        $this->attributes['comments'] = array(
-            $this->normalizeDocComment($docComment)
-        );
+        $this->attributes['comments'] = [
+            BuilderHelpers::normalizeDocComment($docComment)
+        ];
 
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Builder/EnumCase.php b/lib/nikic/php-parser/lib/PhpParser/Builder/EnumCase.php
new file mode 100644
index 000000000..02fa83e62
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Builder/EnumCase.php
@@ -0,0 +1,85 @@
+<?php
+
+declare(strict_types=1);
+
+namespace PhpParser\Builder;
+
+use PhpParser;
+use PhpParser\BuilderHelpers;
+use PhpParser\Node;
+use PhpParser\Node\Identifier;
+use PhpParser\Node\Stmt;
+
+class EnumCase implements PhpParser\Builder
+{
+    protected $name;
+    protected $value = null;
+    protected $attributes = [];
+
+    /** @var Node\AttributeGroup[] */
+    protected $attributeGroups = [];
+
+    /**
+     * Creates an enum case builder.
+     *
+     * @param string|Identifier $name  Name
+     */
+    public function __construct($name) {
+        $this->name = $name;
+    }
+
+    /**
+     * Sets the value.
+     *
+     * @param Node\Expr|string|int $value
+     *
+     * @return $this
+     */
+    public function setValue($value) {
+        $this->value = BuilderHelpers::normalizeValue($value);
+
+        return $this;
+    }
+
+    /**
+     * Sets doc comment for the constant.
+     *
+     * @param PhpParser\Comment\Doc|string $docComment Doc comment to set
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function setDocComment($docComment) {
+        $this->attributes = [
+            'comments' => [BuilderHelpers::normalizeDocComment($docComment)]
+        ];
+
+        return $this;
+    }
+
+    /**
+     * Adds an attribute group.
+     *
+     * @param Node\Attribute|Node\AttributeGroup $attribute
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function addAttribute($attribute) {
+        $this->attributeGroups[] = BuilderHelpers::normalizeAttribute($attribute);
+
+        return $this;
+    }
+
+    /**
+     * Returns the built enum case node.
+     *
+     * @return Stmt\EnumCase The built constant node
+     */
+    public function getNode(): PhpParser\Node {
+        return new Stmt\EnumCase(
+            $this->name,
+            $this->value,
+            $this->attributes,
+            $this->attributeGroups
+        );
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Builder/Enum_.php b/lib/nikic/php-parser/lib/PhpParser/Builder/Enum_.php
new file mode 100644
index 000000000..be7eef95f
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Builder/Enum_.php
@@ -0,0 +1,117 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Builder;
+
+use PhpParser;
+use PhpParser\BuilderHelpers;
+use PhpParser\Node;
+use PhpParser\Node\Identifier;
+use PhpParser\Node\Name;
+use PhpParser\Node\Stmt;
+
+class Enum_ extends Declaration
+{
+    protected $name;
+    protected $scalarType = null;
+
+    protected $implements = [];
+
+    protected $uses = [];
+    protected $enumCases = [];
+    protected $constants = [];
+    protected $methods = [];
+
+    /** @var Node\AttributeGroup[] */
+    protected $attributeGroups = [];
+
+    /**
+     * Creates an enum builder.
+     *
+     * @param string $name Name of the enum
+     */
+    public function __construct(string $name) {
+        $this->name = $name;
+    }
+
+    /**
+     * Sets the scalar type.
+     *
+     * @param string|Identifier $type
+     *
+     * @return $this
+     */
+    public function setScalarType($scalarType) {
+        $this->scalarType = BuilderHelpers::normalizeType($scalarType);
+
+        return $this;
+    }
+
+    /**
+     * Implements one or more interfaces.
+     *
+     * @param Name|string ...$interfaces Names of interfaces to implement
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function implement(...$interfaces) {
+        foreach ($interfaces as $interface) {
+            $this->implements[] = BuilderHelpers::normalizeName($interface);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Adds a statement.
+     *
+     * @param Stmt|PhpParser\Builder $stmt The statement to add
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function addStmt($stmt) {
+        $stmt = BuilderHelpers::normalizeNode($stmt);
+
+        $targets = [
+            Stmt\TraitUse::class    => &$this->uses,
+            Stmt\EnumCase::class    => &$this->enumCases,
+            Stmt\ClassConst::class  => &$this->constants,
+            Stmt\ClassMethod::class => &$this->methods,
+        ];
+
+        $class = \get_class($stmt);
+        if (!isset($targets[$class])) {
+            throw new \LogicException(sprintf('Unexpected node of type "%s"', $stmt->getType()));
+        }
+
+        $targets[$class][] = $stmt;
+
+        return $this;
+    }
+
+    /**
+     * Adds an attribute group.
+     *
+     * @param Node\Attribute|Node\AttributeGroup $attribute
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function addAttribute($attribute) {
+        $this->attributeGroups[] = BuilderHelpers::normalizeAttribute($attribute);
+
+        return $this;
+    }
+
+    /**
+     * Returns the built class node.
+     *
+     * @return Stmt\Enum_ The built enum node
+     */
+    public function getNode() : PhpParser\Node {
+        return new Stmt\Enum_($this->name, [
+            'scalarType' => $this->scalarType,
+            'implements' => $this->implements,
+            'stmts' => array_merge($this->uses, $this->enumCases, $this->constants, $this->methods),
+            'attrGroups' => $this->attributeGroups,
+        ], $this->attributes);
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Builder/FunctionLike.php b/lib/nikic/php-parser/lib/PhpParser/Builder/FunctionLike.php
index 28a2ea618..98ea9d336 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Builder/FunctionLike.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Builder/FunctionLike.php
@@ -1,14 +1,14 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Builder;
 
-use PhpParser;
+use PhpParser\BuilderHelpers;
 use PhpParser\Node;
 
 abstract class FunctionLike extends Declaration
 {
     protected $returnByRef = false;
-    protected $params = array();
+    protected $params = [];
 
     /** @var string|Node\Name|Node\NullableType|null */
     protected $returnType = null;
@@ -32,7 +32,7 @@ abstract class FunctionLike extends Declaration
      * @return $this The builder instance (for fluid interface)
      */
     public function addParam($param) {
-        $param = $this->normalizeNode($param);
+        $param = BuilderHelpers::normalizeNode($param);
 
         if (!$param instanceof Node\Param) {
             throw new \LogicException(sprintf('Expected parameter node, got "%s"', $param->getType()));
@@ -61,14 +61,12 @@ abstract class FunctionLike extends Declaration
     /**
      * Sets the return type for PHP 7.
      *
-     * @param string|Node\Name|Node\NullableType $type One of array, callable, string, int, float, bool, iterable,
-     *                               or a class/interface name.
+     * @param string|Node\Name|Node\Identifier|Node\ComplexType $type
      *
      * @return $this The builder instance (for fluid interface)
      */
-    public function setReturnType($type)
-    {
-        $this->returnType = $this->normalizeType($type);
+    public function setReturnType($type) {
+        $this->returnType = BuilderHelpers::normalizeType($type);
 
         return $this;
     }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Builder/Function_.php b/lib/nikic/php-parser/lib/PhpParser/Builder/Function_.php
index 228bdfaa2..1cd73c0d3 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Builder/Function_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Builder/Function_.php
@@ -1,22 +1,26 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Builder;
 
 use PhpParser;
+use PhpParser\BuilderHelpers;
 use PhpParser\Node;
 use PhpParser\Node\Stmt;
 
 class Function_ extends FunctionLike
 {
     protected $name;
-    protected $stmts = array();
+    protected $stmts = [];
+
+    /** @var Node\AttributeGroup[] */
+    protected $attributeGroups = [];
 
     /**
      * Creates a function builder.
      *
      * @param string $name Name of the function
      */
-    public function __construct($name) {
+    public function __construct(string $name) {
         $this->name = $name;
     }
 
@@ -28,7 +32,20 @@ class Function_ extends FunctionLike
      * @return $this The builder instance (for fluid interface)
      */
     public function addStmt($stmt) {
-        $this->stmts[] = $this->normalizeNode($stmt);
+        $this->stmts[] = BuilderHelpers::normalizeStmt($stmt);
+
+        return $this;
+    }
+
+    /**
+     * Adds an attribute group.
+     *
+     * @param Node\Attribute|Node\AttributeGroup $attribute
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function addAttribute($attribute) {
+        $this->attributeGroups[] = BuilderHelpers::normalizeAttribute($attribute);
 
         return $this;
     }
@@ -38,12 +55,13 @@ class Function_ extends FunctionLike
      *
      * @return Stmt\Function_ The built function node
      */
-    public function getNode() {
-        return new Stmt\Function_($this->name, array(
+    public function getNode() : Node {
+        return new Stmt\Function_($this->name, [
             'byRef'      => $this->returnByRef,
             'params'     => $this->params,
             'returnType' => $this->returnType,
             'stmts'      => $this->stmts,
-        ), $this->attributes);
+            'attrGroups' => $this->attributeGroups,
+        ], $this->attributes);
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Builder/Interface_.php b/lib/nikic/php-parser/lib/PhpParser/Builder/Interface_.php
index 8ebb292a5..7806e85fc 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Builder/Interface_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Builder/Interface_.php
@@ -1,24 +1,29 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Builder;
 
 use PhpParser;
+use PhpParser\BuilderHelpers;
+use PhpParser\Node;
 use PhpParser\Node\Name;
 use PhpParser\Node\Stmt;
 
 class Interface_ extends Declaration
 {
     protected $name;
-    protected $extends = array();
-    protected $constants = array();
-    protected $methods = array();
+    protected $extends = [];
+    protected $constants = [];
+    protected $methods = [];
+
+    /** @var Node\AttributeGroup[] */
+    protected $attributeGroups = [];
 
     /**
      * Creates an interface builder.
      *
      * @param string $name Name of the interface
      */
-    public function __construct($name) {
+    public function __construct(string $name) {
         $this->name = $name;
     }
 
@@ -29,9 +34,9 @@ class Interface_ extends Declaration
      *
      * @return $this The builder instance (for fluid interface)
      */
-    public function extend() {
-        foreach (func_get_args() as $interface) {
-            $this->extends[] = $this->normalizeName($interface);
+    public function extend(...$interfaces) {
+        foreach ($interfaces as $interface) {
+            $this->extends[] = BuilderHelpers::normalizeName($interface);
         }
 
         return $this;
@@ -45,36 +50,44 @@ class Interface_ extends Declaration
      * @return $this The builder instance (for fluid interface)
      */
     public function addStmt($stmt) {
-        $stmt = $this->normalizeNode($stmt);
+        $stmt = BuilderHelpers::normalizeNode($stmt);
 
-        $type = $stmt->getType();
-        switch ($type) {
-            case 'Stmt_ClassConst':
-                $this->constants[] = $stmt;
-                break;
-
-            case 'Stmt_ClassMethod':
-                // we erase all statements in the body of an interface method
-                $stmt->stmts = null;
-                $this->methods[] = $stmt;
-                break;
-
-            default:
-                throw new \LogicException(sprintf('Unexpected node of type "%s"', $type));
+        if ($stmt instanceof Stmt\ClassConst) {
+            $this->constants[] = $stmt;
+        } elseif ($stmt instanceof Stmt\ClassMethod) {
+            // we erase all statements in the body of an interface method
+            $stmt->stmts = null;
+            $this->methods[] = $stmt;
+        } else {
+            throw new \LogicException(sprintf('Unexpected node of type "%s"', $stmt->getType()));
         }
 
         return $this;
     }
 
+    /**
+     * Adds an attribute group.
+     *
+     * @param Node\Attribute|Node\AttributeGroup $attribute
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function addAttribute($attribute) {
+        $this->attributeGroups[] = BuilderHelpers::normalizeAttribute($attribute);
+
+        return $this;
+    }
+
     /**
      * Returns the built interface node.
      *
      * @return Stmt\Interface_ The built interface node
      */
-    public function getNode() {
-        return new Stmt\Interface_($this->name, array(
+    public function getNode() : PhpParser\Node {
+        return new Stmt\Interface_($this->name, [
             'extends' => $this->extends,
             'stmts' => array_merge($this->constants, $this->methods),
-        ), $this->attributes);
+            'attrGroups' => $this->attributeGroups,
+        ], $this->attributes);
     }
-}
\ No newline at end of file
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Builder/Method.php b/lib/nikic/php-parser/lib/PhpParser/Builder/Method.php
index 1ed75eeda..232d7cb87 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Builder/Method.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Builder/Method.php
@@ -1,8 +1,9 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Builder;
 
 use PhpParser;
+use PhpParser\BuilderHelpers;
 use PhpParser\Node;
 use PhpParser\Node\Stmt;
 
@@ -12,14 +13,17 @@ class Method extends FunctionLike
     protected $flags = 0;
 
     /** @var array|null */
-    protected $stmts = array();
+    protected $stmts = [];
+
+    /** @var Node\AttributeGroup[] */
+    protected $attributeGroups = [];
 
     /**
      * Creates a method builder.
      *
      * @param string $name Name of the method
      */
-    public function __construct($name) {
+    public function __construct(string $name) {
         $this->name = $name;
     }
 
@@ -29,7 +33,7 @@ class Method extends FunctionLike
      * @return $this The builder instance (for fluid interface)
      */
     public function makePublic() {
-        $this->setModifier(Stmt\Class_::MODIFIER_PUBLIC);
+        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_PUBLIC);
 
         return $this;
     }
@@ -40,7 +44,7 @@ class Method extends FunctionLike
      * @return $this The builder instance (for fluid interface)
      */
     public function makeProtected() {
-        $this->setModifier(Stmt\Class_::MODIFIER_PROTECTED);
+        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_PROTECTED);
 
         return $this;
     }
@@ -51,7 +55,7 @@ class Method extends FunctionLike
      * @return $this The builder instance (for fluid interface)
      */
     public function makePrivate() {
-        $this->setModifier(Stmt\Class_::MODIFIER_PRIVATE);
+        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_PRIVATE);
 
         return $this;
     }
@@ -62,7 +66,7 @@ class Method extends FunctionLike
      * @return $this The builder instance (for fluid interface)
      */
     public function makeStatic() {
-        $this->setModifier(Stmt\Class_::MODIFIER_STATIC);
+        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_STATIC);
 
         return $this;
     }
@@ -77,7 +81,7 @@ class Method extends FunctionLike
             throw new \LogicException('Cannot make method with statements abstract');
         }
 
-        $this->setModifier(Stmt\Class_::MODIFIER_ABSTRACT);
+        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_ABSTRACT);
         $this->stmts = null; // abstract methods don't have statements
 
         return $this;
@@ -89,7 +93,7 @@ class Method extends FunctionLike
      * @return $this The builder instance (for fluid interface)
      */
     public function makeFinal() {
-        $this->setModifier(Stmt\Class_::MODIFIER_FINAL);
+        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_FINAL);
 
         return $this;
     }
@@ -106,7 +110,20 @@ class Method extends FunctionLike
             throw new \LogicException('Cannot add statements to an abstract method');
         }
 
-        $this->stmts[] = $this->normalizeNode($stmt);
+        $this->stmts[] = BuilderHelpers::normalizeStmt($stmt);
+
+        return $this;
+    }
+
+    /**
+     * Adds an attribute group.
+     *
+     * @param Node\Attribute|Node\AttributeGroup $attribute
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function addAttribute($attribute) {
+        $this->attributeGroups[] = BuilderHelpers::normalizeAttribute($attribute);
 
         return $this;
     }
@@ -116,13 +133,14 @@ class Method extends FunctionLike
      *
      * @return Stmt\ClassMethod The built method node
      */
-    public function getNode() {
-        return new Stmt\ClassMethod($this->name, array(
+    public function getNode() : Node {
+        return new Stmt\ClassMethod($this->name, [
             'flags'      => $this->flags,
             'byRef'      => $this->returnByRef,
             'params'     => $this->params,
             'returnType' => $this->returnType,
             'stmts'      => $this->stmts,
-        ), $this->attributes);
+            'attrGroups' => $this->attributeGroups,
+        ], $this->attributes);
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Builder/Namespace_.php b/lib/nikic/php-parser/lib/PhpParser/Builder/Namespace_.php
index fe636c4ff..1c751e163 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Builder/Namespace_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Builder/Namespace_.php
@@ -1,15 +1,16 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Builder;
 
 use PhpParser;
+use PhpParser\BuilderHelpers;
 use PhpParser\Node;
 use PhpParser\Node\Stmt;
 
 class Namespace_ extends Declaration
 {
     private $name;
-    private $stmts = array();
+    private $stmts = [];
 
     /**
      * Creates a namespace builder.
@@ -17,7 +18,7 @@ class Namespace_ extends Declaration
      * @param Node\Name|string|null $name Name of the namespace
      */
     public function __construct($name) {
-        $this->name = null !== $name ? $this->normalizeName($name) : null;
+        $this->name = null !== $name ? BuilderHelpers::normalizeName($name) : null;
     }
 
     /**
@@ -28,7 +29,7 @@ class Namespace_ extends Declaration
      * @return $this The builder instance (for fluid interface)
      */
     public function addStmt($stmt) {
-        $this->stmts[] = $this->normalizeNode($stmt);
+        $this->stmts[] = BuilderHelpers::normalizeStmt($stmt);
 
         return $this;
     }
@@ -36,9 +37,9 @@ class Namespace_ extends Declaration
     /**
      * Returns the built node.
      *
-     * @return Node The built node
+     * @return Stmt\Namespace_ The built node
      */
-    public function getNode() {
+    public function getNode() : Node {
         return new Stmt\Namespace_($this->name, $this->stmts, $this->attributes);
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Builder/Param.php b/lib/nikic/php-parser/lib/PhpParser/Builder/Param.php
index c029e748b..de9aae7e5 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Builder/Param.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Builder/Param.php
@@ -1,29 +1,33 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Builder;
 
 use PhpParser;
+use PhpParser\BuilderHelpers;
 use PhpParser\Node;
 
-class Param extends PhpParser\BuilderAbstract
+class Param implements PhpParser\Builder
 {
     protected $name;
 
     protected $default = null;
 
-    /** @var string|Node\Name|Node\NullableType|null */
+    /** @var Node\Identifier|Node\Name|Node\NullableType|null */
     protected $type = null;
 
     protected $byRef = false;
 
     protected $variadic = false;
 
+    /** @var Node\AttributeGroup[] */
+    protected $attributeGroups = [];
+
     /**
      * Creates a parameter builder.
      *
      * @param string $name Name of the parameter
      */
-    public function __construct($name) {
+    public function __construct(string $name) {
         $this->name = $name;
     }
 
@@ -35,27 +39,40 @@ class Param extends PhpParser\BuilderAbstract
      * @return $this The builder instance (for fluid interface)
      */
     public function setDefault($value) {
-        $this->default = $this->normalizeValue($value);
+        $this->default = BuilderHelpers::normalizeValue($value);
 
         return $this;
     }
 
     /**
-     * Sets type hint for the parameter.
+     * Sets type for the parameter.
      *
-     * @param string|Node\Name|Node\NullableType $type Type hint to use
+     * @param string|Node\Name|Node\Identifier|Node\ComplexType $type Parameter type
      *
      * @return $this The builder instance (for fluid interface)
      */
-    public function setTypeHint($type) {
-        $this->type = $this->normalizeType($type);
-        if ($this->type === 'void') {
+    public function setType($type) {
+        $this->type = BuilderHelpers::normalizeType($type);
+        if ($this->type == 'void') {
             throw new \LogicException('Parameter type cannot be void');
         }
 
         return $this;
     }
 
+    /**
+     * Sets type for the parameter.
+     *
+     * @param string|Node\Name|Node\Identifier|Node\ComplexType $type Parameter type
+     *
+     * @return $this The builder instance (for fluid interface)
+     *
+     * @deprecated Use setType() instead
+     */
+    public function setTypeHint($type) {
+        return $this->setType($type);
+    }
+
     /**
      * Make the parameter accept the value by reference.
      *
@@ -78,14 +95,28 @@ class Param extends PhpParser\BuilderAbstract
         return $this;
     }
 
+    /**
+     * Adds an attribute group.
+     *
+     * @param Node\Attribute|Node\AttributeGroup $attribute
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function addAttribute($attribute) {
+        $this->attributeGroups[] = BuilderHelpers::normalizeAttribute($attribute);
+
+        return $this;
+    }
+
     /**
      * Returns the built parameter node.
      *
      * @return Node\Param The built parameter node
      */
-    public function getNode() {
+    public function getNode() : Node {
         return new Node\Param(
-            $this->name, $this->default, $this->type, $this->byRef, $this->variadic
+            new Node\Expr\Variable($this->name),
+            $this->default, $this->type, $this->byRef, $this->variadic, [], 0, $this->attributeGroups
         );
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Builder/Property.php b/lib/nikic/php-parser/lib/PhpParser/Builder/Property.php
index 053c851b9..68e318565 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Builder/Property.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Builder/Property.php
@@ -1,24 +1,35 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Builder;
 
 use PhpParser;
+use PhpParser\BuilderHelpers;
+use PhpParser\Node;
+use PhpParser\Node\Identifier;
+use PhpParser\Node\Name;
 use PhpParser\Node\Stmt;
+use PhpParser\Node\ComplexType;
 
-class Property extends PhpParser\BuilderAbstract
+class Property implements PhpParser\Builder
 {
     protected $name;
 
     protected $flags = 0;
     protected $default = null;
-    protected $attributes = array();
+    protected $attributes = [];
+
+    /** @var null|Identifier|Name|NullableType */
+    protected $type;
+
+    /** @var Node\AttributeGroup[] */
+    protected $attributeGroups = [];
 
     /**
      * Creates a property builder.
      *
      * @param string $name Name of the property
      */
-    public function __construct($name) {
+    public function __construct(string $name) {
         $this->name = $name;
     }
 
@@ -28,7 +39,7 @@ class Property extends PhpParser\BuilderAbstract
      * @return $this The builder instance (for fluid interface)
      */
     public function makePublic() {
-        $this->setModifier(Stmt\Class_::MODIFIER_PUBLIC);
+        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_PUBLIC);
 
         return $this;
     }
@@ -39,7 +50,7 @@ class Property extends PhpParser\BuilderAbstract
      * @return $this The builder instance (for fluid interface)
      */
     public function makeProtected() {
-        $this->setModifier(Stmt\Class_::MODIFIER_PROTECTED);
+        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_PROTECTED);
 
         return $this;
     }
@@ -50,7 +61,7 @@ class Property extends PhpParser\BuilderAbstract
      * @return $this The builder instance (for fluid interface)
      */
     public function makePrivate() {
-        $this->setModifier(Stmt\Class_::MODIFIER_PRIVATE);
+        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_PRIVATE);
 
         return $this;
     }
@@ -61,7 +72,18 @@ class Property extends PhpParser\BuilderAbstract
      * @return $this The builder instance (for fluid interface)
      */
     public function makeStatic() {
-        $this->setModifier(Stmt\Class_::MODIFIER_STATIC);
+        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_STATIC);
+
+        return $this;
+    }
+
+    /**
+     * Makes the property readonly.
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function makeReadonly() {
+        $this->flags = BuilderHelpers::addModifier($this->flags, Stmt\Class_::MODIFIER_READONLY);
 
         return $this;
     }
@@ -74,7 +96,7 @@ class Property extends PhpParser\BuilderAbstract
      * @return $this The builder instance (for fluid interface)
      */
     public function setDefault($value) {
-        $this->default = $this->normalizeValue($value);
+        $this->default = BuilderHelpers::normalizeValue($value);
 
         return $this;
     }
@@ -87,9 +109,35 @@ class Property extends PhpParser\BuilderAbstract
      * @return $this The builder instance (for fluid interface)
      */
     public function setDocComment($docComment) {
-        $this->attributes = array(
-            'comments' => array($this->normalizeDocComment($docComment))
-        );
+        $this->attributes = [
+            'comments' => [BuilderHelpers::normalizeDocComment($docComment)]
+        ];
+
+        return $this;
+    }
+
+    /**
+     * Sets the property type for PHP 7.4+.
+     *
+     * @param string|Name|Identifier|ComplexType $type
+     *
+     * @return $this
+     */
+    public function setType($type) {
+        $this->type = BuilderHelpers::normalizeType($type);
+
+        return $this;
+    }
+
+    /**
+     * Adds an attribute group.
+     *
+     * @param Node\Attribute|Node\AttributeGroup $attribute
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function addAttribute($attribute) {
+        $this->attributeGroups[] = BuilderHelpers::normalizeAttribute($attribute);
 
         return $this;
     }
@@ -99,13 +147,15 @@ class Property extends PhpParser\BuilderAbstract
      *
      * @return Stmt\Property The built property node
      */
-    public function getNode() {
+    public function getNode() : PhpParser\Node {
         return new Stmt\Property(
             $this->flags !== 0 ? $this->flags : Stmt\Class_::MODIFIER_PUBLIC,
-            array(
+            [
                 new Stmt\PropertyProperty($this->name, $this->default)
-            ),
-            $this->attributes
+            ],
+            $this->attributes,
+            $this->type,
+            $this->attributeGroups
         );
     }
-}
\ No newline at end of file
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Builder/TraitUse.php b/lib/nikic/php-parser/lib/PhpParser/Builder/TraitUse.php
new file mode 100644
index 000000000..311e8cd7b
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Builder/TraitUse.php
@@ -0,0 +1,64 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Builder;
+
+use PhpParser\Builder;
+use PhpParser\BuilderHelpers;
+use PhpParser\Node;
+use PhpParser\Node\Stmt;
+
+class TraitUse implements Builder
+{
+    protected $traits = [];
+    protected $adaptations = [];
+
+    /**
+     * Creates a trait use builder.
+     *
+     * @param Node\Name|string ...$traits Names of used traits
+     */
+    public function __construct(...$traits) {
+        foreach ($traits as $trait) {
+            $this->and($trait);
+        }
+    }
+
+    /**
+     * Adds used trait.
+     *
+     * @param Node\Name|string $trait Trait name
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function and($trait) {
+        $this->traits[] = BuilderHelpers::normalizeName($trait);
+        return $this;
+    }
+
+    /**
+     * Adds trait adaptation.
+     *
+     * @param Stmt\TraitUseAdaptation|Builder\TraitUseAdaptation $adaptation Trait adaptation
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function with($adaptation) {
+        $adaptation = BuilderHelpers::normalizeNode($adaptation);
+
+        if (!$adaptation instanceof Stmt\TraitUseAdaptation) {
+            throw new \LogicException('Adaptation must have type TraitUseAdaptation');
+        }
+
+        $this->adaptations[] = $adaptation;
+        return $this;
+    }
+
+    /**
+     * Returns the built node.
+     *
+     * @return Node The built node
+     */
+    public function getNode() : Node {
+        return new Stmt\TraitUse($this->traits, $this->adaptations);
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Builder/TraitUseAdaptation.php b/lib/nikic/php-parser/lib/PhpParser/Builder/TraitUseAdaptation.php
new file mode 100644
index 000000000..eb6c0b622
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Builder/TraitUseAdaptation.php
@@ -0,0 +1,148 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Builder;
+
+use PhpParser\Builder;
+use PhpParser\BuilderHelpers;
+use PhpParser\Node;
+use PhpParser\Node\Stmt;
+
+class TraitUseAdaptation implements Builder
+{
+    const TYPE_UNDEFINED  = 0;
+    const TYPE_ALIAS      = 1;
+    const TYPE_PRECEDENCE = 2;
+
+    /** @var int Type of building adaptation */
+    protected $type;
+
+    protected $trait;
+    protected $method;
+
+    protected $modifier = null;
+    protected $alias = null;
+
+    protected $insteadof = [];
+
+    /**
+     * Creates a trait use adaptation builder.
+     *
+     * @param Node\Name|string|null  $trait  Name of adaptated trait
+     * @param Node\Identifier|string $method Name of adaptated method
+     */
+    public function __construct($trait, $method) {
+        $this->type = self::TYPE_UNDEFINED;
+
+        $this->trait = is_null($trait)? null: BuilderHelpers::normalizeName($trait);
+        $this->method = BuilderHelpers::normalizeIdentifier($method);
+    }
+
+    /**
+     * Sets alias of method.
+     *
+     * @param Node\Identifier|string $alias Alias for adaptated method
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function as($alias) {
+        if ($this->type === self::TYPE_UNDEFINED) {
+            $this->type = self::TYPE_ALIAS;
+        }
+
+        if ($this->type !== self::TYPE_ALIAS) {
+            throw new \LogicException('Cannot set alias for not alias adaptation buider');
+        }
+
+        $this->alias = $alias;
+        return $this;
+    }
+
+    /**
+     * Sets adaptated method public.
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function makePublic() {
+        $this->setModifier(Stmt\Class_::MODIFIER_PUBLIC);
+        return $this;
+    }
+
+    /**
+     * Sets adaptated method protected.
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function makeProtected() {
+        $this->setModifier(Stmt\Class_::MODIFIER_PROTECTED);
+        return $this;
+    }
+
+    /**
+     * Sets adaptated method private.
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function makePrivate() {
+        $this->setModifier(Stmt\Class_::MODIFIER_PRIVATE);
+        return $this;
+    }
+
+    /**
+     * Adds overwritten traits.
+     *
+     * @param Node\Name|string ...$traits Traits for overwrite
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function insteadof(...$traits) {
+        if ($this->type === self::TYPE_UNDEFINED) {
+            if (is_null($this->trait)) {
+                throw new \LogicException('Precedence adaptation must have trait');
+            }
+
+            $this->type = self::TYPE_PRECEDENCE;
+        }
+
+        if ($this->type !== self::TYPE_PRECEDENCE) {
+            throw new \LogicException('Cannot add overwritten traits for not precedence adaptation buider');
+        }
+
+        foreach ($traits as $trait) {
+            $this->insteadof[] = BuilderHelpers::normalizeName($trait);
+        }
+
+        return $this;
+    }
+
+    protected function setModifier(int $modifier) {
+        if ($this->type === self::TYPE_UNDEFINED) {
+            $this->type = self::TYPE_ALIAS;
+        }
+
+        if ($this->type !== self::TYPE_ALIAS) {
+            throw new \LogicException('Cannot set access modifier for not alias adaptation buider');
+        }
+
+        if (is_null($this->modifier)) {
+            $this->modifier = $modifier;
+        } else {
+            throw new \LogicException('Multiple access type modifiers are not allowed');
+        }
+    }
+
+    /**
+     * Returns the built node.
+     *
+     * @return Node The built node
+     */
+    public function getNode() : Node {
+        switch ($this->type) {
+            case self::TYPE_ALIAS:
+                return new Stmt\TraitUseAdaptation\Alias($this->trait, $this->method, $this->modifier, $this->alias);
+            case self::TYPE_PRECEDENCE:
+                return new Stmt\TraitUseAdaptation\Precedence($this->trait, $this->method, $this->insteadof);
+            default:
+                throw new \LogicException('Type of adaptation is not defined');
+        }
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Builder/Trait_.php b/lib/nikic/php-parser/lib/PhpParser/Builder/Trait_.php
index 7b004fa96..97f32f98d 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Builder/Trait_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Builder/Trait_.php
@@ -1,23 +1,28 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Builder;
 
 use PhpParser;
+use PhpParser\BuilderHelpers;
+use PhpParser\Node;
 use PhpParser\Node\Stmt;
 
 class Trait_ extends Declaration
 {
     protected $name;
-    protected $uses = array();
-    protected $properties = array();
-    protected $methods = array();
+    protected $uses = [];
+    protected $properties = [];
+    protected $methods = [];
+
+    /** @var Node\AttributeGroup[] */
+    protected $attributeGroups = [];
 
     /**
      * Creates an interface builder.
      *
      * @param string $name Name of the interface
      */
-    public function __construct($name) {
+    public function __construct(string $name) {
         $this->name = $name;
     }
 
@@ -29,13 +34,13 @@ class Trait_ extends Declaration
      * @return $this The builder instance (for fluid interface)
      */
     public function addStmt($stmt) {
-        $stmt = $this->normalizeNode($stmt);
+        $stmt = BuilderHelpers::normalizeNode($stmt);
 
         if ($stmt instanceof Stmt\Property) {
             $this->properties[] = $stmt;
-        } else if ($stmt instanceof Stmt\ClassMethod) {
+        } elseif ($stmt instanceof Stmt\ClassMethod) {
             $this->methods[] = $stmt;
-        } else if ($stmt instanceof Stmt\TraitUse) {
+        } elseif ($stmt instanceof Stmt\TraitUse) {
             $this->uses[] = $stmt;
         } else {
             throw new \LogicException(sprintf('Unexpected node of type "%s"', $stmt->getType()));
@@ -44,16 +49,30 @@ class Trait_ extends Declaration
         return $this;
     }
 
+    /**
+     * Adds an attribute group.
+     *
+     * @param Node\Attribute|Node\AttributeGroup $attribute
+     *
+     * @return $this The builder instance (for fluid interface)
+     */
+    public function addAttribute($attribute) {
+        $this->attributeGroups[] = BuilderHelpers::normalizeAttribute($attribute);
+
+        return $this;
+    }
+
     /**
      * Returns the built trait node.
      *
      * @return Stmt\Trait_ The built interface node
      */
-    public function getNode() {
+    public function getNode() : PhpParser\Node {
         return new Stmt\Trait_(
-            $this->name, array(
-                'stmts' => array_merge($this->uses, $this->properties, $this->methods)
-            ), $this->attributes
+            $this->name, [
+                'stmts' => array_merge($this->uses, $this->properties, $this->methods),
+                'attrGroups' => $this->attributeGroups,
+            ], $this->attributes
         );
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Builder/Use_.php b/lib/nikic/php-parser/lib/PhpParser/Builder/Use_.php
index f6d3a856f..4bd3d12df 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Builder/Use_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Builder/Use_.php
@@ -1,15 +1,14 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Builder;
 
-use PhpParser\BuilderAbstract;
+use PhpParser\Builder;
+use PhpParser\BuilderHelpers;
 use PhpParser\Node;
 use PhpParser\Node\Stmt;
 
-/**
- * @method $this as(string $alias) Sets alias for used name.
- */
-class Use_ extends BuilderAbstract {
+class Use_ implements Builder
+{
     protected $name;
     protected $type;
     protected $alias = null;
@@ -20,8 +19,8 @@ class Use_ extends BuilderAbstract {
      * @param Node\Name|string $name Name of the entity (namespace, class, function, constant) to alias
      * @param int              $type One of the Stmt\Use_::TYPE_* constants
      */
-    public function __construct($name, $type) {
-        $this->name = $this->normalizeName($name);
+    public function __construct($name, int $type) {
+        $this->name = BuilderHelpers::normalizeName($name);
         $this->type = $type;
     }
 
@@ -32,27 +31,19 @@ class Use_ extends BuilderAbstract {
      *
      * @return $this The builder instance (for fluid interface)
      */
-    protected function as_($alias) {
+    public function as(string $alias) {
         $this->alias = $alias;
         return $this;
     }
-    public function __call($name, $args) {
-        if (method_exists($this, $name . '_')) {
-            return call_user_func_array(array($this, $name . '_'), $args);
-        }
-
-        throw new \LogicException(sprintf('Method "%s" does not exist', $name));
-    }
 
     /**
      * Returns the built node.
      *
-     * @return Node The built node
+     * @return Stmt\Use_ The built node
      */
-    public function getNode() {
-        $alias = null !== $this->alias ? $this->alias : $this->name->getLast();
-        return new Stmt\Use_(array(
-            new Stmt\UseUse($this->name, $alias)
-        ), $this->type);
+    public function getNode() : Node {
+        return new Stmt\Use_([
+            new Stmt\UseUse($this->name, $this->alias)
+        ], $this->type);
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/BuilderAbstract.php b/lib/nikic/php-parser/lib/PhpParser/BuilderAbstract.php
deleted file mode 100644
index e353963e6..000000000
--- a/lib/nikic/php-parser/lib/PhpParser/BuilderAbstract.php
+++ /dev/null
@@ -1,175 +0,0 @@
-<?php
-
-namespace PhpParser;
-
-use PhpParser\Comment;
-use PhpParser\Node\Expr;
-use PhpParser\Node\Name;
-use PhpParser\Node\NullableType;
-use PhpParser\Node\Scalar;
-use PhpParser\Node\Stmt;
-
-abstract class BuilderAbstract implements Builder {
-    /**
-     * Normalizes a node: Converts builder objects to nodes.
-     *
-     * @param Node|Builder $node The node to normalize
-     *
-     * @return Node The normalized node
-     */
-    protected function normalizeNode($node) {
-        if ($node instanceof Builder) {
-            return $node->getNode();
-        } elseif ($node instanceof Node) {
-            return $node;
-        }
-
-        throw new \LogicException('Expected node or builder object');
-    }
-
-    /**
-     * Normalizes a name: Converts plain string names to PhpParser\Node\Name.
-     *
-     * @param Name|string $name The name to normalize
-     *
-     * @return Name The normalized name
-     */
-    protected function normalizeName($name) {
-        if ($name instanceof Name) {
-            return $name;
-        } elseif (is_string($name)) {
-            if (!$name) {
-                throw new \LogicException('Name cannot be empty');
-            }
-
-            if ($name[0] == '\\') {
-                return new Name\FullyQualified(substr($name, 1));
-            } elseif (0 === strpos($name, 'namespace\\')) {
-                return new Name\Relative(substr($name, strlen('namespace\\')));
-            } else {
-                return new Name($name);
-            }
-        }
-
-        throw new \LogicException('Name must be a string or an instance of PhpParser\Node\Name');
-    }
-
-    /**
-     * Normalizes a type: Converts plain-text type names into proper AST representation.
-     *
-     * In particular, builtin types are left as strings, custom types become Names and nullables
-     * are wrapped in NullableType nodes.
-     *
-     * @param Name|string|NullableType $type The type to normalize
-     *
-     * @return Name|string|NullableType The normalized type
-     */
-    protected function normalizeType($type) {
-        if (!is_string($type)) {
-            if (!$type instanceof Name && !$type instanceof NullableType) {
-                throw new \LogicException(
-                    'Type must be a string, or an instance of Name or NullableType');
-            }
-            return $type;
-        }
-
-        $nullable = false;
-        if (strlen($type) > 0 && $type[0] === '?') {
-            $nullable = true;
-            $type = substr($type, 1);
-        }
-
-        $builtinTypes = array(
-            'array', 'callable', 'string', 'int', 'float', 'bool', 'iterable', 'void', 'object'
-        );
-
-        $lowerType = strtolower($type);
-        if (in_array($lowerType, $builtinTypes)) {
-            $type = $lowerType;
-        } else {
-            $type = $this->normalizeName($type);
-        }
-
-        if ($nullable && $type === 'void') {
-            throw new \LogicException('void type cannot be nullable');
-        }
-
-        return $nullable ? new Node\NullableType($type) : $type;
-    }
-
-    /**
-     * Normalizes a value: Converts nulls, booleans, integers,
-     * floats, strings and arrays into their respective nodes
-     *
-     * @param mixed $value The value to normalize
-     *
-     * @return Expr The normalized value
-     */
-    protected function normalizeValue($value) {
-        if ($value instanceof Node) {
-            return $value;
-        } elseif (is_null($value)) {
-            return new Expr\ConstFetch(
-                new Name('null')
-            );
-        } elseif (is_bool($value)) {
-            return new Expr\ConstFetch(
-                new Name($value ? 'true' : 'false')
-            );
-        } elseif (is_int($value)) {
-            return new Scalar\LNumber($value);
-        } elseif (is_float($value)) {
-            return new Scalar\DNumber($value);
-        } elseif (is_string($value)) {
-            return new Scalar\String_($value);
-        } elseif (is_array($value)) {
-            $items = array();
-            $lastKey = -1;
-            foreach ($value as $itemKey => $itemValue) {
-                // for consecutive, numeric keys don't generate keys
-                if (null !== $lastKey && ++$lastKey === $itemKey) {
-                    $items[] = new Expr\ArrayItem(
-                        $this->normalizeValue($itemValue)
-                    );
-                } else {
-                    $lastKey = null;
-                    $items[] = new Expr\ArrayItem(
-                        $this->normalizeValue($itemValue),
-                        $this->normalizeValue($itemKey)
-                    );
-                }
-            }
-
-            return new Expr\Array_($items);
-        } else {
-            throw new \LogicException('Invalid value');
-        }
-    }
-
-    /**
-     * Normalizes a doc comment: Converts plain strings to PhpParser\Comment\Doc.
-     *
-     * @param Comment\Doc|string $docComment The doc comment to normalize
-     *
-     * @return Comment\Doc The normalized doc comment
-     */
-    protected function normalizeDocComment($docComment) {
-        if ($docComment instanceof Comment\Doc) {
-            return $docComment;
-        } else if (is_string($docComment)) {
-            return new Comment\Doc($docComment);
-        } else {
-            throw new \LogicException('Doc comment must be a string or an instance of PhpParser\Comment\Doc');
-        }
-    }
-
-    /**
-     * Sets a modifier in the $this->type property.
-     *
-     * @param int $modifier Modifier to set
-     */
-    protected function setModifier($modifier) {
-        Stmt\Class_::verifyModifier($this->flags, $modifier);
-        $this->flags |= $modifier;
-    }
-}
diff --git a/lib/nikic/php-parser/lib/PhpParser/BuilderFactory.php b/lib/nikic/php-parser/lib/PhpParser/BuilderFactory.php
index 42c7f612c..fef2579b3 100644
--- a/lib/nikic/php-parser/lib/PhpParser/BuilderFactory.php
+++ b/lib/nikic/php-parser/lib/PhpParser/BuilderFactory.php
@@ -1,23 +1,32 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser;
 
-use PhpParser\Builder;
+use PhpParser\Node\Arg;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\BinaryOp\Concat;
+use PhpParser\Node\Identifier;
+use PhpParser\Node\Name;
+use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\Use_;
 
-/**
- * The following methods use reserved keywords, so their implementation is defined with an underscore and made available
- * with the reserved name through __call() magic.
- *
- * @method Builder\Namespace_ namespace(string $name) Creates a namespace builder.
- * @method Builder\Class_     class(string $name)     Creates a class builder.
- * @method Builder\Interface_ interface(string $name) Creates an interface builder.
- * @method Builder\Trait_     trait(string $name)     Creates a trait builder.
- * @method Builder\Function_  function(string $name)  Creates a function builder.
- * @method Builder\Use_       use(string $name)       Creates a namespace/class use builder.
- */
 class BuilderFactory
 {
+    /**
+     * Creates an attribute node.
+     *
+     * @param string|Name $name Name of the attribute
+     * @param array       $args Attribute named arguments
+     *
+     * @return Node\Attribute
+     */
+    public function attribute($name, array $args = []) : Node\Attribute {
+        return new Node\Attribute(
+            BuilderHelpers::normalizeName($name),
+            $this->args($args)
+        );
+    }
+
     /**
      * Creates a namespace builder.
      *
@@ -25,7 +34,7 @@ class BuilderFactory
      *
      * @return Builder\Namespace_ The created namespace builder
      */
-    protected function _namespace($name) {
+    public function namespace($name) : Builder\Namespace_ {
         return new Builder\Namespace_($name);
     }
 
@@ -36,7 +45,7 @@ class BuilderFactory
      *
      * @return Builder\Class_ The created class builder
      */
-    protected function _class($name) {
+    public function class(string $name) : Builder\Class_ {
         return new Builder\Class_($name);
     }
 
@@ -47,7 +56,7 @@ class BuilderFactory
      *
      * @return Builder\Interface_ The created interface builder
      */
-    protected function _interface($name) {
+    public function interface(string $name) : Builder\Interface_ {
         return new Builder\Interface_($name);
     }
 
@@ -58,10 +67,49 @@ class BuilderFactory
      *
      * @return Builder\Trait_ The created trait builder
      */
-    protected function _trait($name) {
+    public function trait(string $name) : Builder\Trait_ {
         return new Builder\Trait_($name);
     }
 
+    /**
+     * Creates an enum builder.
+     *
+     * @param string $name Name of the enum
+     *
+     * @return Builder\Enum_ The created enum builder
+     */
+    public function enum(string $name) : Builder\Enum_ {
+        return new Builder\Enum_($name);
+    }
+
+    /**
+     * Creates a trait use builder.
+     *
+     * @param Node\Name|string ...$traits Trait names
+     *
+     * @return Builder\TraitUse The create trait use builder
+     */
+    public function useTrait(...$traits) : Builder\TraitUse {
+        return new Builder\TraitUse(...$traits);
+    }
+
+    /**
+     * Creates a trait use adaptation builder.
+     *
+     * @param Node\Name|string|null  $trait  Trait name
+     * @param Node\Identifier|string $method Method name
+     *
+     * @return Builder\TraitUseAdaptation The create trait use adaptation builder
+     */
+    public function traitUseAdaptation($trait, $method = null) : Builder\TraitUseAdaptation {
+        if ($method === null) {
+            $method = $trait;
+            $trait = null;
+        }
+
+        return new Builder\TraitUseAdaptation($trait, $method);
+    }
+
     /**
      * Creates a method builder.
      *
@@ -69,7 +117,7 @@ class BuilderFactory
      *
      * @return Builder\Method The created method builder
      */
-    public function method($name) {
+    public function method(string $name) : Builder\Method {
         return new Builder\Method($name);
     }
 
@@ -80,7 +128,7 @@ class BuilderFactory
      *
      * @return Builder\Param The created parameter builder
      */
-    public function param($name) {
+    public function param(string $name) : Builder\Param {
         return new Builder\Param($name);
     }
 
@@ -91,7 +139,7 @@ class BuilderFactory
      *
      * @return Builder\Property The created property builder
      */
-    public function property($name) {
+    public function property(string $name) : Builder\Property {
         return new Builder\Property($name);
     }
 
@@ -102,26 +150,250 @@ class BuilderFactory
      *
      * @return Builder\Function_ The created function builder
      */
-    protected function _function($name) {
+    public function function(string $name) : Builder\Function_ {
         return new Builder\Function_($name);
     }
 
     /**
      * Creates a namespace/class use builder.
      *
-     * @param string|Node\Name Name to alias
+     * @param Node\Name|string $name Name of the entity (namespace or class) to alias
      *
-     * @return Builder\Use_ The create use builder
+     * @return Builder\Use_ The created use builder
      */
-    protected function _use($name) {
+    public function use($name) : Builder\Use_ {
         return new Builder\Use_($name, Use_::TYPE_NORMAL);
     }
 
-    public function __call($name, array $args) {
-        if (method_exists($this, '_' . $name)) {
-            return call_user_func_array(array($this, '_' . $name), $args);
+    /**
+     * Creates a function use builder.
+     *
+     * @param Node\Name|string $name Name of the function to alias
+     *
+     * @return Builder\Use_ The created use function builder
+     */
+    public function useFunction($name) : Builder\Use_ {
+        return new Builder\Use_($name, Use_::TYPE_FUNCTION);
+    }
+
+    /**
+     * Creates a constant use builder.
+     *
+     * @param Node\Name|string $name Name of the const to alias
+     *
+     * @return Builder\Use_ The created use const builder
+     */
+    public function useConst($name) : Builder\Use_ {
+        return new Builder\Use_($name, Use_::TYPE_CONSTANT);
+    }
+
+    /**
+     * Creates a class constant builder.
+     *
+     * @param string|Identifier                          $name  Name
+     * @param Node\Expr|bool|null|int|float|string|array $value Value
+     *
+     * @return Builder\ClassConst The created use const builder
+     */
+    public function classConst($name, $value) : Builder\ClassConst {
+        return new Builder\ClassConst($name, $value);
+    }
+
+    /**
+     * Creates an enum case builder.
+     *
+     * @param string|Identifier $name  Name
+     *
+     * @return Builder\EnumCase The created use const builder
+     */
+    public function enumCase($name) : Builder\EnumCase {
+        return new Builder\EnumCase($name);
+    }
+
+    /**
+     * Creates node a for a literal value.
+     *
+     * @param Expr|bool|null|int|float|string|array $value $value
+     *
+     * @return Expr
+     */
+    public function val($value) : Expr {
+        return BuilderHelpers::normalizeValue($value);
+    }
+
+    /**
+     * Creates variable node.
+     *
+     * @param string|Expr $name Name
+     *
+     * @return Expr\Variable
+     */
+    public function var($name) : Expr\Variable {
+        if (!\is_string($name) && !$name instanceof Expr) {
+            throw new \LogicException('Variable name must be string or Expr');
         }
 
-        throw new \LogicException(sprintf('Method "%s" does not exist', $name));
+        return new Expr\Variable($name);
+    }
+
+    /**
+     * Normalizes an argument list.
+     *
+     * Creates Arg nodes for all arguments and converts literal values to expressions.
+     *
+     * @param array $args List of arguments to normalize
+     *
+     * @return Arg[]
+     */
+    public function args(array $args) : array {
+        $normalizedArgs = [];
+        foreach ($args as $key => $arg) {
+            if (!($arg instanceof Arg)) {
+                $arg = new Arg(BuilderHelpers::normalizeValue($arg));
+            }
+            if (\is_string($key)) {
+                $arg->name = BuilderHelpers::normalizeIdentifier($key);
+            }
+            $normalizedArgs[] = $arg;
+        }
+        return $normalizedArgs;
+    }
+
+    /**
+     * Creates a function call node.
+     *
+     * @param string|Name|Expr $name Function name
+     * @param array            $args Function arguments
+     *
+     * @return Expr\FuncCall
+     */
+    public function funcCall($name, array $args = []) : Expr\FuncCall {
+        return new Expr\FuncCall(
+            BuilderHelpers::normalizeNameOrExpr($name),
+            $this->args($args)
+        );
+    }
+
+    /**
+     * Creates a method call node.
+     *
+     * @param Expr                   $var  Variable the method is called on
+     * @param string|Identifier|Expr $name Method name
+     * @param array                  $args Method arguments
+     *
+     * @return Expr\MethodCall
+     */
+    public function methodCall(Expr $var, $name, array $args = []) : Expr\MethodCall {
+        return new Expr\MethodCall(
+            $var,
+            BuilderHelpers::normalizeIdentifierOrExpr($name),
+            $this->args($args)
+        );
+    }
+
+    /**
+     * Creates a static method call node.
+     *
+     * @param string|Name|Expr       $class Class name
+     * @param string|Identifier|Expr $name  Method name
+     * @param array                  $args  Method arguments
+     *
+     * @return Expr\StaticCall
+     */
+    public function staticCall($class, $name, array $args = []) : Expr\StaticCall {
+        return new Expr\StaticCall(
+            BuilderHelpers::normalizeNameOrExpr($class),
+            BuilderHelpers::normalizeIdentifierOrExpr($name),
+            $this->args($args)
+        );
+    }
+
+    /**
+     * Creates an object creation node.
+     *
+     * @param string|Name|Expr $class Class name
+     * @param array            $args  Constructor arguments
+     *
+     * @return Expr\New_
+     */
+    public function new($class, array $args = []) : Expr\New_ {
+        return new Expr\New_(
+            BuilderHelpers::normalizeNameOrExpr($class),
+            $this->args($args)
+        );
+    }
+
+    /**
+     * Creates a constant fetch node.
+     *
+     * @param string|Name $name Constant name
+     *
+     * @return Expr\ConstFetch
+     */
+    public function constFetch($name) : Expr\ConstFetch {
+        return new Expr\ConstFetch(BuilderHelpers::normalizeName($name));
+    }
+
+    /**
+     * Creates a property fetch node.
+     *
+     * @param Expr                   $var  Variable holding object
+     * @param string|Identifier|Expr $name Property name
+     *
+     * @return Expr\PropertyFetch
+     */
+    public function propertyFetch(Expr $var, $name) : Expr\PropertyFetch {
+        return new Expr\PropertyFetch($var, BuilderHelpers::normalizeIdentifierOrExpr($name));
+    }
+
+    /**
+     * Creates a class constant fetch node.
+     *
+     * @param string|Name|Expr  $class Class name
+     * @param string|Identifier $name  Constant name
+     *
+     * @return Expr\ClassConstFetch
+     */
+    public function classConstFetch($class, $name): Expr\ClassConstFetch {
+        return new Expr\ClassConstFetch(
+            BuilderHelpers::normalizeNameOrExpr($class),
+            BuilderHelpers::normalizeIdentifier($name)
+        );
+    }
+
+    /**
+     * Creates nested Concat nodes from a list of expressions.
+     *
+     * @param Expr|string ...$exprs Expressions or literal strings
+     *
+     * @return Concat
+     */
+    public function concat(...$exprs) : Concat {
+        $numExprs = count($exprs);
+        if ($numExprs < 2) {
+            throw new \LogicException('Expected at least two expressions');
+        }
+
+        $lastConcat = $this->normalizeStringExpr($exprs[0]);
+        for ($i = 1; $i < $numExprs; $i++) {
+            $lastConcat = new Concat($lastConcat, $this->normalizeStringExpr($exprs[$i]));
+        }
+        return $lastConcat;
+    }
+
+    /**
+     * @param string|Expr $expr
+     * @return Expr
+     */
+    private function normalizeStringExpr($expr) : Expr {
+        if ($expr instanceof Expr) {
+            return $expr;
+        }
+
+        if (\is_string($expr)) {
+            return new String_($expr);
+        }
+
+        throw new \LogicException('Expected string or Expr');
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/BuilderHelpers.php b/lib/nikic/php-parser/lib/PhpParser/BuilderHelpers.php
new file mode 100644
index 000000000..2f0e91273
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/BuilderHelpers.php
@@ -0,0 +1,313 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser;
+
+use PhpParser\Node\ComplexType;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Identifier;
+use PhpParser\Node\Name;
+use PhpParser\Node\NullableType;
+use PhpParser\Node\Scalar;
+use PhpParser\Node\Stmt;
+
+/**
+ * This class defines helpers used in the implementation of builders. Don't use it directly.
+ *
+ * @internal
+ */
+final class BuilderHelpers
+{
+    /**
+     * Normalizes a node: Converts builder objects to nodes.
+     *
+     * @param Node|Builder $node The node to normalize
+     *
+     * @return Node The normalized node
+     */
+    public static function normalizeNode($node) : Node {
+        if ($node instanceof Builder) {
+            return $node->getNode();
+        }
+
+        if ($node instanceof Node) {
+            return $node;
+        }
+
+        throw new \LogicException('Expected node or builder object');
+    }
+
+    /**
+     * Normalizes a node to a statement.
+     *
+     * Expressions are wrapped in a Stmt\Expression node.
+     *
+     * @param Node|Builder $node The node to normalize
+     *
+     * @return Stmt The normalized statement node
+     */
+    public static function normalizeStmt($node) : Stmt {
+        $node = self::normalizeNode($node);
+        if ($node instanceof Stmt) {
+            return $node;
+        }
+
+        if ($node instanceof Expr) {
+            return new Stmt\Expression($node);
+        }
+
+        throw new \LogicException('Expected statement or expression node');
+    }
+
+    /**
+     * Normalizes strings to Identifier.
+     *
+     * @param string|Identifier $name The identifier to normalize
+     *
+     * @return Identifier The normalized identifier
+     */
+    public static function normalizeIdentifier($name) : Identifier {
+        if ($name instanceof Identifier) {
+            return $name;
+        }
+
+        if (\is_string($name)) {
+            return new Identifier($name);
+        }
+
+        throw new \LogicException('Expected string or instance of Node\Identifier');
+    }
+
+    /**
+     * Normalizes strings to Identifier, also allowing expressions.
+     *
+     * @param string|Identifier|Expr $name The identifier to normalize
+     *
+     * @return Identifier|Expr The normalized identifier or expression
+     */
+    public static function normalizeIdentifierOrExpr($name) {
+        if ($name instanceof Identifier || $name instanceof Expr) {
+            return $name;
+        }
+
+        if (\is_string($name)) {
+            return new Identifier($name);
+        }
+
+        throw new \LogicException('Expected string or instance of Node\Identifier or Node\Expr');
+    }
+
+    /**
+     * Normalizes a name: Converts string names to Name nodes.
+     *
+     * @param Name|string $name The name to normalize
+     *
+     * @return Name The normalized name
+     */
+    public static function normalizeName($name) : Name {
+        if ($name instanceof Name) {
+            return $name;
+        }
+
+        if (is_string($name)) {
+            if (!$name) {
+                throw new \LogicException('Name cannot be empty');
+            }
+
+            if ($name[0] === '\\') {
+                return new Name\FullyQualified(substr($name, 1));
+            }
+
+            if (0 === strpos($name, 'namespace\\')) {
+                return new Name\Relative(substr($name, strlen('namespace\\')));
+            }
+
+            return new Name($name);
+        }
+
+        throw new \LogicException('Name must be a string or an instance of Node\Name');
+    }
+
+    /**
+     * Normalizes a name: Converts string names to Name nodes, while also allowing expressions.
+     *
+     * @param Expr|Name|string $name The name to normalize
+     *
+     * @return Name|Expr The normalized name or expression
+     */
+    public static function normalizeNameOrExpr($name) {
+        if ($name instanceof Expr) {
+            return $name;
+        }
+
+        if (!is_string($name) && !($name instanceof Name)) {
+            throw new \LogicException(
+                'Name must be a string or an instance of Node\Name or Node\Expr'
+            );
+        }
+
+        return self::normalizeName($name);
+    }
+
+    /**
+     * Normalizes a type: Converts plain-text type names into proper AST representation.
+     *
+     * In particular, builtin types become Identifiers, custom types become Names and nullables
+     * are wrapped in NullableType nodes.
+     *
+     * @param string|Name|Identifier|ComplexType $type The type to normalize
+     *
+     * @return Name|Identifier|ComplexType The normalized type
+     */
+    public static function normalizeType($type) {
+        if (!is_string($type)) {
+            if (
+                !$type instanceof Name && !$type instanceof Identifier &&
+                !$type instanceof ComplexType
+            ) {
+                throw new \LogicException(
+                    'Type must be a string, or an instance of Name, Identifier or ComplexType'
+                );
+            }
+            return $type;
+        }
+
+        $nullable = false;
+        if (strlen($type) > 0 && $type[0] === '?') {
+            $nullable = true;
+            $type = substr($type, 1);
+        }
+
+        $builtinTypes = [
+            'array', 'callable', 'string', 'int', 'float', 'bool', 'iterable', 'void', 'object', 'mixed', 'never',
+        ];
+
+        $lowerType = strtolower($type);
+        if (in_array($lowerType, $builtinTypes)) {
+            $type = new Identifier($lowerType);
+        } else {
+            $type = self::normalizeName($type);
+        }
+
+        $notNullableTypes = [
+            'void', 'mixed', 'never',
+        ];
+        if ($nullable && in_array((string) $type, $notNullableTypes)) {
+            throw new \LogicException(sprintf('%s type cannot be nullable', $type));
+        }
+
+        return $nullable ? new NullableType($type) : $type;
+    }
+
+    /**
+     * Normalizes a value: Converts nulls, booleans, integers,
+     * floats, strings and arrays into their respective nodes
+     *
+     * @param Node\Expr|bool|null|int|float|string|array $value The value to normalize
+     *
+     * @return Expr The normalized value
+     */
+    public static function normalizeValue($value) : Expr {
+        if ($value instanceof Node\Expr) {
+            return $value;
+        }
+
+        if (is_null($value)) {
+            return new Expr\ConstFetch(
+                new Name('null')
+            );
+        }
+
+        if (is_bool($value)) {
+            return new Expr\ConstFetch(
+                new Name($value ? 'true' : 'false')
+            );
+        }
+
+        if (is_int($value)) {
+            return new Scalar\LNumber($value);
+        }
+
+        if (is_float($value)) {
+            return new Scalar\DNumber($value);
+        }
+
+        if (is_string($value)) {
+            return new Scalar\String_($value);
+        }
+
+        if (is_array($value)) {
+            $items = [];
+            $lastKey = -1;
+            foreach ($value as $itemKey => $itemValue) {
+                // for consecutive, numeric keys don't generate keys
+                if (null !== $lastKey && ++$lastKey === $itemKey) {
+                    $items[] = new Expr\ArrayItem(
+                        self::normalizeValue($itemValue)
+                    );
+                } else {
+                    $lastKey = null;
+                    $items[] = new Expr\ArrayItem(
+                        self::normalizeValue($itemValue),
+                        self::normalizeValue($itemKey)
+                    );
+                }
+            }
+
+            return new Expr\Array_($items);
+        }
+
+        throw new \LogicException('Invalid value');
+    }
+
+    /**
+     * Normalizes a doc comment: Converts plain strings to PhpParser\Comment\Doc.
+     *
+     * @param Comment\Doc|string $docComment The doc comment to normalize
+     *
+     * @return Comment\Doc The normalized doc comment
+     */
+    public static function normalizeDocComment($docComment) : Comment\Doc {
+        if ($docComment instanceof Comment\Doc) {
+            return $docComment;
+        }
+
+        if (is_string($docComment)) {
+            return new Comment\Doc($docComment);
+        }
+
+        throw new \LogicException('Doc comment must be a string or an instance of PhpParser\Comment\Doc');
+    }
+
+    /**
+     * Normalizes a attribute: Converts attribute to the Attribute Group if needed.
+     *
+     * @param Node\Attribute|Node\AttributeGroup $attribute
+     *
+     * @return Node\AttributeGroup The Attribute Group
+     */
+    public static function normalizeAttribute($attribute) : Node\AttributeGroup
+    {
+        if ($attribute instanceof Node\AttributeGroup) {
+            return $attribute;
+        }
+
+        if (!($attribute instanceof Node\Attribute)) {
+            throw new \LogicException('Attribute must be an instance of PhpParser\Node\Attribute or PhpParser\Node\AttributeGroup');
+        }
+
+        return new Node\AttributeGroup([$attribute]);
+    }
+
+    /**
+     * Adds a modifier and returns new modifier bitmask.
+     *
+     * @param int $modifiers Existing modifiers
+     * @param int $modifier  Modifier to set
+     *
+     * @return int New modifiers
+     */
+    public static function addModifier(int $modifiers, int $modifier) : int {
+        Stmt\Class_::verifyModifier($modifiers, $modifier);
+        return $modifiers | $modifier;
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Comment.php b/lib/nikic/php-parser/lib/PhpParser/Comment.php
index 4034cfa6b..61e98d3dc 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Comment.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Comment.php
@@ -1,24 +1,37 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser;
 
 class Comment implements \JsonSerializable
 {
     protected $text;
-    protected $line;
-    protected $filePos;
+    protected $startLine;
+    protected $startFilePos;
+    protected $startTokenPos;
+    protected $endLine;
+    protected $endFilePos;
+    protected $endTokenPos;
 
     /**
      * Constructs a comment node.
      *
-     * @param string $text         Comment text (including comment delimiters like /*)
-     * @param int    $startLine    Line number the comment started on
-     * @param int    $startFilePos File offset the comment started on
+     * @param string $text          Comment text (including comment delimiters like /*)
+     * @param int    $startLine     Line number the comment started on
+     * @param int    $startFilePos  File offset the comment started on
+     * @param int    $startTokenPos Token offset the comment started on
      */
-    public function __construct($text, $startLine = -1, $startFilePos = -1) {
+    public function __construct(
+        string $text,
+        int $startLine = -1, int $startFilePos = -1, int $startTokenPos = -1,
+        int $endLine = -1, int $endFilePos = -1, int $endTokenPos = -1
+    ) {
         $this->text = $text;
-        $this->line = $startLine;
-        $this->filePos = $startFilePos;
+        $this->startLine = $startLine;
+        $this->startFilePos = $startFilePos;
+        $this->startTokenPos = $startTokenPos;
+        $this->endLine = $endLine;
+        $this->endFilePos = $endFilePos;
+        $this->endTokenPos = $endTokenPos;
     }
 
     /**
@@ -26,26 +39,95 @@ class Comment implements \JsonSerializable
      *
      * @return string The comment text (including comment delimiters like /*)
      */
-    public function getText() {
+    public function getText() : string {
         return $this->text;
     }
 
     /**
      * Gets the line number the comment started on.
      *
-     * @return int Line number
+     * @return int Line number (or -1 if not available)
      */
-    public function getLine() {
-        return $this->line;
+    public function getStartLine() : int {
+        return $this->startLine;
     }
 
     /**
      * Gets the file offset the comment started on.
      *
+     * @return int File offset (or -1 if not available)
+     */
+    public function getStartFilePos() : int {
+        return $this->startFilePos;
+    }
+
+    /**
+     * Gets the token offset the comment started on.
+     *
+     * @return int Token offset (or -1 if not available)
+     */
+    public function getStartTokenPos() : int {
+        return $this->startTokenPos;
+    }
+
+    /**
+     * Gets the line number the comment ends on.
+     *
+     * @return int Line number (or -1 if not available)
+     */
+    public function getEndLine() : int {
+        return $this->endLine;
+    }
+
+    /**
+     * Gets the file offset the comment ends on.
+     *
+     * @return int File offset (or -1 if not available)
+     */
+    public function getEndFilePos() : int {
+        return $this->endFilePos;
+    }
+
+    /**
+     * Gets the token offset the comment ends on.
+     *
+     * @return int Token offset (or -1 if not available)
+     */
+    public function getEndTokenPos() : int {
+        return $this->endTokenPos;
+    }
+
+    /**
+     * Gets the line number the comment started on.
+     *
+     * @deprecated Use getStartLine() instead
+     *
+     * @return int Line number
+     */
+    public function getLine() : int {
+        return $this->startLine;
+    }
+
+    /**
+     * Gets the file offset the comment started on.
+     *
+     * @deprecated Use getStartFilePos() instead
+     *
      * @return int File offset
      */
-    public function getFilePos() {
-        return $this->filePos;
+    public function getFilePos() : int {
+        return $this->startFilePos;
+    }
+
+    /**
+     * Gets the token offset the comment started on.
+     *
+     * @deprecated Use getStartTokenPos() instead
+     *
+     * @return int Token offset
+     */
+    public function getTokenPos() : int {
+        return $this->startTokenPos;
     }
 
     /**
@@ -53,7 +135,7 @@ class Comment implements \JsonSerializable
      *
      * @return string The comment text (including comment delimiters like /*)
      */
-    public function __toString() {
+    public function __toString() : string {
         return $this->text;
     }
 
@@ -114,9 +196,17 @@ class Comment implements \JsonSerializable
         return $text;
     }
 
-    private function getShortestWhitespacePrefixLen($str) {
+    /**
+     * Get length of shortest whitespace prefix (at the start of a line).
+     *
+     * If there is a line with no prefix whitespace, 0 is a valid return value.
+     *
+     * @param string $str String to check
+     * @return int Length in characters. Tabs count as single characters.
+     */
+    private function getShortestWhitespacePrefixLen(string $str) : int {
         $lines = explode("\n", $str);
-        $shortestPrefixLen = INF;
+        $shortestPrefixLen = \INF;
         foreach ($lines as $line) {
             preg_match('(^\s*)', $line, $matches);
             $prefixLen = strlen($matches[0]);
@@ -127,14 +217,23 @@ class Comment implements \JsonSerializable
         return $shortestPrefixLen;
     }
 
-    public function jsonSerialize() {
+    /**
+     * @return       array
+     * @psalm-return array{nodeType:string, text:mixed, line:mixed, filePos:mixed}
+     */
+    public function jsonSerialize() : array {
         // Technically not a node, but we make it look like one anyway
         $type = $this instanceof Comment\Doc ? 'Comment_Doc' : 'Comment';
         return [
             'nodeType' => $type,
             'text' => $this->text,
-            'line' => $this->line,
-            'filePos' => $this->filePos,
+            // TODO: Rename these to include "start".
+            'line' => $this->startLine,
+            'filePos' => $this->startFilePos,
+            'tokenPos' => $this->startTokenPos,
+            'endLine' => $this->endLine,
+            'endFilePos' => $this->endFilePos,
+            'endTokenPos' => $this->endTokenPos,
         ];
     }
-}
\ No newline at end of file
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Comment/Doc.php b/lib/nikic/php-parser/lib/PhpParser/Comment/Doc.php
index 24fc6c9ec..a9db6128f 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Comment/Doc.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Comment/Doc.php
@@ -1,7 +1,7 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Comment;
 
 class Doc extends \PhpParser\Comment
 {
-}
\ No newline at end of file
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/ConstExprEvaluationException.php b/lib/nikic/php-parser/lib/PhpParser/ConstExprEvaluationException.php
new file mode 100644
index 000000000..49c92d595
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/ConstExprEvaluationException.php
@@ -0,0 +1,6 @@
+<?php
+
+namespace PhpParser;
+
+class ConstExprEvaluationException extends \Exception
+{}
diff --git a/lib/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php b/lib/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php
new file mode 100644
index 000000000..7131c3d25
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/ConstExprEvaluator.php
@@ -0,0 +1,229 @@
+<?php
+
+namespace PhpParser;
+
+use function array_merge;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Scalar;
+
+/**
+ * Evaluates constant expressions.
+ *
+ * This evaluator is able to evaluate all constant expressions (as defined by PHP), which can be
+ * evaluated without further context. If a subexpression is not of this type, a user-provided
+ * fallback evaluator is invoked. To support all constant expressions that are also supported by
+ * PHP (and not already handled by this class), the fallback evaluator must be able to handle the
+ * following node types:
+ *
+ *  * All Scalar\MagicConst\* nodes.
+ *  * Expr\ConstFetch nodes. Only null/false/true are already handled by this class.
+ *  * Expr\ClassConstFetch nodes.
+ *
+ * The fallback evaluator should throw ConstExprEvaluationException for nodes it cannot evaluate.
+ *
+ * The evaluation is dependent on runtime configuration in two respects: Firstly, floating
+ * point to string conversions are affected by the precision ini setting. Secondly, they are also
+ * affected by the LC_NUMERIC locale.
+ */
+class ConstExprEvaluator
+{
+    private $fallbackEvaluator;
+
+    /**
+     * Create a constant expression evaluator.
+     *
+     * The provided fallback evaluator is invoked whenever a subexpression cannot be evaluated. See
+     * class doc comment for more information.
+     *
+     * @param callable|null $fallbackEvaluator To call if subexpression cannot be evaluated
+     */
+    public function __construct(callable $fallbackEvaluator = null) {
+        $this->fallbackEvaluator = $fallbackEvaluator ?? function(Expr $expr) {
+            throw new ConstExprEvaluationException(
+                "Expression of type {$expr->getType()} cannot be evaluated"
+            );
+        };
+    }
+
+    /**
+     * Silently evaluates a constant expression into a PHP value.
+     *
+     * Thrown Errors, warnings or notices will be converted into a ConstExprEvaluationException.
+     * The original source of the exception is available through getPrevious().
+     *
+     * If some part of the expression cannot be evaluated, the fallback evaluator passed to the
+     * constructor will be invoked. By default, if no fallback is provided, an exception of type
+     * ConstExprEvaluationException is thrown.
+     *
+     * See class doc comment for caveats and limitations.
+     *
+     * @param Expr $expr Constant expression to evaluate
+     * @return mixed Result of evaluation
+     *
+     * @throws ConstExprEvaluationException if the expression cannot be evaluated or an error occurred
+     */
+    public function evaluateSilently(Expr $expr) {
+        set_error_handler(function($num, $str, $file, $line) {
+            throw new \ErrorException($str, 0, $num, $file, $line);
+        });
+
+        try {
+            return $this->evaluate($expr);
+        } catch (\Throwable $e) {
+            if (!$e instanceof ConstExprEvaluationException) {
+                $e = new ConstExprEvaluationException(
+                    "An error occurred during constant expression evaluation", 0, $e);
+            }
+            throw $e;
+        } finally {
+            restore_error_handler();
+        }
+    }
+
+    /**
+     * Directly evaluates a constant expression into a PHP value.
+     *
+     * May generate Error exceptions, warnings or notices. Use evaluateSilently() to convert these
+     * into a ConstExprEvaluationException.
+     *
+     * If some part of the expression cannot be evaluated, the fallback evaluator passed to the
+     * constructor will be invoked. By default, if no fallback is provided, an exception of type
+     * ConstExprEvaluationException is thrown.
+     *
+     * See class doc comment for caveats and limitations.
+     *
+     * @param Expr $expr Constant expression to evaluate
+     * @return mixed Result of evaluation
+     *
+     * @throws ConstExprEvaluationException if the expression cannot be evaluated
+     */
+    public function evaluateDirectly(Expr $expr) {
+        return $this->evaluate($expr);
+    }
+
+    private function evaluate(Expr $expr) {
+        if ($expr instanceof Scalar\LNumber
+            || $expr instanceof Scalar\DNumber
+            || $expr instanceof Scalar\String_
+        ) {
+            return $expr->value;
+        }
+
+        if ($expr instanceof Expr\Array_) {
+            return $this->evaluateArray($expr);
+        }
+
+        // Unary operators
+        if ($expr instanceof Expr\UnaryPlus) {
+            return +$this->evaluate($expr->expr);
+        }
+        if ($expr instanceof Expr\UnaryMinus) {
+            return -$this->evaluate($expr->expr);
+        }
+        if ($expr instanceof Expr\BooleanNot) {
+            return !$this->evaluate($expr->expr);
+        }
+        if ($expr instanceof Expr\BitwiseNot) {
+            return ~$this->evaluate($expr->expr);
+        }
+
+        if ($expr instanceof Expr\BinaryOp) {
+            return $this->evaluateBinaryOp($expr);
+        }
+
+        if ($expr instanceof Expr\Ternary) {
+            return $this->evaluateTernary($expr);
+        }
+
+        if ($expr instanceof Expr\ArrayDimFetch && null !== $expr->dim) {
+            return $this->evaluate($expr->var)[$this->evaluate($expr->dim)];
+        }
+
+        if ($expr instanceof Expr\ConstFetch) {
+            return $this->evaluateConstFetch($expr);
+        }
+
+        return ($this->fallbackEvaluator)($expr);
+    }
+
+    private function evaluateArray(Expr\Array_ $expr) {
+        $array = [];
+        foreach ($expr->items as $item) {
+            if (null !== $item->key) {
+                $array[$this->evaluate($item->key)] = $this->evaluate($item->value);
+            } elseif ($item->unpack) {
+                $array = array_merge($array, $this->evaluate($item->value));
+            } else {
+                $array[] = $this->evaluate($item->value);
+            }
+        }
+        return $array;
+    }
+
+    private function evaluateTernary(Expr\Ternary $expr) {
+        if (null === $expr->if) {
+            return $this->evaluate($expr->cond) ?: $this->evaluate($expr->else);
+        }
+
+        return $this->evaluate($expr->cond)
+            ? $this->evaluate($expr->if)
+            : $this->evaluate($expr->else);
+    }
+
+    private function evaluateBinaryOp(Expr\BinaryOp $expr) {
+        if ($expr instanceof Expr\BinaryOp\Coalesce
+            && $expr->left instanceof Expr\ArrayDimFetch
+        ) {
+            // This needs to be special cased to respect BP_VAR_IS fetch semantics
+            return $this->evaluate($expr->left->var)[$this->evaluate($expr->left->dim)]
+                ?? $this->evaluate($expr->right);
+        }
+
+        // The evaluate() calls are repeated in each branch, because some of the operators are
+        // short-circuiting and evaluating the RHS in advance may be illegal in that case
+        $l = $expr->left;
+        $r = $expr->right;
+        switch ($expr->getOperatorSigil()) {
+            case '&':   return $this->evaluate($l) &   $this->evaluate($r);
+            case '|':   return $this->evaluate($l) |   $this->evaluate($r);
+            case '^':   return $this->evaluate($l) ^   $this->evaluate($r);
+            case '&&':  return $this->evaluate($l) &&  $this->evaluate($r);
+            case '||':  return $this->evaluate($l) ||  $this->evaluate($r);
+            case '??':  return $this->evaluate($l) ??  $this->evaluate($r);
+            case '.':   return $this->evaluate($l) .   $this->evaluate($r);
+            case '/':   return $this->evaluate($l) /   $this->evaluate($r);
+            case '==':  return $this->evaluate($l) ==  $this->evaluate($r);
+            case '>':   return $this->evaluate($l) >   $this->evaluate($r);
+            case '>=':  return $this->evaluate($l) >=  $this->evaluate($r);
+            case '===': return $this->evaluate($l) === $this->evaluate($r);
+            case 'and': return $this->evaluate($l) and $this->evaluate($r);
+            case 'or':  return $this->evaluate($l) or  $this->evaluate($r);
+            case 'xor': return $this->evaluate($l) xor $this->evaluate($r);
+            case '-':   return $this->evaluate($l) -   $this->evaluate($r);
+            case '%':   return $this->evaluate($l) %   $this->evaluate($r);
+            case '*':   return $this->evaluate($l) *   $this->evaluate($r);
+            case '!=':  return $this->evaluate($l) !=  $this->evaluate($r);
+            case '!==': return $this->evaluate($l) !== $this->evaluate($r);
+            case '+':   return $this->evaluate($l) +   $this->evaluate($r);
+            case '**':  return $this->evaluate($l) **  $this->evaluate($r);
+            case '<<':  return $this->evaluate($l) <<  $this->evaluate($r);
+            case '>>':  return $this->evaluate($l) >>  $this->evaluate($r);
+            case '<':   return $this->evaluate($l) <   $this->evaluate($r);
+            case '<=':  return $this->evaluate($l) <=  $this->evaluate($r);
+            case '<=>': return $this->evaluate($l) <=> $this->evaluate($r);
+        }
+
+        throw new \Exception('Should not happen');
+    }
+
+    private function evaluateConstFetch(Expr\ConstFetch $expr) {
+        $name = $expr->name->toLowerString();
+        switch ($name) {
+            case 'null': return null;
+            case 'false': return false;
+            case 'true': return true;
+        }
+
+        return ($this->fallbackEvaluator)($expr);
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Error.php b/lib/nikic/php-parser/lib/PhpParser/Error.php
index 4a23294fe..d1fb959d1 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Error.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Error.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser;
 
@@ -14,12 +14,12 @@ class Error extends \RuntimeException
      * @param array|int $attributes Attributes of node/token where error occurred
      *                              (or start line of error -- deprecated)
      */
-    public function __construct($message, $attributes = array()) {
-        $this->rawMessage = (string) $message;
+    public function __construct(string $message, $attributes = []) {
+        $this->rawMessage = $message;
         if (is_array($attributes)) {
             $this->attributes = $attributes;
         } else {
-            $this->attributes = array('startLine' => $attributes);
+            $this->attributes = ['startLine' => $attributes];
         }
         $this->updateMessage();
     }
@@ -29,7 +29,7 @@ class Error extends \RuntimeException
      *
      * @return string Error message
      */
-    public function getRawMessage() {
+    public function getRawMessage() : string {
         return $this->rawMessage;
     }
 
@@ -38,8 +38,8 @@ class Error extends \RuntimeException
      *
      * @return int Error start line
      */
-    public function getStartLine() {
-        return isset($this->attributes['startLine']) ? $this->attributes['startLine'] : -1;
+    public function getStartLine() : int {
+        return $this->attributes['startLine'] ?? -1;
     }
 
     /**
@@ -47,22 +47,21 @@ class Error extends \RuntimeException
      *
      * @return int Error end line
      */
-    public function getEndLine() {
-        return isset($this->attributes['endLine']) ? $this->attributes['endLine'] : -1;
+    public function getEndLine() : int {
+        return $this->attributes['endLine'] ?? -1;
     }
 
-
     /**
      * Gets the attributes of the node/token the error occurred at.
      *
      * @return array
      */
-    public function getAttributes() {
+    public function getAttributes() : array {
         return $this->attributes;
     }
 
     /**
-     * Sets the attributes of the node/token the error occured at.
+     * Sets the attributes of the node/token the error occurred at.
      *
      * @param array $attributes
      */
@@ -76,8 +75,8 @@ class Error extends \RuntimeException
      *
      * @param string $message Error message
      */
-    public function setRawMessage($message) {
-        $this->rawMessage = (string) $message;
+    public function setRawMessage(string $message) {
+        $this->rawMessage = $message;
         $this->updateMessage();
     }
 
@@ -86,8 +85,8 @@ class Error extends \RuntimeException
      *
      * @param int $line Error start line
      */
-    public function setStartLine($line) {
-        $this->attributes['startLine'] = (int) $line;
+    public function setStartLine(int $line) {
+        $this->attributes['startLine'] = $line;
         $this->updateMessage();
     }
 
@@ -98,8 +97,8 @@ class Error extends \RuntimeException
      *
      * @return bool
      */
-    public function hasColumnInfo() {
-        return isset($this->attributes['startFilePos']) && isset($this->attributes['endFilePos']);
+    public function hasColumnInfo() : bool {
+        return isset($this->attributes['startFilePos'], $this->attributes['endFilePos']);
     }
 
     /**
@@ -108,7 +107,7 @@ class Error extends \RuntimeException
      * @param string $code Source code of the file
      * @return int
      */
-    public function getStartColumn($code) {
+    public function getStartColumn(string $code) : int {
         if (!$this->hasColumnInfo()) {
             throw new \RuntimeException('Error does not have column information');
         }
@@ -122,7 +121,7 @@ class Error extends \RuntimeException
      * @param string $code Source code of the file
      * @return int
      */
-    public function getEndColumn($code) {
+    public function getEndColumn(string $code) : int {
         if (!$this->hasColumnInfo()) {
             throw new \RuntimeException('Error does not have column information');
         }
@@ -130,7 +129,14 @@ class Error extends \RuntimeException
         return $this->toColumn($code, $this->attributes['endFilePos']);
     }
 
-    public function getMessageWithColumnInfo($code) {
+    /**
+     * Formats message including line and column information.
+     *
+     * @param string $code Source code associated with the error, for calculation of the columns
+     *
+     * @return string Formatted message
+     */
+    public function getMessageWithColumnInfo(string $code) : string {
         return sprintf(
             '%s from %d:%d to %d:%d', $this->getRawMessage(),
             $this->getStartLine(), $this->getStartColumn($code),
@@ -138,7 +144,15 @@ class Error extends \RuntimeException
         );
     }
 
-    private function toColumn($code, $pos) {
+    /**
+     * Converts a file offset into a column.
+     *
+     * @param string $code Source code that $pos indexes into
+     * @param int    $pos  0-based position in $code
+     *
+     * @return int 1-based column (relative to start of line)
+     */
+    private function toColumn(string $code, int $pos) : int {
         if ($pos > strlen($code)) {
             throw new \RuntimeException('Invalid position information');
         }
diff --git a/lib/nikic/php-parser/lib/PhpParser/ErrorHandler.php b/lib/nikic/php-parser/lib/PhpParser/ErrorHandler.php
index fa2c2f8ce..d620e7453 100644
--- a/lib/nikic/php-parser/lib/PhpParser/ErrorHandler.php
+++ b/lib/nikic/php-parser/lib/PhpParser/ErrorHandler.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser;
 
@@ -10,4 +10,4 @@ interface ErrorHandler
      * @param Error $error The error that needs to be handled
      */
     public function handleError(Error $error);
-}
\ No newline at end of file
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/ErrorHandler/Collecting.php b/lib/nikic/php-parser/lib/PhpParser/ErrorHandler/Collecting.php
index 99290f046..784b61b14 100644
--- a/lib/nikic/php-parser/lib/PhpParser/ErrorHandler/Collecting.php
+++ b/lib/nikic/php-parser/lib/PhpParser/ErrorHandler/Collecting.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\ErrorHandler;
 
@@ -24,7 +24,7 @@ class Collecting implements ErrorHandler
      *
      * @return Error[]
      */
-    public function getErrors() {
+    public function getErrors() : array {
         return $this->errors;
     }
 
@@ -33,7 +33,7 @@ class Collecting implements ErrorHandler
      *
      * @return bool
      */
-    public function hasErrors() {
+    public function hasErrors() : bool {
         return !empty($this->errors);
     }
 
@@ -43,4 +43,4 @@ class Collecting implements ErrorHandler
     public function clearErrors() {
         $this->errors = [];
     }
-}
\ No newline at end of file
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/ErrorHandler/Throwing.php b/lib/nikic/php-parser/lib/PhpParser/ErrorHandler/Throwing.php
index c5a76dd0c..aeee989b1 100644
--- a/lib/nikic/php-parser/lib/PhpParser/ErrorHandler/Throwing.php
+++ b/lib/nikic/php-parser/lib/PhpParser/ErrorHandler/Throwing.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\ErrorHandler;
 
@@ -15,4 +15,4 @@ class Throwing implements ErrorHandler
     public function handleError(Error $error) {
         throw $error;
     }
-}
\ No newline at end of file
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Internal/DiffElem.php b/lib/nikic/php-parser/lib/PhpParser/Internal/DiffElem.php
new file mode 100644
index 000000000..a38b57ba9
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Internal/DiffElem.php
@@ -0,0 +1,27 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Internal;
+
+/**
+ * @internal
+ */
+class DiffElem
+{
+    const TYPE_KEEP = 0;
+    const TYPE_REMOVE = 1;
+    const TYPE_ADD = 2;
+    const TYPE_REPLACE = 3;
+
+    /** @var int One of the TYPE_* constants */
+    public $type;
+    /** @var mixed Is null for add operations */
+    public $old;
+    /** @var mixed Is null for remove operations */
+    public $new;
+
+    public function __construct(int $type, $old, $new) {
+        $this->type = $type;
+        $this->old = $old;
+        $this->new = $new;
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Internal/Differ.php b/lib/nikic/php-parser/lib/PhpParser/Internal/Differ.php
new file mode 100644
index 000000000..7f218c74f
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Internal/Differ.php
@@ -0,0 +1,164 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Internal;
+
+/**
+ * Implements the Myers diff algorithm.
+ *
+ * Myers, Eugene W. "An O (ND) difference algorithm and its variations."
+ * Algorithmica 1.1 (1986): 251-266.
+ *
+ * @internal
+ */
+class Differ
+{
+    private $isEqual;
+
+    /**
+     * Create differ over the given equality relation.
+     *
+     * @param callable $isEqual Equality relation with signature function($a, $b) : bool
+     */
+    public function __construct(callable $isEqual) {
+        $this->isEqual = $isEqual;
+    }
+
+    /**
+     * Calculate diff (edit script) from $old to $new.
+     *
+     * @param array $old Original array
+     * @param array $new New array
+     *
+     * @return DiffElem[] Diff (edit script)
+     */
+    public function diff(array $old, array $new) {
+        list($trace, $x, $y) = $this->calculateTrace($old, $new);
+        return $this->extractDiff($trace, $x, $y, $old, $new);
+    }
+
+    /**
+     * Calculate diff, including "replace" operations.
+     *
+     * If a sequence of remove operations is followed by the same number of add operations, these
+     * will be coalesced into replace operations.
+     *
+     * @param array $old Original array
+     * @param array $new New array
+     *
+     * @return DiffElem[] Diff (edit script), including replace operations
+     */
+    public function diffWithReplacements(array $old, array $new) {
+        return $this->coalesceReplacements($this->diff($old, $new));
+    }
+
+    private function calculateTrace(array $a, array $b) {
+        $n = \count($a);
+        $m = \count($b);
+        $max = $n + $m;
+        $v = [1 => 0];
+        $trace = [];
+        for ($d = 0; $d <= $max; $d++) {
+            $trace[] = $v;
+            for ($k = -$d; $k <= $d; $k += 2) {
+                if ($k === -$d || ($k !== $d && $v[$k-1] < $v[$k+1])) {
+                    $x = $v[$k+1];
+                } else {
+                    $x = $v[$k-1] + 1;
+                }
+
+                $y = $x - $k;
+                while ($x < $n && $y < $m && ($this->isEqual)($a[$x], $b[$y])) {
+                    $x++;
+                    $y++;
+                }
+
+                $v[$k] = $x;
+                if ($x >= $n && $y >= $m) {
+                    return [$trace, $x, $y];
+                }
+            }
+        }
+        throw new \Exception('Should not happen');
+    }
+
+    private function extractDiff(array $trace, int $x, int $y, array $a, array $b) {
+        $result = [];
+        for ($d = \count($trace) - 1; $d >= 0; $d--) {
+            $v = $trace[$d];
+            $k = $x - $y;
+
+            if ($k === -$d || ($k !== $d && $v[$k-1] < $v[$k+1])) {
+                $prevK = $k + 1;
+            } else {
+                $prevK = $k - 1;
+            }
+
+            $prevX = $v[$prevK];
+            $prevY = $prevX - $prevK;
+
+            while ($x > $prevX && $y > $prevY) {
+                $result[] = new DiffElem(DiffElem::TYPE_KEEP, $a[$x-1], $b[$y-1]);
+                $x--;
+                $y--;
+            }
+
+            if ($d === 0) {
+                break;
+            }
+
+            while ($x > $prevX) {
+                $result[] = new DiffElem(DiffElem::TYPE_REMOVE, $a[$x-1], null);
+                $x--;
+            }
+
+            while ($y > $prevY) {
+                $result[] = new DiffElem(DiffElem::TYPE_ADD, null, $b[$y-1]);
+                $y--;
+            }
+        }
+        return array_reverse($result);
+    }
+
+    /**
+     * Coalesce equal-length sequences of remove+add into a replace operation.
+     *
+     * @param DiffElem[] $diff
+     * @return DiffElem[]
+     */
+    private function coalesceReplacements(array $diff) {
+        $newDiff = [];
+        $c = \count($diff);
+        for ($i = 0; $i < $c; $i++) {
+            $diffType = $diff[$i]->type;
+            if ($diffType !== DiffElem::TYPE_REMOVE) {
+                $newDiff[] = $diff[$i];
+                continue;
+            }
+
+            $j = $i;
+            while ($j < $c && $diff[$j]->type === DiffElem::TYPE_REMOVE) {
+                $j++;
+            }
+
+            $k = $j;
+            while ($k < $c && $diff[$k]->type === DiffElem::TYPE_ADD) {
+                $k++;
+            }
+
+            if ($j - $i === $k - $j) {
+                $len = $j - $i;
+                for ($n = 0; $n < $len; $n++) {
+                    $newDiff[] = new DiffElem(
+                        DiffElem::TYPE_REPLACE, $diff[$i + $n]->old, $diff[$j + $n]->new
+                    );
+                }
+            } else {
+                for (; $i < $k; $i++) {
+                    $newDiff[] = $diff[$i];
+                }
+            }
+            $i = $k - 1;
+        }
+        return $newDiff;
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Internal/PrintableNewAnonClassNode.php b/lib/nikic/php-parser/lib/PhpParser/Internal/PrintableNewAnonClassNode.php
new file mode 100644
index 000000000..3eeac04a4
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Internal/PrintableNewAnonClassNode.php
@@ -0,0 +1,61 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Internal;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr;
+
+/**
+ * This node is used internally by the format-preserving pretty printer to print anonymous classes.
+ *
+ * The normal anonymous class structure violates assumptions about the order of token offsets.
+ * Namely, the constructor arguments are part of the Expr\New_ node and follow the class node, even
+ * though they are actually interleaved with them. This special node type is used temporarily to
+ * restore a sane token offset order.
+ *
+ * @internal
+ */
+class PrintableNewAnonClassNode extends Expr
+{
+    /** @var Node\AttributeGroup[] PHP attribute groups */
+    public $attrGroups;
+    /** @var Node\Arg[] Arguments */
+    public $args;
+    /** @var null|Node\Name Name of extended class */
+    public $extends;
+    /** @var Node\Name[] Names of implemented interfaces */
+    public $implements;
+    /** @var Node\Stmt[] Statements */
+    public $stmts;
+
+    public function __construct(
+        array $attrGroups, array $args, Node\Name $extends = null, array $implements,
+        array $stmts, array $attributes
+    ) {
+        parent::__construct($attributes);
+        $this->attrGroups = $attrGroups;
+        $this->args = $args;
+        $this->extends = $extends;
+        $this->implements = $implements;
+        $this->stmts = $stmts;
+    }
+
+    public static function fromNewNode(Expr\New_ $newNode) {
+        $class = $newNode->class;
+        assert($class instanceof Node\Stmt\Class_);
+        // We don't assert that $class->name is null here, to allow consumers to assign unique names
+        // to anonymous classes for their own purposes. We simplify ignore the name here.
+        return new self(
+            $class->attrGroups, $newNode->args, $class->extends, $class->implements,
+            $class->stmts, $newNode->getAttributes()
+        );
+    }
+
+    public function getType() : string {
+        return 'Expr_PrintableNewAnonClass';
+    }
+
+    public function getSubNodeNames() : array {
+        return ['attrGroups', 'args', 'extends', 'implements', 'stmts'];
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Internal/TokenStream.php b/lib/nikic/php-parser/lib/PhpParser/Internal/TokenStream.php
new file mode 100644
index 000000000..84c0175ec
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Internal/TokenStream.php
@@ -0,0 +1,281 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Internal;
+
+/**
+ * Provides operations on token streams, for use by pretty printer.
+ *
+ * @internal
+ */
+class TokenStream
+{
+    /** @var array Tokens (in token_get_all format) */
+    private $tokens;
+    /** @var int[] Map from position to indentation */
+    private $indentMap;
+
+    /**
+     * Create token stream instance.
+     *
+     * @param array $tokens Tokens in token_get_all() format
+     */
+    public function __construct(array $tokens) {
+        $this->tokens = $tokens;
+        $this->indentMap = $this->calcIndentMap();
+    }
+
+    /**
+     * Whether the given position is immediately surrounded by parenthesis.
+     *
+     * @param int $startPos Start position
+     * @param int $endPos   End position
+     *
+     * @return bool
+     */
+    public function haveParens(int $startPos, int $endPos) : bool {
+        return $this->haveTokenImmediatelyBefore($startPos, '(')
+            && $this->haveTokenImmediatelyAfter($endPos, ')');
+    }
+
+    /**
+     * Whether the given position is immediately surrounded by braces.
+     *
+     * @param int $startPos Start position
+     * @param int $endPos   End position
+     *
+     * @return bool
+     */
+    public function haveBraces(int $startPos, int $endPos) : bool {
+        return ($this->haveTokenImmediatelyBefore($startPos, '{')
+                || $this->haveTokenImmediatelyBefore($startPos, T_CURLY_OPEN))
+            && $this->haveTokenImmediatelyAfter($endPos, '}');
+    }
+
+    /**
+     * Check whether the position is directly preceded by a certain token type.
+     *
+     * During this check whitespace and comments are skipped.
+     *
+     * @param int        $pos               Position before which the token should occur
+     * @param int|string $expectedTokenType Token to check for
+     *
+     * @return bool Whether the expected token was found
+     */
+    public function haveTokenImmediatelyBefore(int $pos, $expectedTokenType) : bool {
+        $tokens = $this->tokens;
+        $pos--;
+        for (; $pos >= 0; $pos--) {
+            $tokenType = $tokens[$pos][0];
+            if ($tokenType === $expectedTokenType) {
+                return true;
+            }
+            if ($tokenType !== \T_WHITESPACE
+                && $tokenType !== \T_COMMENT && $tokenType !== \T_DOC_COMMENT) {
+                break;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Check whether the position is directly followed by a certain token type.
+     *
+     * During this check whitespace and comments are skipped.
+     *
+     * @param int        $pos               Position after which the token should occur
+     * @param int|string $expectedTokenType Token to check for
+     *
+     * @return bool Whether the expected token was found
+     */
+    public function haveTokenImmediatelyAfter(int $pos, $expectedTokenType) : bool {
+        $tokens = $this->tokens;
+        $pos++;
+        for (; $pos < \count($tokens); $pos++) {
+            $tokenType = $tokens[$pos][0];
+            if ($tokenType === $expectedTokenType) {
+                return true;
+            }
+            if ($tokenType !== \T_WHITESPACE
+                && $tokenType !== \T_COMMENT && $tokenType !== \T_DOC_COMMENT) {
+                break;
+            }
+        }
+        return false;
+    }
+
+    public function skipLeft(int $pos, $skipTokenType) {
+        $tokens = $this->tokens;
+
+        $pos = $this->skipLeftWhitespace($pos);
+        if ($skipTokenType === \T_WHITESPACE) {
+            return $pos;
+        }
+
+        if ($tokens[$pos][0] !== $skipTokenType) {
+            // Shouldn't happen. The skip token MUST be there
+            throw new \Exception('Encountered unexpected token');
+        }
+        $pos--;
+
+        return $this->skipLeftWhitespace($pos);
+    }
+
+    public function skipRight(int $pos, $skipTokenType) {
+        $tokens = $this->tokens;
+
+        $pos = $this->skipRightWhitespace($pos);
+        if ($skipTokenType === \T_WHITESPACE) {
+            return $pos;
+        }
+
+        if ($tokens[$pos][0] !== $skipTokenType) {
+            // Shouldn't happen. The skip token MUST be there
+            throw new \Exception('Encountered unexpected token');
+        }
+        $pos++;
+
+        return $this->skipRightWhitespace($pos);
+    }
+
+    /**
+     * Return first non-whitespace token position smaller or equal to passed position.
+     *
+     * @param int $pos Token position
+     * @return int Non-whitespace token position
+     */
+    public function skipLeftWhitespace(int $pos) {
+        $tokens = $this->tokens;
+        for (; $pos >= 0; $pos--) {
+            $type = $tokens[$pos][0];
+            if ($type !== \T_WHITESPACE && $type !== \T_COMMENT && $type !== \T_DOC_COMMENT) {
+                break;
+            }
+        }
+        return $pos;
+    }
+
+    /**
+     * Return first non-whitespace position greater or equal to passed position.
+     *
+     * @param int $pos Token position
+     * @return int Non-whitespace token position
+     */
+    public function skipRightWhitespace(int $pos) {
+        $tokens = $this->tokens;
+        for ($count = \count($tokens); $pos < $count; $pos++) {
+            $type = $tokens[$pos][0];
+            if ($type !== \T_WHITESPACE && $type !== \T_COMMENT && $type !== \T_DOC_COMMENT) {
+                break;
+            }
+        }
+        return $pos;
+    }
+
+    public function findRight(int $pos, $findTokenType) {
+        $tokens = $this->tokens;
+        for ($count = \count($tokens); $pos < $count; $pos++) {
+            $type = $tokens[$pos][0];
+            if ($type === $findTokenType) {
+                return $pos;
+            }
+        }
+        return -1;
+    }
+
+    /**
+     * Whether the given position range contains a certain token type.
+     *
+     * @param int $startPos Starting position (inclusive)
+     * @param int $endPos Ending position (exclusive)
+     * @param int|string $tokenType Token type to look for
+     * @return bool Whether the token occurs in the given range
+     */
+    public function haveTokenInRange(int $startPos, int $endPos, $tokenType) {
+        $tokens = $this->tokens;
+        for ($pos = $startPos; $pos < $endPos; $pos++) {
+            if ($tokens[$pos][0] === $tokenType) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public function haveBracesInRange(int $startPos, int $endPos) {
+        return $this->haveTokenInRange($startPos, $endPos, '{')
+            || $this->haveTokenInRange($startPos, $endPos, T_CURLY_OPEN)
+            || $this->haveTokenInRange($startPos, $endPos, '}');
+    }
+
+    /**
+     * Get indentation before token position.
+     *
+     * @param int $pos Token position
+     *
+     * @return int Indentation depth (in spaces)
+     */
+    public function getIndentationBefore(int $pos) : int {
+        return $this->indentMap[$pos];
+    }
+
+    /**
+     * Get the code corresponding to a token offset range, optionally adjusted for indentation.
+     *
+     * @param int $from   Token start position (inclusive)
+     * @param int $to     Token end position (exclusive)
+     * @param int $indent By how much the code should be indented (can be negative as well)
+     *
+     * @return string Code corresponding to token range, adjusted for indentation
+     */
+    public function getTokenCode(int $from, int $to, int $indent) : string {
+        $tokens = $this->tokens;
+        $result = '';
+        for ($pos = $from; $pos < $to; $pos++) {
+            $token = $tokens[$pos];
+            if (\is_array($token)) {
+                $type = $token[0];
+                $content = $token[1];
+                if ($type === \T_CONSTANT_ENCAPSED_STRING || $type === \T_ENCAPSED_AND_WHITESPACE) {
+                    $result .= $content;
+                } else {
+                    // TODO Handle non-space indentation
+                    if ($indent < 0) {
+                        $result .= str_replace("\n" . str_repeat(" ", -$indent), "\n", $content);
+                    } elseif ($indent > 0) {
+                        $result .= str_replace("\n", "\n" . str_repeat(" ", $indent), $content);
+                    } else {
+                        $result .= $content;
+                    }
+                }
+            } else {
+                $result .= $token;
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Precalculate the indentation at every token position.
+     *
+     * @return int[] Token position to indentation map
+     */
+    private function calcIndentMap() {
+        $indentMap = [];
+        $indent = 0;
+        foreach ($this->tokens as $token) {
+            $indentMap[] = $indent;
+
+            if ($token[0] === \T_WHITESPACE) {
+                $content = $token[1];
+                $newlinePos = \strrpos($content, "\n");
+                if (false !== $newlinePos) {
+                    $indent = \strlen($content) - $newlinePos - 1;
+                }
+            }
+        }
+
+        // Add a sentinel for one past end of the file
+        $indentMap[] = $indent;
+
+        return $indentMap;
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/JsonDecoder.php b/lib/nikic/php-parser/lib/PhpParser/JsonDecoder.php
new file mode 100644
index 000000000..47d2003d4
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/JsonDecoder.php
@@ -0,0 +1,103 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser;
+
+class JsonDecoder
+{
+    /** @var \ReflectionClass[] Node type to reflection class map */
+    private $reflectionClassCache;
+
+    public function decode(string $json) {
+        $value = json_decode($json, true);
+        if (json_last_error()) {
+            throw new \RuntimeException('JSON decoding error: ' . json_last_error_msg());
+        }
+
+        return $this->decodeRecursive($value);
+    }
+
+    private function decodeRecursive($value) {
+        if (\is_array($value)) {
+            if (isset($value['nodeType'])) {
+                if ($value['nodeType'] === 'Comment' || $value['nodeType'] === 'Comment_Doc') {
+                    return $this->decodeComment($value);
+                }
+                return $this->decodeNode($value);
+            }
+            return $this->decodeArray($value);
+        }
+        return $value;
+    }
+
+    private function decodeArray(array $array) : array {
+        $decodedArray = [];
+        foreach ($array as $key => $value) {
+            $decodedArray[$key] = $this->decodeRecursive($value);
+        }
+        return $decodedArray;
+    }
+
+    private function decodeNode(array $value) : Node {
+        $nodeType = $value['nodeType'];
+        if (!\is_string($nodeType)) {
+            throw new \RuntimeException('Node type must be a string');
+        }
+
+        $reflectionClass = $this->reflectionClassFromNodeType($nodeType);
+        /** @var Node $node */
+        $node = $reflectionClass->newInstanceWithoutConstructor();
+
+        if (isset($value['attributes'])) {
+            if (!\is_array($value['attributes'])) {
+                throw new \RuntimeException('Attributes must be an array');
+            }
+
+            $node->setAttributes($this->decodeArray($value['attributes']));
+        }
+
+        foreach ($value as $name => $subNode) {
+            if ($name === 'nodeType' || $name === 'attributes') {
+                continue;
+            }
+
+            $node->$name = $this->decodeRecursive($subNode);
+        }
+
+        return $node;
+    }
+
+    private function decodeComment(array $value) : Comment {
+        $className = $value['nodeType'] === 'Comment' ? Comment::class : Comment\Doc::class;
+        if (!isset($value['text'])) {
+            throw new \RuntimeException('Comment must have text');
+        }
+
+        return new $className(
+            $value['text'],
+            $value['line'] ?? -1, $value['filePos'] ?? -1, $value['tokenPos'] ?? -1,
+            $value['endLine'] ?? -1, $value['endFilePos'] ?? -1, $value['endTokenPos'] ?? -1
+        );
+    }
+
+    private function reflectionClassFromNodeType(string $nodeType) : \ReflectionClass {
+        if (!isset($this->reflectionClassCache[$nodeType])) {
+            $className = $this->classNameFromNodeType($nodeType);
+            $this->reflectionClassCache[$nodeType] = new \ReflectionClass($className);
+        }
+        return $this->reflectionClassCache[$nodeType];
+    }
+
+    private function classNameFromNodeType(string $nodeType) : string {
+        $className = 'PhpParser\\Node\\' . strtr($nodeType, '_', '\\');
+        if (class_exists($className)) {
+            return $className;
+        }
+
+        $className .= '_';
+        if (class_exists($className)) {
+            return $className;
+        }
+
+        throw new \RuntimeException("Unknown node type \"$nodeType\"");
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Lexer.php b/lib/nikic/php-parser/lib/PhpParser/Lexer.php
index 75d3f35a3..e15dd0a5d 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Lexer.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Lexer.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser;
 
@@ -15,8 +15,15 @@ class Lexer
 
     protected $tokenMap;
     protected $dropTokens;
+    protected $identifierTokens;
 
-    protected $usedAttributes;
+    private $attributeStartLineUsed;
+    private $attributeEndLineUsed;
+    private $attributeStartTokenPosUsed;
+    private $attributeEndTokenPosUsed;
+    private $attributeStartFilePosUsed;
+    private $attributeEndFilePosUsed;
+    private $attributeCommentsUsed;
 
     /**
      * Creates a Lexer.
@@ -27,22 +34,29 @@ class Lexer
      *                       'endTokenPos', 'startFilePos', 'endFilePos'. The option defaults to the
      *                       first three. For more info see getNextToken() docs.
      */
-    public function __construct(array $options = array()) {
-        // map from internal tokens to PhpParser tokens
+    public function __construct(array $options = []) {
+        // Create Map from internal tokens to PhpParser tokens.
+        $this->defineCompatibilityTokens();
         $this->tokenMap = $this->createTokenMap();
+        $this->identifierTokens = $this->createIdentifierTokenMap();
 
         // map of tokens to drop while lexing (the map is only used for isset lookup,
         // that's why the value is simply set to 1; the value is never actually used.)
         $this->dropTokens = array_fill_keys(
-            array(T_WHITESPACE, T_OPEN_TAG, T_COMMENT, T_DOC_COMMENT), 1
+            [\T_WHITESPACE, \T_OPEN_TAG, \T_COMMENT, \T_DOC_COMMENT, \T_BAD_CHARACTER], 1
         );
 
-        // the usedAttributes member is a map of the used attribute names to a dummy
-        // value (here "true")
-        $options += array(
-            'usedAttributes' => array('comments', 'startLine', 'endLine'),
-        );
-        $this->usedAttributes = array_fill_keys($options['usedAttributes'], true);
+        $defaultAttributes = ['comments', 'startLine', 'endLine'];
+        $usedAttributes = array_fill_keys($options['usedAttributes'] ?? $defaultAttributes, true);
+
+        // Create individual boolean properties to make these checks faster.
+        $this->attributeStartLineUsed = isset($usedAttributes['startLine']);
+        $this->attributeEndLineUsed = isset($usedAttributes['endLine']);
+        $this->attributeStartTokenPosUsed = isset($usedAttributes['startTokenPos']);
+        $this->attributeEndTokenPosUsed = isset($usedAttributes['endTokenPos']);
+        $this->attributeStartFilePosUsed = isset($usedAttributes['startFilePos']);
+        $this->attributeEndFilePosUsed = isset($usedAttributes['endFilePos']);
+        $this->attributeCommentsUsed = isset($usedAttributes['comments']);
     }
 
     /**
@@ -55,7 +69,7 @@ class Lexer
      * @param ErrorHandler|null $errorHandler Error handler to use for lexing errors. Defaults to
      *                                        ErrorHandler\Throwing
      */
-    public function startLexing($code, ErrorHandler $errorHandler = null) {
+    public function startLexing(string $code, ErrorHandler $errorHandler = null) {
         if (null === $errorHandler) {
             $errorHandler = new ErrorHandler\Throwing();
         }
@@ -71,34 +85,18 @@ class Lexer
 
         $scream = ini_set('xdebug.scream', '0');
 
-        $this->resetErrors();
         $this->tokens = @token_get_all($code);
-        $this->handleErrors($errorHandler);
+        $this->postprocessTokens($errorHandler);
 
         if (false !== $scream) {
             ini_set('xdebug.scream', $scream);
         }
     }
 
-    protected function resetErrors() {
-        if (function_exists('error_clear_last')) {
-            error_clear_last();
-        } else {
-            // set error_get_last() to defined state by forcing an undefined variable error
-            set_error_handler(function() { return false; }, 0);
-            @$undefinedVariable;
-            restore_error_handler();
-        }
-    }
-
     private function handleInvalidCharacterRange($start, $end, $line, ErrorHandler $errorHandler) {
+        $tokens = [];
         for ($i = $start; $i < $end; $i++) {
             $chr = $this->code[$i];
-            if ($chr === 'b' || $chr === 'B') {
-                // HHVM does not treat b" tokens correctly, so ignore these
-                continue;
-            }
-
             if ($chr === "\0") {
                 // PHP cuts error message after null byte, so need special case
                 $errorMsg = 'Unexpected null byte';
@@ -108,6 +106,7 @@ class Lexer
                 );
             }
 
+            $tokens[] = [\T_BAD_CHARACTER, $chr, $line];
             $errorHandler->handleError(new Error($errorMsg, [
                 'startLine' => $line,
                 'endLine' => $line,
@@ -115,48 +114,130 @@ class Lexer
                 'endFilePos' => $i,
             ]));
         }
+        return $tokens;
     }
 
-    private function isUnterminatedComment($token) {
-        return ($token[0] === T_COMMENT || $token[0] === T_DOC_COMMENT)
+    /**
+     * Check whether comment token is unterminated.
+     *
+     * @return bool
+     */
+    private function isUnterminatedComment($token) : bool {
+        return ($token[0] === \T_COMMENT || $token[0] === \T_DOC_COMMENT)
             && substr($token[1], 0, 2) === '/*'
             && substr($token[1], -2) !== '*/';
     }
 
-    private function errorMayHaveOccurred() {
-        if (defined('HHVM_VERSION')) {
-            // In HHVM token_get_all() does not throw warnings, so we need to conservatively
-            // assume that an error occurred
-            return true;
-        }
-
-        $error = error_get_last();
-        return null !== $error
-            && false === strpos($error['message'], 'Undefined variable');
-    }
-
-    protected function handleErrors(ErrorHandler $errorHandler) {
-        if (!$this->errorMayHaveOccurred()) {
-            return;
-        }
-
+    protected function postprocessTokens(ErrorHandler $errorHandler) {
         // PHP's error handling for token_get_all() is rather bad, so if we want detailed
         // error information we need to compute it ourselves. Invalid character errors are
         // detected by finding "gaps" in the token array. Unterminated comments are detected
         // by checking if a trailing comment has a "*/" at the end.
+        //
+        // Additionally, we perform a number of canonicalizations here:
+        //  * Use the PHP 8.0 comment format, which does not include trailing whitespace anymore.
+        //  * Use PHP 8.0 T_NAME_* tokens.
+        //  * Use PHP 8.1 T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG and
+        //    T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG tokens used to disambiguate intersection types.
 
         $filePos = 0;
         $line = 1;
-        foreach ($this->tokens as $i => $token) {
+        $numTokens = \count($this->tokens);
+        for ($i = 0; $i < $numTokens; $i++) {
+            $token = $this->tokens[$i];
+
+            // Since PHP 7.4 invalid characters are represented by a T_BAD_CHARACTER token.
+            // In this case we only need to emit an error.
+            if ($token[0] === \T_BAD_CHARACTER) {
+                $this->handleInvalidCharacterRange($filePos, $filePos + 1, $line, $errorHandler);
+            }
+
+            if ($token[0] === \T_COMMENT && substr($token[1], 0, 2) !== '/*'
+                    && preg_match('/(\r\n|\n|\r)$/D', $token[1], $matches)) {
+                $trailingNewline = $matches[0];
+                $token[1] = substr($token[1], 0, -strlen($trailingNewline));
+                $this->tokens[$i] = $token;
+                if (isset($this->tokens[$i + 1]) && $this->tokens[$i + 1][0] === \T_WHITESPACE) {
+                    // Move trailing newline into following T_WHITESPACE token, if it already exists.
+                    $this->tokens[$i + 1][1] = $trailingNewline . $this->tokens[$i + 1][1];
+                    $this->tokens[$i + 1][2]--;
+                } else {
+                    // Otherwise, we need to create a new T_WHITESPACE token.
+                    array_splice($this->tokens, $i + 1, 0, [
+                        [\T_WHITESPACE, $trailingNewline, $line],
+                    ]);
+                    $numTokens++;
+                }
+            }
+
+            // Emulate PHP 8 T_NAME_* tokens, by combining sequences of T_NS_SEPARATOR and T_STRING
+            // into a single token.
+            if (\is_array($token)
+                    && ($token[0] === \T_NS_SEPARATOR || isset($this->identifierTokens[$token[0]]))) {
+                $lastWasSeparator = $token[0] === \T_NS_SEPARATOR;
+                $text = $token[1];
+                for ($j = $i + 1; isset($this->tokens[$j]); $j++) {
+                    if ($lastWasSeparator) {
+                        if (!isset($this->identifierTokens[$this->tokens[$j][0]])) {
+                            break;
+                        }
+                        $lastWasSeparator = false;
+                    } else {
+                        if ($this->tokens[$j][0] !== \T_NS_SEPARATOR) {
+                            break;
+                        }
+                        $lastWasSeparator = true;
+                    }
+                    $text .= $this->tokens[$j][1];
+                }
+                if ($lastWasSeparator) {
+                    // Trailing separator is not part of the name.
+                    $j--;
+                    $text = substr($text, 0, -1);
+                }
+                if ($j > $i + 1) {
+                    if ($token[0] === \T_NS_SEPARATOR) {
+                        $type = \T_NAME_FULLY_QUALIFIED;
+                    } else if ($token[0] === \T_NAMESPACE) {
+                        $type = \T_NAME_RELATIVE;
+                    } else {
+                        $type = \T_NAME_QUALIFIED;
+                    }
+                    $token = [$type, $text, $line];
+                    array_splice($this->tokens, $i, $j - $i, [$token]);
+                    $numTokens -= $j - $i - 1;
+                }
+            }
+
+            if ($token === '&') {
+                $next = $i + 1;
+                while (isset($this->tokens[$next]) && $this->tokens[$next][0] === \T_WHITESPACE) {
+                    $next++;
+                }
+                $followedByVarOrVarArg = isset($this->tokens[$next]) &&
+                    ($this->tokens[$next][0] === \T_VARIABLE || $this->tokens[$next][0] === \T_ELLIPSIS);
+                $this->tokens[$i] = $token = [
+                    $followedByVarOrVarArg
+                        ? \T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG
+                        : \T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG,
+                    '&',
+                    $line,
+                ];
+            }
+
             $tokenValue = \is_string($token) ? $token : $token[1];
             $tokenLen = \strlen($tokenValue);
 
             if (substr($this->code, $filePos, $tokenLen) !== $tokenValue) {
                 // Something is missing, must be an invalid character
                 $nextFilePos = strpos($this->code, $tokenValue, $filePos);
-                $this->handleInvalidCharacterRange(
+                $badCharTokens = $this->handleInvalidCharacterRange(
                     $filePos, $nextFilePos, $line, $errorHandler);
-                $filePos = $nextFilePos;
+                $filePos = (int) $nextFilePos;
+
+                array_splice($this->tokens, $i, 0, $badCharTokens);
+                $numTokens += \count($badCharTokens);
+                $i += \count($badCharTokens);
             }
 
             $filePos += $tokenLen;
@@ -176,11 +257,12 @@ class Lexer
 
                 // Emulate the PHP behavior
                 $isDocComment = isset($comment[3]) && $comment[3] === '*';
-                $this->tokens[] = [$isDocComment ? T_DOC_COMMENT : T_COMMENT, $comment, $line];
+                $this->tokens[] = [$isDocComment ? \T_DOC_COMMENT : \T_COMMENT, $comment, $line];
             } else {
                 // Invalid characters at the end of the input
-                $this->handleInvalidCharacterRange(
+                $badCharTokens = $this->handleInvalidCharacterRange(
                     $filePos, \strlen($this->code), $line, $errorHandler);
+                $this->tokens = array_merge($this->tokens, $badCharTokens);
             }
             return;
         }
@@ -221,9 +303,9 @@ class Lexer
      *
      * @return int Token id
      */
-    public function getNextToken(&$value = null, &$startAttributes = null, &$endAttributes = null) {
-        $startAttributes = array();
-        $endAttributes   = array();
+    public function getNextToken(&$value = null, &$startAttributes = null, &$endAttributes = null) : int {
+        $startAttributes = [];
+        $endAttributes   = [];
 
         while (1) {
             if (isset($this->tokens[++$this->pos])) {
@@ -233,13 +315,13 @@ class Lexer
                 $token = "\0";
             }
 
-            if (isset($this->usedAttributes['startLine'])) {
+            if ($this->attributeStartLineUsed) {
                 $startAttributes['startLine'] = $this->line;
             }
-            if (isset($this->usedAttributes['startTokenPos'])) {
+            if ($this->attributeStartTokenPosUsed) {
                 $startAttributes['startTokenPos'] = $this->pos;
             }
-            if (isset($this->usedAttributes['startFilePos'])) {
+            if ($this->attributeStartFilePosUsed) {
                 $startAttributes['startFilePos'] = $this->filePos;
             }
 
@@ -256,36 +338,43 @@ class Lexer
             } elseif (!isset($this->dropTokens[$token[0]])) {
                 $value = $token[1];
                 $id = $this->tokenMap[$token[0]];
-                if (T_CLOSE_TAG === $token[0]) {
-                    $this->prevCloseTagHasNewline = false !== strpos($token[1], "\n");
-                } else if (T_INLINE_HTML === $token[0]) {
+                if (\T_CLOSE_TAG === $token[0]) {
+                    $this->prevCloseTagHasNewline = false !== strpos($token[1], "\n")
+                        || false !== strpos($token[1], "\r");
+                } elseif (\T_INLINE_HTML === $token[0]) {
                     $startAttributes['hasLeadingNewline'] = $this->prevCloseTagHasNewline;
                 }
 
                 $this->line += substr_count($value, "\n");
                 $this->filePos += \strlen($value);
             } else {
-                if (T_COMMENT === $token[0] || T_DOC_COMMENT === $token[0]) {
-                    if (isset($this->usedAttributes['comments'])) {
-                        $comment = T_DOC_COMMENT === $token[0]
-                            ? new Comment\Doc($token[1], $this->line, $this->filePos)
-                            : new Comment($token[1], $this->line, $this->filePos);
+                $origLine = $this->line;
+                $origFilePos = $this->filePos;
+                $this->line += substr_count($token[1], "\n");
+                $this->filePos += \strlen($token[1]);
+
+                if (\T_COMMENT === $token[0] || \T_DOC_COMMENT === $token[0]) {
+                    if ($this->attributeCommentsUsed) {
+                        $comment = \T_DOC_COMMENT === $token[0]
+                            ? new Comment\Doc($token[1],
+                                $origLine, $origFilePos, $this->pos,
+                                $this->line, $this->filePos - 1, $this->pos)
+                            : new Comment($token[1],
+                                $origLine, $origFilePos, $this->pos,
+                                $this->line, $this->filePos - 1, $this->pos);
                         $startAttributes['comments'][] = $comment;
                     }
                 }
-
-                $this->line += substr_count($token[1], "\n");
-                $this->filePos += \strlen($token[1]);
                 continue;
             }
 
-            if (isset($this->usedAttributes['endLine'])) {
+            if ($this->attributeEndLineUsed) {
                 $endAttributes['endLine'] = $this->line;
             }
-            if (isset($this->usedAttributes['endTokenPos'])) {
+            if ($this->attributeEndTokenPosUsed) {
                 $endAttributes['endTokenPos'] = $this->pos;
             }
-            if (isset($this->usedAttributes['endFilePos'])) {
+            if ($this->attributeEndFilePosUsed) {
                 $endAttributes['endFilePos'] = $this->filePos - 1;
             }
 
@@ -305,7 +394,7 @@ class Lexer
      *
      * @return array Array of tokens in token_get_all() format
      */
-    public function getTokens() {
+    public function getTokens() : array {
         return $this->tokens;
     }
 
@@ -314,7 +403,7 @@ class Lexer
      *
      * @return string Remaining text
      */
-    public function handleHaltCompiler() {
+    public function handleHaltCompiler() : string {
         // text after T_HALT_COMPILER, still including ();
         $textAfter = substr($this->code, $this->filePos);
 
@@ -329,7 +418,67 @@ class Lexer
         $this->pos = count($this->tokens);
 
         // return with (); removed
-        return (string) substr($textAfter, strlen($matches[0])); // (string) converts false to ''
+        return substr($textAfter, strlen($matches[0]));
+    }
+
+    private function defineCompatibilityTokens() {
+        static $compatTokensDefined = false;
+        if ($compatTokensDefined) {
+            return;
+        }
+
+        $compatTokens = [
+            // PHP 7.4
+            'T_BAD_CHARACTER',
+            'T_FN',
+            'T_COALESCE_EQUAL',
+            // PHP 8.0
+            'T_NAME_QUALIFIED',
+            'T_NAME_FULLY_QUALIFIED',
+            'T_NAME_RELATIVE',
+            'T_MATCH',
+            'T_NULLSAFE_OBJECT_OPERATOR',
+            'T_ATTRIBUTE',
+            // PHP 8.1
+            'T_ENUM',
+            'T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG',
+            'T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG',
+            'T_READONLY',
+        ];
+
+        // PHP-Parser might be used together with another library that also emulates some or all
+        // of these tokens. Perform a sanity-check that all already defined tokens have been
+        // assigned a unique ID.
+        $usedTokenIds = [];
+        foreach ($compatTokens as $token) {
+            if (\defined($token)) {
+                $tokenId = \constant($token);
+                $clashingToken = $usedTokenIds[$tokenId] ?? null;
+                if ($clashingToken !== null) {
+                    throw new \Error(sprintf(
+                        'Token %s has same ID as token %s, ' .
+                        'you may be using a library with broken token emulation',
+                        $token, $clashingToken
+                    ));
+                }
+                $usedTokenIds[$tokenId] = $token;
+            }
+        }
+
+        // Now define any tokens that have not yet been emulated. Try to assign IDs from -1
+        // downwards, but skip any IDs that may already be in use.
+        $newTokenId = -1;
+        foreach ($compatTokens as $token) {
+            if (!\defined($token)) {
+                while (isset($usedTokenIds[$newTokenId])) {
+                    $newTokenId--;
+                }
+                \define($token, $newTokenId);
+                $newTokenId--;
+            }
+        }
+
+        $compatTokensDefined = true;
     }
 
     /**
@@ -341,26 +490,26 @@ class Lexer
      *
      * @return array The token map
      */
-    protected function createTokenMap() {
-        $tokenMap = array();
+    protected function createTokenMap() : array {
+        $tokenMap = [];
 
         // 256 is the minimum possible token number, as everything below
         // it is an ASCII value
         for ($i = 256; $i < 1000; ++$i) {
-            if (T_DOUBLE_COLON === $i) {
+            if (\T_DOUBLE_COLON === $i) {
                 // T_DOUBLE_COLON is equivalent to T_PAAMAYIM_NEKUDOTAYIM
                 $tokenMap[$i] = Tokens::T_PAAMAYIM_NEKUDOTAYIM;
-            } elseif(T_OPEN_TAG_WITH_ECHO === $i) {
+            } elseif(\T_OPEN_TAG_WITH_ECHO === $i) {
                 // T_OPEN_TAG_WITH_ECHO with dropped T_OPEN_TAG results in T_ECHO
                 $tokenMap[$i] = Tokens::T_ECHO;
-            } elseif(T_CLOSE_TAG === $i) {
+            } elseif(\T_CLOSE_TAG === $i) {
                 // T_CLOSE_TAG is equivalent to ';'
                 $tokenMap[$i] = ord(';');
             } elseif ('UNKNOWN' !== $name = token_name($i)) {
                 if ('T_HASHBANG' === $name) {
                     // HHVM uses a special token for #! hashbang lines
                     $tokenMap[$i] = Tokens::T_INLINE_HTML;
-                } else if (defined($name = Tokens::class . '::' . $name)) {
+                } elseif (defined($name = Tokens::class . '::' . $name)) {
                     // Other tokens can be mapped directly
                     $tokenMap[$i] = constant($name);
                 }
@@ -369,13 +518,43 @@ class Lexer
 
         // HHVM uses a special token for numbers that overflow to double
         if (defined('T_ONUMBER')) {
-            $tokenMap[T_ONUMBER] = Tokens::T_DNUMBER;
+            $tokenMap[\T_ONUMBER] = Tokens::T_DNUMBER;
         }
         // HHVM also has a separate token for the __COMPILER_HALT_OFFSET__ constant
         if (defined('T_COMPILER_HALT_OFFSET')) {
-            $tokenMap[T_COMPILER_HALT_OFFSET] = Tokens::T_STRING;
+            $tokenMap[\T_COMPILER_HALT_OFFSET] = Tokens::T_STRING;
         }
 
+        // Assign tokens for which we define compatibility constants, as token_name() does not know them.
+        $tokenMap[\T_FN] = Tokens::T_FN;
+        $tokenMap[\T_COALESCE_EQUAL] = Tokens::T_COALESCE_EQUAL;
+        $tokenMap[\T_NAME_QUALIFIED] = Tokens::T_NAME_QUALIFIED;
+        $tokenMap[\T_NAME_FULLY_QUALIFIED] = Tokens::T_NAME_FULLY_QUALIFIED;
+        $tokenMap[\T_NAME_RELATIVE] = Tokens::T_NAME_RELATIVE;
+        $tokenMap[\T_MATCH] = Tokens::T_MATCH;
+        $tokenMap[\T_NULLSAFE_OBJECT_OPERATOR] = Tokens::T_NULLSAFE_OBJECT_OPERATOR;
+        $tokenMap[\T_ATTRIBUTE] = Tokens::T_ATTRIBUTE;
+        $tokenMap[\T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG] = Tokens::T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG;
+        $tokenMap[\T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG] = Tokens::T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG;
+        $tokenMap[\T_ENUM] = Tokens::T_ENUM;
+        $tokenMap[\T_READONLY] = Tokens::T_READONLY;
+
         return $tokenMap;
     }
+
+    private function createIdentifierTokenMap(): array {
+        // Based on semi_reserved production.
+        return array_fill_keys([
+            \T_STRING,
+            \T_STATIC, \T_ABSTRACT, \T_FINAL, \T_PRIVATE, \T_PROTECTED, \T_PUBLIC, \T_READONLY,
+            \T_INCLUDE, \T_INCLUDE_ONCE, \T_EVAL, \T_REQUIRE, \T_REQUIRE_ONCE, \T_LOGICAL_OR, \T_LOGICAL_XOR, \T_LOGICAL_AND,
+            \T_INSTANCEOF, \T_NEW, \T_CLONE, \T_EXIT, \T_IF, \T_ELSEIF, \T_ELSE, \T_ENDIF, \T_ECHO, \T_DO, \T_WHILE,
+            \T_ENDWHILE, \T_FOR, \T_ENDFOR, \T_FOREACH, \T_ENDFOREACH, \T_DECLARE, \T_ENDDECLARE, \T_AS, \T_TRY, \T_CATCH,
+            \T_FINALLY, \T_THROW, \T_USE, \T_INSTEADOF, \T_GLOBAL, \T_VAR, \T_UNSET, \T_ISSET, \T_EMPTY, \T_CONTINUE, \T_GOTO,
+            \T_FUNCTION, \T_CONST, \T_RETURN, \T_PRINT, \T_YIELD, \T_LIST, \T_SWITCH, \T_ENDSWITCH, \T_CASE, \T_DEFAULT,
+            \T_BREAK, \T_ARRAY, \T_CALLABLE, \T_EXTENDS, \T_IMPLEMENTS, \T_NAMESPACE, \T_TRAIT, \T_INTERFACE, \T_CLASS,
+            \T_CLASS_C, \T_TRAIT_C, \T_FUNC_C, \T_METHOD_C, \T_LINE, \T_FILE, \T_DIR, \T_NS_C, \T_HALT_COMPILER, \T_FN,
+            \T_MATCH,
+        ], true);
+    }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php b/lib/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php
index 739a328ab..5c56e026b 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Lexer/Emulative.php
@@ -1,174 +1,248 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Lexer;
 
+use PhpParser\Error;
 use PhpParser\ErrorHandler;
-use PhpParser\Parser\Tokens;
+use PhpParser\Lexer;
+use PhpParser\Lexer\TokenEmulator\AttributeEmulator;
+use PhpParser\Lexer\TokenEmulator\EnumTokenEmulator;
+use PhpParser\Lexer\TokenEmulator\CoaleseEqualTokenEmulator;
+use PhpParser\Lexer\TokenEmulator\ExplicitOctalEmulator;
+use PhpParser\Lexer\TokenEmulator\FlexibleDocStringEmulator;
+use PhpParser\Lexer\TokenEmulator\FnTokenEmulator;
+use PhpParser\Lexer\TokenEmulator\MatchTokenEmulator;
+use PhpParser\Lexer\TokenEmulator\NullsafeTokenEmulator;
+use PhpParser\Lexer\TokenEmulator\NumericLiteralSeparatorEmulator;
+use PhpParser\Lexer\TokenEmulator\ReadonlyTokenEmulator;
+use PhpParser\Lexer\TokenEmulator\ReverseEmulator;
+use PhpParser\Lexer\TokenEmulator\TokenEmulator;
 
-class Emulative extends \PhpParser\Lexer
+class Emulative extends Lexer
 {
-    protected $newKeywords;
-    protected $inObjectAccess;
+    const PHP_7_3 = '7.3dev';
+    const PHP_7_4 = '7.4dev';
+    const PHP_8_0 = '8.0dev';
+    const PHP_8_1 = '8.1dev';
 
-    const T_ELLIPSIS   = 1001;
-    const T_POW        = 1002;
-    const T_POW_EQUAL  = 1003;
-    const T_COALESCE   = 1004;
-    const T_SPACESHIP  = 1005;
-    const T_YIELD_FROM = 1006;
+    /** @var mixed[] Patches used to reverse changes introduced in the code */
+    private $patches = [];
 
-    const PHP_7_0 = '7.0.0dev';
-    const PHP_5_6 = '5.6.0rc1';
+    /** @var TokenEmulator[] */
+    private $emulators = [];
+
+    /** @var string */
+    private $targetPhpVersion;
+
+    /**
+     * @param mixed[] $options Lexer options. In addition to the usual options,
+     *                         accepts a 'phpVersion' string that specifies the
+     *                         version to emulate. Defaults to newest supported.
+     */
+    public function __construct(array $options = [])
+    {
+        $this->targetPhpVersion = $options['phpVersion'] ?? Emulative::PHP_8_1;
+        unset($options['phpVersion']);
 
-    public function __construct(array $options = array()) {
         parent::__construct($options);
 
-        $newKeywordsPerVersion = array(
-            // No new keywords since PHP 5.5
-        );
+        $emulators = [
+            new FlexibleDocStringEmulator(),
+            new FnTokenEmulator(),
+            new MatchTokenEmulator(),
+            new CoaleseEqualTokenEmulator(),
+            new NumericLiteralSeparatorEmulator(),
+            new NullsafeTokenEmulator(),
+            new AttributeEmulator(),
+            new EnumTokenEmulator(),
+            new ReadonlyTokenEmulator(),
+            new ExplicitOctalEmulator(),
+        ];
 
-        $this->newKeywords = array();
-        foreach ($newKeywordsPerVersion as $version => $newKeywords) {
-            if (version_compare(PHP_VERSION, $version, '>=')) {
-                break;
+        // Collect emulators that are relevant for the PHP version we're running
+        // and the PHP version we're targeting for emulation.
+        foreach ($emulators as $emulator) {
+            $emulatorPhpVersion = $emulator->getPhpVersion();
+            if ($this->isForwardEmulationNeeded($emulatorPhpVersion)) {
+                $this->emulators[] = $emulator;
+            } else if ($this->isReverseEmulationNeeded($emulatorPhpVersion)) {
+                $this->emulators[] = new ReverseEmulator($emulator);
             }
-
-            $this->newKeywords += $newKeywords;
         }
+    }
 
-        if (version_compare(PHP_VERSION, self::PHP_7_0, '>=')) {
+    public function startLexing(string $code, ErrorHandler $errorHandler = null) {
+        $emulators = array_filter($this->emulators, function($emulator) use($code) {
+            return $emulator->isEmulationNeeded($code);
+        });
+
+        if (empty($emulators)) {
+            // Nothing to emulate, yay
+            parent::startLexing($code, $errorHandler);
             return;
         }
-        $this->tokenMap[self::T_COALESCE]   = Tokens::T_COALESCE;
-        $this->tokenMap[self::T_SPACESHIP]  = Tokens::T_SPACESHIP;
-        $this->tokenMap[self::T_YIELD_FROM] = Tokens::T_YIELD_FROM;
 
-        if (version_compare(PHP_VERSION, self::PHP_5_6, '>=')) {
+        $this->patches = [];
+        foreach ($emulators as $emulator) {
+            $code = $emulator->preprocessCode($code, $this->patches);
+        }
+
+        $collector = new ErrorHandler\Collecting();
+        parent::startLexing($code, $collector);
+        $this->sortPatches();
+        $this->fixupTokens();
+
+        $errors = $collector->getErrors();
+        if (!empty($errors)) {
+            $this->fixupErrors($errors);
+            foreach ($errors as $error) {
+                $errorHandler->handleError($error);
+            }
+        }
+
+        foreach ($emulators as $emulator) {
+            $this->tokens = $emulator->emulate($code, $this->tokens);
+        }
+    }
+
+    private function isForwardEmulationNeeded(string $emulatorPhpVersion): bool {
+        return version_compare(\PHP_VERSION, $emulatorPhpVersion, '<')
+            && version_compare($this->targetPhpVersion, $emulatorPhpVersion, '>=');
+    }
+
+    private function isReverseEmulationNeeded(string $emulatorPhpVersion): bool {
+        return version_compare(\PHP_VERSION, $emulatorPhpVersion, '>=')
+            && version_compare($this->targetPhpVersion, $emulatorPhpVersion, '<');
+    }
+
+    private function sortPatches()
+    {
+        // Patches may be contributed by different emulators.
+        // Make sure they are sorted by increasing patch position.
+        usort($this->patches, function($p1, $p2) {
+            return $p1[0] <=> $p2[0];
+        });
+    }
+
+    private function fixupTokens()
+    {
+        if (\count($this->patches) === 0) {
             return;
         }
-        $this->tokenMap[self::T_ELLIPSIS]  = Tokens::T_ELLIPSIS;
-        $this->tokenMap[self::T_POW]       = Tokens::T_POW;
-        $this->tokenMap[self::T_POW_EQUAL] = Tokens::T_POW_EQUAL;
-    }
 
-    public function startLexing($code, ErrorHandler $errorHandler = null) {
-        $this->inObjectAccess = false;
+        // Load first patch
+        $patchIdx = 0;
 
-        parent::startLexing($code, $errorHandler);
-        if ($this->requiresEmulation($code)) {
-            $this->emulateTokens();
+        list($patchPos, $patchType, $patchText) = $this->patches[$patchIdx];
+
+        // We use a manual loop over the tokens, because we modify the array on the fly
+        $pos = 0;
+        for ($i = 0, $c = \count($this->tokens); $i < $c; $i++) {
+            $token = $this->tokens[$i];
+            if (\is_string($token)) {
+                if ($patchPos === $pos) {
+                    // Only support replacement for string tokens.
+                    assert($patchType === 'replace');
+                    $this->tokens[$i] = $patchText;
+
+                    // Fetch the next patch
+                    $patchIdx++;
+                    if ($patchIdx >= \count($this->patches)) {
+                        // No more patches, we're done
+                        return;
+                    }
+                    list($patchPos, $patchType, $patchText) = $this->patches[$patchIdx];
+                }
+
+                $pos += \strlen($token);
+                continue;
+            }
+
+            $len = \strlen($token[1]);
+            $posDelta = 0;
+            while ($patchPos >= $pos && $patchPos < $pos + $len) {
+                $patchTextLen = \strlen($patchText);
+                if ($patchType === 'remove') {
+                    if ($patchPos === $pos && $patchTextLen === $len) {
+                        // Remove token entirely
+                        array_splice($this->tokens, $i, 1, []);
+                        $i--;
+                        $c--;
+                    } else {
+                        // Remove from token string
+                        $this->tokens[$i][1] = substr_replace(
+                            $token[1], '', $patchPos - $pos + $posDelta, $patchTextLen
+                        );
+                        $posDelta -= $patchTextLen;
+                    }
+                } elseif ($patchType === 'add') {
+                    // Insert into the token string
+                    $this->tokens[$i][1] = substr_replace(
+                        $token[1], $patchText, $patchPos - $pos + $posDelta, 0
+                    );
+                    $posDelta += $patchTextLen;
+                } else if ($patchType === 'replace') {
+                    // Replace inside the token string
+                    $this->tokens[$i][1] = substr_replace(
+                        $token[1], $patchText, $patchPos - $pos + $posDelta, $patchTextLen
+                    );
+                } else {
+                    assert(false);
+                }
+
+                // Fetch the next patch
+                $patchIdx++;
+                if ($patchIdx >= \count($this->patches)) {
+                    // No more patches, we're done
+                    return;
+                }
+
+                list($patchPos, $patchType, $patchText) = $this->patches[$patchIdx];
+
+                // Multiple patches may apply to the same token. Reload the current one to check
+                // If the new patch applies
+                $token = $this->tokens[$i];
+            }
+
+            $pos += $len;
         }
+
+        // A patch did not apply
+        assert(false);
     }
 
-    /*
-     * Checks if the code is potentially using features that require emulation.
+    /**
+     * Fixup line and position information in errors.
+     *
+     * @param Error[] $errors
      */
-    protected function requiresEmulation($code) {
-        if (version_compare(PHP_VERSION, self::PHP_7_0, '>=')) {
-            return false;
-        }
+    private function fixupErrors(array $errors) {
+        foreach ($errors as $error) {
+            $attrs = $error->getAttributes();
 
-        if (preg_match('(\?\?|<=>|yield[ \n\r\t]+from)', $code)) {
-            return true;
-        }
-
-        if (version_compare(PHP_VERSION, self::PHP_5_6, '>=')) {
-            return false;
-        }
-
-        return preg_match('(\.\.\.|(?<!/)\*\*(?!/))', $code);
-    }
-
-    /*
-     * Emulates tokens for newer PHP versions.
-     */
-    protected function emulateTokens() {
-        // We need to manually iterate and manage a count because we'll change
-        // the tokens array on the way
-        $line = 1;
-        for ($i = 0, $c = count($this->tokens); $i < $c; ++$i) {
-            $replace = null;
-            if (isset($this->tokens[$i + 1])) {
-                if ($this->tokens[$i] === '?' && $this->tokens[$i + 1] === '?') {
-                    array_splice($this->tokens, $i, 2, array(
-                        array(self::T_COALESCE, '??', $line)
-                    ));
-                    $c--;
-                    continue;
+            $posDelta = 0;
+            $lineDelta = 0;
+            foreach ($this->patches as $patch) {
+                list($patchPos, $patchType, $patchText) = $patch;
+                if ($patchPos >= $attrs['startFilePos']) {
+                    // No longer relevant
+                    break;
                 }
-                if ($this->tokens[$i][0] === T_IS_SMALLER_OR_EQUAL
-                    && $this->tokens[$i + 1] === '>'
-                ) {
-                    array_splice($this->tokens, $i, 2, array(
-                        array(self::T_SPACESHIP, '<=>', $line)
-                    ));
-                    $c--;
-                    continue;
-                }
-                if ($this->tokens[$i] === '*' && $this->tokens[$i + 1] === '*') {
-                    array_splice($this->tokens, $i, 2, array(
-                        array(self::T_POW, '**', $line)
-                    ));
-                    $c--;
-                    continue;
-                }
-                if ($this->tokens[$i] === '*' && $this->tokens[$i + 1][0] === T_MUL_EQUAL) {
-                    array_splice($this->tokens, $i, 2, array(
-                        array(self::T_POW_EQUAL, '**=', $line)
-                    ));
-                    $c--;
-                    continue;
+
+                if ($patchType === 'add') {
+                    $posDelta += strlen($patchText);
+                    $lineDelta += substr_count($patchText, "\n");
+                } else if ($patchType === 'remove') {
+                    $posDelta -= strlen($patchText);
+                    $lineDelta -= substr_count($patchText, "\n");
                 }
             }
 
-            if (isset($this->tokens[$i + 2])) {
-                if ($this->tokens[$i][0] === T_YIELD && $this->tokens[$i + 1][0] === T_WHITESPACE
-                    && $this->tokens[$i + 2][0] === T_STRING
-                    && !strcasecmp($this->tokens[$i + 2][1], 'from')
-                ) {
-                    array_splice($this->tokens, $i, 3, array(
-                        array(
-                            self::T_YIELD_FROM,
-                            $this->tokens[$i][1] . $this->tokens[$i + 1][1] . $this->tokens[$i + 2][1],
-                            $line
-                        )
-                    ));
-                    $c -= 2;
-                    $line += substr_count($this->tokens[$i][1], "\n");
-                    continue;
-                }
-                if ($this->tokens[$i] === '.' && $this->tokens[$i + 1] === '.'
-                    && $this->tokens[$i + 2] === '.'
-                ) {
-                    array_splice($this->tokens, $i, 3, array(
-                        array(self::T_ELLIPSIS, '...', $line)
-                    ));
-                    $c -= 2;
-                    continue;
-                }
-            }
-
-            if (\is_array($this->tokens[$i])) {
-                $line += substr_count($this->tokens[$i][1], "\n");
-            }
+            $attrs['startFilePos'] += $posDelta;
+            $attrs['endFilePos'] += $posDelta;
+            $attrs['startLine'] += $lineDelta;
+            $attrs['endLine'] += $lineDelta;
+            $error->setAttributes($attrs);
         }
     }
-
-    public function getNextToken(&$value = null, &$startAttributes = null, &$endAttributes = null) {
-        $token = parent::getNextToken($value, $startAttributes, $endAttributes);
-
-        // replace new keywords by their respective tokens. This is not done
-        // if we currently are in an object access (e.g. in $obj->namespace
-        // "namespace" stays a T_STRING tokens and isn't converted to T_NAMESPACE)
-        if (Tokens::T_STRING === $token && !$this->inObjectAccess) {
-            if (isset($this->newKeywords[strtolower($value)])) {
-                return $this->newKeywords[strtolower($value)];
-            }
-        } else {
-            // keep track of whether we currently are in an object access (after ->)
-            $this->inObjectAccess = Tokens::T_OBJECT_OPERATOR === $token;
-        }
-
-        return $token;
-    }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/AttributeEmulator.php b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/AttributeEmulator.php
new file mode 100644
index 000000000..6776a5197
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/AttributeEmulator.php
@@ -0,0 +1,56 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Lexer\TokenEmulator;
+
+use PhpParser\Lexer\Emulative;
+
+final class AttributeEmulator extends TokenEmulator
+{
+    public function getPhpVersion(): string
+    {
+        return Emulative::PHP_8_0;
+    }
+
+    public function isEmulationNeeded(string $code) : bool
+    {
+        return strpos($code, '#[') !== false;
+    }
+
+    public function emulate(string $code, array $tokens): array
+    {
+        // We need to manually iterate and manage a count because we'll change
+        // the tokens array on the way.
+        $line = 1;
+        for ($i = 0, $c = count($tokens); $i < $c; ++$i) {
+            if ($tokens[$i] === '#' && isset($tokens[$i + 1]) && $tokens[$i + 1] === '[') {
+                array_splice($tokens, $i, 2, [
+                    [\T_ATTRIBUTE, '#[', $line]
+                ]);
+                $c--;
+                continue;
+            }
+            if (\is_array($tokens[$i])) {
+                $line += substr_count($tokens[$i][1], "\n");
+            }
+        }
+
+        return $tokens;
+    }
+
+    public function reverseEmulate(string $code, array $tokens): array
+    {
+        // TODO
+        return $tokens;
+    }
+
+    public function preprocessCode(string $code, array &$patches): string {
+        $pos = 0;
+        while (false !== $pos = strpos($code, '#[', $pos)) {
+            // Replace #[ with %[
+            $code[$pos] = '%';
+            $patches[] = [$pos, 'replace', '#'];
+            $pos += 2;
+        }
+        return $code;
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/CoaleseEqualTokenEmulator.php b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/CoaleseEqualTokenEmulator.php
new file mode 100644
index 000000000..d91da9214
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/CoaleseEqualTokenEmulator.php
@@ -0,0 +1,47 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Lexer\TokenEmulator;
+
+use PhpParser\Lexer\Emulative;
+
+final class CoaleseEqualTokenEmulator extends TokenEmulator
+{
+    public function getPhpVersion(): string
+    {
+        return Emulative::PHP_7_4;
+    }
+
+    public function isEmulationNeeded(string $code): bool
+    {
+        return strpos($code, '??=') !== false;
+    }
+
+    public function emulate(string $code, array $tokens): array
+    {
+        // We need to manually iterate and manage a count because we'll change
+        // the tokens array on the way
+        $line = 1;
+        for ($i = 0, $c = count($tokens); $i < $c; ++$i) {
+            if (isset($tokens[$i + 1])) {
+                if ($tokens[$i][0] === T_COALESCE && $tokens[$i + 1] === '=') {
+                    array_splice($tokens, $i, 2, [
+                        [\T_COALESCE_EQUAL, '??=', $line]
+                    ]);
+                    $c--;
+                    continue;
+                }
+            }
+            if (\is_array($tokens[$i])) {
+                $line += substr_count($tokens[$i][1], "\n");
+            }
+        }
+
+        return $tokens;
+    }
+
+    public function reverseEmulate(string $code, array $tokens): array
+    {
+        // ??= was not valid code previously, don't bother.
+        return $tokens;
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/EnumTokenEmulator.php b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/EnumTokenEmulator.php
new file mode 100644
index 000000000..4ddc0b17e
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/EnumTokenEmulator.php
@@ -0,0 +1,31 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Lexer\TokenEmulator;
+
+use PhpParser\Lexer\Emulative;
+
+final class EnumTokenEmulator extends KeywordEmulator
+{
+    public function getPhpVersion(): string
+    {
+        return Emulative::PHP_8_1;
+    }
+
+    public function getKeywordString(): string
+    {
+        return 'enum';
+    }
+
+    public function getKeywordToken(): int
+    {
+        return \T_ENUM;
+    }
+
+    protected function isKeywordContext(array $tokens, int $pos): bool
+    {
+        return parent::isKeywordContext($tokens, $pos)
+            && isset($tokens[$pos + 2])
+            && $tokens[$pos + 1][0] === \T_WHITESPACE
+            && $tokens[$pos + 2][0] === \T_STRING;
+    }
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ExplicitOctalEmulator.php b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ExplicitOctalEmulator.php
new file mode 100644
index 000000000..f5f6805b8
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ExplicitOctalEmulator.php
@@ -0,0 +1,44 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Lexer\TokenEmulator;
+
+use PhpParser\Lexer\Emulative;
+
+class ExplicitOctalEmulator extends TokenEmulator {
+    public function getPhpVersion(): string {
+        return Emulative::PHP_8_1;
+    }
+
+    public function isEmulationNeeded(string $code): bool {
+        return strpos($code, '0o') !== false || strpos($code, '0O') !== false;
+    }
+
+    public function emulate(string $code, array $tokens): array {
+        for ($i = 0, $c = count($tokens); $i < $c; ++$i) {
+            if ($tokens[$i][0] == \T_LNUMBER && $tokens[$i][1] === '0' &&
+                isset($tokens[$i + 1]) && $tokens[$i + 1][0] == \T_STRING &&
+                preg_match('/[oO][0-7]+(?:_[0-7]+)*/', $tokens[$i + 1][1])
+            ) {
+                $tokenKind = $this->resolveIntegerOrFloatToken($tokens[$i + 1][1]);
+                array_splice($tokens, $i, 2, [
+                    [$tokenKind, '0' . $tokens[$i + 1][1], $tokens[$i][2]],
+                ]);
+                $c--;
+            }
+        }
+        return $tokens;
+    }
+
+    private function resolveIntegerOrFloatToken(string $str): int
+    {
+        $str = substr($str, 1);
+        $str = str_replace('_', '', $str);
+        $num = octdec($str);
+        return is_float($num) ? \T_DNUMBER : \T_LNUMBER;
+    }
+
+    public function reverseEmulate(string $code, array $tokens): array {
+        // Explicit octals were not legal code previously, don't bother.
+        return $tokens;
+    }
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/FlexibleDocStringEmulator.php b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/FlexibleDocStringEmulator.php
new file mode 100644
index 000000000..c15d6271f
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/FlexibleDocStringEmulator.php
@@ -0,0 +1,76 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Lexer\TokenEmulator;
+
+use PhpParser\Lexer\Emulative;
+
+final class FlexibleDocStringEmulator extends TokenEmulator
+{
+    const FLEXIBLE_DOC_STRING_REGEX = <<<'REGEX'
+/<<<[ \t]*(['"]?)([a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*)\1\r?\n
+(?:.*\r?\n)*?
+(?<indentation>\h*)\2(?![a-zA-Z0-9_\x80-\xff])(?<separator>(?:;?[\r\n])?)/x
+REGEX;
+
+    public function getPhpVersion(): string
+    {
+        return Emulative::PHP_7_3;
+    }
+
+    public function isEmulationNeeded(string $code) : bool
+    {
+        return strpos($code, '<<<') !== false;
+    }
+
+    public function emulate(string $code, array $tokens): array
+    {
+        // Handled by preprocessing + fixup.
+        return $tokens;
+    }
+
+    public function reverseEmulate(string $code, array $tokens): array
+    {
+        // Not supported.
+        return $tokens;
+    }
+
+    public function preprocessCode(string $code, array &$patches): string {
+        if (!preg_match_all(self::FLEXIBLE_DOC_STRING_REGEX, $code, $matches, PREG_SET_ORDER|PREG_OFFSET_CAPTURE)) {
+            // No heredoc/nowdoc found
+            return $code;
+        }
+
+        // Keep track of how much we need to adjust string offsets due to the modifications we
+        // already made
+        $posDelta = 0;
+        foreach ($matches as $match) {
+            $indentation = $match['indentation'][0];
+            $indentationStart = $match['indentation'][1];
+
+            $separator = $match['separator'][0];
+            $separatorStart = $match['separator'][1];
+
+            if ($indentation === '' && $separator !== '') {
+                // Ordinary heredoc/nowdoc
+                continue;
+            }
+
+            if ($indentation !== '') {
+                // Remove indentation
+                $indentationLen = strlen($indentation);
+                $code = substr_replace($code, '', $indentationStart + $posDelta, $indentationLen);
+                $patches[] = [$indentationStart + $posDelta, 'add', $indentation];
+                $posDelta -= $indentationLen;
+            }
+
+            if ($separator === '') {
+                // Insert newline as separator
+                $code = substr_replace($code, "\n", $separatorStart + $posDelta, 0);
+                $patches[] = [$separatorStart + $posDelta, 'remove', "\n"];
+                $posDelta += 1;
+            }
+        }
+
+        return $code;
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/FnTokenEmulator.php b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/FnTokenEmulator.php
new file mode 100644
index 000000000..eb7e49634
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/FnTokenEmulator.php
@@ -0,0 +1,23 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Lexer\TokenEmulator;
+
+use PhpParser\Lexer\Emulative;
+
+final class FnTokenEmulator extends KeywordEmulator
+{
+    public function getPhpVersion(): string
+    {
+        return Emulative::PHP_7_4;
+    }
+
+    public function getKeywordString(): string
+    {
+        return 'fn';
+    }
+
+    public function getKeywordToken(): int
+    {
+        return \T_FN;
+    }
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/KeywordEmulator.php b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/KeywordEmulator.php
new file mode 100644
index 000000000..ea261cc17
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/KeywordEmulator.php
@@ -0,0 +1,62 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Lexer\TokenEmulator;
+
+abstract class KeywordEmulator extends TokenEmulator
+{
+    abstract function getKeywordString(): string;
+    abstract function getKeywordToken(): int;
+
+    public function isEmulationNeeded(string $code): bool
+    {
+        return strpos(strtolower($code), $this->getKeywordString()) !== false;
+    }
+
+    protected function isKeywordContext(array $tokens, int $pos): bool
+    {
+        $previousNonSpaceToken = $this->getPreviousNonSpaceToken($tokens, $pos);
+        return $previousNonSpaceToken === null || $previousNonSpaceToken[0] !== \T_OBJECT_OPERATOR;
+    }
+
+    public function emulate(string $code, array $tokens): array
+    {
+        $keywordString = $this->getKeywordString();
+        foreach ($tokens as $i => $token) {
+            if ($token[0] === T_STRING && strtolower($token[1]) === $keywordString
+                    && $this->isKeywordContext($tokens, $i)) {
+                $tokens[$i][0] = $this->getKeywordToken();
+            }
+        }
+
+        return $tokens;
+    }
+
+    /**
+     * @param mixed[] $tokens
+     * @return mixed[]|null
+     */
+    private function getPreviousNonSpaceToken(array $tokens, int $start)
+    {
+        for ($i = $start - 1; $i >= 0; --$i) {
+            if ($tokens[$i][0] === T_WHITESPACE) {
+                continue;
+            }
+
+            return $tokens[$i];
+        }
+
+        return null;
+    }
+
+    public function reverseEmulate(string $code, array $tokens): array
+    {
+        $keywordToken = $this->getKeywordToken();
+        foreach ($tokens as $i => $token) {
+            if ($token[0] === $keywordToken) {
+                $tokens[$i][0] = \T_STRING;
+            }
+        }
+
+        return $tokens;
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/MatchTokenEmulator.php b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/MatchTokenEmulator.php
new file mode 100644
index 000000000..902a46dfc
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/MatchTokenEmulator.php
@@ -0,0 +1,23 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Lexer\TokenEmulator;
+
+use PhpParser\Lexer\Emulative;
+
+final class MatchTokenEmulator extends KeywordEmulator
+{
+    public function getPhpVersion(): string
+    {
+        return Emulative::PHP_8_0;
+    }
+
+    public function getKeywordString(): string
+    {
+        return 'match';
+    }
+
+    public function getKeywordToken(): int
+    {
+        return \T_MATCH;
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NullsafeTokenEmulator.php b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NullsafeTokenEmulator.php
new file mode 100644
index 000000000..1a29c676e
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NullsafeTokenEmulator.php
@@ -0,0 +1,67 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Lexer\TokenEmulator;
+
+use PhpParser\Lexer\Emulative;
+
+final class NullsafeTokenEmulator extends TokenEmulator
+{
+    public function getPhpVersion(): string
+    {
+        return Emulative::PHP_8_0;
+    }
+
+    public function isEmulationNeeded(string $code): bool
+    {
+        return strpos($code, '?->') !== false;
+    }
+
+    public function emulate(string $code, array $tokens): array
+    {
+        // We need to manually iterate and manage a count because we'll change
+        // the tokens array on the way
+        $line = 1;
+        for ($i = 0, $c = count($tokens); $i < $c; ++$i) {
+            if ($tokens[$i] === '?' && isset($tokens[$i + 1]) && $tokens[$i + 1][0] === \T_OBJECT_OPERATOR) {
+                array_splice($tokens, $i, 2, [
+                    [\T_NULLSAFE_OBJECT_OPERATOR, '?->', $line]
+                ]);
+                $c--;
+                continue;
+            }
+
+            // Handle ?-> inside encapsed string.
+            if ($tokens[$i][0] === \T_ENCAPSED_AND_WHITESPACE && isset($tokens[$i - 1])
+                && $tokens[$i - 1][0] === \T_VARIABLE
+                && preg_match('/^\?->([a-zA-Z_\x80-\xff][a-zA-Z0-9_\x80-\xff]*)/', $tokens[$i][1], $matches)
+            ) {
+                $replacement = [
+                    [\T_NULLSAFE_OBJECT_OPERATOR, '?->', $line],
+                    [\T_STRING, $matches[1], $line],
+                ];
+                if (\strlen($matches[0]) !== \strlen($tokens[$i][1])) {
+                    $replacement[] = [
+                        \T_ENCAPSED_AND_WHITESPACE,
+                        \substr($tokens[$i][1], \strlen($matches[0])),
+                        $line
+                    ];
+                }
+                array_splice($tokens, $i, 1, $replacement);
+                $c += \count($replacement) - 1;
+                continue;
+            }
+
+            if (\is_array($tokens[$i])) {
+                $line += substr_count($tokens[$i][1], "\n");
+            }
+        }
+
+        return $tokens;
+    }
+
+    public function reverseEmulate(string $code, array $tokens): array
+    {
+        // ?-> was not valid code previously, don't bother.
+        return $tokens;
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NumericLiteralSeparatorEmulator.php b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NumericLiteralSeparatorEmulator.php
new file mode 100644
index 000000000..cdf793e46
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/NumericLiteralSeparatorEmulator.php
@@ -0,0 +1,105 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Lexer\TokenEmulator;
+
+use PhpParser\Lexer\Emulative;
+
+final class NumericLiteralSeparatorEmulator extends TokenEmulator
+{
+    const BIN = '(?:0b[01]+(?:_[01]+)*)';
+    const HEX = '(?:0x[0-9a-f]+(?:_[0-9a-f]+)*)';
+    const DEC = '(?:[0-9]+(?:_[0-9]+)*)';
+    const SIMPLE_FLOAT = '(?:' . self::DEC . '\.' . self::DEC . '?|\.' . self::DEC . ')';
+    const EXP = '(?:e[+-]?' . self::DEC . ')';
+    const FLOAT = '(?:' . self::SIMPLE_FLOAT . self::EXP . '?|' . self::DEC . self::EXP . ')';
+    const NUMBER = '~' . self::FLOAT . '|' . self::BIN . '|' . self::HEX . '|' . self::DEC . '~iA';
+
+    public function getPhpVersion(): string
+    {
+        return Emulative::PHP_7_4;
+    }
+
+    public function isEmulationNeeded(string $code) : bool
+    {
+        return preg_match('~[0-9]_[0-9]~', $code)
+            || preg_match('~0x[0-9a-f]+_[0-9a-f]~i', $code);
+    }
+
+    public function emulate(string $code, array $tokens): array
+    {
+        // We need to manually iterate and manage a count because we'll change
+        // the tokens array on the way
+        $codeOffset = 0;
+        for ($i = 0, $c = count($tokens); $i < $c; ++$i) {
+            $token = $tokens[$i];
+            $tokenLen = \strlen(\is_array($token) ? $token[1] : $token);
+
+            if ($token[0] !== T_LNUMBER && $token[0] !== T_DNUMBER) {
+                $codeOffset += $tokenLen;
+                continue;
+            }
+
+            $res = preg_match(self::NUMBER, $code, $matches, 0, $codeOffset);
+            assert($res, "No number at number token position");
+
+            $match = $matches[0];
+            $matchLen = \strlen($match);
+            if ($matchLen === $tokenLen) {
+                // Original token already holds the full number.
+                $codeOffset += $tokenLen;
+                continue;
+            }
+
+            $tokenKind = $this->resolveIntegerOrFloatToken($match);
+            $newTokens = [[$tokenKind, $match, $token[2]]];
+
+            $numTokens = 1;
+            $len = $tokenLen;
+            while ($matchLen > $len) {
+                $nextToken = $tokens[$i + $numTokens];
+                $nextTokenText = \is_array($nextToken) ? $nextToken[1] : $nextToken;
+                $nextTokenLen = \strlen($nextTokenText);
+
+                $numTokens++;
+                if ($matchLen < $len + $nextTokenLen) {
+                    // Split trailing characters into a partial token.
+                    assert(is_array($nextToken), "Partial token should be an array token");
+                    $partialText = substr($nextTokenText, $matchLen - $len);
+                    $newTokens[] = [$nextToken[0], $partialText, $nextToken[2]];
+                    break;
+                }
+
+                $len += $nextTokenLen;
+            }
+
+            array_splice($tokens, $i, $numTokens, $newTokens);
+            $c -= $numTokens - \count($newTokens);
+            $codeOffset += $matchLen;
+        }
+
+        return $tokens;
+    }
+
+    private function resolveIntegerOrFloatToken(string $str): int
+    {
+        $str = str_replace('_', '', $str);
+
+        if (stripos($str, '0b') === 0) {
+            $num = bindec($str);
+        } elseif (stripos($str, '0x') === 0) {
+            $num = hexdec($str);
+        } elseif (stripos($str, '0') === 0 && ctype_digit($str)) {
+            $num = octdec($str);
+        } else {
+            $num = +$str;
+        }
+
+        return is_float($num) ? T_DNUMBER : T_LNUMBER;
+    }
+
+    public function reverseEmulate(string $code, array $tokens): array
+    {
+        // Numeric separators were not legal code previously, don't bother.
+        return $tokens;
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReadonlyTokenEmulator.php b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReadonlyTokenEmulator.php
new file mode 100644
index 000000000..b97f8d112
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReadonlyTokenEmulator.php
@@ -0,0 +1,23 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Lexer\TokenEmulator;
+
+use PhpParser\Lexer\Emulative;
+
+final class ReadonlyTokenEmulator extends KeywordEmulator
+{
+    public function getPhpVersion(): string
+    {
+        return Emulative::PHP_8_1;
+    }
+
+    public function getKeywordString(): string
+    {
+        return 'readonly';
+    }
+
+    public function getKeywordToken(): int
+    {
+        return \T_READONLY;
+    }
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReverseEmulator.php b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReverseEmulator.php
new file mode 100644
index 000000000..90093f66b
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/ReverseEmulator.php
@@ -0,0 +1,36 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Lexer\TokenEmulator;
+
+/**
+ * Reverses emulation direction of the inner emulator.
+ */
+final class ReverseEmulator extends TokenEmulator
+{
+    /** @var TokenEmulator Inner emulator */
+    private $emulator;
+
+    public function __construct(TokenEmulator $emulator) {
+        $this->emulator = $emulator;
+    }
+
+    public function getPhpVersion(): string {
+        return $this->emulator->getPhpVersion();
+    }
+
+    public function isEmulationNeeded(string $code): bool {
+        return $this->emulator->isEmulationNeeded($code);
+    }
+
+    public function emulate(string $code, array $tokens): array {
+        return $this->emulator->reverseEmulate($code, $tokens);
+    }
+
+    public function reverseEmulate(string $code, array $tokens): array {
+        return $this->emulator->emulate($code, $tokens);
+    }
+
+    public function preprocessCode(string $code, array &$patches): string {
+        return $code;
+    }
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/TokenEmulator.php b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/TokenEmulator.php
new file mode 100644
index 000000000..a020bc0ff
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Lexer/TokenEmulator/TokenEmulator.php
@@ -0,0 +1,25 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Lexer\TokenEmulator;
+
+/** @internal */
+abstract class TokenEmulator
+{
+    abstract public function getPhpVersion(): string;
+
+    abstract public function isEmulationNeeded(string $code): bool;
+
+    /**
+     * @return array Modified Tokens
+     */
+    abstract public function emulate(string $code, array $tokens): array;
+
+    /**
+     * @return array Modified Tokens
+     */
+    abstract public function reverseEmulate(string $code, array $tokens): array;
+
+    public function preprocessCode(string $code, array &$patches): string {
+        return $code;
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/NameContext.php b/lib/nikic/php-parser/lib/PhpParser/NameContext.php
new file mode 100644
index 000000000..777a4afde
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/NameContext.php
@@ -0,0 +1,285 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser;
+
+use PhpParser\Node\Name;
+use PhpParser\Node\Name\FullyQualified;
+use PhpParser\Node\Stmt;
+
+class NameContext
+{
+    /** @var null|Name Current namespace */
+    protected $namespace;
+
+    /** @var Name[][] Map of format [aliasType => [aliasName => originalName]] */
+    protected $aliases = [];
+
+    /** @var Name[][] Same as $aliases but preserving original case */
+    protected $origAliases = [];
+
+    /** @var ErrorHandler Error handler */
+    protected $errorHandler;
+
+    /**
+     * Create a name context.
+     *
+     * @param ErrorHandler $errorHandler Error handling used to report errors
+     */
+    public function __construct(ErrorHandler $errorHandler) {
+        $this->errorHandler = $errorHandler;
+    }
+
+    /**
+     * Start a new namespace.
+     *
+     * This also resets the alias table.
+     *
+     * @param Name|null $namespace Null is the global namespace
+     */
+    public function startNamespace(Name $namespace = null) {
+        $this->namespace = $namespace;
+        $this->origAliases = $this->aliases = [
+            Stmt\Use_::TYPE_NORMAL   => [],
+            Stmt\Use_::TYPE_FUNCTION => [],
+            Stmt\Use_::TYPE_CONSTANT => [],
+        ];
+    }
+
+    /**
+     * Add an alias / import.
+     *
+     * @param Name   $name        Original name
+     * @param string $aliasName   Aliased name
+     * @param int    $type        One of Stmt\Use_::TYPE_*
+     * @param array  $errorAttrs Attributes to use to report an error
+     */
+    public function addAlias(Name $name, string $aliasName, int $type, array $errorAttrs = []) {
+        // Constant names are case sensitive, everything else case insensitive
+        if ($type === Stmt\Use_::TYPE_CONSTANT) {
+            $aliasLookupName = $aliasName;
+        } else {
+            $aliasLookupName = strtolower($aliasName);
+        }
+
+        if (isset($this->aliases[$type][$aliasLookupName])) {
+            $typeStringMap = [
+                Stmt\Use_::TYPE_NORMAL   => '',
+                Stmt\Use_::TYPE_FUNCTION => 'function ',
+                Stmt\Use_::TYPE_CONSTANT => 'const ',
+            ];
+
+            $this->errorHandler->handleError(new Error(
+                sprintf(
+                    'Cannot use %s%s as %s because the name is already in use',
+                    $typeStringMap[$type], $name, $aliasName
+                ),
+                $errorAttrs
+            ));
+            return;
+        }
+
+        $this->aliases[$type][$aliasLookupName] = $name;
+        $this->origAliases[$type][$aliasName] = $name;
+    }
+
+    /**
+     * Get current namespace.
+     *
+     * @return null|Name Namespace (or null if global namespace)
+     */
+    public function getNamespace() {
+        return $this->namespace;
+    }
+
+    /**
+     * Get resolved name.
+     *
+     * @param Name $name Name to resolve
+     * @param int  $type One of Stmt\Use_::TYPE_{FUNCTION|CONSTANT}
+     *
+     * @return null|Name Resolved name, or null if static resolution is not possible
+     */
+    public function getResolvedName(Name $name, int $type) {
+        // don't resolve special class names
+        if ($type === Stmt\Use_::TYPE_NORMAL && $name->isSpecialClassName()) {
+            if (!$name->isUnqualified()) {
+                $this->errorHandler->handleError(new Error(
+                    sprintf("'\\%s' is an invalid class name", $name->toString()),
+                    $name->getAttributes()
+                ));
+            }
+            return $name;
+        }
+
+        // fully qualified names are already resolved
+        if ($name->isFullyQualified()) {
+            return $name;
+        }
+
+        // Try to resolve aliases
+        if (null !== $resolvedName = $this->resolveAlias($name, $type)) {
+            return $resolvedName;
+        }
+
+        if ($type !== Stmt\Use_::TYPE_NORMAL && $name->isUnqualified()) {
+            if (null === $this->namespace) {
+                // outside of a namespace unaliased unqualified is same as fully qualified
+                return new FullyQualified($name, $name->getAttributes());
+            }
+
+            // Cannot resolve statically
+            return null;
+        }
+
+        // if no alias exists prepend current namespace
+        return FullyQualified::concat($this->namespace, $name, $name->getAttributes());
+    }
+
+    /**
+     * Get resolved class name.
+     *
+     * @param Name $name Class ame to resolve
+     *
+     * @return Name Resolved name
+     */
+    public function getResolvedClassName(Name $name) : Name {
+        return $this->getResolvedName($name, Stmt\Use_::TYPE_NORMAL);
+    }
+
+    /**
+     * Get possible ways of writing a fully qualified name (e.g., by making use of aliases).
+     *
+     * @param string $name Fully-qualified name (without leading namespace separator)
+     * @param int    $type One of Stmt\Use_::TYPE_*
+     *
+     * @return Name[] Possible representations of the name
+     */
+    public function getPossibleNames(string $name, int $type) : array {
+        $lcName = strtolower($name);
+
+        if ($type === Stmt\Use_::TYPE_NORMAL) {
+            // self, parent and static must always be unqualified
+            if ($lcName === "self" || $lcName === "parent" || $lcName === "static") {
+                return [new Name($name)];
+            }
+        }
+
+        // Collect possible ways to write this name, starting with the fully-qualified name
+        $possibleNames = [new FullyQualified($name)];
+
+        if (null !== $nsRelativeName = $this->getNamespaceRelativeName($name, $lcName, $type)) {
+            // Make sure there is no alias that makes the normally namespace-relative name
+            // into something else
+            if (null === $this->resolveAlias($nsRelativeName, $type)) {
+                $possibleNames[] = $nsRelativeName;
+            }
+        }
+
+        // Check for relevant namespace use statements
+        foreach ($this->origAliases[Stmt\Use_::TYPE_NORMAL] as $alias => $orig) {
+            $lcOrig = $orig->toLowerString();
+            if (0 === strpos($lcName, $lcOrig . '\\')) {
+                $possibleNames[] = new Name($alias . substr($name, strlen($lcOrig)));
+            }
+        }
+
+        // Check for relevant type-specific use statements
+        foreach ($this->origAliases[$type] as $alias => $orig) {
+            if ($type === Stmt\Use_::TYPE_CONSTANT) {
+                // Constants are are complicated-sensitive
+                $normalizedOrig = $this->normalizeConstName($orig->toString());
+                if ($normalizedOrig === $this->normalizeConstName($name)) {
+                    $possibleNames[] = new Name($alias);
+                }
+            } else {
+                // Everything else is case-insensitive
+                if ($orig->toLowerString() === $lcName) {
+                    $possibleNames[] = new Name($alias);
+                }
+            }
+        }
+
+        return $possibleNames;
+    }
+
+    /**
+     * Get shortest representation of this fully-qualified name.
+     *
+     * @param string $name Fully-qualified name (without leading namespace separator)
+     * @param int    $type One of Stmt\Use_::TYPE_*
+     *
+     * @return Name Shortest representation
+     */
+    public function getShortName(string $name, int $type) : Name {
+        $possibleNames = $this->getPossibleNames($name, $type);
+
+        // Find shortest name
+        $shortestName = null;
+        $shortestLength = \INF;
+        foreach ($possibleNames as $possibleName) {
+            $length = strlen($possibleName->toCodeString());
+            if ($length < $shortestLength) {
+                $shortestName = $possibleName;
+                $shortestLength = $length;
+            }
+        }
+
+       return $shortestName;
+    }
+
+    private function resolveAlias(Name $name, $type) {
+        $firstPart = $name->getFirst();
+
+        if ($name->isQualified()) {
+            // resolve aliases for qualified names, always against class alias table
+            $checkName = strtolower($firstPart);
+            if (isset($this->aliases[Stmt\Use_::TYPE_NORMAL][$checkName])) {
+                $alias = $this->aliases[Stmt\Use_::TYPE_NORMAL][$checkName];
+                return FullyQualified::concat($alias, $name->slice(1), $name->getAttributes());
+            }
+        } elseif ($name->isUnqualified()) {
+            // constant aliases are case-sensitive, function aliases case-insensitive
+            $checkName = $type === Stmt\Use_::TYPE_CONSTANT ? $firstPart : strtolower($firstPart);
+            if (isset($this->aliases[$type][$checkName])) {
+                // resolve unqualified aliases
+                return new FullyQualified($this->aliases[$type][$checkName], $name->getAttributes());
+            }
+        }
+
+        // No applicable aliases
+        return null;
+    }
+
+    private function getNamespaceRelativeName(string $name, string $lcName, int $type) {
+        if (null === $this->namespace) {
+            return new Name($name);
+        }
+
+        if ($type === Stmt\Use_::TYPE_CONSTANT) {
+            // The constants true/false/null always resolve to the global symbols, even inside a
+            // namespace, so they may be used without qualification
+            if ($lcName === "true" || $lcName === "false" || $lcName === "null") {
+                return new Name($name);
+            }
+        }
+
+        $namespacePrefix = strtolower($this->namespace . '\\');
+        if (0 === strpos($lcName, $namespacePrefix)) {
+            return new Name(substr($name, strlen($namespacePrefix)));
+        }
+
+        return null;
+    }
+
+    private function normalizeConstName(string $name) {
+        $nsSep = strrpos($name, '\\');
+        if (false === $nsSep) {
+            return $name;
+        }
+
+        // Constants have case-insensitive namespace and case-sensitive short-name
+        $ns = substr($name, 0, $nsSep);
+        $shortName = substr($name, $nsSep + 1);
+        return strtolower($ns) . '\\' . $shortName;
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node.php b/lib/nikic/php-parser/lib/PhpParser/Node.php
index 6925fd726..befb25650 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser;
 
@@ -9,36 +9,92 @@ interface Node
      *
      * @return string Type of the node
      */
-    public function getType();
+    public function getType() : string;
 
     /**
      * Gets the names of the sub nodes.
      *
      * @return array Names of sub nodes
      */
-    public function getSubNodeNames();
+    public function getSubNodeNames() : array;
+
+    /**
+     * Gets line the node started in (alias of getStartLine).
+     *
+     * @return int Start line (or -1 if not available)
+     */
+    public function getLine() : int;
 
     /**
      * Gets line the node started in.
      *
-     * @return int Line
+     * Requires the 'startLine' attribute to be enabled in the lexer (enabled by default).
+     *
+     * @return int Start line (or -1 if not available)
      */
-    public function getLine();
+    public function getStartLine() : int;
 
     /**
-     * Sets line the node started in.
+     * Gets the line the node ended in.
      *
-     * @param int $line Line
+     * Requires the 'endLine' attribute to be enabled in the lexer (enabled by default).
      *
-     * @deprecated
+     * @return int End line (or -1 if not available)
      */
-    public function setLine($line);
+    public function getEndLine() : int;
+
+    /**
+     * Gets the token offset of the first token that is part of this node.
+     *
+     * The offset is an index into the array returned by Lexer::getTokens().
+     *
+     * Requires the 'startTokenPos' attribute to be enabled in the lexer (DISABLED by default).
+     *
+     * @return int Token start position (or -1 if not available)
+     */
+    public function getStartTokenPos() : int;
+
+    /**
+     * Gets the token offset of the last token that is part of this node.
+     *
+     * The offset is an index into the array returned by Lexer::getTokens().
+     *
+     * Requires the 'endTokenPos' attribute to be enabled in the lexer (DISABLED by default).
+     *
+     * @return int Token end position (or -1 if not available)
+     */
+    public function getEndTokenPos() : int;
+
+    /**
+     * Gets the file offset of the first character that is part of this node.
+     *
+     * Requires the 'startFilePos' attribute to be enabled in the lexer (DISABLED by default).
+     *
+     * @return int File start position (or -1 if not available)
+     */
+    public function getStartFilePos() : int;
+
+    /**
+     * Gets the file offset of the last character that is part of this node.
+     *
+     * Requires the 'endFilePos' attribute to be enabled in the lexer (DISABLED by default).
+     *
+     * @return int File end position (or -1 if not available)
+     */
+    public function getEndFilePos() : int;
+
+    /**
+     * Gets all comments directly preceding this node.
+     *
+     * The comments are also available through the "comments" attribute.
+     *
+     * @return Comment[]
+     */
+    public function getComments() : array;
 
     /**
      * Gets the doc comment of the node.
      *
-     * The doc comment has to be the last comment associated with the node.
-     *
      * @return null|Comment\Doc Doc comment object or null
      */
     public function getDocComment();
@@ -58,7 +114,7 @@ interface Node
      * @param string $key
      * @param mixed  $value
      */
-    public function setAttribute($key, $value);
+    public function setAttribute(string $key, $value);
 
     /**
      * Returns whether an attribute exists.
@@ -67,7 +123,7 @@ interface Node
      *
      * @return bool
      */
-    public function hasAttribute($key);
+    public function hasAttribute(string $key) : bool;
 
     /**
      * Returns the value of an attribute.
@@ -77,12 +133,19 @@ interface Node
      *
      * @return mixed
      */
-    public function &getAttribute($key, $default = null);
+    public function getAttribute(string $key, $default = null);
 
     /**
-     * Returns all attributes for the given node.
+     * Returns all the attributes of this node.
      *
      * @return array
      */
-    public function getAttributes();
-}
\ No newline at end of file
+    public function getAttributes() : array;
+
+    /**
+     * Replaces all the attributes of this node.
+     *
+     * @param array $attributes
+     */
+    public function setAttributes(array $attributes);
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Arg.php b/lib/nikic/php-parser/lib/PhpParser/Node/Arg.php
index 088766943..bcf130e68 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Arg.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Arg.php
@@ -1,11 +1,14 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node;
 
+use PhpParser\Node\VariadicPlaceholder;
 use PhpParser\NodeAbstract;
 
 class Arg extends NodeAbstract
 {
+    /** @var Identifier|null Parameter name (for named parameters) */
+    public $name;
     /** @var Expr Value to pass */
     public $value;
     /** @var bool Whether to pass by ref */
@@ -20,15 +23,24 @@ class Arg extends NodeAbstract
      * @param bool  $byRef      Whether to pass by ref
      * @param bool  $unpack     Whether to unpack the argument
      * @param array $attributes Additional attributes
+     * @param Identifier|null $name Parameter name (for named parameters)
      */
-    public function __construct(Expr $value, $byRef = false, $unpack = false, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(
+        Expr $value, bool $byRef = false, bool $unpack = false, array $attributes = [],
+        Identifier $name = null
+    ) {
+        $this->attributes = $attributes;
+        $this->name = $name;
         $this->value = $value;
         $this->byRef = $byRef;
         $this->unpack = $unpack;
     }
 
-    public function getSubNodeNames() {
-        return array('value', 'byRef', 'unpack');
+    public function getSubNodeNames() : array {
+        return ['name', 'value', 'byRef', 'unpack'];
+    }
+    
+    public function getType() : string {
+        return 'Arg';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Attribute.php b/lib/nikic/php-parser/lib/PhpParser/Node/Attribute.php
new file mode 100644
index 000000000..c96f66e51
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Attribute.php
@@ -0,0 +1,34 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node;
+
+use PhpParser\Node;
+use PhpParser\NodeAbstract;
+
+class Attribute extends NodeAbstract
+{
+    /** @var Name Attribute name */
+    public $name;
+
+    /** @var Arg[] Attribute arguments */
+    public $args;
+
+    /**
+     * @param Node\Name $name       Attribute name
+     * @param Arg[]     $args       Attribute arguments
+     * @param array     $attributes Additional node attributes
+     */
+    public function __construct(Name $name, array $args = [], array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->name = $name;
+        $this->args = $args;
+    }
+
+    public function getSubNodeNames() : array {
+        return ['name', 'args'];
+    }
+
+    public function getType() : string {
+        return 'Attribute';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/AttributeGroup.php b/lib/nikic/php-parser/lib/PhpParser/Node/AttributeGroup.php
new file mode 100644
index 000000000..613bfc413
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/AttributeGroup.php
@@ -0,0 +1,29 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node;
+
+use PhpParser\Node;
+use PhpParser\NodeAbstract;
+
+class AttributeGroup extends NodeAbstract
+{
+    /** @var Attribute[] Attributes */
+    public $attrs;
+
+    /**
+     * @param Attribute[] $attrs PHP attributes
+     * @param array $attributes Additional node attributes
+     */
+    public function __construct(array $attrs, array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->attrs = $attrs;
+    }
+
+    public function getSubNodeNames() : array {
+        return ['attrs'];
+    }
+
+    public function getType() : string {
+        return 'AttributeGroup';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/ComplexType.php b/lib/nikic/php-parser/lib/PhpParser/Node/ComplexType.php
new file mode 100644
index 000000000..9505532ae
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/ComplexType.php
@@ -0,0 +1,14 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node;
+
+use PhpParser\NodeAbstract;
+
+/**
+ * This is a base class for complex types, including nullable types and union types.
+ *
+ * It does not provide any shared behavior and exists only for type-checking purposes.
+ */
+abstract class ComplexType extends NodeAbstract
+{
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Const_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Const_.php
index 26322d49e..b69eb16fa 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Const_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Const_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node;
 
@@ -6,25 +6,32 @@ use PhpParser\NodeAbstract;
 
 class Const_ extends NodeAbstract
 {
-    /** @var string Name */
+    /** @var Identifier Name */
     public $name;
     /** @var Expr Value */
     public $value;
 
+    /** @var Name Namespaced name (if using NameResolver) */
+    public $namespacedName;
+
     /**
      * Constructs a const node for use in class const and const statements.
      *
-     * @param string  $name       Name
-     * @param Expr    $value      Value
-     * @param array   $attributes Additional attributes
+     * @param string|Identifier $name       Name
+     * @param Expr              $value      Value
+     * @param array             $attributes Additional attributes
      */
-    public function __construct($name, Expr $value, array $attributes = array()) {
-        parent::__construct($attributes);
-        $this->name = $name;
+    public function __construct($name, Expr $value, array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->name = \is_string($name) ? new Identifier($name) : $name;
         $this->value = $value;
     }
 
-    public function getSubNodeNames() {
-        return array('name', 'value');
+    public function getSubNodeNames() : array {
+        return ['name', 'value'];
+    }
+    
+    public function getType() : string {
+        return 'Const';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr.php
index 2dae5bfcd..6cf4df223 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node;
 
@@ -6,4 +6,4 @@ use PhpParser\NodeAbstract;
 
 abstract class Expr extends NodeAbstract
 {
-}
\ No newline at end of file
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayDimFetch.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayDimFetch.php
index b8e4818fa..71694478e 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayDimFetch.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayDimFetch.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -18,13 +18,17 @@ class ArrayDimFetch extends Expr
      * @param null|Expr $dim        Array index / dim
      * @param array     $attributes Additional attributes
      */
-    public function __construct(Expr $var, Expr $dim = null, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $var, Expr $dim = null, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
         $this->dim = $dim;
     }
 
-    public function getSubNodeNames() {
-        return array('var', 'dim');
+    public function getSubNodeNames() : array {
+        return ['var', 'dim'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_ArrayDimFetch';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayItem.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayItem.php
index de73ef467..1b078f821 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayItem.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrayItem.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -12,6 +12,8 @@ class ArrayItem extends Expr
     public $value;
     /** @var bool Whether to assign by reference */
     public $byRef;
+    /** @var bool Whether to unpack the argument */
+    public $unpack;
 
     /**
      * Constructs an array item node.
@@ -21,14 +23,19 @@ class ArrayItem extends Expr
      * @param bool      $byRef      Whether to assign by reference
      * @param array     $attributes Additional attributes
      */
-    public function __construct(Expr $value, Expr $key = null, $byRef = false, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $value, Expr $key = null, bool $byRef = false, array $attributes = [], bool $unpack = false) {
+        $this->attributes = $attributes;
         $this->key = $key;
         $this->value = $value;
         $this->byRef = $byRef;
+        $this->unpack = $unpack;
     }
 
-    public function getSubNodeNames() {
-        return array('key', 'value', 'byRef');
+    public function getSubNodeNames() : array {
+        return ['key', 'value', 'byRef', 'unpack'];
+    }
+
+    public function getType() : string {
+        return 'Expr_ArrayItem';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Array_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Array_.php
index 9151f27d8..e6eaa2834 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Array_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Array_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -10,21 +10,25 @@ class Array_ extends Expr
     const KIND_LONG = 1;  // array() syntax
     const KIND_SHORT = 2; // [] syntax
 
-    /** @var ArrayItem[] Items */
+    /** @var (ArrayItem|null)[] Items */
     public $items;
 
     /**
      * Constructs an array node.
      *
-     * @param ArrayItem[] $items      Items of the array
+     * @param (ArrayItem|null)[] $items      Items of the array
      * @param array       $attributes Additional attributes
      */
-    public function __construct(array $items = array(), array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $items = [], array $attributes = []) {
+        $this->attributes = $attributes;
         $this->items = $items;
     }
 
-    public function getSubNodeNames() {
-        return array('items');
+    public function getSubNodeNames() : array {
+        return ['items'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Array';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrowFunction.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrowFunction.php
new file mode 100644
index 000000000..c273fb7ee
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ArrowFunction.php
@@ -0,0 +1,79 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node\Expr;
+
+use PhpParser\Node;
+use PhpParser\Node\Expr;
+use PhpParser\Node\FunctionLike;
+
+class ArrowFunction extends Expr implements FunctionLike
+{
+    /** @var bool */
+    public $static;
+
+    /** @var bool */
+    public $byRef;
+
+    /** @var Node\Param[] */
+    public $params = [];
+
+    /** @var null|Node\Identifier|Node\Name|Node\ComplexType */
+    public $returnType;
+
+    /** @var Expr */
+    public $expr;
+    /** @var Node\AttributeGroup[] */
+    public $attrGroups;
+
+    /**
+     * @param array $subNodes   Array of the following optional subnodes:
+     *                          'static'     => false   : Whether the closure is static
+     *                          'byRef'      => false   : Whether to return by reference
+     *                          'params'     => array() : Parameters
+     *                          'returnType' => null    : Return type
+     *                          'expr'       => Expr    : Expression body
+     *                          'attrGroups' => array() : PHP attribute groups
+     * @param array $attributes Additional attributes
+     */
+    public function __construct(array $subNodes = [], array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->static = $subNodes['static'] ?? false;
+        $this->byRef = $subNodes['byRef'] ?? false;
+        $this->params = $subNodes['params'] ?? [];
+        $returnType = $subNodes['returnType'] ?? null;
+        $this->returnType = \is_string($returnType) ? new Node\Identifier($returnType) : $returnType;
+        $this->expr = $subNodes['expr'];
+        $this->attrGroups = $subNodes['attrGroups'] ?? [];
+    }
+
+    public function getSubNodeNames() : array {
+        return ['attrGroups', 'static', 'byRef', 'params', 'returnType', 'expr'];
+    }
+
+    public function returnsByRef() : bool {
+        return $this->byRef;
+    }
+
+    public function getParams() : array {
+        return $this->params;
+    }
+
+    public function getReturnType() {
+        return $this->returnType;
+    }
+
+    public function getAttrGroups() : array {
+        return $this->attrGroups;
+    }
+
+    /**
+     * @return Node\Stmt\Return_[]
+     */
+    public function getStmts() : array {
+        return [new Node\Stmt\Return_($this->expr)];
+    }
+
+    public function getType() : string {
+        return 'Expr_ArrowFunction';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Assign.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Assign.php
index 1f280ff0c..cf9e6e82b 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Assign.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Assign.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -18,13 +18,17 @@ class Assign extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $var, Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $var, Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('var', 'expr');
+    public function getSubNodeNames() : array {
+        return ['var', 'expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Assign';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp.php
index 83540a072..bce8604f1 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -18,13 +18,13 @@ abstract class AssignOp extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $var, Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $var, Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('var', 'expr');
+    public function getSubNodeNames() : array {
+        return ['var', 'expr'];
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseAnd.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseAnd.php
index 9e3ed8226..420284cdc 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseAnd.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseAnd.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class BitwiseAnd extends AssignOp
 {
-}
\ No newline at end of file
+    public function getType() : string {
+        return 'Expr_AssignOp_BitwiseAnd';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseOr.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseOr.php
index a9fd4e9b2..481ad3bbc 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseOr.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseOr.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class BitwiseOr extends AssignOp
 {
-}
\ No newline at end of file
+    public function getType() : string {
+        return 'Expr_AssignOp_BitwiseOr';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseXor.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseXor.php
index aabe5523e..f41d4c8e7 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseXor.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/BitwiseXor.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class BitwiseXor extends AssignOp
 {
-}
\ No newline at end of file
+    public function getType() : string {
+        return 'Expr_AssignOp_BitwiseXor';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Coalesce.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Coalesce.php
new file mode 100644
index 000000000..c0e9b316c
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Coalesce.php
@@ -0,0 +1,12 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node\Expr\AssignOp;
+
+use PhpParser\Node\Expr\AssignOp;
+
+class Coalesce extends AssignOp
+{
+    public function getType() : string {
+        return 'Expr_AssignOp_Coalesce';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Concat.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Concat.php
index 215445d26..ac1682078 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Concat.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Concat.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class Concat extends AssignOp
 {
-}
\ No newline at end of file
+    public function getType() : string {
+        return 'Expr_AssignOp_Concat';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Div.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Div.php
index 87893bbb4..f1fcfc09a 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Div.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Div.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class Div extends AssignOp
 {
-}
\ No newline at end of file
+    public function getType() : string {
+        return 'Expr_AssignOp_Div';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Minus.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Minus.php
index 32cad523d..82ef4517b 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Minus.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Minus.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class Minus extends AssignOp
 {
-}
\ No newline at end of file
+    public function getType() : string {
+        return 'Expr_AssignOp_Minus';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Mod.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Mod.php
index a0a1571a0..be3b4a0ad 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Mod.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Mod.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class Mod extends AssignOp
 {
-}
\ No newline at end of file
+    public function getType() : string {
+        return 'Expr_AssignOp_Mod';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Mul.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Mul.php
index 88c582b95..5c196c3bc 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Mul.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Mul.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class Mul extends AssignOp
 {
-}
\ No newline at end of file
+    public function getType() : string {
+        return 'Expr_AssignOp_Mul';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Plus.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Plus.php
index bd4d77e76..dd101c61c 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Plus.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Plus.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class Plus extends AssignOp
 {
-}
\ No newline at end of file
+    public function getType() : string {
+        return 'Expr_AssignOp_Plus';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Pow.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Pow.php
index b5e5d98fc..5e1307d1d 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Pow.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/Pow.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class Pow extends AssignOp
 {
-}
\ No newline at end of file
+    public function getType() : string {
+        return 'Expr_AssignOp_Pow';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/ShiftLeft.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/ShiftLeft.php
index 84b2d56b8..b8f88269b 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/ShiftLeft.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/ShiftLeft.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class ShiftLeft extends AssignOp
 {
-}
\ No newline at end of file
+    public function getType() : string {
+        return 'Expr_AssignOp_ShiftLeft';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/ShiftRight.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/ShiftRight.php
index 0c8e237e6..e0cc67b7f 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/ShiftRight.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignOp/ShiftRight.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\AssignOp;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\AssignOp;
 
 class ShiftRight extends AssignOp
 {
-}
\ No newline at end of file
+    public function getType() : string {
+        return 'Expr_AssignOp_ShiftRight';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignRef.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignRef.php
index 7578df3ff..de3c644c3 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignRef.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/AssignRef.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -18,13 +18,17 @@ class AssignRef extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $var, Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $var, Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('var', 'expr');
+    public function getSubNodeNames() : array {
+        return ['var', 'expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_AssignRef';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp.php
index 6f87e2350..d9c582b0d 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -12,19 +12,29 @@ abstract class BinaryOp extends Expr
     public $right;
 
     /**
-     * Constructs a bitwise and node.
+     * Constructs a binary operator node.
      *
      * @param Expr  $left       The left hand side expression
      * @param Expr  $right      The right hand side expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $left, Expr $right, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $left, Expr $right, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->left = $left;
         $this->right = $right;
     }
 
-    public function getSubNodeNames() {
-        return array('left', 'right');
+    public function getSubNodeNames() : array {
+        return ['left', 'right'];
     }
+
+    /**
+     * Get the operator sigil for this binary operation.
+     *
+     * In the case there are multiple possible sigils for an operator, this method does not
+     * necessarily return the one used in the parsed code.
+     *
+     * @return string
+     */
+    abstract public function getOperatorSigil() : string;
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseAnd.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseAnd.php
index bd6c5c1fb..d907393bf 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseAnd.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseAnd.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class BitwiseAnd extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '&';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_BitwiseAnd';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseOr.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseOr.php
index aa0f11419..d92069f32 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseOr.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseOr.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class BitwiseOr extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '|';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_BitwiseOr';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseXor.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseXor.php
index ce951d0b0..40fa94f88 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseXor.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BitwiseXor.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class BitwiseXor extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '^';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_BitwiseXor';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BooleanAnd.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BooleanAnd.php
index 0671f33d8..4c3c9e9b1 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BooleanAnd.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BooleanAnd.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class BooleanAnd extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '&&';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_BooleanAnd';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BooleanOr.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BooleanOr.php
index 22d743fb2..5ad417279 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BooleanOr.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/BooleanOr.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class BooleanOr extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '||';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_BooleanOr';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Coalesce.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Coalesce.php
index 55c2379e1..b8cf6f459 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Coalesce.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Coalesce.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Coalesce extends BinaryOp
 {
+    public function getOperatorSigil() : string {
+        return '??';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Coalesce';
+    }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Concat.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Concat.php
index f65dfa55b..9a8d9873c 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Concat.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Concat.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Concat extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '.';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Concat';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Div.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Div.php
index 78d7f44ff..d38df0db4 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Div.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Div.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Div extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '/';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Div';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Equal.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Equal.php
index d9cb204be..e7b11dc82 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Equal.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Equal.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Equal extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '==';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Equal';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Greater.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Greater.php
index 2f53a9902..da01f7a10 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Greater.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Greater.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Greater extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '>';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Greater';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/GreaterOrEqual.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/GreaterOrEqual.php
index 9bd93a152..d677502cf 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/GreaterOrEqual.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/GreaterOrEqual.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class GreaterOrEqual extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '>=';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_GreaterOrEqual';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Identical.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Identical.php
index 9562680e7..3d96285c6 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Identical.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Identical.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Identical extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '===';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Identical';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalAnd.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalAnd.php
index 5e8bae015..2a3afd548 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalAnd.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalAnd.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class LogicalAnd extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return 'and';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_LogicalAnd';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalOr.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalOr.php
index da92f80e2..21507dba6 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalOr.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalOr.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class LogicalOr extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return 'or';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_LogicalOr';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalXor.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalXor.php
index 5fa965231..261c6a910 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalXor.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/LogicalXor.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class LogicalXor extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return 'xor';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_LogicalXor';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Minus.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Minus.php
index 4a3b11772..54b3c6e90 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Minus.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Minus.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Minus extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '-';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Minus';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Mod.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Mod.php
index 0b1066918..103404040 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Mod.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Mod.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Mod extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '%';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Mod';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Mul.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Mul.php
index 2338d0b1e..b82d0b2fc 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Mul.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Mul.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Mul extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '*';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Mul';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/NotEqual.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/NotEqual.php
index c205ee24c..51075da56 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/NotEqual.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/NotEqual.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class NotEqual extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '!=';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_NotEqual';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/NotIdentical.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/NotIdentical.php
index b7682d759..fa4050e05 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/NotIdentical.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/NotIdentical.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class NotIdentical extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '!==';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_NotIdentical';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Plus.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Plus.php
index 4025e63bd..62f022998 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Plus.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Plus.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Plus extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '+';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Plus';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Pow.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Pow.php
index 007b6cb9d..572a1e8e4 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Pow.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Pow.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Pow extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '**';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Pow';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/ShiftLeft.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/ShiftLeft.php
index 398ec0bcc..4e70b4ef0 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/ShiftLeft.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/ShiftLeft.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class ShiftLeft extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '<<';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_ShiftLeft';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/ShiftRight.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/ShiftRight.php
index 6f98db821..45acbd046 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/ShiftRight.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/ShiftRight.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class ShiftRight extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '>>';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_ShiftRight';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Smaller.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Smaller.php
index ba2c28b8b..3cb8e7e0d 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Smaller.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Smaller.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Smaller extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '<';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Smaller';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/SmallerOrEqual.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/SmallerOrEqual.php
index ebb19111a..83e8e214d 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/SmallerOrEqual.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/SmallerOrEqual.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class SmallerOrEqual extends BinaryOp
 {
-}
\ No newline at end of file
+    public function getOperatorSigil() : string {
+        return '<=';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_SmallerOrEqual';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Spaceship.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Spaceship.php
index f6a97caf3..8c6d787f6 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Spaceship.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BinaryOp/Spaceship.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\BinaryOp;
 
@@ -6,4 +6,11 @@ use PhpParser\Node\Expr\BinaryOp;
 
 class Spaceship extends BinaryOp
 {
+    public function getOperatorSigil() : string {
+        return '<=>';
+    }
+    
+    public function getType() : string {
+        return 'Expr_BinaryOp_Spaceship';
+    }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BitwiseNot.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BitwiseNot.php
index 1d9226410..ed44984be 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BitwiseNot.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BitwiseNot.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class BitwiseNot extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_BitwiseNot';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BooleanNot.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BooleanNot.php
index 8f543b822..bf27e9f65 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BooleanNot.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/BooleanNot.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class BooleanNot extends Expr
      * @param Expr $expr       Expression
      * @param array               $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_BooleanNot';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/CallLike.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/CallLike.php
new file mode 100644
index 000000000..78e1cf349
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/CallLike.php
@@ -0,0 +1,39 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node\Expr;
+
+use PhpParser\Node\Arg;
+use PhpParser\Node\Expr;
+use PhpParser\Node\VariadicPlaceholder;
+
+abstract class CallLike extends Expr {
+    /**
+     * Return raw arguments, which may be actual Args, or VariadicPlaceholders for first-class
+     * callables.
+     *
+     * @return array<Arg|VariadicPlaceholder>
+     */
+    abstract public function getRawArgs(): array;
+
+    /**
+     * Returns whether this call expression is actually a first class callable.
+     */
+    public function isFirstClassCallable(): bool {
+        foreach ($this->getRawArgs() as $arg) {
+            if ($arg instanceof VariadicPlaceholder) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Assert that this is not a first-class callable and return only ordinary Args.
+     *
+     * @return Arg[]
+     */
+    public function getArgs(): array {
+        assert(!$this->isFirstClassCallable());
+        return $this->getRawArgs();
+    }
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast.php
index bf850dc52..36769d4fc 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,12 @@ abstract class Cast extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Array_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Array_.php
index 08b3a384c..57cc473b6 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Array_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Array_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\Cast;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\Cast;
 
 class Array_ extends Cast
 {
-}
\ No newline at end of file
+    public function getType() : string {
+        return 'Expr_Cast_Array';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Bool_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Bool_.php
index 4a1bd8fc3..04eb4af58 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Bool_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Bool_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\Cast;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\Cast;
 
 class Bool_ extends Cast
 {
+    public function getType() : string {
+        return 'Expr_Cast_Bool';
+    }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Double.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Double.php
index eede472d5..891ba5f87 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Double.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Double.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\Cast;
 
@@ -6,4 +6,12 @@ use PhpParser\Node\Expr\Cast;
 
 class Double extends Cast
 {
+    // For use in "kind" attribute
+    const KIND_DOUBLE = 1; // "double" syntax
+    const KIND_FLOAT = 2;  // "float" syntax
+    const KIND_REAL = 3; // "real" syntax
+
+    public function getType() : string {
+        return 'Expr_Cast_Double';
+    }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Int_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Int_.php
index 02a732740..01ed594bd 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Int_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Int_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\Cast;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\Cast;
 
 class Int_ extends Cast
 {
+    public function getType() : string {
+        return 'Expr_Cast_Int';
+    }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Object_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Object_.php
index 4e9d74fee..163752be8 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Object_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Object_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\Cast;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\Cast;
 
 class Object_ extends Cast
 {
+    public function getType() : string {
+        return 'Expr_Cast_Object';
+    }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/String_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/String_.php
index 7c648db95..b3d99270a 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/String_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/String_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\Cast;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\Cast;
 
 class String_ extends Cast
 {
+    public function getType() : string {
+        return 'Expr_Cast_String';
+    }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Unset_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Unset_.php
index 5cfd3efbc..accda3e4f 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Unset_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Cast/Unset_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr\Cast;
 
@@ -6,4 +6,7 @@ use PhpParser\Node\Expr\Cast;
 
 class Unset_ extends Cast
 {
-}
\ No newline at end of file
+    public function getType() : string {
+        return 'Expr_Cast_Unset';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ClassConstFetch.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ClassConstFetch.php
index ac07123ef..faf832f93 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ClassConstFetch.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ClassConstFetch.php
@@ -1,31 +1,36 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
 use PhpParser\Node\Expr;
+use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
 
 class ClassConstFetch extends Expr
 {
     /** @var Name|Expr Class name */
     public $class;
-    /** @var string|Error Constant name */
+    /** @var Identifier|Error Constant name */
     public $name;
 
     /**
      * Constructs a class const fetch node.
      *
-     * @param Name|Expr    $class      Class name
-     * @param string|Error $name       Constant name
-     * @param array        $attributes Additional attributes
+     * @param Name|Expr               $class      Class name
+     * @param string|Identifier|Error $name       Constant name
+     * @param array                   $attributes Additional attributes
      */
-    public function __construct($class, $name, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct($class, $name, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->class = $class;
-        $this->name = $name;
+        $this->name = \is_string($name) ? new Identifier($name) : $name;
     }
 
-    public function getSubNodeNames() {
-        return array('class', 'name');
+    public function getSubNodeNames() : array {
+        return ['class', 'name'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_ClassConstFetch';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Clone_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Clone_.php
index 198ec4d89..db216b8f8 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Clone_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Clone_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class Clone_ extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Clone';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Closure.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Closure.php
index 5d3765508..56ddea6aa 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Closure.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Closure.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -16,10 +16,12 @@ class Closure extends Expr implements FunctionLike
     public $params;
     /** @var ClosureUse[] use()s */
     public $uses;
-    /** @var null|string|Node\Name|Node\NullableType Return type */
+    /** @var null|Node\Identifier|Node\Name|Node\ComplexType Return type */
     public $returnType;
-    /** @var Node[] Statements */
+    /** @var Node\Stmt[] Statements */
     public $stmts;
+    /** @var Node\AttributeGroup[] PHP attribute groups */
+    public $attrGroups;
 
     /**
      * Constructs a lambda function node.
@@ -31,27 +33,30 @@ class Closure extends Expr implements FunctionLike
      *                          'uses'       => array(): use()s
      *                          'returnType' => null   : Return type
      *                          'stmts'      => array(): Statements
+     *                          'attrGroups' => array(): PHP attributes groups
      * @param array $attributes Additional attributes
      */
-    public function __construct(array $subNodes = array(), array $attributes = array()) {
-        parent::__construct($attributes);
-        $this->static = isset($subNodes['static']) ? $subNodes['static'] : false;
-        $this->byRef = isset($subNodes['byRef']) ? $subNodes['byRef'] : false;
-        $this->params = isset($subNodes['params']) ? $subNodes['params'] : array();
-        $this->uses = isset($subNodes['uses']) ? $subNodes['uses'] : array();
-        $this->returnType = isset($subNodes['returnType']) ? $subNodes['returnType'] : null;
-        $this->stmts = isset($subNodes['stmts']) ? $subNodes['stmts'] : array();
+    public function __construct(array $subNodes = [], array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->static = $subNodes['static'] ?? false;
+        $this->byRef = $subNodes['byRef'] ?? false;
+        $this->params = $subNodes['params'] ?? [];
+        $this->uses = $subNodes['uses'] ?? [];
+        $returnType = $subNodes['returnType'] ?? null;
+        $this->returnType = \is_string($returnType) ? new Node\Identifier($returnType) : $returnType;
+        $this->stmts = $subNodes['stmts'] ?? [];
+        $this->attrGroups = $subNodes['attrGroups'] ?? [];
     }
 
-    public function getSubNodeNames() {
-        return array('static', 'byRef', 'params', 'uses', 'returnType', 'stmts');
+    public function getSubNodeNames() : array {
+        return ['attrGroups', 'static', 'byRef', 'params', 'uses', 'returnType', 'stmts'];
     }
 
-    public function returnsByRef() {
+    public function returnsByRef() : bool {
         return $this->byRef;
     }
 
-    public function getParams() {
+    public function getParams() : array {
         return $this->params;
     }
 
@@ -59,7 +64,16 @@ class Closure extends Expr implements FunctionLike
         return $this->returnType;
     }
 
-    public function getStmts() {
+    /** @return Node\Stmt[] */
+    public function getStmts() : array {
         return $this->stmts;
     }
+
+    public function getAttrGroups() : array {
+        return $this->attrGroups;
+    }
+
+    public function getType() : string {
+        return 'Expr_Closure';
+    }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ClosureUse.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ClosureUse.php
index f4d02023e..2b8a09666 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ClosureUse.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ClosureUse.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -6,7 +6,7 @@ use PhpParser\Node\Expr;
 
 class ClosureUse extends Expr
 {
-    /** @var string Name of variable */
+    /** @var Expr\Variable Variable to use */
     public $var;
     /** @var bool Whether to use by reference */
     public $byRef;
@@ -14,17 +14,21 @@ class ClosureUse extends Expr
     /**
      * Constructs a closure use node.
      *
-     * @param string      $var        Name of variable
-     * @param bool        $byRef      Whether to use by reference
-     * @param array       $attributes Additional attributes
+     * @param Expr\Variable $var        Variable to use
+     * @param bool          $byRef      Whether to use by reference
+     * @param array         $attributes Additional attributes
      */
-    public function __construct($var, $byRef = false, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr\Variable $var, bool $byRef = false, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
         $this->byRef = $byRef;
     }
 
-    public function getSubNodeNames() {
-        return array('var', 'byRef');
+    public function getSubNodeNames() : array {
+        return ['var', 'byRef'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_ClosureUse';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ConstFetch.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ConstFetch.php
index 98e51d527..14ebd16bd 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ConstFetch.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ConstFetch.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -16,12 +16,16 @@ class ConstFetch extends Expr
      * @param Name  $name       Constant name
      * @param array $attributes Additional attributes
      */
-    public function __construct(Name $name, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Name $name, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->name = $name;
     }
 
-    public function getSubNodeNames() {
-        return array('name');
+    public function getSubNodeNames() : array {
+        return ['name'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_ConstFetch';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Empty_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Empty_.php
index 0c0509efb..4042ec93c 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Empty_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Empty_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class Empty_ extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Empty';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Error.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Error.php
index 5ab8fd445..1637f3aea 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Error.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Error.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -17,11 +17,15 @@ class Error extends Expr
      *
      * @param array $attributes Additional attributes
      */
-    public function __construct(array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $attributes = []) {
+        $this->attributes = $attributes;
     }
 
-    public function getSubNodeNames() {
-        return array();
+    public function getSubNodeNames() : array {
+        return [];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Error';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ErrorSuppress.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ErrorSuppress.php
index 750c814c7..c44ff6f93 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ErrorSuppress.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ErrorSuppress.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class ErrorSuppress extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_ErrorSuppress';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Eval_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Eval_.php
index eadffd008..856854743 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Eval_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Eval_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class Eval_ extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Eval';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Exit_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Exit_.php
index b0b94cf7b..b88a8f7e6 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Exit_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Exit_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -19,12 +19,16 @@ class Exit_ extends Expr
      * @param null|Expr $expr       Expression
      * @param array                    $attributes Additional attributes
      */
-    public function __construct(Expr $expr = null, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr = null, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Exit';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/FuncCall.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/FuncCall.php
index 60d00507d..2de4d0dd5 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/FuncCall.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/FuncCall.php
@@ -1,31 +1,39 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 
-class FuncCall extends Expr
+class FuncCall extends CallLike
 {
     /** @var Node\Name|Expr Function name */
     public $name;
-    /** @var Node\Arg[] Arguments */
+    /** @var array<Node\Arg|Node\VariadicPlaceholder> Arguments */
     public $args;
 
     /**
      * Constructs a function call node.
      *
-     * @param Node\Name|Expr $name       Function name
-     * @param Node\Arg[]                    $args       Arguments
-     * @param array                                   $attributes Additional attributes
+     * @param Node\Name|Expr                           $name       Function name
+     * @param array<Node\Arg|Node\VariadicPlaceholder> $args       Arguments
+     * @param array                                    $attributes Additional attributes
      */
-    public function __construct($name, array $args = array(), array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct($name, array $args = [], array $attributes = []) {
+        $this->attributes = $attributes;
         $this->name = $name;
         $this->args = $args;
     }
 
-    public function getSubNodeNames() {
-        return array('name', 'args');
+    public function getSubNodeNames() : array {
+        return ['name', 'args'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_FuncCall';
+    }
+
+    public function getRawArgs(): array {
+        return $this->args;
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Include_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Include_.php
index b27f3af18..07ce5968e 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Include_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Include_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -23,13 +23,17 @@ class Include_ extends Expr
      * @param int   $type       Type of include
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $expr, $type, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, int $type, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
         $this->type = $type;
     }
 
-    public function getSubNodeNames() {
-        return array('expr', 'type');
+    public function getSubNodeNames() : array {
+        return ['expr', 'type'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Include';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Instanceof_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Instanceof_.php
index 69573d865..9000d47bb 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Instanceof_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Instanceof_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -19,13 +19,17 @@ class Instanceof_ extends Expr
      * @param Name|Expr $class      Class name
      * @param array     $attributes Additional attributes
      */
-    public function __construct(Expr $expr, $class, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, $class, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
         $this->class = $class;
     }
 
-    public function getSubNodeNames() {
-        return array('expr', 'class');
+    public function getSubNodeNames() : array {
+        return ['expr', 'class'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Instanceof';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Isset_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Isset_.php
index 4ec1d025a..76b738758 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Isset_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Isset_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class Isset_ extends Expr
      * @param Expr[] $vars       Variables
      * @param array  $attributes Additional attributes
      */
-    public function __construct(array $vars, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $vars, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->vars = $vars;
     }
 
-    public function getSubNodeNames() {
-        return array('vars');
+    public function getSubNodeNames() : array {
+        return ['vars'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Isset';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/List_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/List_.php
index 30f3dc165..c27a27b95 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/List_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/List_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -6,21 +6,25 @@ use PhpParser\Node\Expr;
 
 class List_ extends Expr
 {
-    /** @var ArrayItem[] List of items to assign to */
+    /** @var (ArrayItem|null)[] List of items to assign to */
     public $items;
 
     /**
      * Constructs a list() destructuring node.
      *
-     * @param ArrayItem[] $items      List of items to assign to
-     * @param array       $attributes Additional attributes
+     * @param (ArrayItem|null)[] $items      List of items to assign to
+     * @param array              $attributes Additional attributes
      */
-    public function __construct(array $items, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $items, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->items = $items;
     }
 
-    public function getSubNodeNames() {
-        return array('items');
+    public function getSubNodeNames() : array {
+        return ['items'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_List';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Match_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Match_.php
new file mode 100644
index 000000000..2455a3026
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Match_.php
@@ -0,0 +1,31 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node\Expr;
+
+use PhpParser\Node;
+use PhpParser\Node\MatchArm;
+
+class Match_ extends Node\Expr
+{
+    /** @var Node\Expr */
+    public $cond;
+    /** @var MatchArm[] */
+    public $arms;
+
+    /**
+     * @param MatchArm[] $arms
+     */
+    public function __construct(Node\Expr $cond, array $arms = [], array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->cond = $cond;
+        $this->arms = $arms;
+    }
+
+    public function getSubNodeNames() : array {
+        return ['cond', 'arms'];
+    }
+
+    public function getType() : string {
+        return 'Expr_Match';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/MethodCall.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/MethodCall.php
index a6cdd07c1..49ca48356 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/MethodCall.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/MethodCall.php
@@ -1,35 +1,45 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
 use PhpParser\Node\Arg;
 use PhpParser\Node\Expr;
+use PhpParser\Node\Identifier;
+use PhpParser\Node\VariadicPlaceholder;
 
-class MethodCall extends Expr
+class MethodCall extends CallLike
 {
     /** @var Expr Variable holding object */
     public $var;
-    /** @var string|Expr Method name */
+    /** @var Identifier|Expr Method name */
     public $name;
-    /** @var Arg[] Arguments */
+    /** @var array<Arg|VariadicPlaceholder> Arguments */
     public $args;
 
     /**
      * Constructs a function call node.
      *
-     * @param Expr        $var        Variable holding object
-     * @param string|Expr $name       Method name
-     * @param Arg[]       $args       Arguments
-     * @param array       $attributes Additional attributes
+     * @param Expr                           $var        Variable holding object
+     * @param string|Identifier|Expr         $name       Method name
+     * @param array<Arg|VariadicPlaceholder> $args       Arguments
+     * @param array                          $attributes Additional attributes
      */
-    public function __construct(Expr $var, $name, array $args = array(), array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $var, $name, array $args = [], array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
-        $this->name = $name;
+        $this->name = \is_string($name) ? new Identifier($name) : $name;
         $this->args = $args;
     }
 
-    public function getSubNodeNames() {
-        return array('var', 'name', 'args');
+    public function getSubNodeNames() : array {
+        return ['var', 'name', 'args'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_MethodCall';
+    }
+
+    public function getRawArgs(): array {
+        return $this->args;
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/New_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/New_.php
index a8c87794d..e2bb64928 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/New_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/New_.php
@@ -1,31 +1,41 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
 use PhpParser\Node;
+use PhpParser\Node\Arg;
 use PhpParser\Node\Expr;
+use PhpParser\Node\VariadicPlaceholder;
 
-class New_ extends Expr
+class New_ extends CallLike
 {
     /** @var Node\Name|Expr|Node\Stmt\Class_ Class name */
     public $class;
-    /** @var Node\Arg[] Arguments */
+    /** @var array<Arg|VariadicPlaceholder> Arguments */
     public $args;
 
     /**
      * Constructs a function call node.
      *
      * @param Node\Name|Expr|Node\Stmt\Class_ $class      Class name (or class node for anonymous classes)
-     * @param Node\Arg[]                      $args       Arguments
+     * @param array<Arg|VariadicPlaceholder>  $args       Arguments
      * @param array                           $attributes Additional attributes
      */
-    public function __construct($class, array $args = array(), array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct($class, array $args = [], array $attributes = []) {
+        $this->attributes = $attributes;
         $this->class = $class;
         $this->args = $args;
     }
 
-    public function getSubNodeNames() {
-        return array('class', 'args');
+    public function getSubNodeNames() : array {
+        return ['class', 'args'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_New';
+    }
+
+    public function getRawArgs(): array {
+        return $this->args;
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/NullsafeMethodCall.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/NullsafeMethodCall.php
new file mode 100644
index 000000000..07a571fd8
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/NullsafeMethodCall.php
@@ -0,0 +1,45 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node\Expr;
+
+use PhpParser\Node\Arg;
+use PhpParser\Node\Expr;
+use PhpParser\Node\Identifier;
+use PhpParser\Node\VariadicPlaceholder;
+
+class NullsafeMethodCall extends CallLike
+{
+    /** @var Expr Variable holding object */
+    public $var;
+    /** @var Identifier|Expr Method name */
+    public $name;
+    /** @var array<Arg|VariadicPlaceholder> Arguments */
+    public $args;
+
+    /**
+     * Constructs a nullsafe method call node.
+     *
+     * @param Expr                           $var        Variable holding object
+     * @param string|Identifier|Expr         $name       Method name
+     * @param array<Arg|VariadicPlaceholder> $args       Arguments
+     * @param array                          $attributes Additional attributes
+     */
+    public function __construct(Expr $var, $name, array $args = [], array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->var = $var;
+        $this->name = \is_string($name) ? new Identifier($name) : $name;
+        $this->args = $args;
+    }
+
+    public function getSubNodeNames() : array {
+        return ['var', 'name', 'args'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_NullsafeMethodCall';
+    }
+
+    public function getRawArgs(): array {
+        return $this->args;
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/NullsafePropertyFetch.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/NullsafePropertyFetch.php
new file mode 100644
index 000000000..9317eb3b9
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/NullsafePropertyFetch.php
@@ -0,0 +1,35 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node\Expr;
+
+use PhpParser\Node\Expr;
+use PhpParser\Node\Identifier;
+
+class NullsafePropertyFetch extends Expr
+{
+    /** @var Expr Variable holding object */
+    public $var;
+    /** @var Identifier|Expr Property name */
+    public $name;
+
+    /**
+     * Constructs a nullsafe property fetch node.
+     *
+     * @param Expr                   $var        Variable holding object
+     * @param string|Identifier|Expr $name       Property name
+     * @param array                  $attributes Additional attributes
+     */
+    public function __construct(Expr $var, $name, array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->var = $var;
+        $this->name = \is_string($name) ? new Identifier($name) : $name;
+    }
+
+    public function getSubNodeNames() : array {
+        return ['var', 'name'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_NullsafePropertyFetch';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/PostDec.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/PostDec.php
index 06ce5470e..94d6c296d 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/PostDec.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/PostDec.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class PostDec extends Expr
      * @param Expr  $var        Variable
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $var, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $var, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
     }
 
-    public function getSubNodeNames() {
-        return array('var');
+    public function getSubNodeNames() : array {
+        return ['var'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_PostDec';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/PostInc.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/PostInc.php
index 54865ba12..005c443a2 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/PostInc.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/PostInc.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class PostInc extends Expr
      * @param Expr  $var        Variable
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $var, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $var, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
     }
 
-    public function getSubNodeNames() {
-        return array('var');
+    public function getSubNodeNames() : array {
+        return ['var'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_PostInc';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/PreDec.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/PreDec.php
index db30f5102..a5ca685a8 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/PreDec.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/PreDec.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class PreDec extends Expr
      * @param Expr  $var        Variable
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $var, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $var, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
     }
 
-    public function getSubNodeNames() {
-        return array('var');
+    public function getSubNodeNames() : array {
+        return ['var'];
+    }
+
+    public function getType() : string {
+        return 'Expr_PreDec';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/PreInc.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/PreInc.php
index 06356028c..0986c4474 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/PreInc.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/PreInc.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class PreInc extends Expr
      * @param Expr  $var        Variable
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $var, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $var, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
     }
 
-    public function getSubNodeNames() {
-        return array('var');
+    public function getSubNodeNames() : array {
+        return ['var'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_PreInc';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Print_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Print_.php
index 0666ab84d..2d43c2ac8 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Print_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Print_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class Print_ extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Print';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/PropertyFetch.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/PropertyFetch.php
index adcf21ce1..4281f31cc 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/PropertyFetch.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/PropertyFetch.php
@@ -1,30 +1,35 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
 use PhpParser\Node\Expr;
+use PhpParser\Node\Identifier;
 
 class PropertyFetch extends Expr
 {
     /** @var Expr Variable holding object */
     public $var;
-    /** @var string|Expr Property name */
+    /** @var Identifier|Expr Property name */
     public $name;
 
     /**
      * Constructs a function call node.
      *
-     * @param Expr        $var        Variable holding object
-     * @param string|Expr $name       Property name
-     * @param array       $attributes Additional attributes
+     * @param Expr                   $var        Variable holding object
+     * @param string|Identifier|Expr $name       Property name
+     * @param array                  $attributes Additional attributes
      */
-    public function __construct(Expr $var, $name, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $var, $name, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->var = $var;
-        $this->name = $name;
+        $this->name = \is_string($name) ? new Identifier($name) : $name;
     }
 
-    public function getSubNodeNames() {
-        return array('var', 'name');
+    public function getSubNodeNames() : array {
+        return ['var', 'name'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_PropertyFetch';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ShellExec.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ShellExec.php
index 9516a32f4..537a7cc80 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ShellExec.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/ShellExec.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class ShellExec extends Expr
      * @param array $parts      Encapsed string array
      * @param array $attributes Additional attributes
      */
-    public function __construct(array $parts, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $parts, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->parts = $parts;
     }
 
-    public function getSubNodeNames() {
-        return array('parts');
+    public function getSubNodeNames() : array {
+        return ['parts'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_ShellExec';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php
index 5118f34a7..d0d099c47 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/StaticCall.php
@@ -1,35 +1,46 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
 use PhpParser\Node;
+use PhpParser\Node\Arg;
 use PhpParser\Node\Expr;
+use PhpParser\Node\Identifier;
+use PhpParser\Node\VariadicPlaceholder;
 
-class StaticCall extends Expr
+class StaticCall extends CallLike
 {
     /** @var Node\Name|Expr Class name */
     public $class;
-    /** @var string|Expr Method name */
+    /** @var Identifier|Expr Method name */
     public $name;
-    /** @var Node\Arg[] Arguments */
+    /** @var array<Arg|VariadicPlaceholder> Arguments */
     public $args;
 
     /**
      * Constructs a static method call node.
      *
-     * @param Node\Name|Expr $class      Class name
-     * @param string|Expr    $name       Method name
-     * @param Node\Arg[]     $args       Arguments
-     * @param array          $attributes Additional attributes
+     * @param Node\Name|Expr                 $class      Class name
+     * @param string|Identifier|Expr         $name       Method name
+     * @param array<Arg|VariadicPlaceholder> $args       Arguments
+     * @param array                          $attributes Additional attributes
      */
-    public function __construct($class, $name, array $args = array(), array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct($class, $name, array $args = [], array $attributes = []) {
+        $this->attributes = $attributes;
         $this->class = $class;
-        $this->name = $name;
+        $this->name = \is_string($name) ? new Identifier($name) : $name;
         $this->args = $args;
     }
 
-    public function getSubNodeNames() {
-        return array('class', 'name', 'args');
+    public function getSubNodeNames() : array {
+        return ['class', 'name', 'args'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_StaticCall';
+    }
+
+    public function getRawArgs(): array {
+        return $this->args;
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/StaticPropertyFetch.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/StaticPropertyFetch.php
index 477a69ddb..1ee1a25e5 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/StaticPropertyFetch.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/StaticPropertyFetch.php
@@ -1,31 +1,36 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
 use PhpParser\Node\Expr;
 use PhpParser\Node\Name;
+use PhpParser\Node\VarLikeIdentifier;
 
 class StaticPropertyFetch extends Expr
 {
     /** @var Name|Expr Class name */
     public $class;
-    /** @var string|Expr Property name */
+    /** @var VarLikeIdentifier|Expr Property name */
     public $name;
 
     /**
      * Constructs a static property fetch node.
      *
-     * @param Name|Expr   $class      Class name
-     * @param string|Expr $name       Property name
-     * @param array       $attributes Additional attributes
+     * @param Name|Expr                     $class      Class name
+     * @param string|VarLikeIdentifier|Expr $name       Property name
+     * @param array                         $attributes Additional attributes
      */
-    public function __construct($class, $name, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct($class, $name, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->class = $class;
-        $this->name = $name;
+        $this->name = \is_string($name) ? new VarLikeIdentifier($name) : $name;
     }
 
-    public function getSubNodeNames() {
-        return array('class', 'name');
+    public function getSubNodeNames() : array {
+        return ['class', 'name'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_StaticPropertyFetch';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Ternary.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Ternary.php
index 57301390f..9316f47d4 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Ternary.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Ternary.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -21,14 +21,18 @@ class Ternary extends Expr
      * @param Expr      $else       Expression for false
      * @param array                    $attributes Additional attributes
      */
-    public function __construct(Expr $cond, $if, Expr $else, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $cond, $if, Expr $else, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->cond = $cond;
         $this->if = $if;
         $this->else = $else;
     }
 
-    public function getSubNodeNames() {
-        return array('cond', 'if', 'else');
+    public function getSubNodeNames() : array {
+        return ['cond', 'if', 'else'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Ternary';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Throw_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Throw_.php
new file mode 100644
index 000000000..5c97f0e2b
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Throw_.php
@@ -0,0 +1,30 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node\Expr;
+
+use PhpParser\Node;
+
+class Throw_ extends Node\Expr
+{
+    /** @var Node\Expr Expression */
+    public $expr;
+
+    /**
+     * Constructs a throw expression node.
+     *
+     * @param Node\Expr $expr       Expression
+     * @param array     $attributes Additional attributes
+     */
+    public function __construct(Node\Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->expr = $expr;
+    }
+
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+
+    public function getType() : string {
+        return 'Expr_Throw';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryMinus.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryMinus.php
index 94635d638..ce8808bc6 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryMinus.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryMinus.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class UnaryMinus extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_UnaryMinus';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryPlus.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryPlus.php
index 651412003..d23047e54 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryPlus.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/UnaryPlus.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class UnaryPlus extends Expr
      * @param Expr $expr       Expression
      * @param array               $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_UnaryPlus';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Variable.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Variable.php
index 3ae3ecd9b..b47d38e93 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Variable.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Variable.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -13,14 +13,18 @@ class Variable extends Expr
      * Constructs a variable node.
      *
      * @param string|Expr $name       Name
-     * @param array                      $attributes Additional attributes
+     * @param array       $attributes Additional attributes
      */
-    public function __construct($name, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct($name, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->name = $name;
     }
 
-    public function getSubNodeNames() {
-        return array('name');
+    public function getSubNodeNames() : array {
+        return ['name'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Variable';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/YieldFrom.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/YieldFrom.php
index 993c82c20..a3efce618 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/YieldFrom.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/YieldFrom.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -15,12 +15,16 @@ class YieldFrom extends Expr
      * @param Expr  $expr       Expression
      * @param array $attributes Additional attributes
      */
-    public function __construct(Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_YieldFrom';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Yield_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Yield_.php
index f3ca88e05..aef8fc333 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Yield_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Expr/Yield_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Expr;
 
@@ -18,13 +18,17 @@ class Yield_ extends Expr
      * @param null|Expr $key        Key expression
      * @param array     $attributes Additional attributes
      */
-    public function __construct(Expr $value = null, Expr $key = null, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Expr $value = null, Expr $key = null, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->key = $key;
         $this->value = $value;
     }
 
-    public function getSubNodeNames() {
-        return array('key', 'value');
+    public function getSubNodeNames() : array {
+        return ['key', 'value'];
+    }
+    
+    public function getType() : string {
+        return 'Expr_Yield';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/FunctionLike.php b/lib/nikic/php-parser/lib/PhpParser/Node/FunctionLike.php
index 82569450c..5a825e731 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/FunctionLike.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/FunctionLike.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node;
 
@@ -11,26 +11,33 @@ interface FunctionLike extends Node
      *
      * @return bool
      */
-    public function returnsByRef();
+    public function returnsByRef() : bool;
 
     /**
      * List of parameters
      *
-     * @return Node\Param[]
+     * @return Param[]
      */
-    public function getParams();
+    public function getParams() : array;
 
     /**
      * Get the declared return type or null
-     * 
-     * @return null|string|Node\Name|Node\NullableType
+     *
+     * @return null|Identifier|Name|ComplexType
      */
     public function getReturnType();
 
     /**
      * The function body
      *
-     * @return Node\Stmt[]
+     * @return Stmt[]|null
      */
     public function getStmts();
+
+    /**
+     * Get PHP attribute groups.
+     *
+     * @return AttributeGroup[]
+     */
+    public function getAttrGroups() : array;
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Identifier.php b/lib/nikic/php-parser/lib/PhpParser/Node/Identifier.php
new file mode 100644
index 000000000..2f262db0a
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Identifier.php
@@ -0,0 +1,75 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node;
+
+use PhpParser\NodeAbstract;
+
+/**
+ * Represents a non-namespaced name. Namespaced names are represented using Name nodes.
+ */
+class Identifier extends NodeAbstract
+{
+    /** @var string Identifier as string */
+    public $name;
+
+    private static $specialClassNames = [
+        'self'   => true,
+        'parent' => true,
+        'static' => true,
+    ];
+
+    /**
+     * Constructs an identifier node.
+     *
+     * @param string $name       Identifier as string
+     * @param array  $attributes Additional attributes
+     */
+    public function __construct(string $name, array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->name = $name;
+    }
+
+    public function getSubNodeNames() : array {
+        return ['name'];
+    }
+
+    /**
+     * Get identifier as string.
+     *
+     * @return string Identifier as string.
+     */
+    public function toString() : string {
+        return $this->name;
+    }
+
+    /**
+     * Get lowercased identifier as string.
+     *
+     * @return string Lowercased identifier as string
+     */
+    public function toLowerString() : string {
+        return strtolower($this->name);
+    }
+
+    /**
+     * Checks whether the identifier is a special class name (self, parent or static).
+     *
+     * @return bool Whether identifier is a special class name
+     */
+    public function isSpecialClassName() : bool {
+        return isset(self::$specialClassNames[strtolower($this->name)]);
+    }
+
+    /**
+     * Get identifier as string.
+     *
+     * @return string Identifier as string
+     */
+    public function __toString() : string {
+        return $this->name;
+    }
+    
+    public function getType() : string {
+        return 'Identifier';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/IntersectionType.php b/lib/nikic/php-parser/lib/PhpParser/Node/IntersectionType.php
new file mode 100644
index 000000000..9208e1392
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/IntersectionType.php
@@ -0,0 +1,30 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node;
+
+use PhpParser\NodeAbstract;
+
+class IntersectionType extends ComplexType
+{
+    /** @var (Identifier|Name)[] Types */
+    public $types;
+
+    /**
+     * Constructs an intersection type.
+     *
+     * @param (Identifier|Name)[] $types      Types
+     * @param array               $attributes Additional attributes
+     */
+    public function __construct(array $types, array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->types = $types;
+    }
+
+    public function getSubNodeNames() : array {
+        return ['types'];
+    }
+
+    public function getType() : string {
+        return 'IntersectionType';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/MatchArm.php b/lib/nikic/php-parser/lib/PhpParser/Node/MatchArm.php
new file mode 100644
index 000000000..2ae1c86b8
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/MatchArm.php
@@ -0,0 +1,31 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node;
+
+use PhpParser\Node;
+use PhpParser\NodeAbstract;
+
+class MatchArm extends NodeAbstract
+{
+    /** @var null|Node\Expr[] */
+    public $conds;
+    /** @var Node\Expr */
+    public $body;
+
+    /**
+     * @param null|Node\Expr[] $conds
+     */
+    public function __construct($conds, Node\Expr $body, array $attributes = []) {
+        $this->conds = $conds;
+        $this->body = $body;
+        $this->attributes = $attributes;
+    }
+
+    public function getSubNodeNames() : array {
+        return ['conds', 'body'];
+    }
+
+    public function getType() : string {
+        return 'MatchArm';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Name.php b/lib/nikic/php-parser/lib/PhpParser/Node/Name.php
index 7b8c8e232..6b1cc9f8e 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Name.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Name.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node;
 
@@ -6,24 +6,28 @@ use PhpParser\NodeAbstract;
 
 class Name extends NodeAbstract
 {
-    /**
-     * @var string[] Parts of the name
-     */
+    /** @var string[] Parts of the name */
     public $parts;
 
+    private static $specialClassNames = [
+        'self'   => true,
+        'parent' => true,
+        'static' => true,
+    ];
+
     /**
      * Constructs a name node.
      *
-     * @param string|array|self $name       Name as string, part array or Name instance (copy ctor)
-     * @param array             $attributes Additional attributes
+     * @param string|string[]|self $name       Name as string, part array or Name instance (copy ctor)
+     * @param array                $attributes Additional attributes
      */
-    public function __construct($name, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct($name, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->parts = self::prepareName($name);
     }
 
-    public function getSubNodeNames() {
-        return array('parts');
+    public function getSubNodeNames() : array {
+        return ['parts'];
     }
 
     /**
@@ -31,7 +35,7 @@ class Name extends NodeAbstract
      *
      * @return string First part of the name
      */
-    public function getFirst() {
+    public function getFirst() : string {
         return $this->parts[0];
     }
 
@@ -40,7 +44,7 @@ class Name extends NodeAbstract
      *
      * @return string Last part of the name
      */
-    public function getLast() {
+    public function getLast() : string {
         return $this->parts[count($this->parts) - 1];
     }
 
@@ -49,8 +53,8 @@ class Name extends NodeAbstract
      *
      * @return bool Whether the name is unqualified
      */
-    public function isUnqualified() {
-        return 1 == count($this->parts);
+    public function isUnqualified() : bool {
+        return 1 === count($this->parts);
     }
 
     /**
@@ -58,7 +62,7 @@ class Name extends NodeAbstract
      *
      * @return bool Whether the name is qualified
      */
-    public function isQualified() {
+    public function isQualified() : bool {
         return 1 < count($this->parts);
     }
 
@@ -67,7 +71,7 @@ class Name extends NodeAbstract
      *
      * @return bool Whether the name is fully qualified
      */
-    public function isFullyQualified() {
+    public function isFullyQualified() : bool {
         return false;
     }
 
@@ -76,27 +80,57 @@ class Name extends NodeAbstract
      *
      * @return bool Whether the name is relative
      */
-    public function isRelative() {
+    public function isRelative() : bool {
         return false;
     }
 
     /**
-     * Returns a string representation of the name by imploding the namespace parts with the
-     * namespace separator.
+     * Returns a string representation of the name itself, without taking the name type into
+     * account (e.g., not including a leading backslash for fully qualified names).
      *
      * @return string String representation
      */
-    public function toString() {
+    public function toString() : string {
         return implode('\\', $this->parts);
     }
 
+    /**
+     * Returns a string representation of the name as it would occur in code (e.g., including
+     * leading backslash for fully qualified names.
+     *
+     * @return string String representation
+     */
+    public function toCodeString() : string {
+        return $this->toString();
+    }
+
+    /**
+     * Returns lowercased string representation of the name, without taking the name type into
+     * account (e.g., no leading backslash for fully qualified names).
+     *
+     * @return string Lowercased string representation
+     */
+    public function toLowerString() : string {
+        return strtolower(implode('\\', $this->parts));
+    }
+
+    /**
+     * Checks whether the identifier is a special class name (self, parent or static).
+     *
+     * @return bool Whether identifier is a special class name
+     */
+    public function isSpecialClassName() : bool {
+        return count($this->parts) === 1
+            && isset(self::$specialClassNames[strtolower($this->parts[0])]);
+    }
+
     /**
      * Returns a string representation of the name by imploding the namespace parts with the
      * namespace separator.
      *
      * @return string String representation
      */
-    public function __toString() {
+    public function __toString() : string {
         return implode('\\', $this->parts);
     }
 
@@ -116,7 +150,7 @@ class Name extends NodeAbstract
      *
      * @return static|null Sliced name
      */
-    public function slice($offset, $length = null) {
+    public function slice(int $offset, int $length = null) {
         $numParts = count($this->parts);
 
         $realOffset = $offset < 0 ? $offset + $numParts : $offset;
@@ -152,9 +186,9 @@ class Name extends NodeAbstract
      *     Name::concat($namespace, $shortName)
      * where $namespace is a Name node or null will work as expected.
      *
-     * @param string|array|self|null $name1      The first name
-     * @param string|array|self|null $name2      The second name
-     * @param array                  $attributes Attributes to assign to concatenated name
+     * @param string|string[]|self|null $name1      The first name
+     * @param string|string[]|self|null $name2      The second name
+     * @param array                     $attributes Attributes to assign to concatenated name
      *
      * @return static|null Concatenated name
      */
@@ -163,7 +197,7 @@ class Name extends NodeAbstract
             return null;
         } elseif (null === $name1) {
             return new static(self::prepareName($name2), $attributes);
-        } else if (null === $name2) {
+        } elseif (null === $name2) {
             return new static(self::prepareName($name1), $attributes);
         } else {
             return new static(
@@ -176,14 +210,22 @@ class Name extends NodeAbstract
      * Prepares a (string, array or Name node) name for use in name changing methods by converting
      * it to an array.
      *
-     * @param string|array|self $name Name to prepare
+     * @param string|string[]|self $name Name to prepare
      *
-     * @return array Prepared name
+     * @return string[] Prepared name
      */
-    private static function prepareName($name) {
+    private static function prepareName($name) : array {
         if (\is_string($name)) {
+            if ('' === $name) {
+                throw new \InvalidArgumentException('Name cannot be empty');
+            }
+
             return explode('\\', $name);
         } elseif (\is_array($name)) {
+            if (empty($name)) {
+                throw new \InvalidArgumentException('Name cannot be empty');
+            }
+
             return $name;
         } elseif ($name instanceof self) {
             return $name->parts;
@@ -193,4 +235,8 @@ class Name extends NodeAbstract
             'Expected string, array of parts or Name instance'
         );
     }
+
+    public function getType() : string {
+        return 'Name';
+    }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Name/FullyQualified.php b/lib/nikic/php-parser/lib/PhpParser/Node/Name/FullyQualified.php
index 97cc1113d..1df93a56b 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Name/FullyQualified.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Name/FullyQualified.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Name;
 
@@ -9,7 +9,7 @@ class FullyQualified extends \PhpParser\Node\Name
      *
      * @return bool Whether the name is unqualified
      */
-    public function isUnqualified() {
+    public function isUnqualified() : bool {
         return false;
     }
 
@@ -18,7 +18,7 @@ class FullyQualified extends \PhpParser\Node\Name
      *
      * @return bool Whether the name is qualified
      */
-    public function isQualified() {
+    public function isQualified() : bool {
         return false;
     }
 
@@ -27,7 +27,7 @@ class FullyQualified extends \PhpParser\Node\Name
      *
      * @return bool Whether the name is fully qualified
      */
-    public function isFullyQualified() {
+    public function isFullyQualified() : bool {
         return true;
     }
 
@@ -36,7 +36,15 @@ class FullyQualified extends \PhpParser\Node\Name
      *
      * @return bool Whether the name is relative
      */
-    public function isRelative() {
+    public function isRelative() : bool {
         return false;
     }
-}
\ No newline at end of file
+
+    public function toCodeString() : string {
+        return '\\' . $this->toString();
+    }
+    
+    public function getType() : string {
+        return 'Name_FullyQualified';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Name/Relative.php b/lib/nikic/php-parser/lib/PhpParser/Node/Name/Relative.php
index 25676ce69..57bf7af2b 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Name/Relative.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Name/Relative.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Name;
 
@@ -9,7 +9,7 @@ class Relative extends \PhpParser\Node\Name
      *
      * @return bool Whether the name is unqualified
      */
-    public function isUnqualified() {
+    public function isUnqualified() : bool {
         return false;
     }
 
@@ -18,7 +18,7 @@ class Relative extends \PhpParser\Node\Name
      *
      * @return bool Whether the name is qualified
      */
-    public function isQualified() {
+    public function isQualified() : bool {
         return false;
     }
 
@@ -27,7 +27,7 @@ class Relative extends \PhpParser\Node\Name
      *
      * @return bool Whether the name is fully qualified
      */
-    public function isFullyQualified() {
+    public function isFullyQualified() : bool {
         return false;
     }
 
@@ -36,7 +36,15 @@ class Relative extends \PhpParser\Node\Name
      *
      * @return bool Whether the name is relative
      */
-    public function isRelative() {
+    public function isRelative() : bool {
         return true;
     }
-}
\ No newline at end of file
+
+    public function toCodeString() : string {
+        return 'namespace\\' . $this->toString();
+    }
+    
+    public function getType() : string {
+        return 'Name_Relative';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/NullableType.php b/lib/nikic/php-parser/lib/PhpParser/Node/NullableType.php
index d887b321a..d68e26a38 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/NullableType.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/NullableType.php
@@ -1,26 +1,28 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node;
 
-use PhpParser\NodeAbstract;
-
-class NullableType extends NodeAbstract
+class NullableType extends ComplexType
 {
-    /** @var string|Name Type */
+    /** @var Identifier|Name Type */
     public $type;
 
     /**
      * Constructs a nullable type (wrapping another type).
      *
-     * @param string|Name $type       Type
-     * @param array       $attributes Additional attributes
+     * @param string|Identifier|Name $type       Type
+     * @param array                  $attributes Additional attributes
      */
-    public function __construct($type, array $attributes = array()) {
-        parent::__construct($attributes);
-        $this->type = $type;
+    public function __construct($type, array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->type = \is_string($type) ? new Identifier($type) : $type;
     }
 
-    public function getSubNodeNames() {
-        return array('type');
+    public function getSubNodeNames() : array {
+        return ['type'];
+    }
+    
+    public function getType() : string {
+        return 'NullableType';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Param.php b/lib/nikic/php-parser/lib/PhpParser/Node/Param.php
index b35ee4ef0..1e90b7944 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Param.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Param.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node;
 
@@ -6,37 +6,55 @@ use PhpParser\NodeAbstract;
 
 class Param extends NodeAbstract
 {
-    /** @var null|string|Name|NullableType Typehint */
+    /** @var null|Identifier|Name|ComplexType Type declaration */
     public $type;
     /** @var bool Whether parameter is passed by reference */
     public $byRef;
     /** @var bool Whether this is a variadic argument */
     public $variadic;
-    /** @var string Name */
-    public $name;
+    /** @var Expr\Variable|Expr\Error Parameter variable */
+    public $var;
     /** @var null|Expr Default value */
     public $default;
+    /** @var int */
+    public $flags;
+    /** @var AttributeGroup[] PHP attribute groups */
+    public $attrGroups;
 
     /**
      * Constructs a parameter node.
      *
-     * @param string                        $name       Name
-     * @param null|Expr                     $default    Default value
-     * @param null|string|Name|NullableType $type       Typehint
-     * @param bool                          $byRef      Whether is passed by reference
-     * @param bool                          $variadic   Whether this is a variadic argument
-     * @param array                         $attributes Additional attributes
+     * @param Expr\Variable|Expr\Error                $var        Parameter variable
+     * @param null|Expr                               $default    Default value
+     * @param null|string|Identifier|Name|ComplexType $type       Type declaration
+     * @param bool                                    $byRef      Whether is passed by reference
+     * @param bool                                    $variadic   Whether this is a variadic argument
+     * @param array                                   $attributes Additional attributes
+     * @param int                                     $flags      Optional visibility flags
+     * @param AttributeGroup[]                        $attrGroups PHP attribute groups
      */
-    public function __construct($name, Expr $default = null, $type = null, $byRef = false, $variadic = false, array $attributes = array()) {
-        parent::__construct($attributes);
-        $this->type = $type;
+    public function __construct(
+        $var, Expr $default = null, $type = null,
+        bool $byRef = false, bool $variadic = false,
+        array $attributes = [],
+        int $flags = 0,
+        array $attrGroups = []
+    ) {
+        $this->attributes = $attributes;
+        $this->type = \is_string($type) ? new Identifier($type) : $type;
         $this->byRef = $byRef;
         $this->variadic = $variadic;
-        $this->name = $name;
+        $this->var = $var;
         $this->default = $default;
+        $this->flags = $flags;
+        $this->attrGroups = $attrGroups;
     }
 
-    public function getSubNodeNames() {
-        return array('type', 'byRef', 'variadic', 'name', 'default');
+    public function getSubNodeNames() : array {
+        return ['attrGroups', 'flags', 'type', 'byRef', 'variadic', 'var', 'default'];
+    }
+
+    public function getType() : string {
+        return 'Param';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar.php b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar.php
index 01177532c..8117909b6 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar.php
@@ -1,7 +1,7 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node;
 
 abstract class Scalar extends Expr
 {
-}
\ No newline at end of file
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/DNumber.php b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/DNumber.php
index 84ef75d34..29ce0dd40 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/DNumber.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/DNumber.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Scalar;
 
@@ -15,13 +15,13 @@ class DNumber extends Scalar
      * @param float $value      Value of the number
      * @param array $attributes Additional attributes
      */
-    public function __construct($value, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(float $value, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->value = $value;
     }
 
-    public function getSubNodeNames() {
-        return array('value');
+    public function getSubNodeNames() : array {
+        return ['value'];
     }
 
     /**
@@ -33,7 +33,9 @@ class DNumber extends Scalar
      *
      * @return float The parsed number
      */
-    public static function parse($str) {
+    public static function parse(string $str) : float {
+        $str = str_replace('_', '', $str);
+
         // if string contains any of .eE just cast it to float
         if (false !== strpbrk($str, '.eE')) {
             return (float) $str;
@@ -61,4 +63,8 @@ class DNumber extends Scalar
         // dec
         return (float) $str;
     }
+    
+    public function getType() : string {
+        return 'Scalar_DNumber';
+    }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/Encapsed.php b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/Encapsed.php
index 4f9b433c2..fa5d2e268 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/Encapsed.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/Encapsed.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Scalar;
 
@@ -13,15 +13,19 @@ class Encapsed extends Scalar
     /**
      * Constructs an encapsed string node.
      *
-     * @param array $parts      Encaps list
-     * @param array $attributes Additional attributes
+     * @param Expr[] $parts      Encaps list
+     * @param array  $attributes Additional attributes
      */
-    public function __construct(array $parts, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $parts, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->parts = $parts;
     }
 
-    public function getSubNodeNames() {
-        return array('parts');
+    public function getSubNodeNames() : array {
+        return ['parts'];
+    }
+    
+    public function getType() : string {
+        return 'Scalar_Encapsed';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/EncapsedStringPart.php b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/EncapsedStringPart.php
index 50cb1afe6..bb3194c1d 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/EncapsedStringPart.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/EncapsedStringPart.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Scalar;
 
@@ -15,12 +15,16 @@ class EncapsedStringPart extends Scalar
      * @param string $value      String value
      * @param array  $attributes Additional attributes
      */
-    public function __construct($value, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(string $value, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->value = $value;
     }
 
-    public function getSubNodeNames() {
-        return array('value');
+    public function getSubNodeNames() : array {
+        return ['value'];
+    }
+    
+    public function getType() : string {
+        return 'Scalar_EncapsedStringPart';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/LNumber.php b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/LNumber.php
index 3559b982c..f17dd1f8a 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/LNumber.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/LNumber.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Scalar;
 
@@ -22,13 +22,13 @@ class LNumber extends Scalar
      * @param int   $value      Value of the number
      * @param array $attributes Additional attributes
      */
-    public function __construct($value, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(int $value, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->value = $value;
     }
 
-    public function getSubNodeNames() {
-        return array('value');
+    public function getSubNodeNames() : array {
+        return ['value'];
     }
 
     /**
@@ -40,7 +40,9 @@ class LNumber extends Scalar
      *
      * @return LNumber The constructed LNumber, including kind attribute
      */
-    public static function fromString($str, array $attributes = array(), $allowInvalidOctal = false) {
+    public static function fromString(string $str, array $attributes = [], bool $allowInvalidOctal = false) : LNumber {
+        $str = str_replace('_', '', $str);
+
         if ('0' !== $str[0] || '0' === $str) {
             $attributes['kind'] = LNumber::KIND_DEC;
             return new LNumber((int) $str, $attributes);
@@ -60,8 +62,17 @@ class LNumber extends Scalar
             throw new Error('Invalid numeric literal', $attributes);
         }
 
+        // Strip optional explicit octal prefix.
+        if ('o' === $str[1] || 'O' === $str[1]) {
+            $str = substr($str, 2);
+        }
+
         // use intval instead of octdec to get proper cutting behavior with malformed numbers
         $attributes['kind'] = LNumber::KIND_OCT;
         return new LNumber(intval($str, 8), $attributes);
     }
+    
+    public function getType() : string {
+        return 'Scalar_LNumber';
+    }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst.php b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst.php
index a50d68f3d..941f0c762 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Scalar;
 
@@ -11,12 +11,12 @@ abstract class MagicConst extends Scalar
      *
      * @param array $attributes Additional attributes
      */
-    public function __construct(array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $attributes = []) {
+        $this->attributes = $attributes;
     }
 
-    public function getSubNodeNames() {
-        return array();
+    public function getSubNodeNames() : array {
+        return [];
     }
 
     /**
@@ -24,5 +24,5 @@ abstract class MagicConst extends Scalar
      *
      * @return string Name of magic constant
      */
-    abstract public function getName();
+    abstract public function getName() : string;
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Class_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Class_.php
index 3466b21a1..244328476 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Class_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Class_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Scalar\MagicConst;
 
@@ -6,7 +6,11 @@ use PhpParser\Node\Scalar\MagicConst;
 
 class Class_ extends MagicConst
 {
-    public function getName() {
+    public function getName() : string {
         return '__CLASS__';
     }
-}
\ No newline at end of file
+    
+    public function getType() : string {
+        return 'Scalar_MagicConst_Class';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Dir.php b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Dir.php
index 9a86ae9c0..2b618473e 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Dir.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Dir.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Scalar\MagicConst;
 
@@ -6,7 +6,11 @@ use PhpParser\Node\Scalar\MagicConst;
 
 class Dir extends MagicConst
 {
-    public function getName() {
+    public function getName() : string {
         return '__DIR__';
     }
-}
\ No newline at end of file
+    
+    public function getType() : string {
+        return 'Scalar_MagicConst_Dir';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/File.php b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/File.php
index db293ef53..3422db069 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/File.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/File.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Scalar\MagicConst;
 
@@ -6,7 +6,11 @@ use PhpParser\Node\Scalar\MagicConst;
 
 class File extends MagicConst
 {
-    public function getName() {
+    public function getName() : string {
         return '__FILE__';
     }
-}
\ No newline at end of file
+    
+    public function getType() : string {
+        return 'Scalar_MagicConst_File';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Function_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Function_.php
index 435a8aec0..1db65a151 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Function_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Function_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Scalar\MagicConst;
 
@@ -6,7 +6,11 @@ use PhpParser\Node\Scalar\MagicConst;
 
 class Function_ extends MagicConst
 {
-    public function getName() {
+    public function getName() : string {
         return '__FUNCTION__';
     }
-}
\ No newline at end of file
+    
+    public function getType() : string {
+        return 'Scalar_MagicConst_Function';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Line.php b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Line.php
index 35f89bc72..25d3de57c 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Line.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Line.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Scalar\MagicConst;
 
@@ -6,7 +6,11 @@ use PhpParser\Node\Scalar\MagicConst;
 
 class Line extends MagicConst
 {
-    public function getName() {
+    public function getName() : string {
         return '__LINE__';
     }
-}
\ No newline at end of file
+    
+    public function getType() : string {
+        return 'Scalar_MagicConst_Line';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Method.php b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Method.php
index 7791b9d6c..d168d56f1 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Method.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Method.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Scalar\MagicConst;
 
@@ -6,7 +6,11 @@ use PhpParser\Node\Scalar\MagicConst;
 
 class Method extends MagicConst
 {
-    public function getName() {
+    public function getName() : string {
         return '__METHOD__';
     }
-}
\ No newline at end of file
+    
+    public function getType() : string {
+        return 'Scalar_MagicConst_Method';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Namespace_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Namespace_.php
index 07f5affb6..4fabb751a 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Namespace_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Namespace_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Scalar\MagicConst;
 
@@ -6,7 +6,11 @@ use PhpParser\Node\Scalar\MagicConst;
 
 class Namespace_ extends MagicConst
 {
-    public function getName() {
+    public function getName() : string {
         return '__NAMESPACE__';
     }
-}
\ No newline at end of file
+    
+    public function getType() : string {
+        return 'Scalar_MagicConst_Namespace';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Trait_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Trait_.php
index 1ac3f784d..5ee7e40a3 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Trait_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/MagicConst/Trait_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Scalar\MagicConst;
 
@@ -6,7 +6,11 @@ use PhpParser\Node\Scalar\MagicConst;
 
 class Trait_ extends MagicConst
 {
-    public function getName() {
+    public function getName() : string {
         return '__TRAIT__';
     }
-}
\ No newline at end of file
+    
+    public function getType() : string {
+        return 'Scalar_MagicConst_Trait';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/String_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/String_.php
index d7bbf83e8..8a6d93a47 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/String_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Scalar/String_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Scalar;
 
@@ -16,7 +16,7 @@ class String_ extends Scalar
     /** @var string String value */
     public $value;
 
-    protected static $replacements = array(
+    protected static $replacements = [
         '\\' => '\\',
         '$'  =>  '$',
         'n'  => "\n",
@@ -25,7 +25,7 @@ class String_ extends Scalar
         'f'  => "\f",
         'v'  => "\v",
         'e'  => "\x1B",
-    );
+    ];
 
     /**
      * Constructs a string scalar node.
@@ -33,13 +33,13 @@ class String_ extends Scalar
      * @param string $value      Value of the string
      * @param array  $attributes Additional attributes
      */
-    public function __construct($value, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(string $value, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->value = $value;
     }
 
-    public function getSubNodeNames() {
-        return array('value');
+    public function getSubNodeNames() : array {
+        return ['value'];
     }
 
     /**
@@ -52,7 +52,7 @@ class String_ extends Scalar
      *
      * @return string The parsed string
      */
-    public static function parse($str, $parseUnicodeEscape = true) {
+    public static function parse(string $str, bool $parseUnicodeEscape = true) : string {
         $bLength = 0;
         if ('b' === $str[0] || 'B' === $str[0]) {
             $bLength = 1;
@@ -60,8 +60,8 @@ class String_ extends Scalar
 
         if ('\'' === $str[$bLength]) {
             return str_replace(
-                array('\\\\', '\\\''),
-                array(  '\\',   '\''),
+                ['\\\\', '\\\''],
+                ['\\', '\''],
                 substr($str, $bLength + 1, -1)
             );
         } else {
@@ -82,7 +82,7 @@ class String_ extends Scalar
      *
      * @return string String with escape sequences parsed
      */
-    public static function parseEscapeSequences($str, $quote, $parseUnicodeEscape = true) {
+    public static function parseEscapeSequences(string $str, $quote, bool $parseUnicodeEscape = true) : string {
         if (null !== $quote) {
             $str = str_replace('\\' . $quote, $quote, $str);
         }
@@ -100,7 +100,7 @@ class String_ extends Scalar
                 if (isset(self::$replacements[$str])) {
                     return self::$replacements[$str];
                 } elseif ('x' === $str[0] || 'X' === $str[0]) {
-                    return chr(hexdec($str));
+                    return chr(hexdec(substr($str, 1)));
                 } elseif ('u' === $str[0]) {
                     return self::codePointToUtf8(hexdec($matches[2]));
                 } else {
@@ -111,7 +111,14 @@ class String_ extends Scalar
         );
     }
 
-    private static function codePointToUtf8($num) {
+    /**
+     * Converts a Unicode code point to its UTF-8 encoded representation.
+     *
+     * @param int $num Code point
+     *
+     * @return string UTF-8 representation of code point
+     */
+    private static function codePointToUtf8(int $num) : string {
         if ($num <= 0x7F) {
             return chr($num);
         }
@@ -128,26 +135,7 @@ class String_ extends Scalar
         throw new Error('Invalid UTF-8 codepoint escape sequence: Codepoint too large');
     }
 
-    /**
-     * @internal
-     *
-     * Parses a constant doc string.
-     *
-     * @param string $startToken Doc string start token content (<<<SMTHG)
-     * @param string $str        String token content
-     * @param bool $parseUnicodeEscape Whether to parse PHP 7 \u escapes
-     *
-     * @return string Parsed string
-     */
-    public static function parseDocString($startToken, $str, $parseUnicodeEscape = true) {
-        // strip last newline (thanks tokenizer for sticking it into the string!)
-        $str = preg_replace('~(\r\n|\n|\r)\z~', '', $str);
-
-        // nowdoc string
-        if (false !== strpos($startToken, '\'')) {
-            return $str;
-        }
-
-        return self::parseEscapeSequences($str, null, $parseUnicodeEscape);
+    public function getType() : string {
+        return 'Scalar_String';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt.php
index baa2f3e16..69d33e579 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node;
 
@@ -6,4 +6,4 @@ use PhpParser\NodeAbstract;
 
 abstract class Stmt extends NodeAbstract
 {
-}
\ No newline at end of file
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Break_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Break_.php
index c177c9a07..6adc5a6c6 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Break_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Break_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -15,12 +15,16 @@ class Break_ extends Node\Stmt
      * @param null|Node\Expr $num        Number of loops to break
      * @param array          $attributes Additional attributes
      */
-    public function __construct(Node\Expr $num = null, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Node\Expr $num = null, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->num = $num;
     }
 
-    public function getSubNodeNames() {
-        return array('num');
+    public function getSubNodeNames() : array {
+        return ['num'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Break';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Case_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Case_.php
index 03f892c7c..2bf044c90 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Case_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Case_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -6,25 +6,29 @@ use PhpParser\Node;
 
 class Case_ extends Node\Stmt
 {
-    /** @var null|Node\Expr $cond Condition (null for default) */
+    /** @var null|Node\Expr Condition (null for default) */
     public $cond;
-    /** @var Node[] Statements */
+    /** @var Node\Stmt[] Statements */
     public $stmts;
 
     /**
      * Constructs a case node.
      *
      * @param null|Node\Expr $cond       Condition (null for default)
-     * @param Node[]         $stmts      Statements
+     * @param Node\Stmt[]    $stmts      Statements
      * @param array          $attributes Additional attributes
      */
-    public function __construct($cond, array $stmts = array(), array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct($cond, array $stmts = [], array $attributes = []) {
+        $this->attributes = $attributes;
         $this->cond = $cond;
         $this->stmts = $stmts;
     }
 
-    public function getSubNodeNames() {
-        return array('cond', 'stmts');
+    public function getSubNodeNames() : array {
+        return ['cond', 'stmts'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Case';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Catch_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Catch_.php
index 58337ad9b..9b9c09478 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Catch_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Catch_.php
@@ -1,34 +1,41 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr;
 
 class Catch_ extends Node\Stmt
 {
     /** @var Node\Name[] Types of exceptions to catch */
     public $types;
-    /** @var string Variable for exception */
+    /** @var Expr\Variable|null Variable for exception */
     public $var;
-    /** @var Node[] Statements */
+    /** @var Node\Stmt[] Statements */
     public $stmts;
 
     /**
      * Constructs a catch node.
      *
-     * @param Node\Name[] $types      Types of exceptions to catch
-     * @param string      $var        Variable for exception
-     * @param Node[]      $stmts      Statements
-     * @param array       $attributes Additional attributes
+     * @param Node\Name[]           $types      Types of exceptions to catch
+     * @param Expr\Variable|null    $var        Variable for exception
+     * @param Node\Stmt[]           $stmts      Statements
+     * @param array                 $attributes Additional attributes
      */
-    public function __construct(array $types, $var, array $stmts = array(), array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(
+        array $types, Expr\Variable $var = null, array $stmts = [], array $attributes = []
+    ) {
+        $this->attributes = $attributes;
         $this->types = $types;
         $this->var = $var;
         $this->stmts = $stmts;
     }
 
-    public function getSubNodeNames() {
-        return array('types', 'var', 'stmts');
+    public function getSubNodeNames() : array {
+        return ['types', 'var', 'stmts'];
+    }
+
+    public function getType() : string {
+        return 'Stmt_Catch';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassConst.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassConst.php
index 0d41094ff..1fc7f3362 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassConst.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassConst.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -10,38 +10,71 @@ class ClassConst extends Node\Stmt
     public $flags;
     /** @var Node\Const_[] Constant declarations */
     public $consts;
+    /** @var Node\AttributeGroup[] */
+    public $attrGroups;
 
     /**
      * Constructs a class const list node.
      *
-     * @param Node\Const_[] $consts     Constant declarations
-     * @param int           $flags      Modifiers
-     * @param array         $attributes Additional attributes
+     * @param Node\Const_[]         $consts     Constant declarations
+     * @param int                   $flags      Modifiers
+     * @param array                 $attributes Additional attributes
+     * @param Node\AttributeGroup[] $attrGroups PHP attribute groups
      */
-    public function __construct(array $consts, $flags = 0, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(
+        array $consts,
+        int $flags = 0,
+        array $attributes = [],
+        array $attrGroups = []
+    ) {
+        $this->attributes = $attributes;
         $this->flags = $flags;
         $this->consts = $consts;
+        $this->attrGroups = $attrGroups;
     }
 
-    public function getSubNodeNames() {
-        return array('flags', 'consts');
+    public function getSubNodeNames() : array {
+        return ['attrGroups', 'flags', 'consts'];
     }
 
-    public function isPublic() {
+    /**
+     * Whether constant is explicitly or implicitly public.
+     *
+     * @return bool
+     */
+    public function isPublic() : bool {
         return ($this->flags & Class_::MODIFIER_PUBLIC) !== 0
             || ($this->flags & Class_::VISIBILITY_MODIFIER_MASK) === 0;
     }
 
-    public function isProtected() {
+    /**
+     * Whether constant is protected.
+     *
+     * @return bool
+     */
+    public function isProtected() : bool {
         return (bool) ($this->flags & Class_::MODIFIER_PROTECTED);
     }
 
-    public function isPrivate() {
+    /**
+     * Whether constant is private.
+     *
+     * @return bool
+     */
+    public function isPrivate() : bool {
         return (bool) ($this->flags & Class_::MODIFIER_PRIVATE);
     }
 
-    public function isStatic() {
-        return (bool) ($this->flags & Class_::MODIFIER_STATIC);
+    /**
+     * Whether constant is final.
+     *
+     * @return bool
+     */
+    public function isFinal() : bool {
+        return (bool) ($this->flags & Class_::MODIFIER_FINAL);
+    }
+
+    public function getType() : string {
+        return 'Stmt_ClassConst';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassLike.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassLike.php
index f90533553..6c3369172 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassLike.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassLike.php
@@ -1,22 +1,87 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
 use PhpParser\Node;
 
-abstract class ClassLike extends Node\Stmt {
-    /** @var string|null Name */
+abstract class ClassLike extends Node\Stmt
+{
+    /** @var Node\Identifier|null Name */
     public $name;
-    /** @var Node[] Statements */
+    /** @var Node\Stmt[] Statements */
     public $stmts;
+    /** @var Node\AttributeGroup[] PHP attribute groups */
+    public $attrGroups;
+
+    /** @var Node\Name Namespaced name (if using NameResolver) */
+    public $namespacedName;
+
+    /**
+     * @return TraitUse[]
+     */
+    public function getTraitUses() : array {
+        $traitUses = [];
+        foreach ($this->stmts as $stmt) {
+            if ($stmt instanceof TraitUse) {
+                $traitUses[] = $stmt;
+            }
+        }
+        return $traitUses;
+    }
+
+    /**
+     * @return ClassConst[]
+     */
+    public function getConstants() : array {
+        $constants = [];
+        foreach ($this->stmts as $stmt) {
+            if ($stmt instanceof ClassConst) {
+                $constants[] = $stmt;
+            }
+        }
+        return $constants;
+    }
+
+    /**
+     * @return Property[]
+     */
+    public function getProperties() : array {
+        $properties = [];
+        foreach ($this->stmts as $stmt) {
+            if ($stmt instanceof Property) {
+                $properties[] = $stmt;
+            }
+        }
+        return $properties;
+    }
+
+    /**
+     * Gets property with the given name defined directly in this class/interface/trait.
+     *
+     * @param string $name Name of the property
+     *
+     * @return Property|null Property node or null if the property does not exist
+     */
+    public function getProperty(string $name) {
+        foreach ($this->stmts as $stmt) {
+            if ($stmt instanceof Property) {
+                foreach ($stmt->props as $prop) {
+                    if ($prop instanceof PropertyProperty && $name === $prop->name->toString()) {
+                        return $stmt;
+                    }
+                }
+            }
+        }
+        return null;
+    }
 
     /**
      * Gets all methods defined directly in this class/interface/trait
      *
      * @return ClassMethod[]
      */
-    public function getMethods() {
-        $methods = array();
+    public function getMethods() : array {
+        $methods = [];
         foreach ($this->stmts as $stmt) {
             if ($stmt instanceof ClassMethod) {
                 $methods[] = $stmt;
@@ -32,10 +97,10 @@ abstract class ClassLike extends Node\Stmt {
      *
      * @return ClassMethod|null Method node or null if the method does not exist
      */
-    public function getMethod($name) {
+    public function getMethod(string $name) {
         $lowerName = strtolower($name);
         foreach ($this->stmts as $stmt) {
-            if ($stmt instanceof ClassMethod && $lowerName === strtolower($stmt->name)) {
+            if ($stmt instanceof ClassMethod && $lowerName === $stmt->name->toLowerString()) {
                 return $stmt;
             }
         }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassMethod.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassMethod.php
index de05390ad..09b877a92 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassMethod.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ClassMethod.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -11,51 +11,69 @@ class ClassMethod extends Node\Stmt implements FunctionLike
     public $flags;
     /** @var bool Whether to return by reference */
     public $byRef;
-    /** @var string Name */
+    /** @var Node\Identifier Name */
     public $name;
     /** @var Node\Param[] Parameters */
     public $params;
-    /** @var null|string|Node\Name|Node\NullableType Return type */
+    /** @var null|Node\Identifier|Node\Name|Node\ComplexType Return type */
     public $returnType;
-    /** @var Node[]|null Statements */
+    /** @var Node\Stmt[]|null Statements */
     public $stmts;
+    /** @var Node\AttributeGroup[] PHP attribute groups */
+    public $attrGroups;
 
-    /** @deprecated Use $flags instead */
-    public $type;
+    private static $magicNames = [
+        '__construct'  => true,
+        '__destruct'   => true,
+        '__call'       => true,
+        '__callstatic' => true,
+        '__get'        => true,
+        '__set'        => true,
+        '__isset'      => true,
+        '__unset'      => true,
+        '__sleep'      => true,
+        '__wakeup'     => true,
+        '__tostring'   => true,
+        '__set_state'  => true,
+        '__clone'      => true,
+        '__invoke'     => true,
+        '__debuginfo'  => true,
+    ];
 
     /**
      * Constructs a class method node.
      *
-     * @param string      $name       Name
-     * @param array       $subNodes   Array of the following optional subnodes:
-     *                                'flags       => MODIFIER_PUBLIC: Flags
-     *                                'byRef'      => false          : Whether to return by reference
-     *                                'params'     => array()        : Parameters
-     *                                'returnType' => null           : Return type
-     *                                'stmts'      => array()        : Statements
-     * @param array       $attributes Additional attributes
+     * @param string|Node\Identifier $name Name
+     * @param array $subNodes   Array of the following optional subnodes:
+     *                          'flags       => MODIFIER_PUBLIC: Flags
+     *                          'byRef'      => false          : Whether to return by reference
+     *                          'params'     => array()        : Parameters
+     *                          'returnType' => null           : Return type
+     *                          'stmts'      => array()        : Statements
+     *                          'attrGroups' => array()        : PHP attribute groups
+     * @param array $attributes Additional attributes
      */
-    public function __construct($name, array $subNodes = array(), array $attributes = array()) {
-        parent::__construct($attributes);
-        $this->flags = isset($subNodes['flags']) ? $subNodes['flags']
-            : (isset($subNodes['type']) ? $subNodes['type'] : 0);
-        $this->type = $this->flags;
-        $this->byRef = isset($subNodes['byRef'])  ? $subNodes['byRef']  : false;
-        $this->name = $name;
-        $this->params = isset($subNodes['params']) ? $subNodes['params'] : array();
-        $this->returnType = isset($subNodes['returnType']) ? $subNodes['returnType'] : null;
-        $this->stmts = array_key_exists('stmts', $subNodes) ? $subNodes['stmts'] : array();
+    public function __construct($name, array $subNodes = [], array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->flags = $subNodes['flags'] ?? $subNodes['type'] ?? 0;
+        $this->byRef = $subNodes['byRef'] ?? false;
+        $this->name = \is_string($name) ? new Node\Identifier($name) : $name;
+        $this->params = $subNodes['params'] ?? [];
+        $returnType = $subNodes['returnType'] ?? null;
+        $this->returnType = \is_string($returnType) ? new Node\Identifier($returnType) : $returnType;
+        $this->stmts = array_key_exists('stmts', $subNodes) ? $subNodes['stmts'] : [];
+        $this->attrGroups = $subNodes['attrGroups'] ?? [];
     }
 
-    public function getSubNodeNames() {
-        return array('flags', 'byRef', 'name', 'params', 'returnType', 'stmts');
+    public function getSubNodeNames() : array {
+        return ['attrGroups', 'flags', 'byRef', 'name', 'params', 'returnType', 'stmts'];
     }
 
-    public function returnsByRef() {
+    public function returnsByRef() : bool {
         return $this->byRef;
     }
 
-    public function getParams() {
+    public function getParams() : array {
         return $this->params;
     }
 
@@ -67,28 +85,75 @@ class ClassMethod extends Node\Stmt implements FunctionLike
         return $this->stmts;
     }
 
-    public function isPublic() {
+    public function getAttrGroups() : array {
+        return $this->attrGroups;
+    }
+
+    /**
+     * Whether the method is explicitly or implicitly public.
+     *
+     * @return bool
+     */
+    public function isPublic() : bool {
         return ($this->flags & Class_::MODIFIER_PUBLIC) !== 0
             || ($this->flags & Class_::VISIBILITY_MODIFIER_MASK) === 0;
     }
 
-    public function isProtected() {
+    /**
+     * Whether the method is protected.
+     *
+     * @return bool
+     */
+    public function isProtected() : bool {
         return (bool) ($this->flags & Class_::MODIFIER_PROTECTED);
     }
 
-    public function isPrivate() {
+    /**
+     * Whether the method is private.
+     *
+     * @return bool
+     */
+    public function isPrivate() : bool {
         return (bool) ($this->flags & Class_::MODIFIER_PRIVATE);
     }
 
-    public function isAbstract() {
+    /**
+     * Whether the method is abstract.
+     *
+     * @return bool
+     */
+    public function isAbstract() : bool {
         return (bool) ($this->flags & Class_::MODIFIER_ABSTRACT);
     }
 
-    public function isFinal() {
+    /**
+     * Whether the method is final.
+     *
+     * @return bool
+     */
+    public function isFinal() : bool {
         return (bool) ($this->flags & Class_::MODIFIER_FINAL);
     }
 
-    public function isStatic() {
+    /**
+     * Whether the method is static.
+     *
+     * @return bool
+     */
+    public function isStatic() : bool {
         return (bool) ($this->flags & Class_::MODIFIER_STATIC);
     }
+
+    /**
+     * Whether the method is magic.
+     *
+     * @return bool
+     */
+    public function isMagic() : bool {
+        return isset(self::$magicNames[$this->name->toLowerString()]);
+    }
+
+    public function getType() : string {
+        return 'Stmt_ClassMethod';
+    }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Class_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Class_.php
index 0a65e3740..b290aaf6d 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Class_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Class_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -13,10 +13,9 @@ class Class_ extends ClassLike
     const MODIFIER_STATIC    =  8;
     const MODIFIER_ABSTRACT  = 16;
     const MODIFIER_FINAL     = 32;
+    const MODIFIER_READONLY  = 64;
 
     const VISIBILITY_MODIFIER_MASK = 7; // 1 | 2 | 4
-    /** @deprecated */
-    const VISIBILITY_MODIFER_MASK = self::VISIBILITY_MODIFIER_MASK;
 
     /** @var int Type */
     public $flags;
@@ -25,50 +24,56 @@ class Class_ extends ClassLike
     /** @var Node\Name[] Names of implemented interfaces */
     public $implements;
 
-    /** @deprecated Use $flags instead */
-    public $type;
-
-    protected static $specialNames = array(
-        'self'   => true,
-        'parent' => true,
-        'static' => true,
-    );
-
     /**
      * Constructs a class node.
      *
-     * @param string|null $name       Name
+     * @param string|Node\Identifier|null $name Name
      * @param array       $subNodes   Array of the following optional subnodes:
-     *                                'flags'      => 0      : Flags
-     *                                'extends'    => null   : Name of extended class
-     *                                'implements' => array(): Names of implemented interfaces
-     *                                'stmts'      => array(): Statements
+     *                                'flags'       => 0      : Flags
+     *                                'extends'     => null   : Name of extended class
+     *                                'implements'  => array(): Names of implemented interfaces
+     *                                'stmts'       => array(): Statements
+     *                                'attrGroups'  => array(): PHP attribute groups
      * @param array       $attributes Additional attributes
      */
-    public function __construct($name, array $subNodes = array(), array $attributes = array()) {
-        parent::__construct($attributes);
-        $this->flags = isset($subNodes['flags']) ? $subNodes['flags']
-            : (isset($subNodes['type']) ? $subNodes['type'] : 0);
-        $this->type = $this->flags;
-        $this->name = $name;
-        $this->extends = isset($subNodes['extends']) ? $subNodes['extends'] : null;
-        $this->implements = isset($subNodes['implements']) ? $subNodes['implements'] : array();
-        $this->stmts = isset($subNodes['stmts']) ? $subNodes['stmts'] : array();
+    public function __construct($name, array $subNodes = [], array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->flags = $subNodes['flags'] ?? $subNodes['type'] ?? 0;
+        $this->name = \is_string($name) ? new Node\Identifier($name) : $name;
+        $this->extends = $subNodes['extends'] ?? null;
+        $this->implements = $subNodes['implements'] ?? [];
+        $this->stmts = $subNodes['stmts'] ?? [];
+        $this->attrGroups = $subNodes['attrGroups'] ?? [];
     }
 
-    public function getSubNodeNames() {
-        return array('flags', 'name', 'extends', 'implements', 'stmts');
+    public function getSubNodeNames() : array {
+        return ['attrGroups', 'flags', 'name', 'extends', 'implements', 'stmts'];
     }
 
-    public function isAbstract() {
+    /**
+     * Whether the class is explicitly abstract.
+     *
+     * @return bool
+     */
+    public function isAbstract() : bool {
         return (bool) ($this->flags & self::MODIFIER_ABSTRACT);
     }
 
-    public function isFinal() {
+    /**
+     * Whether the class is final.
+     *
+     * @return bool
+     */
+    public function isFinal() : bool {
         return (bool) ($this->flags & self::MODIFIER_FINAL);
     }
 
-    public function isAnonymous() {
+    /**
+     * Whether the class is anonymous.
+     *
+     * @return bool
+     */
+    public function isAnonymous() : bool {
         return null === $this->name;
     }
 
@@ -92,8 +97,16 @@ class Class_ extends ClassLike
             throw new Error('Multiple final modifiers are not allowed');
         }
 
+        if ($a & self::MODIFIER_READONLY && $b & self::MODIFIER_READONLY) {
+            throw new Error('Multiple readonly modifiers are not allowed');
+        }
+
         if ($a & 48 && $b & 48) {
             throw new Error('Cannot use the final modifier on an abstract class member');
         }
     }
+
+    public function getType() : string {
+        return 'Stmt_Class';
+    }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Const_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Const_.php
index 8b2eecd51..e6316345e 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Const_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Const_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -15,12 +15,16 @@ class Const_ extends Node\Stmt
      * @param Node\Const_[] $consts     Constant declarations
      * @param array         $attributes Additional attributes
      */
-    public function __construct(array $consts, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $consts, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->consts = $consts;
     }
 
-    public function getSubNodeNames() {
-        return array('consts');
+    public function getSubNodeNames() : array {
+        return ['consts'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Const';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Continue_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Continue_.php
index f78e19a2a..24882683b 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Continue_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Continue_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -15,12 +15,16 @@ class Continue_ extends Node\Stmt
      * @param null|Node\Expr $num        Number of loops to continue
      * @param array          $attributes Additional attributes
      */
-    public function __construct(Node\Expr $num = null, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Node\Expr $num = null, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->num = $num;
     }
 
-    public function getSubNodeNames() {
-        return array('num');
+    public function getSubNodeNames() : array {
+        return ['num'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Continue';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/DeclareDeclare.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/DeclareDeclare.php
index 829dbaf25..ac07f30c7 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/DeclareDeclare.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/DeclareDeclare.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -6,7 +6,7 @@ use PhpParser\Node;
 
 class DeclareDeclare extends Node\Stmt
 {
-    /** @var string Key */
+    /** @var Node\Identifier Key */
     public $key;
     /** @var Node\Expr Value */
     public $value;
@@ -14,17 +14,21 @@ class DeclareDeclare extends Node\Stmt
     /**
      * Constructs a declare key=>value pair node.
      *
-     * @param string    $key        Key
-     * @param Node\Expr $value      Value
-     * @param array     $attributes Additional attributes
+     * @param string|Node\Identifier $key        Key
+     * @param Node\Expr              $value      Value
+     * @param array                  $attributes Additional attributes
      */
-    public function __construct($key, Node\Expr $value, array $attributes = array()) {
-        parent::__construct($attributes);
-        $this->key = $key;
+    public function __construct($key, Node\Expr $value, array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->key = \is_string($key) ? new Node\Identifier($key) : $key;
         $this->value = $value;
     }
 
-    public function getSubNodeNames() {
-        return array('key', 'value');
+    public function getSubNodeNames() : array {
+        return ['key', 'value'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_DeclareDeclare';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Declare_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Declare_.php
index 32739f35f..f46ff0baf 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Declare_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Declare_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -8,23 +8,27 @@ class Declare_ extends Node\Stmt
 {
     /** @var DeclareDeclare[] List of declares */
     public $declares;
-    /** @var Node[] Statements */
+    /** @var Node\Stmt[]|null Statements */
     public $stmts;
 
     /**
      * Constructs a declare node.
      *
      * @param DeclareDeclare[] $declares   List of declares
-     * @param Node[]|null      $stmts      Statements
+     * @param Node\Stmt[]|null $stmts      Statements
      * @param array            $attributes Additional attributes
      */
-    public function __construct(array $declares, array $stmts = null, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $declares, array $stmts = null, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->declares = $declares;
         $this->stmts = $stmts;
     }
 
-    public function getSubNodeNames() {
-        return array('declares', 'stmts');
+    public function getSubNodeNames() : array {
+        return ['declares', 'stmts'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Declare';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Do_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Do_.php
index dd4c6c843..78e90da03 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Do_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Do_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -6,25 +6,29 @@ use PhpParser\Node;
 
 class Do_ extends Node\Stmt
 {
+    /** @var Node\Stmt[] Statements */
+    public $stmts;
     /** @var Node\Expr Condition */
     public $cond;
-    /** @var Node[] Statements */
-    public $stmts;
 
     /**
      * Constructs a do while node.
      *
-     * @param Node\Expr $cond       Condition
-     * @param Node[]    $stmts      Statements
-     * @param array     $attributes Additional attributes
+     * @param Node\Expr   $cond       Condition
+     * @param Node\Stmt[] $stmts      Statements
+     * @param array       $attributes Additional attributes
      */
-    public function __construct(Node\Expr $cond, array $stmts = array(), array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Node\Expr $cond, array $stmts = [], array $attributes = []) {
+        $this->attributes = $attributes;
         $this->cond = $cond;
         $this->stmts = $stmts;
     }
 
-    public function getSubNodeNames() {
-        return array('cond', 'stmts');
+    public function getSubNodeNames() : array {
+        return ['stmts', 'cond'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Do';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Echo_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Echo_.php
index 11e107072..7cc50d5d6 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Echo_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Echo_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -15,12 +15,16 @@ class Echo_ extends Node\Stmt
      * @param Node\Expr[] $exprs      Expressions
      * @param array       $attributes Additional attributes
      */
-    public function __construct(array $exprs, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $exprs, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->exprs = $exprs;
     }
 
-    public function getSubNodeNames() {
-        return array('exprs');
+    public function getSubNodeNames() : array {
+        return ['exprs'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Echo';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ElseIf_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ElseIf_.php
index 608878f65..eef1ece32 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ElseIf_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/ElseIf_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -8,23 +8,27 @@ class ElseIf_ extends Node\Stmt
 {
     /** @var Node\Expr Condition */
     public $cond;
-    /** @var Node[] Statements */
+    /** @var Node\Stmt[] Statements */
     public $stmts;
 
     /**
      * Constructs an elseif node.
      *
-     * @param Node\Expr $cond       Condition
-     * @param Node[]    $stmts      Statements
-     * @param array     $attributes Additional attributes
+     * @param Node\Expr   $cond       Condition
+     * @param Node\Stmt[] $stmts      Statements
+     * @param array       $attributes Additional attributes
      */
-    public function __construct(Node\Expr $cond, array $stmts = array(), array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Node\Expr $cond, array $stmts = [], array $attributes = []) {
+        $this->attributes = $attributes;
         $this->cond = $cond;
         $this->stmts = $stmts;
     }
 
-    public function getSubNodeNames() {
-        return array('cond', 'stmts');
+    public function getSubNodeNames() : array {
+        return ['cond', 'stmts'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_ElseIf';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Else_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Else_.php
index c91a1484f..0e61778e2 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Else_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Else_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -6,21 +6,25 @@ use PhpParser\Node;
 
 class Else_ extends Node\Stmt
 {
-    /** @var Node[] Statements */
+    /** @var Node\Stmt[] Statements */
     public $stmts;
 
     /**
      * Constructs an else node.
      *
-     * @param Node[] $stmts      Statements
-     * @param array  $attributes Additional attributes
+     * @param Node\Stmt[] $stmts      Statements
+     * @param array       $attributes Additional attributes
      */
-    public function __construct(array $stmts = array(), array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $stmts = [], array $attributes = []) {
+        $this->attributes = $attributes;
         $this->stmts = $stmts;
     }
 
-    public function getSubNodeNames() {
-        return array('stmts');
+    public function getSubNodeNames() : array {
+        return ['stmts'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Else';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/EnumCase.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/EnumCase.php
new file mode 100644
index 000000000..5beff8b39
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/EnumCase.php
@@ -0,0 +1,37 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node\Stmt;
+
+use PhpParser\Node;
+use PhpParser\Node\AttributeGroup;
+
+class EnumCase extends Node\Stmt
+{
+    /** @var Node\Identifier Enum case name */
+    public $name;
+    /** @var Node\Expr|null Enum case expression */
+    public $expr;
+    /** @var Node\AttributeGroup[] PHP attribute groups */
+    public $attrGroups;
+
+    /**
+     * @param string|Node\Identifier    $name       Enum case name
+     * @param Node\Expr|null            $expr       Enum case expression
+     * @param AttributeGroup[]          $attrGroups PHP attribute groups
+     * @param array                     $attributes Additional attributes
+     */
+    public function __construct($name, Node\Expr $expr = null, array $attrGroups = [], array $attributes = []) {
+        parent::__construct($attributes);
+        $this->name = \is_string($name) ? new Node\Identifier($name) : $name;
+        $this->expr = $expr;
+        $this->attrGroups = $attrGroups;
+    }
+
+    public function getSubNodeNames() : array {
+        return ['attrGroups', 'name', 'expr'];
+    }
+
+    public function getType() : string {
+        return 'Stmt_EnumCase';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Enum_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Enum_.php
new file mode 100644
index 000000000..3a50c225d
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Enum_.php
@@ -0,0 +1,40 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node\Stmt;
+
+use PhpParser\Node;
+
+class Enum_ extends ClassLike
+{
+    /** @var null|Node\Identifier Scalar Type */
+    public $scalarType;
+    /** @var Node\Name[] Names of implemented interfaces */
+    public $implements;
+
+    /**
+     * @param string|Node\Identifier|null $name       Name
+     * @param array                       $subNodes   Array of the following optional subnodes:
+     *                                                'scalarType'  => null    : Scalar type
+     *                                                'implements'  => array() : Names of implemented interfaces
+     *                                                'stmts'       => array() : Statements
+     *                                                'attrGroups'  => array() : PHP attribute groups
+     * @param array                       $attributes Additional attributes
+     */
+    public function __construct($name, array $subNodes = [], array $attributes = []) {
+        $this->name = \is_string($name) ? new Node\Identifier($name) : $name;
+        $this->scalarType = $subNodes['scalarType'] ?? null;
+        $this->implements = $subNodes['implements'] ?? [];
+        $this->stmts = $subNodes['stmts'] ?? [];
+        $this->attrGroups = $subNodes['attrGroups'] ?? [];
+
+        parent::__construct($attributes);
+    }
+
+    public function getSubNodeNames() : array {
+        return ['attrGroups', 'name', 'scalarType', 'implements', 'stmts'];
+    }
+
+    public function getType() : string {
+        return 'Stmt_Enum';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Expression.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Expression.php
new file mode 100644
index 000000000..99d1687de
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Expression.php
@@ -0,0 +1,33 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node\Stmt;
+
+use PhpParser\Node;
+
+/**
+ * Represents statements of type "expr;"
+ */
+class Expression extends Node\Stmt
+{
+    /** @var Node\Expr Expression */
+    public $expr;
+
+    /**
+     * Constructs an expression statement.
+     *
+     * @param Node\Expr $expr       Expression
+     * @param array     $attributes Additional attributes
+     */
+    public function __construct(Node\Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->expr = $expr;
+    }
+
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Expression';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Finally_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Finally_.php
index 0e3eabbe1..d55b8b687 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Finally_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Finally_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -6,21 +6,25 @@ use PhpParser\Node;
 
 class Finally_ extends Node\Stmt
 {
-    /** @var Node[] Statements */
+    /** @var Node\Stmt[] Statements */
     public $stmts;
 
     /**
      * Constructs a finally node.
      *
-     * @param Node[] $stmts      Statements
-     * @param array  $attributes Additional attributes
+     * @param Node\Stmt[] $stmts      Statements
+     * @param array       $attributes Additional attributes
      */
-    public function __construct(array $stmts = array(), array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $stmts = [], array $attributes = []) {
+        $this->attributes = $attributes;
         $this->stmts = $stmts;
     }
 
-    public function getSubNodeNames() {
-        return array('stmts');
+    public function getSubNodeNames() : array {
+        return ['stmts'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Finally';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/For_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/For_.php
index 2ca88a332..1323d37cf 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/For_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/For_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -12,7 +12,7 @@ class For_ extends Node\Stmt
     public $cond;
     /** @var Node\Expr[] Loop expressions */
     public $loop;
-    /** @var Node[] Statements */
+    /** @var Node\Stmt[] Statements */
     public $stmts;
 
     /**
@@ -25,15 +25,19 @@ class For_ extends Node\Stmt
      *                          'stmts' => array(): Statements
      * @param array $attributes Additional attributes
      */
-    public function __construct(array $subNodes = array(), array $attributes = array()) {
-        parent::__construct($attributes);
-        $this->init = isset($subNodes['init']) ? $subNodes['init'] : array();
-        $this->cond = isset($subNodes['cond']) ? $subNodes['cond'] : array();
-        $this->loop = isset($subNodes['loop']) ? $subNodes['loop'] : array();
-        $this->stmts = isset($subNodes['stmts']) ? $subNodes['stmts'] : array();
+    public function __construct(array $subNodes = [], array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->init = $subNodes['init'] ?? [];
+        $this->cond = $subNodes['cond'] ?? [];
+        $this->loop = $subNodes['loop'] ?? [];
+        $this->stmts = $subNodes['stmts'] ?? [];
     }
 
-    public function getSubNodeNames() {
-        return array('init', 'cond', 'loop', 'stmts');
+    public function getSubNodeNames() : array {
+        return ['init', 'cond', 'loop', 'stmts'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_For';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Foreach_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Foreach_.php
index d2c643205..0556a7ce5 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Foreach_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Foreach_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -14,7 +14,7 @@ class Foreach_ extends Node\Stmt
     public $byRef;
     /** @var Node\Expr Variable to assign value to */
     public $valueVar;
-    /** @var Node[] Statements */
+    /** @var Node\Stmt[] Statements */
     public $stmts;
 
     /**
@@ -28,16 +28,20 @@ class Foreach_ extends Node\Stmt
      *                              'stmts'  => array(): Statements
      * @param array     $attributes Additional attributes
      */
-    public function __construct(Node\Expr $expr, Node\Expr $valueVar, array $subNodes = array(), array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Node\Expr $expr, Node\Expr $valueVar, array $subNodes = [], array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
-        $this->keyVar = isset($subNodes['keyVar']) ? $subNodes['keyVar'] : null;
-        $this->byRef = isset($subNodes['byRef']) ? $subNodes['byRef'] : false;
+        $this->keyVar = $subNodes['keyVar'] ?? null;
+        $this->byRef = $subNodes['byRef'] ?? false;
         $this->valueVar = $valueVar;
-        $this->stmts = isset($subNodes['stmts']) ? $subNodes['stmts'] : array();
+        $this->stmts = $subNodes['stmts'] ?? [];
     }
 
-    public function getSubNodeNames() {
-        return array('expr', 'keyVar', 'byRef', 'valueVar', 'stmts');
+    public function getSubNodeNames() : array {
+        return ['expr', 'keyVar', 'byRef', 'valueVar', 'stmts'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Foreach';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Function_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Function_.php
index 4c1f48d84..abb7ee5c8 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Function_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Function_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -9,44 +9,52 @@ class Function_ extends Node\Stmt implements FunctionLike
 {
     /** @var bool Whether function returns by reference */
     public $byRef;
-    /** @var string Name */
+    /** @var Node\Identifier Name */
     public $name;
     /** @var Node\Param[] Parameters */
     public $params;
-    /** @var null|string|Node\Name|Node\NullableType Return type */
+    /** @var null|Node\Identifier|Node\Name|Node\ComplexType Return type */
     public $returnType;
-    /** @var Node[] Statements */
+    /** @var Node\Stmt[] Statements */
     public $stmts;
+    /** @var Node\AttributeGroup[] PHP attribute groups */
+    public $attrGroups;
+
+    /** @var Node\Name Namespaced name (if using NameResolver) */
+    public $namespacedName;
 
     /**
      * Constructs a function node.
      *
-     * @param string $name       Name
+     * @param string|Node\Identifier $name Name
      * @param array  $subNodes   Array of the following optional subnodes:
      *                           'byRef'      => false  : Whether to return by reference
      *                           'params'     => array(): Parameters
      *                           'returnType' => null   : Return type
      *                           'stmts'      => array(): Statements
+     *                           'attrGroups' => array(): PHP attribute groups
      * @param array  $attributes Additional attributes
      */
-    public function __construct($name, array $subNodes = array(), array $attributes = array()) {
-        parent::__construct($attributes);
-        $this->byRef = isset($subNodes['byRef']) ? $subNodes['byRef'] : false;
-        $this->name = $name;
-        $this->params = isset($subNodes['params']) ? $subNodes['params'] : array();
-        $this->returnType = isset($subNodes['returnType']) ? $subNodes['returnType'] : null;
-        $this->stmts = isset($subNodes['stmts']) ? $subNodes['stmts'] : array();
+    public function __construct($name, array $subNodes = [], array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->byRef = $subNodes['byRef'] ?? false;
+        $this->name = \is_string($name) ? new Node\Identifier($name) : $name;
+        $this->params = $subNodes['params'] ?? [];
+        $returnType = $subNodes['returnType'] ?? null;
+        $this->returnType = \is_string($returnType) ? new Node\Identifier($returnType) : $returnType;
+        $this->stmts = $subNodes['stmts'] ?? [];
+        $this->attrGroups = $subNodes['attrGroups'] ?? [];
     }
 
-    public function getSubNodeNames() {
-        return array('byRef', 'name', 'params', 'returnType', 'stmts');
+    public function getSubNodeNames() : array {
+        return ['attrGroups', 'byRef', 'name', 'params', 'returnType', 'stmts'];
     }
 
-    public function returnsByRef() {
+    public function returnsByRef() : bool {
         return $this->byRef;
     }
 
-    public function getParams() {
+    public function getParams() : array {
         return $this->params;
     }
 
@@ -54,7 +62,16 @@ class Function_ extends Node\Stmt implements FunctionLike
         return $this->returnType;
     }
 
-    public function getStmts() {
+    public function getAttrGroups() : array {
+        return $this->attrGroups;
+    }
+
+    /** @return Node\Stmt[] */
+    public function getStmts() : array {
         return $this->stmts;
     }
+
+    public function getType() : string {
+        return 'Stmt_Function';
+    }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Global_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Global_.php
index 29fbc488e..a0022ad93 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Global_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Global_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -15,12 +15,16 @@ class Global_ extends Node\Stmt
      * @param Node\Expr[] $vars       Variables to unset
      * @param array       $attributes Additional attributes
      */
-    public function __construct(array $vars, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $vars, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->vars = $vars;
     }
 
-    public function getSubNodeNames() {
-        return array('vars');
+    public function getSubNodeNames() : array {
+        return ['vars'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Global';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Goto_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Goto_.php
index b087fe02b..24a57f780 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Goto_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Goto_.php
@@ -1,26 +1,31 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
+use PhpParser\Node\Identifier;
 use PhpParser\Node\Stmt;
 
 class Goto_ extends Stmt
 {
-    /** @var string Name of label to jump to */
+    /** @var Identifier Name of label to jump to */
     public $name;
 
     /**
      * Constructs a goto node.
      *
-     * @param string $name       Name of label to jump to
-     * @param array  $attributes Additional attributes
+     * @param string|Identifier $name       Name of label to jump to
+     * @param array             $attributes Additional attributes
      */
-    public function __construct($name, array $attributes = array()) {
-        parent::__construct($attributes);
-        $this->name = $name;
+    public function __construct($name, array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->name = \is_string($name) ? new Identifier($name) : $name;
     }
 
-    public function getSubNodeNames() {
-        return array('name');
+    public function getSubNodeNames() : array {
+        return ['name'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Goto';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/GroupUse.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/GroupUse.php
index 30837dd6b..24520d223 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/GroupUse.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/GroupUse.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -22,14 +22,18 @@ class GroupUse extends Stmt
      * @param int      $type       Type of group use
      * @param array    $attributes Additional attributes
      */
-    public function __construct(Name $prefix, array $uses, $type = Use_::TYPE_NORMAL, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Name $prefix, array $uses, int $type = Use_::TYPE_NORMAL, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->type = $type;
         $this->prefix = $prefix;
         $this->uses = $uses;
     }
 
-    public function getSubNodeNames() {
-        return array('type', 'prefix', 'uses');
+    public function getSubNodeNames() : array {
+        return ['type', 'prefix', 'uses'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_GroupUse';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/HaltCompiler.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/HaltCompiler.php
index c33ec9f1d..8e624e0f1 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/HaltCompiler.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/HaltCompiler.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -15,12 +15,16 @@ class HaltCompiler extends Stmt
      * @param string $remaining  Remaining text after halt compiler statement.
      * @param array  $attributes Additional attributes
      */
-    public function __construct($remaining, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(string $remaining, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->remaining = $remaining;
     }
 
-    public function getSubNodeNames() {
-        return array('remaining');
+    public function getSubNodeNames() : array {
+        return ['remaining'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_HaltCompiler';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/If_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/If_.php
index 98bda356f..a1bae4bf8 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/If_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/If_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -8,7 +8,7 @@ class If_ extends Node\Stmt
 {
     /** @var Node\Expr Condition expression */
     public $cond;
-    /** @var Node[] Statements */
+    /** @var Node\Stmt[] Statements */
     public $stmts;
     /** @var ElseIf_[] Elseif clauses */
     public $elseifs;
@@ -25,15 +25,19 @@ class If_ extends Node\Stmt
      *                              'else'    => null   : Else clause
      * @param array     $attributes Additional attributes
      */
-    public function __construct(Node\Expr $cond, array $subNodes = array(), array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Node\Expr $cond, array $subNodes = [], array $attributes = []) {
+        $this->attributes = $attributes;
         $this->cond = $cond;
-        $this->stmts = isset($subNodes['stmts']) ? $subNodes['stmts'] : array();
-        $this->elseifs = isset($subNodes['elseifs']) ? $subNodes['elseifs'] : array();
-        $this->else = isset($subNodes['else']) ? $subNodes['else'] : null;
+        $this->stmts = $subNodes['stmts'] ?? [];
+        $this->elseifs = $subNodes['elseifs'] ?? [];
+        $this->else = $subNodes['else'] ?? null;
     }
 
-    public function getSubNodeNames() {
-        return array('cond', 'stmts', 'elseifs', 'else');
+    public function getSubNodeNames() : array {
+        return ['cond', 'stmts', 'elseifs', 'else'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_If';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/InlineHTML.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/InlineHTML.php
index accebe61e..0711d2842 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/InlineHTML.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/InlineHTML.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -15,12 +15,16 @@ class InlineHTML extends Stmt
      * @param string $value      String
      * @param array  $attributes Additional attributes
      */
-    public function __construct($value, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(string $value, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->value = $value;
     }
 
-    public function getSubNodeNames() {
-        return array('value');
+    public function getSubNodeNames() : array {
+        return ['value'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_InlineHTML';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Interface_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Interface_.php
index efb5891fc..4d587dd48 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Interface_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Interface_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -12,20 +12,26 @@ class Interface_ extends ClassLike
     /**
      * Constructs a class node.
      *
-     * @param string $name       Name
+     * @param string|Node\Identifier $name Name
      * @param array  $subNodes   Array of the following optional subnodes:
-     *                           'extends' => array(): Name of extended interfaces
-     *                           'stmts'   => array(): Statements
+     *                           'extends'    => array(): Name of extended interfaces
+     *                           'stmts'      => array(): Statements
+     *                           'attrGroups' => array(): PHP attribute groups
      * @param array  $attributes Additional attributes
      */
-    public function __construct($name, array $subNodes = array(), array $attributes = array()) {
-        parent::__construct($attributes);
-        $this->name = $name;
-        $this->extends = isset($subNodes['extends']) ? $subNodes['extends'] : array();
-        $this->stmts = isset($subNodes['stmts']) ? $subNodes['stmts'] : array();
+    public function __construct($name, array $subNodes = [], array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->name = \is_string($name) ? new Node\Identifier($name) : $name;
+        $this->extends = $subNodes['extends'] ?? [];
+        $this->stmts = $subNodes['stmts'] ?? [];
+        $this->attrGroups = $subNodes['attrGroups'] ?? [];
     }
 
-    public function getSubNodeNames() {
-        return array('name', 'extends', 'stmts');
+    public function getSubNodeNames() : array {
+        return ['attrGroups', 'name', 'extends', 'stmts'];
+    }
+
+    public function getType() : string {
+        return 'Stmt_Interface';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Label.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Label.php
index edd0ee9a5..3edcb3be7 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Label.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Label.php
@@ -1,26 +1,31 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
+use PhpParser\Node\Identifier;
 use PhpParser\Node\Stmt;
 
 class Label extends Stmt
 {
-    /** @var string Name */
+    /** @var Identifier Name */
     public $name;
 
     /**
      * Constructs a label node.
      *
-     * @param string $name       Name
-     * @param array  $attributes Additional attributes
+     * @param string|Identifier $name       Name
+     * @param array             $attributes Additional attributes
      */
-    public function __construct($name, array $attributes = array()) {
-        parent::__construct($attributes);
-        $this->name = $name;
+    public function __construct($name, array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->name = \is_string($name) ? new Identifier($name) : $name;
     }
 
-    public function getSubNodeNames() {
-        return array('name');
+    public function getSubNodeNames() : array {
+        return ['name'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Label';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Namespace_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Namespace_.php
index 444855c39..c63204577 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Namespace_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Namespace_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -12,23 +12,27 @@ class Namespace_ extends Node\Stmt
 
     /** @var null|Node\Name Name */
     public $name;
-    /** @var Node[] Statements */
+    /** @var Node\Stmt[] Statements */
     public $stmts;
 
     /**
      * Constructs a namespace node.
      *
-     * @param null|Node\Name $name       Name
-     * @param null|Node[]    $stmts      Statements
-     * @param array          $attributes Additional attributes
+     * @param null|Node\Name   $name       Name
+     * @param null|Node\Stmt[] $stmts      Statements
+     * @param array            $attributes Additional attributes
      */
-    public function __construct(Node\Name $name = null, $stmts = array(), array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Node\Name $name = null, $stmts = [], array $attributes = []) {
+        $this->attributes = $attributes;
         $this->name = $name;
         $this->stmts = $stmts;
     }
 
-    public function getSubNodeNames() {
-        return array('name', 'stmts');
+    public function getSubNodeNames() : array {
+        return ['name', 'stmts'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Namespace';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Nop.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Nop.php
index 270dd0995..f86f8df7d 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Nop.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Nop.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -7,7 +7,11 @@ use PhpParser\Node;
 /** Nop/empty statement (;). */
 class Nop extends Node\Stmt
 {
-    public function getSubNodeNames() {
-        return array();
+    public function getSubNodeNames() : array {
+        return [];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Nop';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Property.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Property.php
index 420f055e2..bc781bbff 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Property.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Property.php
@@ -1,8 +1,11 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
 use PhpParser\Node;
+use PhpParser\Node\ComplexType;
+use PhpParser\Node\Identifier;
+use PhpParser\Node\Name;
 
 class Property extends Node\Stmt
 {
@@ -10,42 +13,79 @@ class Property extends Node\Stmt
     public $flags;
     /** @var PropertyProperty[] Properties */
     public $props;
-
-    /** @deprecated Use $flags instead */
+    /** @var null|Identifier|Name|ComplexType Type declaration */
     public $type;
+    /** @var Node\AttributeGroup[] PHP attribute groups */
+    public $attrGroups;
 
     /**
      * Constructs a class property list node.
      *
-     * @param int                $flags      Modifiers
-     * @param PropertyProperty[] $props      Properties
-     * @param array              $attributes Additional attributes
+     * @param int                                     $flags      Modifiers
+     * @param PropertyProperty[]                      $props      Properties
+     * @param array                                   $attributes Additional attributes
+     * @param null|string|Identifier|Name|ComplexType $type       Type declaration
+     * @param Node\AttributeGroup[]                   $attrGroups PHP attribute groups
      */
-    public function __construct($flags, array $props, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(int $flags, array $props, array $attributes = [], $type = null, array $attrGroups = []) {
+        $this->attributes = $attributes;
         $this->flags = $flags;
-        $this->type = $flags;
         $this->props = $props;
+        $this->type = \is_string($type) ? new Identifier($type) : $type;
+        $this->attrGroups = $attrGroups;
     }
 
-    public function getSubNodeNames() {
-        return array('flags', 'props');
+    public function getSubNodeNames() : array {
+        return ['attrGroups', 'flags', 'type', 'props'];
     }
 
-    public function isPublic() {
+    /**
+     * Whether the property is explicitly or implicitly public.
+     *
+     * @return bool
+     */
+    public function isPublic() : bool {
         return ($this->flags & Class_::MODIFIER_PUBLIC) !== 0
             || ($this->flags & Class_::VISIBILITY_MODIFIER_MASK) === 0;
     }
 
-    public function isProtected() {
+    /**
+     * Whether the property is protected.
+     *
+     * @return bool
+     */
+    public function isProtected() : bool {
         return (bool) ($this->flags & Class_::MODIFIER_PROTECTED);
     }
 
-    public function isPrivate() {
+    /**
+     * Whether the property is private.
+     *
+     * @return bool
+     */
+    public function isPrivate() : bool {
         return (bool) ($this->flags & Class_::MODIFIER_PRIVATE);
     }
 
-    public function isStatic() {
+    /**
+     * Whether the property is static.
+     *
+     * @return bool
+     */
+    public function isStatic() : bool {
         return (bool) ($this->flags & Class_::MODIFIER_STATIC);
     }
+
+    /**
+     * Whether the property is readonly.
+     *
+     * @return bool
+     */
+    public function isReadonly() : bool {
+        return (bool) ($this->flags & Class_::MODIFIER_READONLY);
+    }
+
+    public function getType() : string {
+        return 'Stmt_Property';
+    }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/PropertyProperty.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/PropertyProperty.php
index b2d29dc77..205731e20 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/PropertyProperty.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/PropertyProperty.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -6,7 +6,7 @@ use PhpParser\Node;
 
 class PropertyProperty extends Node\Stmt
 {
-    /** @var string Name */
+    /** @var Node\VarLikeIdentifier Name */
     public $name;
     /** @var null|Node\Expr Default */
     public $default;
@@ -14,17 +14,21 @@ class PropertyProperty extends Node\Stmt
     /**
      * Constructs a class property node.
      *
-     * @param string         $name       Name
-     * @param null|Node\Expr $default    Default value
-     * @param array          $attributes Additional attributes
+     * @param string|Node\VarLikeIdentifier $name       Name
+     * @param null|Node\Expr                $default    Default value
+     * @param array                         $attributes Additional attributes
      */
-    public function __construct($name, Node\Expr $default = null, array $attributes = array()) {
-        parent::__construct($attributes);
-        $this->name = $name;
+    public function __construct($name, Node\Expr $default = null, array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->name = \is_string($name) ? new Node\VarLikeIdentifier($name) : $name;
         $this->default = $default;
     }
 
-    public function getSubNodeNames() {
-        return array('name', 'default');
+    public function getSubNodeNames() : array {
+        return ['name', 'default'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_PropertyProperty';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Return_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Return_.php
index b64284114..efc578c58 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Return_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Return_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -15,12 +15,16 @@ class Return_ extends Node\Stmt
      * @param null|Node\Expr $expr       Expression
      * @param array          $attributes Additional attributes
      */
-    public function __construct(Node\Expr $expr = null, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Node\Expr $expr = null, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Return';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/StaticVar.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/StaticVar.php
index 4bc5dd25c..29584560d 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/StaticVar.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/StaticVar.php
@@ -1,30 +1,37 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
 use PhpParser\Node;
+use PhpParser\Node\Expr;
 
 class StaticVar extends Node\Stmt
 {
-    /** @var string Name */
-    public $name;
+    /** @var Expr\Variable Variable */
+    public $var;
     /** @var null|Node\Expr Default value */
     public $default;
 
     /**
      * Constructs a static variable node.
      *
-     * @param string         $name       Name
+     * @param Expr\Variable  $var         Name
      * @param null|Node\Expr $default    Default value
      * @param array          $attributes Additional attributes
      */
-    public function __construct($name, Node\Expr $default = null, array $attributes = array()) {
-        parent::__construct($attributes);
-        $this->name = $name;
+    public function __construct(
+        Expr\Variable $var, Node\Expr $default = null, array $attributes = []
+    ) {
+        $this->attributes = $attributes;
+        $this->var = $var;
         $this->default = $default;
     }
 
-    public function getSubNodeNames() {
-        return array('name', 'default');
+    public function getSubNodeNames() : array {
+        return ['var', 'default'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_StaticVar';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Static_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Static_.php
index 37cc0b36f..464898ffa 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Static_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Static_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -15,12 +15,16 @@ class Static_ extends Stmt
      * @param StaticVar[] $vars       Variable definitions
      * @param array       $attributes Additional attributes
      */
-    public function __construct(array $vars, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $vars, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->vars = $vars;
     }
 
-    public function getSubNodeNames() {
-        return array('vars');
+    public function getSubNodeNames() : array {
+        return ['vars'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Static';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Switch_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Switch_.php
index 72d667b1e..2c8dae022 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Switch_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Switch_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -18,13 +18,17 @@ class Switch_ extends Node\Stmt
      * @param Case_[]   $cases      Case list
      * @param array     $attributes Additional attributes
      */
-    public function __construct(Node\Expr $cond, array $cases, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Node\Expr $cond, array $cases, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->cond = $cond;
         $this->cases = $cases;
     }
 
-    public function getSubNodeNames() {
-        return array('cond', 'cases');
+    public function getSubNodeNames() : array {
+        return ['cond', 'cases'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Switch';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Throw_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Throw_.php
index f8ff6aa38..a34e2b362 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Throw_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Throw_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -10,17 +10,21 @@ class Throw_ extends Node\Stmt
     public $expr;
 
     /**
-     * Constructs a throw node.
+     * Constructs a legacy throw statement node.
      *
      * @param Node\Expr $expr       Expression
      * @param array     $attributes Additional attributes
      */
-    public function __construct(Node\Expr $expr, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Node\Expr $expr, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->expr = $expr;
     }
 
-    public function getSubNodeNames() {
-        return array('expr');
+    public function getSubNodeNames() : array {
+        return ['expr'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Throw';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUse.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUse.php
index a29874bea..9e97053b4 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUse.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUse.php
@@ -1,10 +1,9 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
 use PhpParser\Node;
 
-
 class TraitUse extends Node\Stmt
 {
     /** @var Node\Name[] Traits */
@@ -19,13 +18,17 @@ class TraitUse extends Node\Stmt
      * @param TraitUseAdaptation[] $adaptations Adaptations
      * @param array                $attributes  Additional attributes
      */
-    public function __construct(array $traits, array $adaptations = array(), array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $traits, array $adaptations = [], array $attributes = []) {
+        $this->attributes = $attributes;
         $this->traits = $traits;
         $this->adaptations = $adaptations;
     }
 
-    public function getSubNodeNames() {
-        return array('traits', 'adaptations');
+    public function getSubNodeNames() : array {
+        return ['traits', 'adaptations'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_TraitUse';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation.php
index c6038c8ca..8bdd2c041 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -6,8 +6,8 @@ use PhpParser\Node;
 
 abstract class TraitUseAdaptation extends Node\Stmt
 {
-    /** @var Node\Name Trait name */
+    /** @var Node\Name|null Trait name */
     public $trait;
-    /** @var string Method name */
+    /** @var Node\Identifier Method name */
     public $method;
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Alias.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Alias.php
index e9b50654c..a3bccbd10 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Alias.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Alias.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt\TraitUseAdaptation;
 
@@ -8,27 +8,31 @@ class Alias extends Node\Stmt\TraitUseAdaptation
 {
     /** @var null|int New modifier */
     public $newModifier;
-    /** @var null|string New name */
+    /** @var null|Node\Identifier New name */
     public $newName;
 
     /**
      * Constructs a trait use precedence adaptation node.
      *
-     * @param null|Node\Name $trait       Trait name
-     * @param string         $method      Method name
-     * @param null|int       $newModifier New modifier
-     * @param null|string    $newName     New name
-     * @param array          $attributes  Additional attributes
+     * @param null|Node\Name              $trait       Trait name
+     * @param string|Node\Identifier      $method      Method name
+     * @param null|int                    $newModifier New modifier
+     * @param null|string|Node\Identifier $newName     New name
+     * @param array                       $attributes  Additional attributes
      */
-    public function __construct($trait, $method, $newModifier, $newName, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct($trait, $method, $newModifier, $newName, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->trait = $trait;
-        $this->method = $method;
+        $this->method = \is_string($method) ? new Node\Identifier($method) : $method;
         $this->newModifier = $newModifier;
-        $this->newName = $newName;
+        $this->newName = \is_string($newName) ? new Node\Identifier($newName) : $newName;
     }
 
-    public function getSubNodeNames() {
-        return array('trait', 'method', 'newModifier', 'newName');
+    public function getSubNodeNames() : array {
+        return ['trait', 'method', 'newModifier', 'newName'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_TraitUseAdaptation_Alias';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Precedence.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Precedence.php
index 1f6bc1f98..80385f64e 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Precedence.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TraitUseAdaptation/Precedence.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt\TraitUseAdaptation;
 
@@ -12,19 +12,23 @@ class Precedence extends Node\Stmt\TraitUseAdaptation
     /**
      * Constructs a trait use precedence adaptation node.
      *
-     * @param Node\Name   $trait       Trait name
-     * @param string      $method      Method name
-     * @param Node\Name[] $insteadof   Overwritten traits
-     * @param array       $attributes  Additional attributes
+     * @param Node\Name              $trait       Trait name
+     * @param string|Node\Identifier $method      Method name
+     * @param Node\Name[]            $insteadof   Overwritten traits
+     * @param array                  $attributes  Additional attributes
      */
-    public function __construct(Node\Name $trait, $method, array $insteadof, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Node\Name $trait, $method, array $insteadof, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->trait = $trait;
-        $this->method = $method;
+        $this->method = \is_string($method) ? new Node\Identifier($method) : $method;
         $this->insteadof = $insteadof;
     }
 
-    public function getSubNodeNames() {
-        return array('trait', 'method', 'insteadof');
+    public function getSubNodeNames() : array {
+        return ['trait', 'method', 'insteadof'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_TraitUseAdaptation_Precedence';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Trait_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Trait_.php
index eed5844ae..0cec203ac 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Trait_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Trait_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -9,18 +9,24 @@ class Trait_ extends ClassLike
     /**
      * Constructs a trait node.
      *
-     * @param string $name       Name
+     * @param string|Node\Identifier $name Name
      * @param array  $subNodes   Array of the following optional subnodes:
-     *                           'stmts' => array(): Statements
+     *                           'stmts'      => array(): Statements
+     *                           'attrGroups' => array(): PHP attribute groups
      * @param array  $attributes Additional attributes
      */
-    public function __construct($name, array $subNodes = array(), array $attributes = array()) {
-        parent::__construct($attributes);
-        $this->name = $name;
-        $this->stmts = isset($subNodes['stmts']) ? $subNodes['stmts'] : array();
+    public function __construct($name, array $subNodes = [], array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->name = \is_string($name) ? new Node\Identifier($name) : $name;
+        $this->stmts = $subNodes['stmts'] ?? [];
+        $this->attrGroups = $subNodes['attrGroups'] ?? [];
     }
 
-    public function getSubNodeNames() {
-        return array('name', 'stmts');
+    public function getSubNodeNames() : array {
+        return ['attrGroups', 'name', 'stmts'];
+    }
+
+    public function getType() : string {
+        return 'Stmt_Trait';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TryCatch.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TryCatch.php
index 0ff36cc77..7fc158c57 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TryCatch.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/TryCatch.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -6,7 +6,7 @@ use PhpParser\Node;
 
 class TryCatch extends Node\Stmt
 {
-    /** @var Node[] Statements */
+    /** @var Node\Stmt[] Statements */
     public $stmts;
     /** @var Catch_[] Catches */
     public $catches;
@@ -16,19 +16,23 @@ class TryCatch extends Node\Stmt
     /**
      * Constructs a try catch node.
      *
-     * @param Node[]        $stmts      Statements
+     * @param Node\Stmt[]   $stmts      Statements
      * @param Catch_[]      $catches    Catches
-     * @param null|Finally_ $finally    Optionaly finally node
-     * @param array|null    $attributes Additional attributes
+     * @param null|Finally_ $finally    Optional finally node
+     * @param array         $attributes Additional attributes
      */
-    public function __construct(array $stmts, array $catches, Finally_ $finally = null, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $stmts, array $catches, Finally_ $finally = null, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->stmts = $stmts;
         $this->catches = $catches;
         $this->finally = $finally;
     }
 
-    public function getSubNodeNames() {
-        return array('stmts', 'catches', 'finally');
+    public function getSubNodeNames() : array {
+        return ['stmts', 'catches', 'finally'];
+    }
+
+    public function getType() : string {
+        return 'Stmt_TryCatch';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Unset_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Unset_.php
index 0f00fe941..310e427aa 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Unset_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Unset_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -15,12 +15,16 @@ class Unset_ extends Node\Stmt
      * @param Node\Expr[] $vars       Variables to unset
      * @param array       $attributes Additional attributes
      */
-    public function __construct(array $vars, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $vars, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->vars = $vars;
     }
 
-    public function getSubNodeNames() {
-        return array('vars');
+    public function getSubNodeNames() : array {
+        return ['vars'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Unset';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/UseUse.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/UseUse.php
index 2de8432d7..32bd7847d 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/UseUse.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/UseUse.php
@@ -1,8 +1,9 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
 use PhpParser\Node;
+use PhpParser\Node\Identifier;
 
 class UseUse extends Node\Stmt
 {
@@ -10,29 +11,42 @@ class UseUse extends Node\Stmt
     public $type;
     /** @var Node\Name Namespace, class, function or constant to alias */
     public $name;
-    /** @var string Alias */
+    /** @var Identifier|null Alias */
     public $alias;
 
     /**
      * Constructs an alias (use) node.
      *
-     * @param Node\Name   $name       Namespace/Class to alias
-     * @param null|string $alias      Alias
-     * @param int         $type       Type of the use element (for mixed group use declarations only)
-     * @param array       $attributes Additional attributes
+     * @param Node\Name              $name       Namespace/Class to alias
+     * @param null|string|Identifier $alias      Alias
+     * @param int                    $type       Type of the use element (for mixed group use only)
+     * @param array                  $attributes Additional attributes
      */
-    public function __construct(Node\Name $name, $alias = null, $type = Use_::TYPE_UNKNOWN, array $attributes = array()) {
-        if (null === $alias) {
-            $alias = $name->getLast();
-        }
-
-        parent::__construct($attributes);
+    public function __construct(Node\Name $name, $alias = null, int $type = Use_::TYPE_UNKNOWN, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->type = $type;
         $this->name = $name;
-        $this->alias = $alias;
+        $this->alias = \is_string($alias) ? new Identifier($alias) : $alias;
     }
 
-    public function getSubNodeNames() {
-        return array('type', 'name', 'alias');
+    public function getSubNodeNames() : array {
+        return ['type', 'name', 'alias'];
+    }
+
+    /**
+     * Get alias. If not explicitly given this is the last component of the used name.
+     *
+     * @return Identifier
+     */
+    public function getAlias() : Identifier {
+        if (null !== $this->alias) {
+            return $this->alias;
+        }
+
+        return new Identifier($this->name->getLast());
+    }
+    
+    public function getType() : string {
+        return 'Stmt_UseUse';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Use_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Use_.php
index 6c89ebb1b..8753da313 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Use_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/Use_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -31,13 +31,17 @@ class Use_ extends Stmt
      * @param int      $type       Type of alias
      * @param array    $attributes Additional attributes
      */
-    public function __construct(array $uses, $type = self::TYPE_NORMAL, array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(array $uses, int $type = self::TYPE_NORMAL, array $attributes = []) {
+        $this->attributes = $attributes;
         $this->type = $type;
         $this->uses = $uses;
     }
 
-    public function getSubNodeNames() {
-        return array('type', 'uses');
+    public function getSubNodeNames() : array {
+        return ['type', 'uses'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_Use';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/While_.php b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/While_.php
index afad1b259..f41034f8c 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/While_.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/Stmt/While_.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Node\Stmt;
 
@@ -8,23 +8,27 @@ class While_ extends Node\Stmt
 {
     /** @var Node\Expr Condition */
     public $cond;
-    /** @var Node[] Statements */
+    /** @var Node\Stmt[] Statements */
     public $stmts;
 
     /**
      * Constructs a while node.
      *
-     * @param Node\Expr $cond       Condition
-     * @param Node[]    $stmts      Statements
-     * @param array     $attributes Additional attributes
+     * @param Node\Expr   $cond       Condition
+     * @param Node\Stmt[] $stmts      Statements
+     * @param array       $attributes Additional attributes
      */
-    public function __construct(Node\Expr $cond, array $stmts = array(), array $attributes = array()) {
-        parent::__construct($attributes);
+    public function __construct(Node\Expr $cond, array $stmts = [], array $attributes = []) {
+        $this->attributes = $attributes;
         $this->cond = $cond;
         $this->stmts = $stmts;
     }
 
-    public function getSubNodeNames() {
-        return array('cond', 'stmts');
+    public function getSubNodeNames() : array {
+        return ['cond', 'stmts'];
+    }
+    
+    public function getType() : string {
+        return 'Stmt_While';
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/UnionType.php b/lib/nikic/php-parser/lib/PhpParser/Node/UnionType.php
new file mode 100644
index 000000000..61c2d8106
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/UnionType.php
@@ -0,0 +1,28 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node;
+
+class UnionType extends ComplexType
+{
+    /** @var (Identifier|Name)[] Types */
+    public $types;
+
+    /**
+     * Constructs a union type.
+     *
+     * @param (Identifier|Name)[] $types      Types
+     * @param array               $attributes Additional attributes
+     */
+    public function __construct(array $types, array $attributes = []) {
+        $this->attributes = $attributes;
+        $this->types = $types;
+    }
+
+    public function getSubNodeNames() : array {
+        return ['types'];
+    }
+    
+    public function getType() : string {
+        return 'UnionType';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/VarLikeIdentifier.php b/lib/nikic/php-parser/lib/PhpParser/Node/VarLikeIdentifier.php
new file mode 100644
index 000000000..a30807a6d
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/VarLikeIdentifier.php
@@ -0,0 +1,17 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node;
+
+/**
+ * Represents a name that is written in source code with a leading dollar,
+ * but is not a proper variable. The leading dollar is not stored as part of the name.
+ *
+ * Examples: Names in property declarations are formatted as variables. Names in static property
+ * lookups are also formatted as variables.
+ */
+class VarLikeIdentifier extends Identifier
+{
+    public function getType() : string {
+        return 'VarLikeIdentifier';
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Node/VariadicPlaceholder.php b/lib/nikic/php-parser/lib/PhpParser/Node/VariadicPlaceholder.php
new file mode 100644
index 000000000..403a24df2
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/Node/VariadicPlaceholder.php
@@ -0,0 +1,27 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\Node;
+
+use PhpParser\NodeAbstract;
+
+/**
+ * Represents the "..." in "foo(...)" of the first-class callable syntax.
+ */
+class VariadicPlaceholder extends NodeAbstract {
+    /**
+     * Create a variadic argument placeholder (first-class callable syntax).
+     *
+     * @param array $attributes Additional attributes
+     */
+    public function __construct(array $attributes = []) {
+        $this->attributes = $attributes;
+    }
+
+    public function getType(): string {
+        return 'VariadicPlaceholder';
+    }
+
+    public function getSubNodeNames(): array {
+        return [];
+    }
+}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/lib/PhpParser/NodeAbstract.php b/lib/nikic/php-parser/lib/PhpParser/NodeAbstract.php
index 1b757c7bc..04514da11 100644
--- a/lib/nikic/php-parser/lib/PhpParser/NodeAbstract.php
+++ b/lib/nikic/php-parser/lib/PhpParser/NodeAbstract.php
@@ -1,9 +1,7 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser;
 
-use PhpParser\Node;
-
 abstract class NodeAbstract implements Node, \JsonSerializable
 {
     protected $attributes;
@@ -13,63 +11,115 @@ abstract class NodeAbstract implements Node, \JsonSerializable
      *
      * @param array $attributes Array of attributes
      */
-    public function __construct(array $attributes = array()) {
+    public function __construct(array $attributes = []) {
         $this->attributes = $attributes;
     }
 
     /**
-     * Gets the type of the node.
+     * Gets line the node started in (alias of getStartLine).
      *
-     * @return string Type of the node
+     * @return int Start line (or -1 if not available)
      */
-    public function getType() {
-        $className = rtrim(get_class($this), '_');
-        return strtr(
-            substr($className, strlen(Node::class) + 1),
-            '\\',
-            '_'
-        );
+    public function getLine() : int {
+        return $this->attributes['startLine'] ?? -1;
     }
 
     /**
      * Gets line the node started in.
      *
-     * @return int Line
+     * Requires the 'startLine' attribute to be enabled in the lexer (enabled by default).
+     *
+     * @return int Start line (or -1 if not available)
      */
-    public function getLine() {
-        return $this->getAttribute('startLine', -1);
+    public function getStartLine() : int {
+        return $this->attributes['startLine'] ?? -1;
     }
 
     /**
-     * Sets line the node started in.
+     * Gets the line the node ended in.
      *
-     * @param int $line Line
+     * Requires the 'endLine' attribute to be enabled in the lexer (enabled by default).
      *
-     * @deprecated
+     * @return int End line (or -1 if not available)
      */
-    public function setLine($line) {
-        $this->setAttribute('startLine', (int) $line);
+    public function getEndLine() : int {
+        return $this->attributes['endLine'] ?? -1;
+    }
+
+    /**
+     * Gets the token offset of the first token that is part of this node.
+     *
+     * The offset is an index into the array returned by Lexer::getTokens().
+     *
+     * Requires the 'startTokenPos' attribute to be enabled in the lexer (DISABLED by default).
+     *
+     * @return int Token start position (or -1 if not available)
+     */
+    public function getStartTokenPos() : int {
+        return $this->attributes['startTokenPos'] ?? -1;
+    }
+
+    /**
+     * Gets the token offset of the last token that is part of this node.
+     *
+     * The offset is an index into the array returned by Lexer::getTokens().
+     *
+     * Requires the 'endTokenPos' attribute to be enabled in the lexer (DISABLED by default).
+     *
+     * @return int Token end position (or -1 if not available)
+     */
+    public function getEndTokenPos() : int {
+        return $this->attributes['endTokenPos'] ?? -1;
+    }
+
+    /**
+     * Gets the file offset of the first character that is part of this node.
+     *
+     * Requires the 'startFilePos' attribute to be enabled in the lexer (DISABLED by default).
+     *
+     * @return int File start position (or -1 if not available)
+     */
+    public function getStartFilePos() : int {
+        return $this->attributes['startFilePos'] ?? -1;
+    }
+
+    /**
+     * Gets the file offset of the last character that is part of this node.
+     *
+     * Requires the 'endFilePos' attribute to be enabled in the lexer (DISABLED by default).
+     *
+     * @return int File end position (or -1 if not available)
+     */
+    public function getEndFilePos() : int {
+        return $this->attributes['endFilePos'] ?? -1;
+    }
+
+    /**
+     * Gets all comments directly preceding this node.
+     *
+     * The comments are also available through the "comments" attribute.
+     *
+     * @return Comment[]
+     */
+    public function getComments() : array {
+        return $this->attributes['comments'] ?? [];
     }
 
     /**
      * Gets the doc comment of the node.
      *
-     * The doc comment has to be the last comment associated with the node.
-     *
      * @return null|Comment\Doc Doc comment object or null
      */
     public function getDocComment() {
-        $comments = $this->getAttribute('comments');
-        if (!$comments) {
-            return null;
+        $comments = $this->getComments();
+        for ($i = count($comments) - 1; $i >= 0; $i--) {
+            $comment = $comments[$i];
+            if ($comment instanceof Comment\Doc) {
+                return $comment;
+            }
         }
 
-        $lastComment = $comments[count($comments) - 1];
-        if (!$lastComment instanceof Comment\Doc) {
-            return null;
-        }
-
-        return $lastComment;
+        return null;
     }
 
     /**
@@ -80,41 +130,49 @@ abstract class NodeAbstract implements Node, \JsonSerializable
      * @param Comment\Doc $docComment Doc comment to set
      */
     public function setDocComment(Comment\Doc $docComment) {
-        $comments = $this->getAttribute('comments', []);
-
-        $numComments = count($comments);
-        if ($numComments > 0 && $comments[$numComments - 1] instanceof Comment\Doc) {
-            // Replace existing doc comment
-            $comments[$numComments - 1] = $docComment;
-        } else {
-            // Append new comment
-            $comments[] = $docComment;
+        $comments = $this->getComments();
+        for ($i = count($comments) - 1; $i >= 0; $i--) {
+            if ($comments[$i] instanceof Comment\Doc) {
+                // Replace existing doc comment.
+                $comments[$i] = $docComment;
+                $this->setAttribute('comments', $comments);
+                return;
+            }
         }
 
+        // Append new doc comment.
+        $comments[] = $docComment;
         $this->setAttribute('comments', $comments);
     }
 
-    public function setAttribute($key, $value) {
+    public function setAttribute(string $key, $value) {
         $this->attributes[$key] = $value;
     }
 
-    public function hasAttribute($key) {
+    public function hasAttribute(string $key) : bool {
         return array_key_exists($key, $this->attributes);
     }
 
-    public function &getAttribute($key, $default = null) {
-        if (!array_key_exists($key, $this->attributes)) {
-            return $default;
-        } else {
+    public function getAttribute(string $key, $default = null) {
+        if (array_key_exists($key, $this->attributes)) {
             return $this->attributes[$key];
         }
+
+        return $default;
     }
 
-    public function getAttributes() {
+    public function getAttributes() : array {
         return $this->attributes;
     }
 
-    public function jsonSerialize() {
+    public function setAttributes(array $attributes) {
+        $this->attributes = $attributes;
+    }
+
+    /**
+     * @return array
+     */
+    public function jsonSerialize() : array {
         return ['nodeType' => $this->getType()] + get_object_vars($this);
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/NodeDumper.php b/lib/nikic/php-parser/lib/PhpParser/NodeDumper.php
index 9946eb853..ba622efd1 100644
--- a/lib/nikic/php-parser/lib/PhpParser/NodeDumper.php
+++ b/lib/nikic/php-parser/lib/PhpParser/NodeDumper.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser;
 
@@ -39,7 +39,7 @@ class NodeDumper
      *
      * @return string Dumped value
      */
-    public function dump($node, $code = null) {
+    public function dump($node, string $code = null) : string {
         $this->code = $code;
         return $this->dumpRecursive($node);
     }
@@ -65,9 +65,9 @@ class NodeDumper
                 } elseif (is_scalar($value)) {
                     if ('flags' === $key || 'newModifier' === $key) {
                         $r .= $this->dumpFlags($value);
-                    } else if ('type' === $key && $node instanceof Include_) {
+                    } elseif ('type' === $key && $node instanceof Include_) {
                         $r .= $this->dumpIncludeType($value);
-                    } else if ('type' === $key
+                    } elseif ('type' === $key
                             && ($node instanceof Use_ || $node instanceof UseUse || $node instanceof GroupUse)) {
                         $r .= $this->dumpUseType($value);
                     } else {
@@ -78,7 +78,7 @@ class NodeDumper
                 }
             }
 
-            if ($this->dumpComments && $comments = $node->getAttribute('comments')) {
+            if ($this->dumpComments && $comments = $node->getComments()) {
                 $r .= "\n    comments: " . str_replace("\n", "\n    ", $this->dumpRecursive($comments));
             }
         } elseif (is_array($node)) {
@@ -128,6 +128,9 @@ class NodeDumper
         if ($flags & Class_::MODIFIER_FINAL) {
             $strs[] = 'MODIFIER_FINAL';
         }
+        if ($flags & Class_::MODIFIER_READONLY) {
+            $strs[] = 'MODIFIER_READONLY';
+        }
 
         if ($strs) {
             return implode(' | ', $strs) . ' (' . $flags . ')';
@@ -141,7 +144,7 @@ class NodeDumper
             Include_::TYPE_INCLUDE      => 'TYPE_INCLUDE',
             Include_::TYPE_INCLUDE_ONCE => 'TYPE_INCLUDE_ONCE',
             Include_::TYPE_REQUIRE      => 'TYPE_REQUIRE',
-            Include_::TYPE_REQUIRE_ONCE => 'TYPE_REQURE_ONCE',
+            Include_::TYPE_REQUIRE_ONCE => 'TYPE_REQUIRE_ONCE',
         ];
 
         if (!isset($map[$type])) {
@@ -164,18 +167,25 @@ class NodeDumper
         return $map[$type] . ' (' . $type . ')';
     }
 
+    /**
+     * Dump node position, if possible.
+     *
+     * @param Node $node Node for which to dump position
+     *
+     * @return string|null Dump of position, or null if position information not available
+     */
     protected function dumpPosition(Node $node) {
         if (!$node->hasAttribute('startLine') || !$node->hasAttribute('endLine')) {
             return null;
         }
 
-        $start = $node->getAttribute('startLine');
-        $end = $node->getAttribute('endLine');
+        $start = $node->getStartLine();
+        $end = $node->getEndLine();
         if ($node->hasAttribute('startFilePos') && $node->hasAttribute('endFilePos')
             && null !== $this->code
         ) {
-            $start .= ':' . $this->toColumn($this->code, $node->getAttribute('startFilePos'));
-            $end .= ':' . $this->toColumn($this->code, $node->getAttribute('endFilePos'));
+            $start .= ':' . $this->toColumn($this->code, $node->getStartFilePos());
+            $end .= ':' . $this->toColumn($this->code, $node->getEndFilePos());
         }
         return "[$start - $end]";
     }
diff --git a/lib/nikic/php-parser/lib/PhpParser/NodeFinder.php b/lib/nikic/php-parser/lib/PhpParser/NodeFinder.php
new file mode 100644
index 000000000..2e7cfdad4
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/NodeFinder.php
@@ -0,0 +1,81 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser;
+
+use PhpParser\NodeVisitor\FindingVisitor;
+use PhpParser\NodeVisitor\FirstFindingVisitor;
+
+class NodeFinder
+{
+    /**
+     * Find all nodes satisfying a filter callback.
+     *
+     * @param Node|Node[] $nodes  Single node or array of nodes to search in
+     * @param callable    $filter Filter callback: function(Node $node) : bool
+     *
+     * @return Node[] Found nodes satisfying the filter callback
+     */
+    public function find($nodes, callable $filter) : array {
+        if (!is_array($nodes)) {
+            $nodes = [$nodes];
+        }
+
+        $visitor = new FindingVisitor($filter);
+
+        $traverser = new NodeTraverser;
+        $traverser->addVisitor($visitor);
+        $traverser->traverse($nodes);
+
+        return $visitor->getFoundNodes();
+    }
+
+    /**
+     * Find all nodes that are instances of a certain class.
+     *
+     * @param Node|Node[] $nodes Single node or array of nodes to search in
+     * @param string      $class Class name
+     *
+     * @return Node[] Found nodes (all instances of $class)
+     */
+    public function findInstanceOf($nodes, string $class) : array {
+        return $this->find($nodes, function ($node) use ($class) {
+            return $node instanceof $class;
+        });
+    }
+
+    /**
+     * Find first node satisfying a filter callback.
+     *
+     * @param Node|Node[] $nodes  Single node or array of nodes to search in
+     * @param callable    $filter Filter callback: function(Node $node) : bool
+     *
+     * @return null|Node Found node (or null if none found)
+     */
+    public function findFirst($nodes, callable $filter) {
+        if (!is_array($nodes)) {
+            $nodes = [$nodes];
+        }
+
+        $visitor = new FirstFindingVisitor($filter);
+
+        $traverser = new NodeTraverser;
+        $traverser->addVisitor($visitor);
+        $traverser->traverse($nodes);
+
+        return $visitor->getFoundNode();
+    }
+
+    /**
+     * Find first node that is an instance of a certain class.
+     *
+     * @param Node|Node[] $nodes  Single node or array of nodes to search in
+     * @param string      $class Class name
+     *
+     * @return null|Node Found node, which is an instance of $class (or null if none found)
+     */
+    public function findFirstInstanceOf($nodes, string $class) {
+        return $this->findFirst($nodes, function ($node) use ($class) {
+            return $node instanceof $class;
+        });
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/NodeTraverser.php b/lib/nikic/php-parser/lib/PhpParser/NodeTraverser.php
index cce43d926..97d45bdaa 100644
--- a/lib/nikic/php-parser/lib/PhpParser/NodeTraverser.php
+++ b/lib/nikic/php-parser/lib/PhpParser/NodeTraverser.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser;
 
@@ -28,19 +28,25 @@ class NodeTraverser implements NodeTraverserInterface
      * For subsequent visitors leaveNode() will still be invoked for the
      * removed node.
      */
-    const REMOVE_NODE = false;
+    const REMOVE_NODE = 3;
+
+    /**
+     * If NodeVisitor::enterNode() returns DONT_TRAVERSE_CURRENT_AND_CHILDREN, child nodes
+     * of the current node will not be traversed for any visitors.
+     *
+     * For subsequent visitors enterNode() will not be called as well.
+     * leaveNode() will be invoked for visitors that has enterNode() method invoked.
+     */
+    const DONT_TRAVERSE_CURRENT_AND_CHILDREN = 4;
 
     /** @var NodeVisitor[] Visitors */
-    protected $visitors;
+    protected $visitors = [];
 
     /** @var bool Whether traversal should be stopped */
     protected $stopTraversal;
 
-    /**
-     * Constructs a node traverser.
-     */
     public function __construct() {
-        $this->visitors = array();
+        // for BC
     }
 
     /**
@@ -73,7 +79,7 @@ class NodeTraverser implements NodeTraverserInterface
      *
      * @return Node[] Traversed array of nodes
      */
-    public function traverse(array $nodes) {
+    public function traverse(array $nodes) : array {
         $this->stopTraversal = false;
 
         foreach ($this->visitors as $visitor) {
@@ -93,26 +99,46 @@ class NodeTraverser implements NodeTraverserInterface
         return $nodes;
     }
 
-    protected function traverseNode(Node $node) {
+    /**
+     * Recursively traverse a node.
+     *
+     * @param Node $node Node to traverse.
+     *
+     * @return Node Result of traversal (may be original node or new one)
+     */
+    protected function traverseNode(Node $node) : Node {
         foreach ($node->getSubNodeNames() as $name) {
             $subNode =& $node->$name;
 
-            if (is_array($subNode)) {
+            if (\is_array($subNode)) {
                 $subNode = $this->traverseArray($subNode);
                 if ($this->stopTraversal) {
                     break;
                 }
             } elseif ($subNode instanceof Node) {
                 $traverseChildren = true;
-                foreach ($this->visitors as $visitor) {
+                $breakVisitorIndex = null;
+
+                foreach ($this->visitors as $visitorIndex => $visitor) {
                     $return = $visitor->enterNode($subNode);
-                    if (self::DONT_TRAVERSE_CHILDREN === $return) {
-                        $traverseChildren = false;
-                    } else if (self::STOP_TRAVERSAL === $return) {
-                        $this->stopTraversal = true;
-                        break 2;
-                    } else if (null !== $return) {
-                        $subNode = $return;
+                    if (null !== $return) {
+                        if ($return instanceof Node) {
+                            $this->ensureReplacementReasonable($subNode, $return);
+                            $subNode = $return;
+                        } elseif (self::DONT_TRAVERSE_CHILDREN === $return) {
+                            $traverseChildren = false;
+                        } elseif (self::DONT_TRAVERSE_CURRENT_AND_CHILDREN === $return) {
+                            $traverseChildren = false;
+                            $breakVisitorIndex = $visitorIndex;
+                            break;
+                        } elseif (self::STOP_TRAVERSAL === $return) {
+                            $this->stopTraversal = true;
+                            break 2;
+                        } else {
+                            throw new \LogicException(
+                                'enterNode() returned invalid value of type ' . gettype($return)
+                            );
+                        }
                     }
                 }
 
@@ -123,19 +149,30 @@ class NodeTraverser implements NodeTraverserInterface
                     }
                 }
 
-                foreach ($this->visitors as $visitor) {
+                foreach ($this->visitors as $visitorIndex => $visitor) {
                     $return = $visitor->leaveNode($subNode);
-                    if (self::STOP_TRAVERSAL === $return) {
-                        $this->stopTraversal = true;
-                        break 2;
-                    } else if (null !== $return) {
-                        if (is_array($return)) {
+
+                    if (null !== $return) {
+                        if ($return instanceof Node) {
+                            $this->ensureReplacementReasonable($subNode, $return);
+                            $subNode = $return;
+                        } elseif (self::STOP_TRAVERSAL === $return) {
+                            $this->stopTraversal = true;
+                            break 2;
+                        } elseif (\is_array($return)) {
                             throw new \LogicException(
                                 'leaveNode() may only return an array ' .
                                 'if the parent structure is an array'
                             );
+                        } else {
+                            throw new \LogicException(
+                                'leaveNode() returned invalid value of type ' . gettype($return)
+                            );
                         }
-                        $subNode = $return;
+                    }
+
+                    if ($breakVisitorIndex === $visitorIndex) {
+                        break;
                     }
                 }
             }
@@ -144,26 +181,41 @@ class NodeTraverser implements NodeTraverserInterface
         return $node;
     }
 
-    protected function traverseArray(array $nodes) {
-        $doNodes = array();
+    /**
+     * Recursively traverse array (usually of nodes).
+     *
+     * @param array $nodes Array to traverse
+     *
+     * @return array Result of traversal (may be original array or changed one)
+     */
+    protected function traverseArray(array $nodes) : array {
+        $doNodes = [];
 
         foreach ($nodes as $i => &$node) {
-            if (is_array($node)) {
-                $node = $this->traverseArray($node);
-                if ($this->stopTraversal) {
-                    break;
-                }
-            } elseif ($node instanceof Node) {
+            if ($node instanceof Node) {
                 $traverseChildren = true;
-                foreach ($this->visitors as $visitor) {
+                $breakVisitorIndex = null;
+
+                foreach ($this->visitors as $visitorIndex => $visitor) {
                     $return = $visitor->enterNode($node);
-                    if (self::DONT_TRAVERSE_CHILDREN === $return) {
-                        $traverseChildren = false;
-                    } else if (self::STOP_TRAVERSAL === $return) {
-                        $this->stopTraversal = true;
-                        break 2;
-                    } else if (null !== $return) {
-                        $node = $return;
+                    if (null !== $return) {
+                        if ($return instanceof Node) {
+                            $this->ensureReplacementReasonable($node, $return);
+                            $node = $return;
+                        } elseif (self::DONT_TRAVERSE_CHILDREN === $return) {
+                            $traverseChildren = false;
+                        } elseif (self::DONT_TRAVERSE_CURRENT_AND_CHILDREN === $return) {
+                            $traverseChildren = false;
+                            $breakVisitorIndex = $visitorIndex;
+                            break;
+                        } elseif (self::STOP_TRAVERSAL === $return) {
+                            $this->stopTraversal = true;
+                            break 2;
+                        } else {
+                            throw new \LogicException(
+                                'enterNode() returned invalid value of type ' . gettype($return)
+                            );
+                        }
                     }
                 }
 
@@ -174,22 +226,40 @@ class NodeTraverser implements NodeTraverserInterface
                     }
                 }
 
-                foreach ($this->visitors as $visitor) {
+                foreach ($this->visitors as $visitorIndex => $visitor) {
                     $return = $visitor->leaveNode($node);
 
-                    if (self::REMOVE_NODE === $return) {
-                        $doNodes[] = array($i, array());
+                    if (null !== $return) {
+                        if ($return instanceof Node) {
+                            $this->ensureReplacementReasonable($node, $return);
+                            $node = $return;
+                        } elseif (\is_array($return)) {
+                            $doNodes[] = [$i, $return];
+                            break;
+                        } elseif (self::REMOVE_NODE === $return) {
+                            $doNodes[] = [$i, []];
+                            break;
+                        } elseif (self::STOP_TRAVERSAL === $return) {
+                            $this->stopTraversal = true;
+                            break 2;
+                        } elseif (false === $return) {
+                            throw new \LogicException(
+                                'bool(false) return from leaveNode() no longer supported. ' .
+                                'Return NodeTraverser::REMOVE_NODE instead'
+                            );
+                        } else {
+                            throw new \LogicException(
+                                'leaveNode() returned invalid value of type ' . gettype($return)
+                            );
+                        }
+                    }
+
+                    if ($breakVisitorIndex === $visitorIndex) {
                         break;
-                    } else if (self::STOP_TRAVERSAL === $return) {
-                        $this->stopTraversal = true;
-                        break 2;
-                    } elseif (is_array($return)) {
-                        $doNodes[] = array($i, $return);
-                        break;
-                    } elseif (null !== $return) {
-                        $node = $return;
                     }
                 }
+            } elseif (\is_array($node)) {
+                throw new \LogicException('Invalid node structure: Contains nested arrays');
             }
         }
 
@@ -201,4 +271,21 @@ class NodeTraverser implements NodeTraverserInterface
 
         return $nodes;
     }
+
+    private function ensureReplacementReasonable($old, $new) {
+        if ($old instanceof Node\Stmt && $new instanceof Node\Expr) {
+            throw new \LogicException(
+                "Trying to replace statement ({$old->getType()}) " .
+                "with expression ({$new->getType()}). Are you missing a " .
+                "Stmt_Expression wrapper?"
+            );
+        }
+
+        if ($old instanceof Node\Expr && $new instanceof Node\Stmt) {
+            throw new \LogicException(
+                "Trying to replace expression ({$old->getType()}) " .
+                "with statement ({$new->getType()})"
+            );
+        }
+    }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/NodeTraverserInterface.php b/lib/nikic/php-parser/lib/PhpParser/NodeTraverserInterface.php
index 0f88e4671..77ff3d27f 100644
--- a/lib/nikic/php-parser/lib/PhpParser/NodeTraverserInterface.php
+++ b/lib/nikic/php-parser/lib/PhpParser/NodeTraverserInterface.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser;
 
@@ -9,14 +9,14 @@ interface NodeTraverserInterface
      *
      * @param NodeVisitor $visitor Visitor to add
      */
-    function addVisitor(NodeVisitor $visitor);
+    public function addVisitor(NodeVisitor $visitor);
 
     /**
      * Removes an added visitor.
      *
      * @param NodeVisitor $visitor
      */
-    function removeVisitor(NodeVisitor $visitor);
+    public function removeVisitor(NodeVisitor $visitor);
 
     /**
      * Traverses an array of nodes using the registered visitors.
@@ -25,6 +25,5 @@ interface NodeTraverserInterface
      *
      * @return Node[] Traversed array of nodes
      */
-    function traverse(array $nodes);
+    public function traverse(array $nodes) : array;
 }
-
diff --git a/lib/nikic/php-parser/lib/PhpParser/NodeVisitor.php b/lib/nikic/php-parser/lib/PhpParser/NodeVisitor.php
index 5a1a3d0c4..f1f7f3e3e 100644
--- a/lib/nikic/php-parser/lib/PhpParser/NodeVisitor.php
+++ b/lib/nikic/php-parser/lib/PhpParser/NodeVisitor.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser;
 
@@ -32,7 +32,7 @@ interface NodeVisitor
      *
      * @param Node $node Node
      *
-     * @return null|int|Node Node
+     * @return null|int|Node Replacement node (or special return value)
      */
     public function enterNode(Node $node);
 
@@ -53,7 +53,7 @@ interface NodeVisitor
      *
      * @param Node $node Node
      *
-     * @return null|false|int|Node|Node[] Node
+     * @return null|int|Node|Node[] Replacement node (or special return value)
      */
     public function leaveNode(Node $node);
 
@@ -69,4 +69,4 @@ interface NodeVisitor
      * @return null|Node[] Array of nodes
      */
     public function afterTraverse(array $nodes);
-}
\ No newline at end of file
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/CloningVisitor.php b/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/CloningVisitor.php
new file mode 100644
index 000000000..a85fa493b
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/CloningVisitor.php
@@ -0,0 +1,20 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\NodeVisitor;
+
+use PhpParser\Node;
+use PhpParser\NodeVisitorAbstract;
+
+/**
+ * Visitor cloning all nodes and linking to the original nodes using an attribute.
+ *
+ * This visitor is required to perform format-preserving pretty prints.
+ */
+class CloningVisitor extends NodeVisitorAbstract
+{
+    public function enterNode(Node $origNode) {
+        $node = clone $origNode;
+        $node->setAttribute('origNode', $origNode);
+        return $node;
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/FindingVisitor.php b/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/FindingVisitor.php
new file mode 100644
index 000000000..9531edbce
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/FindingVisitor.php
@@ -0,0 +1,48 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\NodeVisitor;
+
+use PhpParser\Node;
+use PhpParser\NodeVisitorAbstract;
+
+/**
+ * This visitor can be used to find and collect all nodes satisfying some criterion determined by
+ * a filter callback.
+ */
+class FindingVisitor extends NodeVisitorAbstract
+{
+    /** @var callable Filter callback */
+    protected $filterCallback;
+    /** @var Node[] Found nodes */
+    protected $foundNodes;
+
+    public function __construct(callable $filterCallback) {
+        $this->filterCallback = $filterCallback;
+    }
+
+    /**
+     * Get found nodes satisfying the filter callback.
+     *
+     * Nodes are returned in pre-order.
+     *
+     * @return Node[] Found nodes
+     */
+    public function getFoundNodes() : array {
+        return $this->foundNodes;
+    }
+
+    public function beforeTraverse(array $nodes) {
+        $this->foundNodes = [];
+
+        return null;
+    }
+
+    public function enterNode(Node $node) {
+        $filterCallback = $this->filterCallback;
+        if ($filterCallback($node)) {
+            $this->foundNodes[] = $node;
+        }
+
+        return null;
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/FirstFindingVisitor.php b/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/FirstFindingVisitor.php
new file mode 100644
index 000000000..596a7d7fd
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/FirstFindingVisitor.php
@@ -0,0 +1,50 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\NodeVisitor;
+
+use PhpParser\Node;
+use PhpParser\NodeTraverser;
+use PhpParser\NodeVisitorAbstract;
+
+/**
+ * This visitor can be used to find the first node satisfying some criterion determined by
+ * a filter callback.
+ */
+class FirstFindingVisitor extends NodeVisitorAbstract
+{
+    /** @var callable Filter callback */
+    protected $filterCallback;
+    /** @var null|Node Found node */
+    protected $foundNode;
+
+    public function __construct(callable $filterCallback) {
+        $this->filterCallback = $filterCallback;
+    }
+
+    /**
+     * Get found node satisfying the filter callback.
+     *
+     * Returns null if no node satisfies the filter callback.
+     *
+     * @return null|Node Found node (or null if not found)
+     */
+    public function getFoundNode() {
+        return $this->foundNode;
+    }
+
+    public function beforeTraverse(array $nodes) {
+        $this->foundNode = null;
+
+        return null;
+    }
+
+    public function enterNode(Node $node) {
+        $filterCallback = $this->filterCallback;
+        if ($filterCallback($node)) {
+            $this->foundNode = $node;
+            return NodeTraverser::STOP_TRAVERSAL;
+        }
+
+        return null;
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php b/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php
index d56812bcc..8e259c57b 100644
--- a/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php
+++ b/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/NameResolver.php
@@ -1,9 +1,9 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\NodeVisitor;
 
-use PhpParser\Error;
 use PhpParser\ErrorHandler;
+use PhpParser\NameContext;
 use PhpParser\Node;
 use PhpParser\Node\Expr;
 use PhpParser\Node\Name;
@@ -13,39 +13,51 @@ use PhpParser\NodeVisitorAbstract;
 
 class NameResolver extends NodeVisitorAbstract
 {
-    /** @var null|Name Current namespace */
-    protected $namespace;
-
-    /** @var array Map of format [aliasType => [aliasName => originalName]] */
-    protected $aliases;
-
-    /** @var ErrorHandler Error handler */
-    protected $errorHandler;
+    /** @var NameContext Naming context */
+    protected $nameContext;
 
     /** @var bool Whether to preserve original names */
     protected $preserveOriginalNames;
 
+    /** @var bool Whether to replace resolved nodes in place, or to add resolvedNode attributes */
+    protected $replaceNodes;
+
     /**
      * Constructs a name resolution visitor.
      *
-     * Options: If "preserveOriginalNames" is enabled, an "originalName" attribute will be added to
-     * all name nodes that underwent resolution.
+     * Options:
+     *  * preserveOriginalNames (default false): An "originalName" attribute will be added to
+     *    all name nodes that underwent resolution.
+     *  * replaceNodes (default true): Resolved names are replaced in-place. Otherwise, a
+     *    resolvedName attribute is added. (Names that cannot be statically resolved receive a
+     *    namespacedName attribute, as usual.)
      *
      * @param ErrorHandler|null $errorHandler Error handler
      * @param array $options Options
      */
     public function __construct(ErrorHandler $errorHandler = null, array $options = []) {
-        $this->errorHandler = $errorHandler ?: new ErrorHandler\Throwing;
-        $this->preserveOriginalNames = !empty($options['preserveOriginalNames']);
+        $this->nameContext = new NameContext($errorHandler ?? new ErrorHandler\Throwing);
+        $this->preserveOriginalNames = $options['preserveOriginalNames'] ?? false;
+        $this->replaceNodes = $options['replaceNodes'] ?? true;
+    }
+
+    /**
+     * Get name resolution context.
+     *
+     * @return NameContext
+     */
+    public function getNameContext() : NameContext {
+        return $this->nameContext;
     }
 
     public function beforeTraverse(array $nodes) {
-        $this->resetState();
+        $this->nameContext->startNamespace();
+        return null;
     }
 
     public function enterNode(Node $node) {
         if ($node instanceof Stmt\Namespace_) {
-            $this->resetState($node->name);
+            $this->nameContext->startNamespace($node->name);
         } elseif ($node instanceof Stmt\Use_) {
             foreach ($node->uses as $use) {
                 $this->addAlias($use, $node->type, null);
@@ -63,6 +75,7 @@ class NameResolver extends NodeVisitorAbstract
                 $interface = $this->resolveClassName($interface);
             }
 
+            $this->resolveAttrGroups($node);
             if (null !== $node->name) {
                 $this->addNamespacedName($node);
             }
@@ -71,20 +84,43 @@ class NameResolver extends NodeVisitorAbstract
                 $interface = $this->resolveClassName($interface);
             }
 
+            $this->resolveAttrGroups($node);
             $this->addNamespacedName($node);
+         } elseif ($node instanceof Stmt\Enum_) {
+            foreach ($node->implements as &$interface) {
+                $interface = $this->resolveClassName($interface);
+            }
+
+            $this->resolveAttrGroups($node);
+            if (null !== $node->name) {
+                $this->addNamespacedName($node);
+            }
         } elseif ($node instanceof Stmt\Trait_) {
+            $this->resolveAttrGroups($node);
             $this->addNamespacedName($node);
         } elseif ($node instanceof Stmt\Function_) {
-            $this->addNamespacedName($node);
             $this->resolveSignature($node);
+            $this->resolveAttrGroups($node);
+            $this->addNamespacedName($node);
         } elseif ($node instanceof Stmt\ClassMethod
                   || $node instanceof Expr\Closure
+                  || $node instanceof Expr\ArrowFunction
         ) {
             $this->resolveSignature($node);
+            $this->resolveAttrGroups($node);
+        } elseif ($node instanceof Stmt\Property) {
+            if (null !== $node->type) {
+                $node->type = $this->resolveType($node->type);
+            }
+            $this->resolveAttrGroups($node);
         } elseif ($node instanceof Stmt\Const_) {
             foreach ($node->consts as $const) {
                 $this->addNamespacedName($const);
             }
+        } else if ($node instanceof Stmt\ClassConst) {
+            $this->resolveAttrGroups($node);
+        } else if ($node instanceof Stmt\EnumCase) {
+            $this->resolveAttrGroups($node);
         } elseif ($node instanceof Expr\StaticCall
                   || $node instanceof Expr\StaticPropertyFetch
                   || $node instanceof Expr\ClassConstFetch
@@ -100,10 +136,10 @@ class NameResolver extends NodeVisitorAbstract
             }
         } elseif ($node instanceof Expr\FuncCall) {
             if ($node->name instanceof Name) {
-                $node->name = $this->resolveOtherName($node->name, Stmt\Use_::TYPE_FUNCTION);
+                $node->name = $this->resolveName($node->name, Stmt\Use_::TYPE_FUNCTION);
             }
         } elseif ($node instanceof Expr\ConstFetch) {
-            $node->name = $this->resolveOtherName($node->name, Stmt\Use_::TYPE_CONSTANT);
+            $node->name = $this->resolveName($node->name, Stmt\Use_::TYPE_CONSTANT);
         } elseif ($node instanceof Stmt\TraitUse) {
             foreach ($node->traits as &$trait) {
                 $trait = $this->resolveClassName($trait);
@@ -121,70 +157,67 @@ class NameResolver extends NodeVisitorAbstract
                 }
             }
         }
+
+        return null;
     }
 
-    protected function resetState(Name $namespace = null) {
-        $this->namespace = $namespace;
-        $this->aliases   = array(
-            Stmt\Use_::TYPE_NORMAL   => array(),
-            Stmt\Use_::TYPE_FUNCTION => array(),
-            Stmt\Use_::TYPE_CONSTANT => array(),
-        );
-    }
-
-    protected function addAlias(Stmt\UseUse $use, $type, Name $prefix = null) {
+    private function addAlias(Stmt\UseUse $use, $type, Name $prefix = null) {
         // Add prefix for group uses
         $name = $prefix ? Name::concat($prefix, $use->name) : $use->name;
         // Type is determined either by individual element or whole use declaration
         $type |= $use->type;
 
-        // Constant names are case sensitive, everything else case insensitive
-        if ($type === Stmt\Use_::TYPE_CONSTANT) {
-            $aliasName = $use->alias;
-        } else {
-            $aliasName = strtolower($use->alias);
-        }
-
-        if (isset($this->aliases[$type][$aliasName])) {
-            $typeStringMap = array(
-                Stmt\Use_::TYPE_NORMAL   => '',
-                Stmt\Use_::TYPE_FUNCTION => 'function ',
-                Stmt\Use_::TYPE_CONSTANT => 'const ',
-            );
-
-            $this->errorHandler->handleError(new Error(
-                sprintf(
-                    'Cannot use %s%s as %s because the name is already in use',
-                    $typeStringMap[$type], $name, $use->alias
-                ),
-                $use->getAttributes()
-            ));
-            return;
-        }
-
-        $this->aliases[$type][$aliasName] = $name;
+        $this->nameContext->addAlias(
+            $name, (string) $use->getAlias(), $type, $use->getAttributes()
+        );
     }
 
     /** @param Stmt\Function_|Stmt\ClassMethod|Expr\Closure $node */
     private function resolveSignature($node) {
         foreach ($node->params as $param) {
             $param->type = $this->resolveType($param->type);
+            $this->resolveAttrGroups($param);
         }
         $node->returnType = $this->resolveType($node->returnType);
     }
 
     private function resolveType($node) {
+        if ($node instanceof Name) {
+            return $this->resolveClassName($node);
+        }
         if ($node instanceof Node\NullableType) {
             $node->type = $this->resolveType($node->type);
             return $node;
         }
-        if ($node instanceof Name) {
-            return $this->resolveClassName($node);
+        if ($node instanceof Node\UnionType || $node instanceof Node\IntersectionType) {
+            foreach ($node->types as &$type) {
+                $type = $this->resolveType($type);
+            }
+            return $node;
         }
         return $node;
     }
 
-    protected function resolveClassName(Name $name) {
+    /**
+     * Resolve name, according to name resolver options.
+     *
+     * @param Name $name Function or constant name to resolve
+     * @param int  $type One of Stmt\Use_::TYPE_*
+     *
+     * @return Name Resolved name, or original name with attribute
+     */
+    protected function resolveName(Name $name, int $type) : Name {
+        if (!$this->replaceNodes) {
+            $resolvedName = $this->nameContext->getResolvedName($name, $type);
+            if (null !== $resolvedName) {
+                $name->setAttribute('resolvedName', $resolvedName);
+            } else {
+                $name->setAttribute('namespacedName', FullyQualified::concat(
+                    $this->nameContext->getNamespace(), $name, $name->getAttributes()));
+            }
+            return $name;
+        }
+
         if ($this->preserveOriginalNames) {
             // Save the original name
             $originalName = $name;
@@ -192,81 +225,33 @@ class NameResolver extends NodeVisitorAbstract
             $name->setAttribute('originalName', $originalName);
         }
 
-        // don't resolve special class names
-        if (in_array(strtolower($name->toString()), array('self', 'parent', 'static'))) {
-            if (!$name->isUnqualified()) {
-                $this->errorHandler->handleError(new Error(
-                    sprintf("'\\%s' is an invalid class name", $name->toString()),
-                    $name->getAttributes()
-                ));
-            }
-            return $name;
+        $resolvedName = $this->nameContext->getResolvedName($name, $type);
+        if (null !== $resolvedName) {
+            return $resolvedName;
         }
 
-        // fully qualified names are already resolved
-        if ($name->isFullyQualified()) {
-            return $name;
-        }
-
-        $aliasName = strtolower($name->getFirst());
-        if (!$name->isRelative() && isset($this->aliases[Stmt\Use_::TYPE_NORMAL][$aliasName])) {
-            // resolve aliases (for non-relative names)
-            $alias = $this->aliases[Stmt\Use_::TYPE_NORMAL][$aliasName];
-            return FullyQualified::concat($alias, $name->slice(1), $name->getAttributes());
-        }
-
-        // if no alias exists prepend current namespace
-        return FullyQualified::concat($this->namespace, $name, $name->getAttributes());
+        // unqualified names inside a namespace cannot be resolved at compile-time
+        // add the namespaced version of the name as an attribute
+        $name->setAttribute('namespacedName', FullyQualified::concat(
+            $this->nameContext->getNamespace(), $name, $name->getAttributes()));
+        return $name;
     }
 
-    protected function resolveOtherName(Name $name, $type) {
-        if ($this->preserveOriginalNames) {
-            // Save the original name
-            $originalName = $name;
-            $name = clone $originalName;
-            $name->setAttribute('originalName', $originalName);
-        }
-
-        // fully qualified names are already resolved
-        if ($name->isFullyQualified()) {
-            return $name;
-        }
-
-        // resolve aliases for qualified names
-        $aliasName = strtolower($name->getFirst());
-        if ($name->isQualified() && isset($this->aliases[Stmt\Use_::TYPE_NORMAL][$aliasName])) {
-            $alias = $this->aliases[Stmt\Use_::TYPE_NORMAL][$aliasName];
-            return FullyQualified::concat($alias, $name->slice(1), $name->getAttributes());
-        }
-
-        if ($name->isUnqualified()) {
-            if ($type === Stmt\Use_::TYPE_CONSTANT) {
-                // constant aliases are case-sensitive, function aliases case-insensitive
-                $aliasName = $name->getFirst();
-            }
-
-            if (isset($this->aliases[$type][$aliasName])) {
-                // resolve unqualified aliases
-                return new FullyQualified($this->aliases[$type][$aliasName], $name->getAttributes());
-            }
-
-            if (null === $this->namespace) {
-                // outside of a namespace unaliased unqualified is same as fully qualified
-                return new FullyQualified($name, $name->getAttributes());
-            }
-
-            // unqualified names inside a namespace cannot be resolved at compile-time
-            // add the namespaced version of the name as an attribute
-            $name->setAttribute('namespacedName',
-                FullyQualified::concat($this->namespace, $name, $name->getAttributes()));
-            return $name;
-        }
-
-        // if no alias exists prepend current namespace
-        return FullyQualified::concat($this->namespace, $name, $name->getAttributes());
+    protected function resolveClassName(Name $name) {
+        return $this->resolveName($name, Stmt\Use_::TYPE_NORMAL);
     }
 
     protected function addNamespacedName(Node $node) {
-        $node->namespacedName = Name::concat($this->namespace, $node->name);
+        $node->namespacedName = Name::concat(
+            $this->nameContext->getNamespace(), (string) $node->name);
+    }
+
+    protected function resolveAttrGroups(Node $node)
+    {
+        foreach ($node->attrGroups as $attrGroup) {
+            foreach ($attrGroup->attrs as $attr) {
+                $attr->name = $this->resolveClassName($attr->name);
+            }
+        }
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/NodeConnectingVisitor.php b/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/NodeConnectingVisitor.php
new file mode 100644
index 000000000..ea372e5b9
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/NodeConnectingVisitor.php
@@ -0,0 +1,52 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\NodeVisitor;
+
+use PhpParser\Node;
+use PhpParser\NodeVisitorAbstract;
+
+/**
+ * Visitor that connects a child node to its parent node
+ * as well as its sibling nodes.
+ *
+ * On the child node, the parent node can be accessed through
+ * <code>$node->getAttribute('parent')</code>, the previous
+ * node can be accessed through <code>$node->getAttribute('previous')</code>,
+ * and the next node can be accessed through <code>$node->getAttribute('next')</code>.
+ */
+final class NodeConnectingVisitor extends NodeVisitorAbstract
+{
+    /**
+     * @var Node[]
+     */
+    private $stack = [];
+
+    /**
+     * @var ?Node
+     */
+    private $previous;
+
+    public function beforeTraverse(array $nodes) {
+        $this->stack    = [];
+        $this->previous = null;
+    }
+
+    public function enterNode(Node $node) {
+        if (!empty($this->stack)) {
+            $node->setAttribute('parent', $this->stack[count($this->stack) - 1]);
+        }
+
+        if ($this->previous !== null && $this->previous->getAttribute('parent') === $node->getAttribute('parent')) {
+            $node->setAttribute('previous', $this->previous);
+            $this->previous->setAttribute('next', $node);
+        }
+
+        $this->stack[] = $node;
+    }
+
+    public function leaveNode(Node $node) {
+        $this->previous = $node;
+
+        array_pop($this->stack);
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/ParentConnectingVisitor.php b/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/ParentConnectingVisitor.php
new file mode 100644
index 000000000..b98d2bfa6
--- /dev/null
+++ b/lib/nikic/php-parser/lib/PhpParser/NodeVisitor/ParentConnectingVisitor.php
@@ -0,0 +1,41 @@
+<?php declare(strict_types=1);
+
+namespace PhpParser\NodeVisitor;
+
+use function array_pop;
+use function count;
+use PhpParser\Node;
+use PhpParser\NodeVisitorAbstract;
+
+/**
+ * Visitor that connects a child node to its parent node.
+ *
+ * On the child node, the parent node can be accessed through
+ * <code>$node->getAttribute('parent')</code>.
+ */
+final class ParentConnectingVisitor extends NodeVisitorAbstract
+{
+    /**
+     * @var Node[]
+     */
+    private $stack = [];
+
+    public function beforeTraverse(array $nodes)
+    {
+        $this->stack = [];
+    }
+
+    public function enterNode(Node $node)
+    {
+        if (!empty($this->stack)) {
+            $node->setAttribute('parent', $this->stack[count($this->stack) - 1]);
+        }
+
+        $this->stack[] = $node;
+    }
+
+    public function leaveNode(Node $node)
+    {
+        array_pop($this->stack);
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/NodeVisitorAbstract.php b/lib/nikic/php-parser/lib/PhpParser/NodeVisitorAbstract.php
index 3e1743a74..d378d6709 100644
--- a/lib/nikic/php-parser/lib/PhpParser/NodeVisitorAbstract.php
+++ b/lib/nikic/php-parser/lib/PhpParser/NodeVisitorAbstract.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser;
 
@@ -7,8 +7,19 @@ namespace PhpParser;
  */
 class NodeVisitorAbstract implements NodeVisitor
 {
-    public function beforeTraverse(array $nodes)    { }
-    public function enterNode(Node $node) { }
-    public function leaveNode(Node $node) { }
-    public function afterTraverse(array $nodes)     { }
-}
\ No newline at end of file
+    public function beforeTraverse(array $nodes) {
+        return null;
+    }
+
+    public function enterNode(Node $node) {
+        return null;
+    }
+
+    public function leaveNode(Node $node) {
+        return null;
+    }
+
+    public function afterTraverse(array $nodes) {
+        return null;
+    }
+}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Parser.php b/lib/nikic/php-parser/lib/PhpParser/Parser.php
index fb7dcad30..8956c7671 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Parser.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Parser.php
@@ -1,8 +1,9 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser;
 
-interface Parser {
+interface Parser
+{
     /**
      * Parses PHP code into a node tree.
      *
@@ -10,8 +11,8 @@ interface Parser {
      * @param ErrorHandler|null $errorHandler Error handler to use for lexer/parser errors, defaults
      *                                        to ErrorHandler\Throwing.
      *
-     * @return Node[]|null Array of statements (or null if the 'throwOnError' option is disabled and the parser was
-     *                     unable to recover from an error).
+     * @return Node\Stmt[]|null Array of statements (or null non-throwing error handler is used and
+     *                          the parser was unable to recover from an error).
      */
-    public function parse($code, ErrorHandler $errorHandler = null);
+    public function parse(string $code, ErrorHandler $errorHandler = null);
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Parser/Multiple.php b/lib/nikic/php-parser/lib/PhpParser/Parser/Multiple.php
index 25296a4ef..77fd1f3fb 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Parser/Multiple.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Parser/Multiple.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\Parser;
 
@@ -6,7 +6,8 @@ use PhpParser\Error;
 use PhpParser\ErrorHandler;
 use PhpParser\Parser;
 
-class Multiple implements Parser {
+class Multiple implements Parser
+{
     /** @var Parser[] List of parsers to try, in order of preference */
     private $parsers;
 
@@ -23,7 +24,7 @@ class Multiple implements Parser {
         $this->parsers = $parsers;
     }
 
-    public function parse($code, ErrorHandler $errorHandler = null) {
+    public function parse(string $code, ErrorHandler $errorHandler = null) {
         if (null === $errorHandler) {
             $errorHandler = new ErrorHandler\Throwing;
         }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Parser/Php5.php b/lib/nikic/php-parser/lib/PhpParser/Parser/Php5.php
index 4fbddaa70..c62adfd2c 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Parser/Php5.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Parser/Php5.php
@@ -17,21 +17,22 @@ use PhpParser\Node\Stmt;
  */
 class Php5 extends \PhpParser\ParserAbstract
 {
-    protected $tokenToSymbolMapSize = 392;
-    protected $actionTableSize = 1077;
-    protected $gotoTableSize = 591;
+    protected $tokenToSymbolMapSize = 396;
+    protected $actionTableSize = 1093;
+    protected $gotoTableSize = 643;
 
-    protected $invalidSymbol = 157;
+    protected $invalidSymbol = 168;
     protected $errorSymbol = 1;
     protected $defaultAction = -32766;
     protected $unexpectedTokenRule = 32767;
 
-    protected $YY2TBLSTATE  = 407;
-    protected $YYNLSTATES   = 669;
+    protected $YY2TBLSTATE = 415;
+    protected $numNonLeafStates = 662;
 
     protected $symbolToName = array(
         "EOF",
         "error",
+        "T_THROW",
         "T_INCLUDE",
         "T_INCLUDE_ONCE",
         "T_EVAL",
@@ -58,6 +59,7 @@ class Php5 extends \PhpParser\ParserAbstract
         "T_SL_EQUAL",
         "T_SR_EQUAL",
         "T_POW_EQUAL",
+        "T_COALESCE_EQUAL",
         "'?'",
         "':'",
         "T_COALESCE",
@@ -65,7 +67,8 @@ class Php5 extends \PhpParser\ParserAbstract
         "T_BOOLEAN_AND",
         "'|'",
         "'^'",
-        "'&'",
+        "T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG",
+        "T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG",
         "T_IS_EQUAL",
         "T_IS_NOT_EQUAL",
         "T_IS_IDENTICAL",
@@ -126,6 +129,7 @@ class Php5 extends \PhpParser\ParserAbstract
         "T_ENDDECLARE",
         "T_AS",
         "T_SWITCH",
+        "T_MATCH",
         "T_ENDSWITCH",
         "T_CASE",
         "T_DEFAULT",
@@ -133,12 +137,12 @@ class Php5 extends \PhpParser\ParserAbstract
         "T_CONTINUE",
         "T_GOTO",
         "T_FUNCTION",
+        "T_FN",
         "T_CONST",
         "T_RETURN",
         "T_TRY",
         "T_CATCH",
         "T_FINALLY",
-        "T_THROW",
         "T_USE",
         "T_INSTEADOF",
         "T_GLOBAL",
@@ -178,6 +182,9 @@ class Php5 extends \PhpParser\ParserAbstract
         "T_DIR",
         "T_NS_SEPARATOR",
         "T_ELLIPSIS",
+        "T_NAME_FULLY_QUALIFIED",
+        "T_NAME_QUALIFIED",
+        "T_NAME_RELATIVE",
         "';'",
         "'{'",
         "'}'",
@@ -186,671 +193,693 @@ class Php5 extends \PhpParser\ParserAbstract
         "'$'",
         "'`'",
         "']'",
-        "'\"'"
+        "'\"'",
+        "T_READONLY",
+        "T_ENUM",
+        "T_NULLSAFE_OBJECT_OPERATOR",
+        "T_ATTRIBUTE"
     );
 
     protected $tokenToSymbol = array(
-            0,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,   53,  156,  157,  153,   52,   35,  157,
-          151,  152,   50,   47,    7,   48,   49,   51,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,   29,  148,
-           41,   15,   43,   28,   65,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,   67,  157,  155,   34,  157,  154,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  149,   33,  150,   55,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,    1,    2,    3,    4,
-            5,    6,    8,    9,   10,   11,   12,   13,   14,   16,
+            0,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,   56,  163,  168,  160,   55,  168,  168,
+          158,  159,   53,   50,    8,   51,   52,   54,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,   31,  155,
+           44,   16,   46,   30,   68,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,   70,  168,  162,   36,  168,  161,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  156,   35,  157,   58,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,    1,    2,    3,    4,
+            5,    6,    7,    9,   10,   11,   12,   13,   14,   15,
            17,   18,   19,   20,   21,   22,   23,   24,   25,   26,
-           27,   30,   31,   32,   36,   37,   38,   39,   40,   42,
-           44,   45,   46,   54,   56,   57,   58,   59,   60,   61,
-           62,   63,   64,   66,   68,   69,   70,   71,   72,   73,
-           74,   75,   76,   77,   78,   79,   80,   81,  157,  157,
-           82,   83,   84,   85,   86,   87,   88,   89,   90,   91,
+           27,   28,   29,   32,   33,   34,   37,   38,   39,   40,
+           41,   42,   43,   45,   47,   48,   49,   57,   59,   60,
+           61,   62,   63,   64,   65,   66,   67,   69,   71,   72,
+           73,   74,   75,   76,   77,   78,   79,   80,   81,   82,
+           83,   84,   85,   86,   87,   88,   89,   90,   91,   92,
+           93,   94,   95,   96,   97,   98,   99,  100,  101,  102,
+          103,  104,  105,  106,  107,  108,  109,  110,  111,  112,
+          113,  114,  115,  116,  117,  118,  119,  120,  121,  164,
+          122,  123,  124,  125,  126,  127,  128,  129,  165,  130,
+          131,  132,  166,  133,  134,  135,  136,  137,  138,  139,
+          140,  141,  142,  143,  144,  145,  146,  147,  148,  149,
+          150,  151,  152,  153,  154,  167
+    );
+
+    protected $action = array(
+          699,  669,  670,  671,  672,  673,  286,  674,  675,  676,
+          712,  713,  223,  224,  225,  226,  227,  228,  229,  230,
+          231,  232,    0,  233,  234,  235,  236,  237,  238,  239,
+          240,  241,  242,  243,  244,-32766,-32766,-32766,-32766,-32766,
+        -32766,-32766,-32766,-32766,-32767,-32767,-32767,-32767,  245,  246,
+          242,  243,  244,-32766,-32766,  677,-32766,  750,-32766,-32766,
+        -32766,-32766,-32766,-32766,-32766, 1224,  245,  246, 1225,  678,
+          679,  680,  681,  682,  683,  684,-32766,   48,  746,-32766,
+        -32766,-32766,-32766,-32766,-32766,  685,  686,  687,  688,  689,
+          690,  691,  692,  693,  694,  695,  715,  738,  716,  717,
+          718,  719,  707,  708,  709,  737,  710,  711,  696,  697,
+          698,  700,  701,  702,  740,  741,  742,  743,  744,  745,
+          703,  704,  705,  706,  736,  727,  725,  726,  722,  723,
+          751,  714,  720,  721,  728,  729,  731,  730,  732,  733,
+           55,   56,  425,   57,   58,  724,  735,  734, 1073,   59,
+           60, -224,   61,-32766,-32766,-32766,-32766,-32766,-32766,-32766,
+        -32766,-32766,-32766,  121,-32767,-32767,-32767,-32767,   29,  107,
+          108,  109,  110,  111,  112,  113,  114,  115,  116,  117,
+          118,  119, 1043,  766, 1071,  767,  580,   62,   63,-32766,
+        -32766,-32766,-32766,   64,  516,   65,  294,  295,   66,   67,
+           68,   69,   70,   71,   72,   73,  822,   25,  302,   74,
+          418,  981,  983, 1043, 1181, 1095, 1096, 1073,  748,  754,
+         1075, 1074, 1076,  469,-32766,-32766,-32766,  337,  823,   54,
+        -32767,-32767,-32767,-32767,   98,   99,  100,  101,  102,  220,
+          221,  222,   78,  361, 1107,-32766,  341,-32766,-32766,-32766,
+        -32766,-32766, 1107,  492,  949,  950,  951,  948,  947,  946,
+          207,  477,  478,  949,  950,  951,  948,  947,  946, 1043,
+          479,  480,   52, 1101, 1102, 1103, 1104, 1098, 1099,  319,
+          872,  668,  667,   27, -511, 1105, 1100,-32766,  130, 1075,
+         1074, 1076,  345,  668,  667,   41,  126,  341,  334,  369,
+          336,  426, -128, -128, -128,  896,  897,  468,  220,  221,
+          222,  811, 1195,  619,   40,   21,  427, -128,  470, -128,
+          471, -128,  472, -128,  802,  428,   -4,  823,   54,  207,
+           33,   34,  429,  360,  317,   28,   35,  473,-32766,-32766,
+        -32766,  211,  356,  357,  474,  475,-32766,-32766,-32766,  754,
+          476,   49,  313,  794,  843,  430,  431,  289,  125,-32766,
+          813,-32766,-32766,-32766,-32766,-32766,-32766,-32766,-32767,-32767,
+        -32767,-32767,-32767,-32766,-32766,-32766,  769,  103,  104,  105,
+          327,  307,  825,  633, -128, 1075, 1074, 1076,  221,  222,
+          927,  748, 1146,  106,-32766,  129,-32766,-32766,-32766,-32766,
+          426,  823,   54,  902,  873,  302,  468,   75,  207,  359,
+          811,  668,  667,   40,   21,  427,  754,  470,  754,  471,
+          423,  472, 1043,  127,  428,  435, 1043,  341, 1043,   33,
+           34,  429,  360, 1181,  415,   35,  473,  122,   10,  315,
+          128,  356,  357,  474,  475,-32766,-32766,-32766,  768,  476,
+          668,  667,  758,  843,  430,  431,  754, 1043, 1147,-32766,
+        -32766,-32766,  754,  419,  342, 1215,-32766,  131,-32766,-32766,
+        -32766,  341,  363,  346,  426,  823,   54,  100,  101,  102,
+          468,  825,  633,   -4,  811,  442,  903,   40,   21,  427,
+          754,  470,  435,  471,  341,  472,  341,  766,  428,  767,
+         -209, -209, -209,   33,   34,  429,  360,  479, 1196,   35,
+          473,  345,-32766,-32766,-32766,  356,  357,  474,  475,  220,
+          221,  222,  421,  476,   32,  297,  794,  843,  430,  431,
+          754,  754,  435,-32766,  341,-32766,-32766,    9,  300,   51,
+          207,  249,  324,  753,  120,  220,  221,  222,  426,   30,
+          247,  941,  422,  424,  468,  825,  633, -209,  811, 1043,
+         1061,   40,   21,  427,  129,  470,  207,  471,  341,  472,
+          804,   20,  428,  124, -208, -208, -208,   33,   34,  429,
+          360,  479,  212,   35,  473,  923, -259,  823,   54,  356,
+          357,  474,  475,-32766,-32766,-32766, 1043,  476,  213,  806,
+          794,  843,  430,  431,-32766,-32766,  435,  435,  341,  341,
+          443,   79,   80,   81,-32766,  668,  667,  636,  344,  808,
+          668,  667,  239,  240,  241,  123,  214,  538,  250,  825,
+          633, -208,   36,  251,   82,   83,   84,   85,   86,   87,
+           88,   89,   90,   91,   92,   93,   94,   95,   96,   97,
+           98,   99,  100,  101,  102,  103,  104,  105,  252,  307,
+          426,  220,  221,  222,  823,   54,  468,-32766,  222,  765,
+          811,  106,  134,   40,   21,  427,  571,  470,  207,  471,
+          445,  472,  207,-32766,  428,  896,  897,  207,  307,   33,
+           34,  429,  245,  246,  637,   35,  473,  452,   22,  809,
+          922,  356,  357,  457,  588,  135,  374,  595,  596,  476,
+         -228,  759,  639,  938,  653,  926,  661,  -86,  823,   54,
+          314,  644,  647,  821,  133,  836,   43,  106,  603,   44,
+           45,   46,   47,  748,   50,   53,  132,  426,  302,-32766,
+          520,  825,  633,  468,  -84,  607,  577,  811,  641,  362,
+           40,   21,  427, -278,  470,  754,  471,  954,  472,  441,
+          627,  428,  823,   54,  574,  844,   33,   34,  429,   11,
+          615,  845,   35,  473,  444,  461,  285, -511,  356,  357,
+          592, -419,  593, 1106, 1153, -410,  476,  368,  838,   38,
+          658,  426,  645,  795, 1052,    0,  325,  468,    0,-32766,
+            0,  811,    0,    0,   40,   21,  427,    0,  470,    0,
+          471,    0,  472,    0,  322,  428,  823,   54,  825,  633,
+           33,   34,  429,    0,  326,    0,   35,  473,  323,    0,
+          316,  318,  356,  357, -512,  426,    0,  753,  531,    0,
+          476,  468,    6,    0,    0,  811,  650,    7,   40,   21,
+          427,   12,  470,   14,  471,  373,  472, -420,  562,  428,
+          823,   54,   78, -225,   33,   34,  429,   39,  656,  657,
+           35,  473,  859,  633,  764,  812,  356,  357,  820,  799,
+          814,  875,  866,  867,  476,  797,  860,  857,  855,  426,
+          933,  934,  931,  819,  803,  468,  805,  807,  810,  811,
+          930,  762,   40,   21,  427,  763,  470,  932,  471,  335,
+          472,  358,  634,  428,  638,  640,  825,  633,   33,   34,
+          429,  642,  643,  646,   35,  473,  648,  649,  651,  652,
+          356,  357,  635,  426, 1221, 1223,  761,  842,  476,  468,
+          248,  760,  841,  811, 1222,  840,   40,   21,  427, 1057,
+          470,  830,  471, 1045,  472,  839, 1046,  428,  828,  215,
+          216,  939,   33,   34,  429,  217,  864,  218,   35,  473,
+          825,  633,   24,  865,  356,  357,  456, 1220, 1189,  209,
+         1187, 1172,  476, 1185,  215,  216, 1086, 1095, 1096,  914,
+          217, 1193,  218, 1183, -224, 1097,   26,   31,   37,   42,
+           76,   77,  210,  288,  209,  292,  293,  308,  309,  310,
+          311,  339, 1095, 1096,  825,  633,  355,  291,  416, 1152,
+         1097,   16,   17,   18,  393,  453,  460,  462,  466,  552,
+          624, 1048, 1051,  904, 1111, 1047, 1023,  563, 1022, 1088,
+            0,    0, -429,  558, 1041, 1101, 1102, 1103, 1104, 1098,
+         1099,  398, 1054, 1053, 1056, 1055, 1070, 1105, 1100, 1186,
+         1171, 1167, 1184, 1085, 1218, 1112, 1166,  219,  558,  599,
+         1101, 1102, 1103, 1104, 1098, 1099,  398,    0,    0,    0,
+            0,    0, 1105, 1100,    0,    0,    0,    0,    0,    0,
+            0,    0,  219
+    );
+
+    protected $actionCheck = array(
+            2,    3,    4,    5,    6,    7,   14,    9,   10,   11,
+           12,   13,   33,   34,   35,   36,   37,   38,   39,   40,
+           41,   42,    0,   44,   45,   46,   47,   48,   49,   50,
+           51,   52,   53,   54,   55,    9,   10,   11,   33,   34,
+           35,   36,   37,   38,   39,   40,   41,   42,   69,   70,
+           53,   54,   55,    9,   10,   57,   30,   80,   32,   33,
+           34,   35,   36,   37,   38,   80,   69,   70,   83,   71,
+           72,   73,   74,   75,   76,   77,    9,   70,   80,   33,
+           34,   35,   36,   37,   38,   87,   88,   89,   90,   91,
            92,   93,   94,   95,   96,   97,   98,   99,  100,  101,
           102,  103,  104,  105,  106,  107,  108,  109,  110,  111,
           112,  113,  114,  115,  116,  117,  118,  119,  120,  121,
           122,  123,  124,  125,  126,  127,  128,  129,  130,  131,
-          132,  133,  134,  135,  136,  137,  157,  157,  157,  157,
-          157,  157,  138,  139,  140,  141,  142,  143,  144,  145,
-          146,  147
-    );
-
-    protected $action = array(
-          674,  675,  676,  677,  678,-32766,  679,  680,  681,  717,
-          718,  218,  219,  220,  221,  222,  223,  224,  225,  226,
-            0,  227,  228,  229,  230,  231,  232,  233,  234,  235,
-          236,  237,  238,-32766,-32766,-32766,-32766,-32766,-32766,-32766,
-        -32766,-32767,-32767,-32767,-32767,  442,  239,  240,-32766,-32766,
-        -32766,-32766,  682,-32766,  308,-32766,-32766,-32766,-32766,-32766,
-        -32766,-32767,-32767,-32767,-32767,-32767,  683,  684,  685,  686,
-          687,  688,  689, 1174,  462,  749,-32766,-32766,-32766,-32766,
-        -32766,   25,  690,  691,  692,  693,  694,  695,  696,  697,
-          698,  699,  700,  720,  721,  722,  723,  724,  712,  713,
-          714,  715,  716,  701,  702,  703,  704,  705,  706,  707,
-          743,  744,  745,  746,  747,  748,  708,  709,  710,  711,
-          741,  732,  730,  731,  727,  728,  520,  719,  725,  726,
-          733,  734,  736,  735,  737,  738,   54,   55,  422,   56,
-           57,  729,  740,  739,  421,   58,   59,  341,   60,-32766,
-        -32766,-32766,-32766,-32766,-32766,-32766,-32766,-32766,    9,-32767,
-        -32767,-32767,-32767,   52,  327,-32766,  331,  947,  948,  949,
-          946,  945,  944,  939, 1215,   29, 1217, 1216,  765,  766,
-          823,   61,   62, 1101, -269, 1180,  764,   63, 1174,   64,
-          293,  294,   65,   66,   67,   68,   69,   70,   71,   72,
-          129,   26,  301,   73,  415,-32766,-32766,-32766,-32766, 1089,
-         1090,  751,  635, 1180,-32766,  920,  206,  466,-32766,-32766,
-        -32766,  824,  409,-32766,  313,-32766,  902,-32766,-32766,-32766,
-        -32766,-32766,-32766,  215,  216,  217,  430,-32766,-32766,-32766,
-        -32766,-32766,-32766,-32766,-32766,  122,  493,  947,  948,  949,
-          946,  945,  944,  202,  475,  476,  284,  625,  127,  336,
-          895,  896,  341,  479,  480, 1187, 1095, 1096, 1097, 1098,
-         1092, 1093,  309,  494,   10,  443,  427,  494, 1099, 1094,
-          427,  587, -220, 1212,  123,   41,  449,  336,  323, 1056,
-          324,  423, -122, -122, -122,   -4,  824,  465,  101,  102,
-          103,  813,  303,  282,   40,   21,  424, -122,  467, -122,
-          468, -122,  469, -122,  104,  425,  215,  216,  217,   30,
-           31,  470,  426,  626,   32,  471,  427,  814,   74,  871,
-          925,  351,  352,  472,  473,  358,  202,  243, 1101,  474,
-          414, 1184,  795,  842,  477,  478,  300,  236,  237,  238,
-           35,  105,  106,  107,  108,  109,  110,  111,  112,  113,
-          114,  115,  116,  239,  240, 1038,  423,  350,  826,  640,
-         -122,  824,  465,  215,  216,  217,  813, 1140,  241,   40,
-           21,  424,   48,  467,  440,  468,  334,  469,  297, 1038,
-          425,  977,  979,  202,   30,   31,  470,  426,  416,   32,
-          471, 1188, 1038,   74,  322, 1038,  351,  352,  472,  473,
-        -32766,-32766,-32766,  128,  474,  921,  811,  757,  842,  477,
-          478,-32767,-32767,-32767,-32767,   96,   97,   98,   99,  100,
-        -32766,   20,-32766,-32766,-32766,-32766,  895,  896,  335, 1038,
-          479,  423, -216,  826,  640,   -4,  824,  465,  872,  494,
-         1207,  813,  427, 1206,   40,   21,  424,  299,  467,  121,
-          468, 1038,  469, -497,  118,  425, -201, -201, -201,   30,
-           31,  470,  426,  297,   32,  471,  810,  911,   74,  216,
-          217,  351,  352,  472,  473,-32766,-32766,-32766,   36,  474,
-           51,  340,  795,  842,  477,  478,  207,  751,  202, 1180,
-          126,-32766,-32766,-32766,  441,-32766,  417,-32766,-32766,-32766,
-           49,   33,  296,-32766,-32766,-32766,  423,  208,  826,  640,
-         -201,-32766,  465,-32766,-32766,  807,  813,  379,  117,   40,
-           21,  424, 1066,  467,-32766,  468,  217,  469,  805,  245,
-          425, -200, -200, -200,   30,   31,  470,  426, 1038,   32,
-          471,  286,  548,   74,  202,  824,  351,  352,  472,  473,
-        -32766,-32766,-32766,  494,  474,  125,  427,  795,  842,  477,
-          478,  431,  120,  336, 1038,  803,   78,   79,   80,  494,
-        -32766,  436,  427,  646,  642,  126,-32766,-32766,-32766,  244,
-          901,  246,  119,  826,  640, -200,   34,  298,   81,   82,
-           83,   84,   85,   86,   87,   88,   89,   90,   91,   92,
-           93,   94,   95,   96,   97,   98,   99,  100,  101,  102,
-          103,  209,  303,  202,  824,  423,  822, 1038,  215,  216,
-          217,  465,  131,  130,  104,  813,  578, 1038,   40,   21,
-          424,  650,  467,  835,  468,  647,  469,  315,  202,  425,
-          285,  104,  643,   30,   31,  470,  824,-32766,   32,  471,
-          295,  303,   74,-32766,-32766,  351,  352,  215,  216,  217,
-        -32766,-32766,   50,  474,   98,   99,  100,  233,  234,  235,
-          239,  240,  456,  593,  644,  451,   22,  202,  132,  359,
-          765,  766,  601,  602,  423,  758,  645,  924,  668,  301,
-          465,   47,  858,  640,  813,  936,  656,   40,   21,  424,
-           43,  467,   46,  468,   45,  469,   44,   53,  425,  751,
-          607,  514,   30,   31,  470,  824,  423,   32,  471,  778,
-          752,   74,  465,  437,  351,  352,  813,  535,  519,   40,
-           21,  424,  474,  467,  536,  468, 1210,  469,  515,  435,
-          425,  439,  518,  648,   30,   31,  470,  824,  624,   32,
-          471,  614,  604,   74, 1059,  581,  351,  352,-32766,  526,
-          634,  826,  640,  611,  474, 1139,  460,  434,  281,  621,
-          328,  844,  314,  539,   14,  653,  -80,  597,  837,  584,
-          330,  843,  325, -398,  395,  423, 1146,    0,    0,    0,
-            0,  465, 1100,  826,  640,  813,  598,    0,   40,   21,
-          424,    0,  467,    0,  468,    0,  469,    0,  372,  425,
-            0,  326,    0,   30,   31,  470,  824,  423,   32,  471,
-          312, -498,   74,  465, -497,  351,  352,  813,  479,    0,
-           40,   21,  424,  474,  467,  374,  468,    5,  469,    6,
-           11,  425, -407,   13, -406,   30,   31,  470, 1036,  386,
-           32,  471,  411,  410,   74,  387,  528,  351,  352,  436,
-          856, 1213,  826,  640,  866,  474,  865,  874,  815,  800,
-          821,  809,  763,  661,  660,   39,   38,  854,  931,  932,
-          929,  859,  930,  820,  808,  761,  423,  928,  806,  804,
-          798,  812,  465,  762,  826,  640,  813,  649,   77,   40,
-           21,  424,  651,  467,  652,  468,  242,  469,  654,  655,
-          425,  658,  663,  664,   30,   31,  470,  665,  124,   32,
-          471,  332,  333,   74,  210,  211,  351,  352,  407,  641,
-          212,  408,  213,  768,  474,  767,  864,  455, 1211, 1181,
-         1179, 1165, 1177, 1080,  204,  913, 1185, 1175,  838,  210,
-          211, 1040, 1089, 1090, 1041,  212,-32766,  213,  829,  863,
-         1091, 1052,  759,  826,  640,  306,  839,  840,  760,  204,
-         1214,  796,  662,  841,  770,  769,  937, 1089, 1090,  831,
-         1042,-32766,  305,  304,   24, 1091,   27,  292,  291,  283,
-          307,  338,  413,  419,   28,  205,   37,   42,   76,   75,
-        -32766,    0, 1018, 1017, 1082,  571, -216,  567, 1105, 1095,
-         1096, 1097, 1098, 1092, 1093,  385,  903, 1046, 1043,  631,
-          561, 1099, 1094,  463,  459,  457,  452,  380,  214,    0,
-        -32766,   18,  567, -217, 1095, 1096, 1097, 1098, 1092, 1093,
-          385,   17,   16,  605,    0, -416, 1099, 1094, 1160, 1159,
-         1106, 1209, 1079,  214, 1176,-32766, 1047,    0, 1164, 1178,
-         1065, 1050, 1051, 1048, 1049,    0, 1145
-    );
-
-    protected $actionCheck = array(
-            2,    3,    4,    5,    6,    8,    8,    9,   10,   11,
-           12,   31,   32,   33,   34,   35,   36,   37,   38,   39,
-            0,   41,   42,   43,   44,   45,   46,   47,   48,   49,
-           50,   51,   52,    8,    9,   10,   31,   32,   33,   34,
-           35,   36,   37,   38,   39,    7,   66,   67,   31,   32,
-           33,   34,   54,   28,    7,   30,   31,   32,   33,   34,
-           35,   36,   37,   38,   39,   40,   68,   69,   70,   71,
-           72,   73,   74,   79,    7,   77,   31,   32,   33,   34,
-           35,    7,   84,   85,   86,   87,   88,   89,   90,   91,
-           92,   93,   94,   95,   96,   97,   98,   99,  100,  101,
-          102,  103,  104,  105,  106,  107,  108,  109,  110,  111,
-          112,  113,  114,  115,  116,  117,  118,  119,  120,  121,
-          122,  123,  124,  125,  126,  127,   82,  129,  130,  131,
-          132,  133,  134,  135,  136,  137,    2,    3,    4,    5,
-            6,  143,  144,  145,    7,   11,   12,  153,   14,   31,
-           32,   33,   34,   35,   36,   37,   38,   39,  103,   41,
-           42,   43,   44,   67,  109,   79,    7,  112,  113,  114,
-          115,  116,  117,  118,   77,    7,   79,   80,  102,  103,
-            1,   47,   48,  139,   79,   79,  148,   53,   79,   55,
-           56,   57,   58,   59,   60,   61,   62,   63,   64,   65,
-           67,   67,   68,   69,   70,    8,    9,   10,  103,   75,
-           76,   77,   77,   79,  109,  148,    7,   83,    8,    9,
-           10,    1,  146,  118,  128,   28,  152,   30,   31,   32,
-           33,   34,   35,    8,    9,   10,  102,  151,   28,  153,
-           30,   31,   32,   33,   34,  149,  112,  112,  113,  114,
-          115,  116,  117,   28,  120,  121,    7,   77,  149,  153,
-          130,  131,  153,  129,  130,    1,  132,  133,  134,  135,
-          136,  137,  138,  143,    7,    7,  146,  143,  144,  145,
-          146,   82,  152,  150,    7,  151,    7,  153,  154,  152,
-          156,   71,   72,   73,   74,    0,    1,   77,   50,   51,
-           52,   81,   54,   13,   84,   85,   86,   87,   88,   89,
-           90,   91,   92,   93,   66,   95,    8,    9,   10,   99,
-          100,  101,  102,  143,  104,  105,  146,  148,  108,   29,
-          150,  111,  112,  113,  114,    7,   28,   29,  139,  119,
-            7,   77,  122,  123,  124,  125,   35,   50,   51,   52,
-           15,   16,   17,   18,   19,   20,   21,   22,   23,   24,
-           25,   26,   27,   66,   67,   12,   71,    7,  148,  149,
-          150,    1,   77,    8,    9,   10,   81,  152,   13,   84,
-           85,   86,   67,   88,   29,   90,    7,   92,   35,   12,
-           95,   56,   57,   28,   99,  100,  101,  102,  103,  104,
-          105,  152,   12,  108,  109,   12,  111,  112,  113,  114,
-            8,    9,   10,  149,  119,  148,  148,  122,  123,  124,
-          125,   41,   42,   43,   44,   45,   46,   47,   48,   49,
-           28,  152,   30,   31,   32,   33,  130,  131,  143,   12,
-          129,   71,  152,  148,  149,  150,    1,   77,  148,  143,
-           79,   81,  146,   82,   84,   85,   86,    7,   88,   13,
-           90,   12,   92,  128,  149,   95,   96,   97,   98,   99,
-          100,  101,  102,   35,  104,  105,  148,   79,  108,    9,
-           10,  111,  112,  113,  114,    8,    9,   10,   13,  119,
-           67,   67,  122,  123,  124,  125,   15,   77,   28,   79,
-          147,    8,    9,   10,  149,   28,  123,   30,   31,   32,
-           67,  140,  141,    8,    9,   10,   71,   15,  148,  149,
-          150,   28,   77,   30,   31,  148,   81,   78,   15,   84,
-           85,   86,  112,   88,  151,   90,   10,   92,  148,   15,
-           95,   96,   97,   98,   99,  100,  101,  102,   12,  104,
-          105,  153,  128,  108,   28,    1,  111,  112,  113,  114,
-            8,    9,   10,  143,  119,   29,  146,  122,  123,  124,
-          125,  151,  149,  153,   12,  148,    8,    9,   10,  143,
-           28,  146,  146,   29,  149,  147,   31,   32,   33,   15,
-          152,   15,  149,  148,  149,  150,   28,   35,   30,   31,
-           32,   33,   34,   35,   36,   37,   38,   39,   40,   41,
-           42,   43,   44,   45,   46,   47,   48,   49,   50,   51,
-           52,   15,   54,   28,    1,   71,   29,   12,    8,    9,
-           10,   77,  149,   29,   66,   81,  153,   12,   84,   85,
-           86,   29,   88,   35,   90,   29,   92,   29,   28,   95,
-           35,   66,   29,   99,  100,  101,    1,   31,  104,  105,
-           35,   54,  108,   31,   32,  111,  112,    8,    9,   10,
-            8,    9,   67,  119,   47,   48,   49,   47,   48,   49,
-           66,   67,   72,   73,   29,   72,   73,   28,   97,   98,
-          102,  103,  106,  107,   71,  148,  149,  148,  149,   68,
-           77,   67,  148,  149,   81,  148,  149,   84,   85,   86,
-           67,   88,   67,   90,   67,   92,   67,   67,   95,   77,
-           74,   77,   99,  100,  101,    1,   71,  104,  105,   77,
-           77,  108,   77,   77,  111,  112,   81,   77,   77,   84,
-           85,   86,  119,   88,   77,   90,   77,   92,   77,   77,
-           95,   86,   79,   29,   99,  100,  101,    1,   79,  104,
-          105,   79,   79,  108,   79,   87,  111,  112,   82,   82,
-           89,  148,  149,   93,  119,  155,  102,  102,   94,   91,
-          110,  123,  128,   94,   94,   29,   94,   96,  147,   96,
-          126,  123,  126,  142,  146,   71,  139,   -1,   -1,   -1,
-           -1,   77,  139,  148,  149,   81,  109,   -1,   84,   85,
-           86,   -1,   88,   -1,   90,   -1,   92,   -1,  142,   95,
-           -1,  127,   -1,   99,  100,  101,    1,   71,  104,  105,
-          128,  128,  108,   77,  128,  111,  112,   81,  129,   -1,
-           84,   85,   86,  119,   88,  146,   90,  142,   92,  142,
-          142,   95,  142,  142,  142,   99,  100,  101,  154,  146,
-          104,  105,  146,  146,  108,  146,  146,  111,  112,  146,
-          148,  150,  148,  149,  148,  119,  148,  148,  148,  148,
-          148,  148,  148,  148,  148,  148,  148,  148,  148,  148,
-          148,  148,  148,  148,  148,  148,   71,  148,  148,  148,
-          148,  148,   77,  148,  148,  149,   81,  149,  149,   84,
-           85,   86,  149,   88,  149,   90,   29,   92,  149,  149,
-           95,  149,  149,  149,   99,  100,  101,  149,  149,  104,
-          105,  149,  149,  108,   47,   48,  111,  112,  149,  149,
-           53,  149,   55,  150,  119,  150,  150,  150,  150,  150,
-          150,  150,  150,  150,   67,  150,  150,  150,  150,   47,
-           48,  150,   75,   76,  150,   53,   79,   55,  150,  150,
-           83,  150,  150,  148,  149,  151,  150,  150,  150,   67,
-          150,  150,  150,  150,  150,  150,  150,   75,   76,  150,
-          152,   79,  151,  151,  151,   83,  151,  151,  151,  151,
-          151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
-          151,   -1,  152,  152,  152,  152,  152,  130,  152,  132,
-          133,  134,  135,  136,  137,  138,  152,  152,  152,  152,
-          152,  144,  145,  152,  152,  152,  152,  152,  151,   -1,
-          153,  152,  130,  152,  132,  133,  134,  135,  136,  137,
-          138,  152,  152,  155,   -1,  154,  144,  145,  155,  155,
-          155,  155,  155,  151,  155,  153,  155,   -1,  155,  155,
-          155,  155,  155,  155,  155,   -1,  156
+          153,  133,  134,  135,  136,  137,  138,  139,  140,  141,
+            3,    4,    5,    6,    7,  147,  148,  149,   80,   12,
+           13,  159,   15,   33,   34,   35,   36,   37,   38,   39,
+           40,   41,   42,  156,   44,   45,   46,   47,   16,   17,
+           18,   19,   20,   21,   22,   23,   24,   25,   26,   27,
+           28,   29,   13,  106,  116,  108,   85,   50,   51,   33,
+           34,   35,   36,   56,   85,   58,   59,   60,   61,   62,
+           63,   64,   65,   66,   67,   68,    1,   70,   71,   72,
+           73,   59,   60,   13,   82,   78,   79,   80,   80,   82,
+          152,  153,  154,   86,    9,   10,   11,    8,    1,    2,
+           44,   45,   46,   47,   48,   49,   50,   51,   52,    9,
+           10,   11,  156,  106,  143,   30,  160,   32,   33,   34,
+           35,   36,  143,  116,  116,  117,  118,  119,  120,  121,
+           30,  124,  125,  116,  117,  118,  119,  120,  121,   13,
+          133,  134,   70,  136,  137,  138,  139,  140,  141,  142,
+           31,   37,   38,    8,  132,  148,  149,  116,  156,  152,
+          153,  154,  160,   37,   38,  158,    8,  160,  161,    8,
+          163,   74,   75,   76,   77,  134,  135,   80,    9,   10,
+           11,   84,    1,   80,   87,   88,   89,   90,   91,   92,
+           93,   94,   95,   96,  155,   98,    0,    1,    2,   30,
+          103,  104,  105,  106,  132,    8,  109,  110,    9,   10,
+           11,    8,  115,  116,  117,  118,    9,   10,   11,   82,
+          123,   70,    8,  126,  127,  128,  129,    8,  156,   30,
+          155,   32,   33,   34,   35,   36,   37,   38,   39,   40,
+           41,   42,   43,    9,   10,   11,  157,   53,   54,   55,
+            8,   57,  155,  156,  157,  152,  153,  154,   10,   11,
+          157,   80,  162,   69,   30,  151,   32,   33,   34,   35,
+           74,    1,    2,  159,  155,   71,   80,  151,   30,    8,
+           84,   37,   38,   87,   88,   89,   82,   91,   82,   93,
+            8,   95,   13,  156,   98,  158,   13,  160,   13,  103,
+          104,  105,  106,   82,  108,  109,  110,  156,    8,  113,
+           31,  115,  116,  117,  118,    9,   10,   11,  157,  123,
+           37,   38,  126,  127,  128,  129,   82,   13,  159,   33,
+           34,   35,   82,  127,    8,   85,   30,  156,   32,   33,
+           34,  160,    8,  147,   74,    1,    2,   50,   51,   52,
+           80,  155,  156,  157,   84,   31,  159,   87,   88,   89,
+           82,   91,  158,   93,  160,   95,  160,  106,   98,  108,
+          100,  101,  102,  103,  104,  105,  106,  133,  159,  109,
+          110,  160,    9,   10,   11,  115,  116,  117,  118,    9,
+           10,   11,    8,  123,  144,  145,  126,  127,  128,  129,
+           82,   82,  158,   30,  160,   32,   33,  108,    8,   70,
+           30,   31,  113,  152,   16,    9,   10,   11,   74,   14,
+           14,  122,    8,    8,   80,  155,  156,  157,   84,   13,
+          159,   87,   88,   89,  151,   91,   30,   93,  160,   95,
+          155,  159,   98,   14,  100,  101,  102,  103,  104,  105,
+          106,  133,   16,  109,  110,  155,  157,    1,    2,  115,
+          116,  117,  118,    9,   10,   11,   13,  123,   16,  155,
+          126,  127,  128,  129,   33,   34,  158,  158,  160,  160,
+          156,    9,   10,   11,   30,   37,   38,   31,   70,  155,
+           37,   38,   50,   51,   52,  156,   16,   81,   16,  155,
+          156,  157,   30,   16,   32,   33,   34,   35,   36,   37,
+           38,   39,   40,   41,   42,   43,   44,   45,   46,   47,
+           48,   49,   50,   51,   52,   53,   54,   55,   16,   57,
+           74,    9,   10,   11,    1,    2,   80,  116,   11,  155,
+           84,   69,  156,   87,   88,   89,  160,   91,   30,   93,
+          132,   95,   30,   33,   98,  134,  135,   30,   57,  103,
+          104,  105,   69,   70,   31,  109,  110,   75,   76,  155,
+          155,  115,  116,   75,   76,  101,  102,  111,  112,  123,
+          159,  155,  156,  155,  156,  155,  156,   31,    1,    2,
+           31,   31,   31,   31,   31,   38,   70,   69,   77,   70,
+           70,   70,   70,   80,   70,   70,   70,   74,   71,   85,
+           85,  155,  156,   80,   97,   96,  100,   84,   31,  106,
+           87,   88,   89,   82,   91,   82,   93,   82,   95,   89,
+           92,   98,    1,    2,   90,  127,  103,  104,  105,   97,
+           94,  127,  109,  110,   97,   97,   97,  132,  115,  116,
+          100,  146,  113,  143,  143,  146,  123,  106,  151,  155,
+          157,   74,   31,  157,  162,   -1,  114,   80,   -1,  116,
+           -1,   84,   -1,   -1,   87,   88,   89,   -1,   91,   -1,
+           93,   -1,   95,   -1,  130,   98,    1,    2,  155,  156,
+          103,  104,  105,   -1,  130,   -1,  109,  110,  131,   -1,
+          132,  132,  115,  116,  132,   74,   -1,  152,  150,   -1,
+          123,   80,  146,   -1,   -1,   84,   31,  146,   87,   88,
+           89,  146,   91,  146,   93,  146,   95,  146,  150,   98,
+            1,    2,  156,  159,  103,  104,  105,  155,  155,  155,
+          109,  110,  155,  156,  155,  155,  115,  116,  155,  155,
+          155,  155,  155,  155,  123,  155,  155,  155,  155,   74,
+          155,  155,  155,  155,  155,   80,  155,  155,  155,   84,
+          155,  155,   87,   88,   89,  155,   91,  155,   93,  156,
+           95,  156,  156,   98,  156,  156,  155,  156,  103,  104,
+          105,  156,  156,  156,  109,  110,  156,  156,  156,  156,
+          115,  116,  156,   74,  157,  157,  157,  157,  123,   80,
+           31,  157,  157,   84,  157,  157,   87,   88,   89,  157,
+           91,  157,   93,  157,   95,  157,  157,   98,  157,   50,
+           51,  157,  103,  104,  105,   56,  157,   58,  109,  110,
+          155,  156,  158,  157,  115,  116,  157,  157,  157,   70,
+          157,  157,  123,  157,   50,   51,  157,   78,   79,  157,
+           56,  157,   58,  157,  159,   86,  158,  158,  158,  158,
+          158,  158,  158,  158,   70,  158,  158,  158,  158,  158,
+          158,  158,   78,   79,  155,  156,  158,  160,  158,  163,
+           86,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+          159,  159,  159,  159,  159,  159,  159,  159,  159,  159,
+           -1,   -1,  161,  134,  161,  136,  137,  138,  139,  140,
+          141,  142,  162,  162,  162,  162,  162,  148,  149,  162,
+          162,  162,  162,  162,  162,  162,  162,  158,  134,  162,
+          136,  137,  138,  139,  140,  141,  142,   -1,   -1,   -1,
+           -1,   -1,  148,  149,   -1,   -1,   -1,   -1,   -1,   -1,
+           -1,   -1,  158
     );
 
     protected $actionBase = array(
-            0,  220,  295,  370,  445,  109,  109,  180,  744,   -2,
-           -2,   -2,   -2,   -2,  135,  655,  724,  756,  724,  623,
-          554,  825,  825,  825,  438,  353,  625,  625,  862,  625,
-          427,  390,  377,  449,  536,  615,  562,  393,  393,  393,
-          393,  134,  134,  393,  393,  393,  393,  393,  393,  393,
-          393,  393,  393,  393,  393,  393,  393,  393,  393,  393,
-          393,  393,  393,  393,  393,  393,  393,  393,  393,  393,
-          393,  393,  393,  393,  393,  393,  393,  393,  393,  393,
-          393,  393,  393,  393,  393,  393,  393,  393,  393,  393,
-          393,  393,  393,  393,  393,  393,  393,  393,  393,  393,
-          393,  393,  393,  393,  393,  393,  393,  393,  393,  393,
-          393,  393,  393,  393,  393,  393,  393,  393,  393,  393,
-          393,  393,  393,  393,  393,  393,  393,  393,  393,  393,
-          393,  393,  393,  300,  179,  446,  475,  751,  750,  746,
-          745,  838,  684,  860,  798,  799,  604,  800,  801,  802,
-          803,  805,  797,  806,  898,  807,  568,  568,  568,  568,
-          568,  568,  568,  568,  568,  568,  568,   -3,  365,  225,
-          308,  620,  662,  659,  659,  659,  659,  659,  659,  659,
-          505,  505,  505,  505,  505,  505,  505,  505,  505,  505,
-          505,  505,  505,  505,  505,  505,  505,  470,  552,  552,
-          552,  526,  887,  595,  912,  912,  912,  912,  912,  912,
-          912,  912,  912,  912,  912,  912,  912,  912,  912,  912,
-          912,  912,  912,  912,  912,  912,  912,  912,  912,  912,
-          912,  912,  912,  912,  912,  912,  912,  912,  912,  912,
-          912,  912,  912,  912,  912,  912,  912,  493,  -20,  -20,
-          477,  626,  402,  632,  210,  555,  197,   25,   25,   25,
-           25,   25,   17,   45,    5,    5,    5,    5,  335,  380,
-          380,  380,  380,  118,  118,  118,  118,  833,  827,  826,
-          821,  311,  311,  709,  709,  631,  779,  627,  627,  630,
-          630,  420,  420,  420,  420,  420,  420,  420,  420,  420,
-          420,  383,  105,  859,  130,  130,  130,  130,  306,   44,
-          657,  920,  264,  264,  264,  306,  248,  248,  248,  297,
-          297,  297,   76,  687,  371,   86,   86,   86,   86,  371,
-           86,   86,  588,  588,  588,  435,  759,  686,  436,  443,
-           97,  483,  693,  819,  691,  796,  549,  710,   96,  717,
-          716,  398,  675,  613,  610,  586,  651,  355,  398,  300,
-          557,  423,  607,  753,  667,   38,  747,  328,  268,  424,
-          547,  315,   -6,  279,  782,  755,  863,  861,  249,  133,
-          703,  607,  607,  607,   74,  199,  783,  789,  315,  290,
-          614,  614,  614,  614,  835,  792,  614,  614,  614,  614,
-          834,  795,  267,   67,  793,  137,  749,  642,  642,  642,
-          642,  642,  642,  608,  642,  853,  671,  843,  843,  660,
-          683,  608,  856,  856,  856,  856,  608,  642,  843,  843,
-          608,  631,  843,  168,  608,  666,  642,  664,  664,  856,
-          736,  735,  671,  673,  694,  843,  843,  843,  694,  660,
-          608,  856,  697,  641,  209,  843,  856,  618,  618,  697,
-          608,  618,  683,  618,   20,  597,  643,  855,  858,  852,
-          644,  790,  668,  658,  847,  846,  857,  661,  672,  848,
-          845,  720,  734,  733,  656,  513,  649,  647,  645,  634,
-          705,  605,  702,  675,  723,  585,  585,  585,  706,  707,
-          706,  585,  585,  585,  585,  585,  585,  585,  585,  911,
-          712,  676,  654,  665,  732,  481,  699,  689,  502,  772,
-          663,  720,  720,  831,  876,  885,  901,  704,  653,  842,
-          878,  706,  919,  738,  277,  606,  841,  832,  713,  652,
-          719,  706,  824,  706,  773,  706,  875,  830,  669,  720,
-          828,  585,  874,  918,  917,  916,  915,  914,  913,  903,
-          909,  650,  907,  731,  678,  884,   47,  854,  651,  708,
-          648,  730,  159,  906,  822,  706,  706,  774,  759,  706,
-          778,  729,  737,  900,  728,  883,  905,  663,  882,  706,
-          674,  904,  159,  616,  646,  891,  680,  726,  851,  682,
-          866,  850,  758,  574,  524,  721,  612,  752,  899,  889,
-          864,  743,  763,  765,  576,  688,  685,  679,  839,  769,
-          849,  722,  808,  811,  877,  692,  723,  711,  670,  690,
-          681,  770,  814,  881,  739,  740,  741,  818,  742,  836,
+            0,  227,  326,  400,  474,  233,  132,  132,  752,   -2,
+           -2,  138,   -2,   -2,   -2,  663,  761,  815,  761,  586,
+          717,  859,  859,  859,  244,  256,  256,  256,  413,  583,
+          583,  880,  546,  169,  415,  444,  409,  200,  200,  200,
+          200,  137,  137,  200,  200,  200,  200,  200,  200,  200,
+          200,  200,  200,  200,  200,  200,  200,  200,  200,  200,
+          200,  200,  200,  200,  200,  200,  200,  200,  200,  200,
+          200,  200,  200,  200,  200,  200,  200,  200,  200,  200,
+          200,  200,  200,  200,  200,  200,  200,  200,  200,  200,
+          200,  200,  200,  200,  200,  200,  200,  200,  200,  200,
+          200,  200,  200,  200,  200,  200,  200,  200,  200,  200,
+          200,  200,  200,  200,  200,  200,  200,  200,  200,  200,
+          200,  200,  200,  200,  200,  200,  200,  200,  200,  200,
+          200,  200,  200,  200,  200,  200,  249,  205,  738,  559,
+          535,  739,  741,  742,  876,  679,  877,  820,  821,  693,
+          823,  824,  826,  829,  832,  819,  834,  907,  836,  602,
+          602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+          602,   67,  536,  299,  510,  230,   44,  652,  652,  652,
+          652,  652,  652,  652,  337,  337,  337,  337,  337,  337,
+          337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
+          337,  337,  378,  584,  584,  584,  657,  909,  648,  934,
+          934,  934,  934,  934,  934,  934,  934,  934,  934,  934,
+          934,  934,  934,  934,  934,  934,  934,  934,  934,  934,
+          934,  934,  934,  934,  934,  934,  934,  934,  934,  934,
+          934,  934,  934,  934,  934,  934,  934,  934,  934,  934,
+          934,  934,  934,  503,  -21,  -21,  436,  650,  364,  571,
+          215,  426,  156,   26,   26,  329,  329,  329,  329,  329,
+           46,   46,    5,    5,    5,    5,  152,  186,  186,  186,
+          186,  120,  120,  120,  120,  374,  374,  429,  448,  448,
+          334,  267,  449,  449,  449,  449,  449,  449,  449,  449,
+          449,  449,  336,  427,  427,  572,  572,  408,  551,  551,
+          551,  551,  671,  171,  171,  391,  311,  311,  311,  109,
+          641,  856,   68,   68,   68,   68,   68,   68,  324,  324,
+          324,   -3,   -3,   -3,  655,   77,  380,   77,  380,  683,
+          685,   86,  685,  654,  -15,  516,  776,  281,  646,  809,
+          680,  816,  560,  711,  202,  578,  857,  643,  -23,  578,
+          578,  578,  578,  857,  622,  628,  596,  -23,  578,  -23,
+          639,  454,  849,  351,  249,  558,  469,  631,  743,  514,
+          688,  746,  464,  544,  548,  556,    7,  412,  708,  750,
+          878,  879,  349,  702,  631,  631,  631,  327,  101,    7,
+           -8,  623,  623,  623,  623,  219,  623,  623,  623,  623,
+          291,  430,  545,  401,  745,  653,  653,  675,  839,  814,
+          814,  653,  673,  653,  675,  841,  841,  841,  841,  653,
+          653,  653,  653,  814,  814,  667,  814,  275,  684,  694,
+          694,  841,  713,  714,  653,  653,  697,  814,  814,  814,
+          697,  687,  841,  669,  637,  333,  814,  841,  689,  673,
+          689,  653,  669,  689,  673,  673,  689,   22,  686,  656,
+          840,  842,  860,  756,  638,  644,  847,  848,  843,  845,
+          838,  692,  719,  720,  528,  659,  660,  661,  662,  696,
+          664,  698,  643,  658,  658,  658,  645,  701,  645,  658,
+          658,  658,  658,  658,  658,  658,  658,  632,  635,  709,
+          699,  670,  723,  566,  582,  758,  640,  636,  872,  865,
+          881,  883,  849,  870,  645,  890,  634,  288,  610,  850,
+          633,  753,  645,  851,  645,  759,  645,  873,  777,  666,
+          778,  779,  658,  874,  891,  892,  893,  894,  897,  898,
+          899,  900,  665,  901,  724,  674,  866,  344,  844,  639,
+          705,  677,  755,  725,  780,  372,  902,  784,  645,  645,
+          765,  706,  645,  766,  726,  712,  862,  727,  867,  903,
+          640,  678,  868,  645,  681,  785,  904,  372,  690,  651,
+          704,  649,  728,  858,  875,  853,  767,  612,  617,  787,
+          788,  792,  691,  730,  863,  864,  835,  731,  770,  642,
+          771,  676,  794,  772,  852,  732,  796,  798,  871,  647,
+          707,  682,  672,  668,  773,  799,  869,  733,  735,  736,
+          801,  737,  804,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,  137,  137,  137,  137,   -2,   -2,   -2,
+           -2,    0,    0,   -2,    0,    0,    0,  137,  137,  137,
+          137,  137,  137,  137,  137,  137,  137,  137,  137,  137,
+          137,  137,  137,  137,  137,  137,  137,  137,  137,  137,
+          137,  137,  137,    0,    0,  137,  137,  137,  137,  137,
+          137,  137,  137,  137,  137,  137,  137,  137,  137,  137,
+          137,  137,  137,  137,  137,  137,  137,  137,  137,  137,
+          137,  137,  137,  137,  137,  137,  137,  137,  137,  137,
+          137,  137,  137,  137,  137,  137,  137,  137,  137,  137,
+          137,  137,  137,  137,  137,  137,  137,  137,  137,  137,
+          137,  137,  137,  137,  137,  137,  137,  137,  137,  137,
+          137,  137,  137,  137,  137,  137,  137,  137,  137,  137,
+          137,  137,  137,  137,  137,  137,  137,  137,  137,  137,
+          137,  137,  137,  137,  137,  137,  137,  137,  602,  602,
+          602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+          602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+          602,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,  602,  -21,  -21,  -21,  -21,  602,  -21,
+          -21,  -21,  -21,  -21,  -21,  -21,  602,  602,  602,  602,
+          602,  602,  602,  602,  602,  602,  602,  602,  602,  602,
+          602,  602,  602,  602,  -21,  602,  602,  602,  -21,   68,
+          -21,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+           68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+           68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+           68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+           68,   68,   68,   68,   68,  602,    0,    0,  602,  -21,
+          602,  -21,  602,  -21,  -21,  602,  602,  602,  602,  602,
+          602,  602,  -21,  -21,  -21,  -21,  -21,  -21,    0,  324,
+          324,  324,  324,  -21,  -21,  -21,  -21,   68,   68,  147,
+           68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+           68,   68,   68,   68,   68,  324,  324,   -3,   -3,   68,
+           68,   68,   68,   68,  147,   68,   68,  -23,  673,  673,
+          673,  380,  380,  380,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,    0,    0,    0,  380,  -23,    0,  -23,
+            0,   68,  -23,  673,  -23,  380,  673,  673,  -23,  814,
+          604,  604,  604,  604,  372,    7,    0,    0,  673,  673,
+            0,    0,    0,    0,    0,  673,    0,    0,    0,    0,
+            0,    0,  814,    0,  653,    0,    0,    0,    0,  658,
+          288,    0,  677,  456,    0,    0,    0,    0,    0,    0,
+          677,  456,  530,  530,    0,  665,  658,  658,  658,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-          134,  134,  134,  134,   -2,   -2,   -2,   -2,    0,    0,
-            0,    0,    0,   -2,  134,  134,  134,  134,  134,  134,
-          134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-          134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-            0,    0,  134,  134,  134,  134,  134,  134,  134,  134,
-          134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-          134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-          134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-          134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-          134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-          134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-          134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-          134,  134,  134,  134,  134,  134,  134,  134,  134,  134,
-          134,  134,  568,  568,  568,  568,  568,  568,  568,  568,
-          568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
-          568,  568,  568,  568,  568,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,  568,  -20,  -20,  -20,
-          -20,  568,  -20,  -20,  -20,  -20,  -20,  -20,  -20,  568,
-          568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
-          568,  568,  568,  568,  568,  568,  -20,  568,  568,  568,
-          -20,  420,  -20,  420,  420,  420,  420,  420,  420,  420,
-          420,  420,  420,  420,  420,  420,  420,  420,  420,  420,
-          420,  420,  420,  420,  420,  420,  420,  420,  420,  420,
-          420,  420,  420,  420,  420,  420,  420,  420,  420,  420,
-          420,  420,  420,  420,  420,  420,  568,    0,    0,  568,
-          -20,  568,  -20,  568,  -20,  568,  568,  568,  568,  568,
-          568,  -20,  -20,  -20,  -20,  -20,  -20,    0,  248,  248,
-          248,  248,  -20,  -20,  -20,  -20,   55,   55,   55,   55,
-          420,  420,  420,  420,  420,  420,  248,  248,  297,  297,
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-          420,   55,  420,  642,  642,  642,  642,  642,  371,  371,
-          371,  106,  106,  106,  642,    0,    0,    0,    0,    0,
-            0,  642,  371,    0,  420,  420,  420,  420,    0,  420,
-          420,  642,  642,  642,  642,  106,  371,  642,  843,    0,
-          106,  591,  591,  591,  591,  159,  315,    0,  642,  642,
-            0,  673,    0,    0,    0,  843,    0,    0,    0,    0,
-            0,  585,  277,  842,    0,  360,    0,    0,    0,    0,
-            0,    0,    0,  653,  360,  450,  450,    0,    0,  650,
-          585,  585,  585,    0,    0,  653,  653,    0,    0,    0,
-            0,    0,    0,  379,  653,    0,    0,    0,    0,  379,
-          333,    0,    0,  333,    0,  159
+            0,    0,    0,    0,    0,    0,  372
     );
 
     protected $actionDefault = array(
             3,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,  525,  525,32767,  481,
-        32767,32767,32767,32767,32767,32767,32767,  287,  287,  287,
-        32767,32767,32767,  513,  513,  513,  513,  513,  513,  513,
-          513,  513,  513,  513,32767,32767,32767,32767,32767,  369,
+        32767,32767,32767,32767,32767,  540,  540,  495,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,  297,  297,  297,
+        32767,32767,32767,  528,  528,  528,  528,  528,  528,  528,
+          528,  528,  528,  528,32767,32767,32767,32767,32767,32767,
+          381,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,  375,  530,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,  350,  351,  353,  354,
-          286,  514,  237,  376,  529,  285,  239,  314,  485,32767,
-        32767,32767,  316,  116,  248,  193,  484,  119,  284,  224,
-          368,  370,  315,  291,  296,  297,  298,  299,  300,  301,
-          302,  303,  304,  305,  306,  307,  290,  441,  347,  346,
-          345,  443,32767,  442,  478,  478,  481,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,32767,  387,
+          545,32767,32767,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,32767,  362,
+          363,  365,  366,  296,  548,  529,  245,  388,  544,  295,
+          247,  325,  499,32767,32767,32767,  327,  122,  256,  201,
+          498,  125,  294,  232,  380,  382,  326,  301,  306,  307,
+          308,  309,  310,  311,  312,  313,  314,  315,  316,  317,
+          318,  300,  454,  359,  358,  357,  456,32767,  455,  492,
+          492,  495,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,  312,  469,  468,
-          313,  439,  317,  440,  319,  444,  318,  335,  336,  333,
-          334,  337,  446,  445,  462,  463,  460,  461,  289,  338,
-          339,  340,  341,  464,  465,  466,  467,  271,  271,  271,
-          271,32767,32767,  524,  524,32767,32767,  326,  327,  453,
-          454,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,  272,32767,  228,  228,  228,  228,  228,32767,
-        32767,32767,32767,32767,32767,32767,  321,  322,  320,  448,
-          449,  447,32767,  415,32767,32767,32767,32767,32767,  417,
-        32767,32767,32767,32767,32767,32767,32767,32767,32767,  486,
-        32767,32767,32767,32767,32767,32767,32767,  499,  404,32767,
-        32767,32767,  397,  212,  214,  161,  472,32767,32767,32767,
-        32767,  504,  331,32767,32767,32767,32767,32767,32767,  539,
-        32767,  499,32767,32767,32767,32767,32767,32767,32767,32767,
-          344,  323,  324,  325,32767,32767,32767,32767,  503,  497,
-          456,  457,  458,  459,32767,32767,  450,  451,  452,  455,
+        32767,32767,32767,  323,  483,  482,  324,  452,  328,  453,
+          331,  457,  460,  329,  330,  347,  348,  345,  346,  349,
+          458,  459,  476,  477,  474,  475,  299,  350,  351,  352,
+          353,  478,  479,  480,  481,32767,32767,  280,  539,  539,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,  165,32767,  412,32767,  418,  418,32767,
-        32767,  165,32767,32767,32767,32767,  165,32767,  502,  501,
-          165,32767,  398,  480,  165,  178,32767,  176,  176,32767,
-          198,  198,32767,32767,  180,  473,  492,32767,  180,32767,
-          165,32767,  386,  167,  480,32767,32767,  230,  230,  386,
-          165,  230,32767,  230,32767,   82,  422,32767,32767,32767,
+        32767,32767,32767,  338,  339,  467,  468,32767,  236,  236,
+          236,  236,  281,  236,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,  333,  334,
+          332,  462,  463,  461,  428,32767,32767,32767,  430,32767,
+        32767,32767,32767,32767,32767,32767,32767,  500,32767,32767,
+        32767,32767,32767,  513,  417,  171,32767,  409,32767,  171,
+          171,  171,  171,32767,  220,  222,  167,32767,  171,32767,
+          486,32767,32767,32767,32767,32767,  518,  343,32767,32767,
+          116,32767,32767,32767,  555,32767,  513,32767,  116,32767,
+        32767,32767,32767,  356,  335,  336,  337,32767,32767,  517,
+          511,  470,  471,  472,  473,32767,  464,  465,  466,  469,
+        32767,32767,32767,32767,32767,32767,32767,32767,  425,  431,
+          431,32767,32767,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,  516,  515,32767,  410,  494,  186,  184,
+          184,32767,  206,  206,32767,32767,  188,  487,  506,32767,
+          188,  173,32767,  398,  175,  494,32767,32767,  238,32767,
+          238,32767,  398,  238,32767,32767,  238,32767,  411,  435,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,  399,32767,32767,32767,32767,  365,  366,  475,  488,
-        32767,  489,32767,  397,32767,  329,  330,  332,  309,32767,
-          311,  355,  356,  357,  358,  359,  360,  361,  363,32767,
-          402,32767,  405,32767,32767,32767,   84,  108,  247,32767,
-          537,   84,  400,32767,32767,  294,  537,32767,32767,32767,
-        32767,  532,32767,32767,  288,32767,32767,32767,   84,32767,
-           84,  243,32767,  163,32767,  522,32767,  497,32767,  401,
-        32767,  328,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,  498,32767,32767,32767,32767,  219,32767,  435,32767,
-           84,32767,  179,32767,32767,  292,  238,32767,32767,  531,
-        32767,32767,32767,32767,32767,32767,32767,32767,32767,  164,
-        32767,32767,  181,32767,32767,  497,32767,32767,32767,32767,
-        32767,32767,32767,32767,  283,32767,32767,32767,32767,32767,
-          497,32767,32767,32767,  223,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,   82,   60,32767,  265,32767,
-        32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-          121,  121,    3,  121,  121,    3,  121,  121,  121,  121,
-          121,  121,  121,  121,  121,  121,  121,  206,  250,  209,
-          198,  198,  158,  250,  250,  250,  121,  121,  257
+        32767,32767,32767,32767,32767,  377,  378,  489,  502,32767,
+          503,32767,  409,  341,  342,  344,  320,32767,  322,  367,
+          368,  369,  370,  371,  372,  373,  375,32767,  415,32767,
+          418,32767,32767,32767,  255,32767,  553,32767,32767,  304,
+          553,32767,32767,32767,  547,32767,32767,  298,32767,32767,
+        32767,32767,  251,32767,  169,32767,  537,32767,  554,32767,
+          511,32767,  340,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,  512,32767,32767,32767,32767,  227,32767,  448,
+        32767,  116,32767,32767,32767,  187,32767,32767,  302,  246,
+        32767,32767,  546,32767,32767,32767,32767,32767,32767,32767,
+        32767,  114,32767,  170,32767,32767,32767,  189,32767,32767,
+          511,32767,32767,32767,32767,32767,32767,32767,  293,32767,
+        32767,32767,32767,32767,32767,32767,  511,32767,32767,  231,
+        32767,32767,32767,32767,32767,32767,32767,32767,32767,  411,
+        32767,  274,32767,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,  127,  127,    3,  127,  127,  258,    3,
+          258,  127,  258,  258,  127,  127,  127,  127,  127,  127,
+          127,  127,  127,  127,  214,  217,  206,  206,  164,  127,
+          127,  266
     );
 
     protected $goto = array(
-          162,  162,  136,  136,  141,  136,  137,  138,  139,  144,
-          146,  183,  164,  160,  160,  160,  160,  141,  141,  161,
-          161,  161,  161,  161,  161,  161,  161,  161,  161,  161,
-          156,  157,  158,  159,  180,  135,  181,  495,  496,  362,
-          497,  501,  502,  503,  504,  505,  506,  507,  508,  964,
-          140,  142,  143,  145,  167,  172,  182,  198,  247,  250,
-          252,  254,  256,  257,  258,  259,  260,  261,  269,  270,
-          271,  272,  287,  288,  316,  317,  318,  381,  382,  383,
-          551,  184,  185,  186,  187,  188,  189,  190,  191,  192,
-          193,  194,  195,  196,  147,  148,  149,  163,  150,  165,
-          151,  199,  166,  152,  153,  154,  200,  155,  133,  627,
-          569,  786,  569,  569,  569,  569,  569,  569,  569,  569,
-          569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
-          569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
-          569,  569,  569,  569,  569,  569,  569,  569,  569,  569,
-          569,  569,  569,  569,  569, 1102,  636, 1102, 1102, 1102,
-         1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102,
-         1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102,
-         1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102,
-         1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102, 1102,
-          525,  817,  499,  499,  499,  499,  499,  499, 1171,  510,
-         1171,  510,  499,  499,  499,  499,  499,  499,  499,  499,
-          499,  499,  511,  552,  511,  582,  608,  524,  887,  887,
-         1192, 1192,  755,  851,  851,  851,  851,  170,  846,  852,
-          524,  524,  173,  174,  175,  390,  391,  392,  393,  169,
-          197,  201,  203,  251,  253,  255,  262,  263,  264,  265,
-          266,  267,  273,  274,  275,  276,  289,  290,  319,  320,
-          321,  396,  397,  398,  399,  171,  176,  248,  249,  177,
-          178,  179,  389,  610,  545,  545,  575,  541,    8,  343,
-         1078, 1077,  543,  543,  498,  500,  531,  547,  576,  579,
-          589,  595,  550,  756,  568,  574,  568,  568,  568,  568,
-          568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
-          568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
-          568,  568,  568,  568,  568,  568,  568,  568,  568,  568,
-          568,  568,  568,  568,  568,  568,  568,  568,  568,  516,
-          445,  447,  935,  638,  329,  311, 1103,  620,  933,  521,
-          521,  521,  521,  779,  553,  554,  555,  556,  557,  558,
-          559,  560,  562,  591,  857,  613,  540,  521,  619,  512,
-          360,  512,  905,  432,  432,  432,  432,  432,  432,  546,
-          779,  779, 1196,  432,  432,  432,  432,  432,  432,  432,
-          432,  432,  432, 1067, 1163, 1067,  894,  894,  894,  894,
-          894, 1170,  363, 1170,  585,  588,  633,  894,  371,  371,
-          371, 1060, 1186, 1186, 1186,    3,    4, 1067, 1067, 1067,
-         1067,  600, 1067, 1067,  521,  521,  538,  570,  521,  521,
-          617,  521,  371, 1151,  962,  609, 1169,  388,  772,  772,
-          780,  780,  780,  782,  522,  771, 1189, 1202, 1202,  537,
-          377,  659,  564,  549,  596,  884,  615,  618,  880,  622,
-          623,  630,  632,  637,  639,  900, 1202, 1203, 1203,  364,
-          592,  346,  406,  529, 1205,  754,  891,  542,  278,  279,
-          280, 1011,  349, 1063, 1064,  400, 1203, 1060,  873,  855,
-          853,  855,  657,  453,  513,  882,  877, 1083,  344,  345,
-         1061, 1162, 1061,   12, 1021,   19,   15,  357,  775,  773,
-         1062,  370,  375,  909,  404,  666, 1053,  448, 1058,  783,
-          580,  563,  861,  914, 1148,  461,  951,    0,    0,    0,
-            0,    0,    0,   23,    0,    0,    0,    0,  606,    0,
+          166,  140,  140,  140,  166,  187,  168,  144,  147,  141,
+          142,  143,  149,  163,  163,  163,  163,  144,  144,  165,
+          165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
+          138,  159,  160,  161,  162,  184,  139,  185,  493,  494,
+          377,  495,  499,  500,  501,  502,  503,  504,  505,  506,
+          967,  164,  145,  146,  148,  171,  176,  186,  203,  253,
+          256,  258,  260,  263,  264,  265,  266,  267,  268,  269,
+          277,  278,  279,  280,  303,  304,  328,  329,  330,  394,
+          395,  396,  542,  188,  189,  190,  191,  192,  193,  194,
+          195,  196,  197,  198,  199,  200,  201,  150,  151,  152,
+          167,  153,  169,  154,  204,  170,  155,  156,  157,  205,
+          158,  136,  620,  560,  756,  560,  560,  560,  560,  560,
+          560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+          560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+          560,  560,  560,  560,  560,  560,  560,  560,  560,  560,
+          560,  560,  560,  560,  560,  560,  560,  560,  560, 1108,
+          628, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108,
+         1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108,
+         1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108,
+         1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108, 1108,
+         1108, 1108, 1108, 1108, 1108,  757,  888,  888,  508, 1200,
+         1200,  400,  606,  508,  536,  536,  568,  532,  534,  534,
+          496,  498,  524,  540,  569,  572,  583,  590,  852,  852,
+          852,  852,  847,  853,  174,  585,  519,  600,  601,  177,
+          178,  179,  401,  402,  403,  404,  173,  202,  206,  208,
+          257,  259,  261,  262,  270,  271,  272,  273,  274,  275,
+          281,  282,  283,  284,  305,  306,  331,  332,  333,  406,
+          407,  408,  409,  175,  180,  254,  255,  181,  182,  183,
+          497,  497,  785,  497,  497,  497,  497,  497,  497,  497,
+          497,  497,  497,  497,  497,  497,  497,  509,  578,  582,
+          626,  749,  509,  544,  545,  546,  547,  548,  549,  550,
+          551,  553,  586,  338,  559,  321,  559,  559,  559,  559,
+          559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
+          559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
+          559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
+          559,  559,  559,  559,  559,  559,  559,  559,  559,  559,
+          530,  349,  655,  555,  587,  352,  414,  591,  575,  604,
+          885,  611,  612,  881,  616,  617,  623,  625,  630,  632,
+          298,  296,  296,  296,  298,  290,  299,  944,  610,  816,
+         1170,  613,  436,  436,  375,  436,  436,  436,  436,  436,
+          436,  436,  436,  436,  436,  436,  436,  436,  436, 1072,
+         1084, 1083,  945, 1065, 1072,  895,  895,  895,  895, 1178,
+          895,  895, 1212, 1212, 1178,  388,  858,  561,  755, 1072,
+         1072, 1072, 1072, 1072, 1072,    3,    4,  384,  384,  384,
+         1212,  874,  856,  854,  856,  654,  465,  511,  883,  878,
+         1089,  541,  384,  537,  384,  567,  384, 1026,   19,   15,
+          371,  384, 1226,  510, 1204, 1192, 1192, 1192,  510,  906,
+          372,  522,  533,  554,  912,  514, 1068, 1069,   13, 1065,
+          378,  912, 1158,  594,   23,  965,  386,  386,  386,  602,
+         1066, 1169, 1066,  937,  447,  449,  631,  752, 1177, 1067,
+         1109,  614,  935, 1177,  605, 1197,  391, 1211, 1211,  543,
+          892,  386, 1194, 1194, 1194,  399,  518, 1016,  901,  389,
+          771,  529,  752,  340,  752, 1211,  518,  518,  385,  781,
+         1214,  770,  772, 1063,  910,  774, 1058, 1176,  659,  953,
+          514,  782,  862,  915,  450,  573, 1155,    0,  463,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,    0,  513,  528,    0,    0,    0,    0,
+          513,    0,  528,    0,  350,  351,    0,  609,  512,  515,
+          438,  439, 1064,  618,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,  779, 1219,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,  943,    0,    0,    0,
+          777,    0,    0,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-          530
+          523,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+            0,  301,  301
     );
 
     protected $gotoCheck = array(
-           39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-           39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-           39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-           39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-           39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-           39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-           39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-           39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-           39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-           39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-           39,   39,   39,   39,   39,   39,   39,   39,   39,   53,
-           63,   25,   63,   63,   63,   63,   63,   63,   63,   63,
-           63,   63,   63,   63,   63,   63,   63,   63,   63,   63,
-           63,   63,   63,   63,   63,   63,   63,   63,   63,   63,
-           63,   63,   63,   63,   63,   63,   63,   63,   63,   63,
-           63,   63,   63,   63,   63,  119,    5,  119,  119,  119,
-          119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-          119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-          119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-          119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-           94,   46,  110,  110,  110,  110,  110,  110,  111,   63,
-          111,   63,  110,  110,  110,  110,  110,  110,  110,  110,
-          110,  110,  110,   40,  110,   36,   36,   40,   71,   71,
-           71,   71,   11,   63,   63,   63,   63,   23,   63,   63,
-           40,   40,   23,   23,   23,   23,   23,   23,   23,   23,
-           23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-           23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-           23,   23,   23,   23,   23,   23,   23,   23,   23,   23,
-           23,   23,   47,   47,   47,   47,   47,   47,   91,   66,
-          117,  117,   47,   47,   47,   47,   47,   47,   47,   47,
-           47,   47,    2,   12,   53,    2,   53,   53,   53,   53,
-           53,   53,   53,   53,   53,   53,   53,   53,   53,   53,
-           53,   53,   53,   53,   53,   53,   53,   53,   53,   53,
-           53,   53,   53,   53,   53,   53,   53,   53,   53,   53,
-           53,   53,   53,   53,   53,   53,   53,   53,   53,    8,
-            7,    7,    7,    7,  118,  118,    7,    7,    7,    8,
-            8,    8,    8,   19,  103,  103,  103,  103,  103,  103,
-          103,  103,  103,  103,   29,   57,    8,    8,   57,  115,
-           57,  115,   78,   53,   53,   53,   53,   53,   53,  102,
-           19,   19,  132,   53,   53,   53,   53,   53,   53,   53,
-           53,   53,   53,   53,   76,   53,   53,   53,   53,   53,
-           53,  112,   43,  112,   56,   56,   56,   53,  116,  116,
-          116,   76,  112,  112,  112,   26,   26,   53,   53,   53,
-           53,  120,   53,   53,    8,    8,    8,    8,    8,    8,
-           53,    8,  116,  124,   94,   45,  112,  116,   19,   19,
-           19,   19,   19,   19,    8,   19,  130,  133,  133,   28,
-           44,   28,   28,    8,   28,   28,   28,   28,   28,   28,
-           28,   28,   28,   28,   28,   75,  133,  134,  134,   54,
-           64,   64,   64,   54,  133,   10,   73,   54,   61,   61,
-           61,   95,   14,   76,   76,   18,  134,   76,   10,   10,
-           10,   10,   10,   54,   10,   10,   10,   30,   66,   66,
-           76,   76,   76,   54,   30,   30,   30,   30,   21,   20,
-           76,    9,   13,   79,   17,   68,  106,   59,  108,   22,
-           60,   30,   65,   80,  123,  101,   93,   -1,   -1,   -1,
-           -1,   -1,   -1,   30,   -1,   -1,   -1,   -1,   30,   -1,
+           43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+           43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+           43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+           43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+           43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+           43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+           43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+           43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+           43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+           43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+           43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+           43,   43,   57,   68,   15,   68,   68,   68,   68,   68,
+           68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+           68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+           68,   68,   68,   68,   68,   68,   68,   68,   68,   68,
+           68,   68,   68,   68,   68,   68,   68,   68,   68,  126,
+            9,  126,  126,  126,  126,  126,  126,  126,  126,  126,
+          126,  126,  126,  126,  126,  126,  126,  126,  126,  126,
+          126,  126,  126,  126,  126,  126,  126,  126,  126,  126,
+          126,  126,  126,  126,  126,  126,  126,  126,  126,  126,
+          126,  126,  126,  126,  126,   16,   76,   76,   68,   76,
+           76,   51,   51,   68,   51,   51,   51,   51,   51,   51,
+           51,   51,   51,   51,   51,   51,   51,   51,   68,   68,
+           68,   68,   68,   68,   27,   66,  101,   66,   66,   27,
+           27,   27,   27,   27,   27,   27,   27,   27,   27,   27,
+           27,   27,   27,   27,   27,   27,   27,   27,   27,   27,
+           27,   27,   27,   27,   27,   27,   27,   27,   27,   27,
+           27,   27,   27,   27,   27,   27,   27,   27,   27,   27,
+          117,  117,   29,  117,  117,  117,  117,  117,  117,  117,
+          117,  117,  117,  117,  117,  117,  117,  117,   61,   61,
+           61,    6,  117,  110,  110,  110,  110,  110,  110,  110,
+          110,  110,  110,  125,   57,  125,   57,   57,   57,   57,
+           57,   57,   57,   57,   57,   57,   57,   57,   57,   57,
+           57,   57,   57,   57,   57,   57,   57,   57,   57,   57,
+           57,   57,   57,   57,   57,   57,   57,   57,   57,   57,
+           57,   57,   57,   57,   57,   57,   57,   57,   57,   57,
+           32,   71,   32,   32,   69,   69,   69,   32,   40,   40,
+           32,   32,   32,   32,   32,   32,   32,   32,   32,   32,
+            5,    5,    5,    5,    5,    5,    5,   97,   62,   50,
+           81,   62,   57,   57,   62,   57,   57,   57,   57,   57,
+           57,   57,   57,   57,   57,   57,   57,   57,   57,   57,
+          124,  124,   97,   81,   57,   57,   57,   57,   57,  118,
+           57,   57,  142,  142,  118,   12,   33,   12,   14,   57,
+           57,   57,   57,   57,   57,   30,   30,   13,   13,   13,
+          142,   14,   14,   14,   14,   14,   57,   14,   14,   14,
+           34,    2,   13,  109,   13,    2,   13,   34,   34,   34,
+           34,   13,   13,  122,  140,    9,    9,    9,  122,   83,
+           58,   58,   58,   34,   13,   13,   81,   81,   58,   81,
+           46,   13,  131,  127,   34,  101,  123,  123,  123,   34,
+           81,   81,   81,    8,    8,    8,    8,   11,  119,   81,
+            8,    8,    8,  119,   49,  138,   48,  141,  141,   47,
+           78,  123,  119,  119,  119,  123,   47,  102,   80,   17,
+           23,    9,   11,   18,   11,  141,   47,   47,   11,   23,
+          141,   23,   24,  115,   84,   25,  113,  119,   73,   99,
+           13,   26,   70,   85,   64,   65,  130,   -1,  108,   -1,
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+           -1,   -1,   -1,   -1,    9,    9,   -1,   -1,   -1,   -1,
+            9,   -1,    9,   -1,   71,   71,   -1,   13,    9,    9,
+            9,    9,   13,   13,   -1,   -1,   -1,   -1,   -1,   -1,
+           -1,   -1,   -1,    9,    9,   -1,   -1,   -1,   -1,   -1,
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-           -1,   -1,   -1,   -1,   -1,   -1,   91,   -1,   -1,   -1,
+            9,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
            -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-           94
+          101,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+           -1,    5,    5
     );
 
     protected $gotoBase = array(
-            0,    0, -340,    0,    0,  142,    0,  345,   27,  186,
-          483,  230,  301,  173,  170,    0,    0,  116,  162,   41,
-          169,  184,   87,   35,    0,  101, -241,    0, -182,  354,
-           92,    0,    0,    0,    0,    0,  187,    0,    0,  -24,
-          199,    0,    0,  372,  168,  163,  183,    1,    0,    0,
-            0,    0,    0,  102,   53,    0,  109,  -83,    0,   89,
-           82, -175,    0,  -92,  154,   83, -152,    0,  166,    0,
-            0,  -53,    0,  178,    0,  160,   65,    0,  357,  165,
-           90,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,  274,    0,   74,  159,  188,    0,    0,    0,    0,
-            0,   76,  362,  320,    0,    0,  108,    0,  107,    0,
-          -79,  -93,  110,    0,    0,   78,  106,  -23,   31,  -47,
-          226,    0,    0,   80,  237,    0,    0,    0,    0,    0,
-          172,    0,  363,  147,  167,    0,    0
+            0,    0, -184,    0,    0,  356,  290,    0,  488,  149,
+            0,  182,   85,  118,  426,  112,  203,  179,  208,    0,
+            0,    0,    0,  162,  190,  198,  120,   27,    0,  272,
+         -224,    0, -274,  406,   32,    0,    0,    0,    0,    0,
+          330,    0,    0,  -24,    0,    0,  440,  485,  213,  218,
+          371,  -74,    0,    0,    0,    0,    0,  107,  110,    0,
+            0,  -11,  -72,    0,  104,   95, -405,    0,  -94,   41,
+          119,  -82,    0,  164,    0,    0,  -79,    0,  197,    0,
+          204,   43,    0,  441,  171,  121,    0,    0,    0,    0,
+            0,    0,    0,    0,    0,    0,    0,  100,    0,  115,
+            0,  195,  210,    0,    0,    0,    0,    0,   86,  427,
+          259,    0,    0,  116,    0,  174,    0,   -5,  117,  196,
+            0,    0,  161,  170,   93,  -21,  -48,  273,    0,    0,
+           91,  271,    0,    0,    0,    0,    0,    0,  216,    0,
+          437,  187,  102,    0,    0
     );
 
     protected $gotoDefault = array(
-        -32768,  464,  670,    2,  671,  742,  750,  603,  481,  517,
-          792,  793,  794,  366,  412,  482,  365,  401,  394,  781,
-          774,  776,  784,  168,  402,  787,    1,  789,  523,  825,
-         1012,  353,  797,  354,  594,  799,  533,  801,  802,  134,
-          483,  367,  368,  534,  376,  583,  816,  268,  373,  818,
-          355,  819,  828,  356,  616,  599,  565,  612,  484,  444,
-          577,  277,  544, 1075,  572,  860,  342,  868,  667,  876,
-          879,  485,  566,  890,  450,  898, 1088,  384,  904,  910,
-          915,  918,  420,  403,  590,  922,  923,    7,  927,  628,
-          629,  942,  302,  950,  963,  418, 1031, 1033,  486,  487,
-          527,  458,  509,  532,  488, 1054,  438,  405, 1057,  489,
-          490,  428,  429, 1072,  348, 1156,  347,  446,  310, 1143,
-          586, 1107,  454, 1195, 1152,  339,  491,  492,  361,  378,
-         1190,  433, 1197, 1204,  337,  369,  573
+        -32768,  467,  663,    2,  664,  834,  739,  747,  597,  481,
+          629,  581,  380, 1188,  791,  792,  793,  381,  367,  482,
+          379,  410,  405,  780,  773,  775,  783,  172,  411,  786,
+            1,  788,  517,  824, 1017,  364,  796,  365,  589,  798,
+          526,  800,  801,  137,  382,  383,  527,  483,  390,  576,
+          815,  276,  387,  817,  366,  818,  827,  370,  464,  454,
+          459,  556,  608,  432,  446,  570,  564,  535, 1081,  565,
+          861,  348,  869,  660,  877,  880,  484,  557,  891,  451,
+          899, 1094,  397,  905,  911,  916,  287,  919,  417,  412,
+          584,  924,  925,    5,  929,  621,  622,    8,  312,  952,
+          598,  966,  420, 1036, 1038,  485,  486,  521,  458,  507,
+          525,  487, 1059,  440,  413, 1062,  488,  489,  433,  434,
+         1078,  354, 1163,  353,  448,  320, 1150,  579, 1113,  455,
+         1203, 1159,  347,  490,  491,  376, 1182,  392, 1198,  437,
+         1205, 1213,  343,  539,  566
     );
 
     protected $ruleToNonTerminal = array(
-            0,    1,    3,    3,    2,    5,    5,    5,    5,    5,
-            5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-            5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-            5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-            5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-            5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-            5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-            5,    5,    5,    6,    6,    6,    6,    6,    6,    6,
-            7,    7,    8,    8,    9,    4,    4,    4,    4,    4,
-            4,    4,    4,    4,    4,    4,   14,   14,   15,   15,
-           15,   15,   17,   17,   13,   13,   18,   18,   19,   19,
-           20,   20,   21,   21,   16,   16,   22,   24,   24,   25,
-           26,   26,   28,   27,   27,   27,   27,   29,   29,   29,
-           29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
-           29,   29,   29,   29,   29,   29,   29,   29,   29,   29,
-           29,   29,   29,   29,   29,   29,   10,   10,   50,   50,
-           52,   51,   51,   44,   44,   54,   54,   55,   55,   11,
-           12,   12,   12,   58,   58,   58,   59,   59,   62,   62,
-           60,   60,   64,   64,   37,   37,   46,   46,   49,   49,
-           49,   48,   48,   65,   38,   38,   38,   38,   66,   66,
-           67,   67,   68,   68,   35,   35,   31,   31,   69,   33,
-           33,   70,   32,   32,   34,   34,   45,   45,   45,   56,
-           56,   72,   72,   73,   73,   75,   75,   75,   74,   74,
-           57,   57,   76,   76,   76,   77,   77,   78,   78,   78,
-           41,   41,   79,   79,   79,   42,   42,   80,   80,   61,
-           61,   81,   81,   81,   81,   86,   86,   87,   87,   88,
-           88,   88,   88,   88,   89,   90,   90,   85,   85,   82,
-           82,   84,   84,   92,   92,   91,   91,   91,   91,   91,
-           91,   83,   83,   93,   93,   43,   43,   36,   36,   39,
-           39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-           39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-           39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-           39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-           39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-           39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-           39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-           39,   39,   39,   39,   39,   39,   39,   39,   39,   39,
-           39,   39,   39,   30,   30,   40,   40,   98,   98,   99,
-           99,   99,   99,  105,   94,   94,  101,  101,  107,  107,
-          108,  109,  109,  109,  109,  109,  109,   63,   63,   53,
-           53,   53,   95,   95,  113,  113,  110,  110,  114,  114,
-          114,  114,   96,   96,   96,  100,  100,  100,  106,  106,
-          119,  119,  119,  119,  119,  119,  119,  119,  119,  119,
-          119,  119,  119,   23,   23,   23,   23,   23,   23,  121,
-          121,  121,  121,  121,  121,  121,  121,  121,  121,  121,
-          121,  121,  121,  121,  121,  121,  121,  121,  121,  121,
-          121,  121,  121,  121,  121,  121,  121,  121,  121,  121,
-          121,  121,  104,  104,   97,   97,   97,   97,  120,  120,
-          123,  123,  122,  122,  124,  124,   47,   47,   47,   47,
-          126,  126,  125,  125,  125,  125,  125,  127,  127,  112,
-          112,  115,  115,  111,  111,  128,  128,  128,  128,  116,
-          116,  116,  116,  103,  103,  117,  117,  117,  117,   71,
-          129,  129,  130,  130,  130,  102,  102,  131,  131,  132,
-          132,  132,  132,  118,  118,  118,  118,  134,  135,  133,
-          133,  133,  133,  133,  133,  133,  136,  136,  136
+            0,    1,    3,    3,    2,    5,    5,    6,    6,    6,
+            6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+            6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+            6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+            6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+            6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+            6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+            6,    6,    6,    6,    6,    6,    6,    7,    7,    7,
+            7,    7,    7,    7,    8,    8,    9,   10,   11,   11,
+           12,   12,   13,    4,    4,    4,    4,    4,    4,    4,
+            4,    4,    4,    4,   18,   18,   19,   19,   21,   21,
+           17,   17,   22,   22,   23,   23,   24,   24,   25,   25,
+           20,   20,   26,   28,   28,   29,   30,   30,   32,   31,
+           31,   31,   31,   33,   33,   33,   33,   33,   33,   33,
+           33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+           33,   33,   33,   33,   33,   33,   33,   33,   33,   33,
+           33,   33,   14,   14,   54,   54,   56,   55,   55,   48,
+           48,   58,   58,   59,   59,   60,   60,   15,   16,   16,
+           16,   63,   63,   63,   64,   64,   67,   67,   65,   65,
+           69,   69,   41,   41,   50,   50,   53,   53,   53,   52,
+           52,   70,   42,   42,   42,   42,   71,   71,   72,   72,
+           73,   73,   39,   39,   35,   35,   74,   37,   37,   75,
+           36,   36,   38,   38,   49,   49,   49,   61,   61,   77,
+           77,   78,   78,   80,   80,   80,   79,   79,   62,   62,
+           81,   81,   81,   82,   82,   83,   83,   83,   44,   44,
+           84,   84,   84,   45,   45,   85,   85,   86,   86,   66,
+           87,   87,   87,   87,   92,   92,   93,   93,   94,   94,
+           94,   94,   94,   95,   96,   96,   91,   91,   88,   88,
+           90,   90,   98,   98,   97,   97,   97,   97,   97,   97,
+           89,   89,  100,   99,   99,   46,   46,   40,   40,   43,
+           43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+           43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+           43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+           43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+           43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+           43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+           43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+           43,   43,   43,   43,   43,   43,   43,   43,   43,   43,
+           43,   43,   43,   43,   43,   34,   34,   47,   47,  105,
+          105,  106,  106,  106,  106,  112,  101,  101,  108,  108,
+          114,  114,  115,  116,  116,  116,  116,  116,  116,   68,
+           68,   57,   57,   57,   57,  102,  102,  120,  120,  117,
+          117,  121,  121,  121,  121,  103,  103,  103,  107,  107,
+          107,  113,  113,  126,  126,  126,  126,  126,  126,  126,
+          126,  126,  126,  126,  126,  126,   27,   27,   27,   27,
+           27,   27,  128,  128,  128,  128,  128,  128,  128,  128,
+          128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
+          128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
+          128,  128,  128,  128,  128,  128,  111,  111,  104,  104,
+          104,  104,  127,  127,  130,  130,  129,  129,  131,  131,
+           51,   51,   51,   51,  133,  133,  132,  132,  132,  132,
+          132,  134,  134,  119,  119,  122,  122,  118,  118,  136,
+          135,  135,  135,  135,  123,  123,  123,  123,  110,  110,
+          124,  124,  124,  124,   76,  137,  137,  138,  138,  138,
+          109,  109,  139,  139,  140,  140,  140,  140,  140,  125,
+          125,  125,  125,  142,  143,  141,  141,  141,  141,  141,
+          141,  141,  144,  144,  144
     );
 
     protected $ruleToLength = array(
@@ -862,2292 +891,1784 @@ class Php5 extends \PhpParser\ParserAbstract
             1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
             1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
             1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-            1,    1,    1,    3,    1,    1,    1,    1,    1,    3,
-            5,    4,    3,    4,    2,    3,    1,    1,    7,    8,
-            6,    7,    3,    1,    3,    1,    3,    1,    1,    3,
-            1,    2,    1,    2,    3,    1,    3,    3,    1,    3,
-            2,    0,    1,    1,    1,    1,    1,    3,    5,    8,
-            3,    5,    9,    3,    2,    3,    2,    3,    2,    3,
-            2,    3,    3,    3,    1,    2,    5,    7,    9,    5,
-            6,    3,    3,    2,    2,    1,    1,    1,    0,    2,
-            8,    0,    4,    1,    3,    0,    1,    0,    1,   10,
-            7,    6,    5,    1,    2,    2,    0,    2,    0,    2,
-            0,    2,    1,    3,    1,    4,    1,    4,    1,    1,
-            4,    1,    3,    3,    3,    4,    4,    5,    0,    2,
-            4,    3,    1,    1,    1,    4,    0,    2,    3,    0,
-            2,    4,    0,    2,    0,    3,    1,    2,    1,    1,
-            0,    1,    3,    4,    6,    1,    1,    1,    0,    1,
-            0,    2,    2,    3,    3,    1,    3,    1,    2,    2,
-            3,    1,    1,    2,    4,    3,    1,    1,    3,    2,
-            0,    3,    3,    9,    3,    1,    3,    0,    2,    4,
-            5,    4,    4,    4,    3,    1,    1,    1,    3,    1,
-            1,    0,    1,    1,    2,    1,    1,    1,    1,    1,
-            1,    1,    3,    1,    3,    3,    1,    0,    1,    1,
+            1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+            1,    1,    1,    1,    1,    1,    1,    3,    5,    4,
+            3,    4,    2,    3,    1,    1,    7,    6,    3,    1,
+            3,    1,    3,    1,    1,    3,    1,    3,    1,    2,
+            3,    1,    3,    3,    1,    3,    2,    0,    1,    1,
+            1,    1,    1,    3,    5,    8,    3,    5,    9,    3,
+            2,    3,    2,    3,    2,    3,    3,    3,    3,    1,
+            2,    2,    5,    7,    9,    5,    6,    3,    3,    2,
+            2,    1,    1,    1,    0,    2,    8,    0,    4,    1,
+            3,    0,    1,    0,    1,    0,    1,   10,    7,    6,
+            5,    1,    2,    2,    0,    2,    0,    2,    0,    2,
+            1,    3,    1,    4,    1,    4,    1,    1,    4,    1,
+            3,    3,    3,    4,    4,    5,    0,    2,    4,    3,
+            1,    1,    1,    4,    0,    2,    3,    0,    2,    4,
+            0,    2,    0,    3,    1,    2,    1,    1,    0,    1,
+            3,    4,    6,    1,    1,    1,    0,    1,    0,    2,
+            2,    3,    3,    1,    3,    1,    2,    2,    3,    1,
+            1,    2,    4,    3,    1,    1,    3,    2,    0,    1,
+            3,    3,    9,    3,    1,    3,    0,    2,    4,    5,
+            4,    4,    4,    3,    1,    1,    1,    3,    1,    1,
+            0,    1,    1,    2,    1,    1,    1,    1,    1,    1,
+            1,    3,    1,    1,    3,    3,    1,    0,    1,    1,
             3,    3,    4,    4,    1,    2,    3,    3,    3,    3,
-            3,    3,    3,    3,    3,    3,    3,    3,    2,    2,
-            2,    2,    3,    3,    3,    3,    3,    3,    3,    3,
             3,    3,    3,    3,    3,    3,    3,    3,    3,    2,
             2,    2,    2,    3,    3,    3,    3,    3,    3,    3,
-            3,    3,    3,    1,    3,    5,    4,    3,    4,    4,
-            2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
-            2,    2,    2,    2,    1,    1,    1,    3,    2,    1,
-            2,   10,   11,    3,    3,    2,    4,    4,    3,    4,
-            4,    4,    4,    7,    3,    2,    0,    4,    1,    3,
-            2,    2,    4,    6,    2,    2,    4,    1,    1,    1,
-            2,    3,    1,    1,    1,    1,    1,    1,    3,    3,
-            4,    4,    0,    2,    1,    0,    1,    1,    0,    1,
-            1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-            1,    3,    2,    1,    3,    1,    4,    3,    1,    3,
             3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-            3,    3,    3,    3,    3,    3,    2,    2,    2,    2,
-            3,    3,    3,    3,    3,    3,    3,    3,    5,    4,
-            4,    3,    1,    3,    1,    1,    3,    3,    0,    2,
-            0,    1,    3,    1,    3,    1,    1,    1,    1,    1,
-            6,    4,    3,    4,    2,    4,    4,    1,    3,    1,
-            2,    1,    1,    4,    1,    3,    6,    4,    4,    4,
-            4,    1,    4,    0,    1,    1,    3,    1,    1,    4,
-            3,    1,    1,    1,    0,    0,    2,    3,    1,    3,
-            1,    4,    2,    2,    2,    1,    2,    1,    1,    1,
-            4,    3,    3,    3,    6,    3,    1,    1,    1
+            3,    2,    2,    2,    2,    3,    3,    3,    3,    3,
+            3,    3,    3,    3,    3,    1,    3,    5,    4,    3,
+            4,    4,    2,    2,    2,    2,    2,    2,    2,    2,
+            2,    2,    2,    2,    2,    2,    1,    1,    1,    3,
+            2,    1,    2,   10,   11,    3,    3,    2,    4,    4,
+            3,    4,    4,    4,    4,    7,    3,    2,    0,    4,
+            1,    3,    2,    2,    4,    6,    2,    2,    4,    1,
+            1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+            1,    3,    3,    4,    4,    0,    2,    1,    0,    1,
+            1,    0,    1,    1,    1,    1,    1,    1,    1,    1,
+            1,    1,    1,    1,    3,    2,    1,    3,    1,    4,
+            3,    1,    3,    3,    3,    3,    3,    3,    3,    3,
+            3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+            2,    2,    2,    2,    3,    3,    3,    3,    3,    3,
+            3,    3,    5,    4,    4,    3,    1,    3,    1,    1,
+            3,    3,    0,    2,    0,    1,    3,    1,    3,    1,
+            1,    1,    1,    1,    6,    4,    3,    4,    2,    4,
+            4,    1,    3,    1,    2,    1,    1,    4,    1,    1,
+            3,    6,    4,    4,    4,    4,    1,    4,    0,    1,
+            1,    3,    1,    1,    4,    3,    1,    1,    1,    0,
+            0,    2,    3,    1,    3,    1,    4,    2,    2,    2,
+            2,    1,    2,    1,    1,    1,    4,    3,    3,    3,
+            6,    3,    1,    1,    1
     );
 
-    protected function reduceRule0() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule1() {
-         $this->semValue = $this->handleNamespaces($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule2() {
-         if (is_array($this->semStack[$this->stackPos-(2-2)])) { $this->semValue = array_merge($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)]); } else { $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; };
-    }
-
-    protected function reduceRule3() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule4() {
-         $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop(['comments' => $startAttributes['comments']]); } else { $nop = null; };
-            if ($nop !== null) { $this->semStack[$this->stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule5() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule6() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule7() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule8() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule9() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule10() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule11() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule12() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule13() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule14() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule15() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule16() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule17() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule18() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule19() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule20() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule21() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule22() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule23() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule24() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule25() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule26() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule27() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule28() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule29() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule30() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule31() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule32() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule33() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule34() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule35() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule36() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule37() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule38() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule39() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule40() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule41() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule42() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule43() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule44() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule45() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule46() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule47() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule48() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule49() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule50() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule51() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule52() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule53() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule54() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule55() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule56() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule57() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule58() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule59() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule60() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule61() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule62() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule63() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule64() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule65() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule66() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule67() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule68() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule69() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule70() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule71() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule72() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule73() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule74() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule75() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule76() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule77() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule78() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule79() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule80() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule81() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule82() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule83() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule84() {
-         $this->semValue = new Name($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule85() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule86() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule87() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule88() {
-         $this->semValue = new Stmt\HaltCompiler($this->lexer->handleHaltCompiler(), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule89() {
-         $this->semValue = new Stmt\Namespace_($this->semStack[$this->stackPos-(3-2)], null, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
+    protected function initReduceCallbacks() {
+        $this->reduceCallbacks = [
+            0 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            1 => function ($stackPos) {
+                 $this->semValue = $this->handleNamespaces($this->semStack[$stackPos-(1-1)]);
+            },
+            2 => function ($stackPos) {
+                 if (is_array($this->semStack[$stackPos-(2-2)])) { $this->semValue = array_merge($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]); } else { $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; };
+            },
+            3 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            4 => function ($stackPos) {
+                 $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop($this->createCommentNopAttributes($startAttributes['comments'])); } else { $nop = null; };
+            if ($nop !== null) { $this->semStack[$stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            5 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            6 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            7 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            8 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            9 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            10 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            11 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            12 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            13 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            14 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            15 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            16 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            17 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            18 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            19 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            20 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            21 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            22 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            23 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            24 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            25 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            26 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            27 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            28 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            29 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            30 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            31 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            32 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            33 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            34 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            35 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            36 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            37 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            38 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            39 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            40 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            41 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            42 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            43 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            44 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            45 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            46 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            47 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            48 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            49 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            50 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            51 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            52 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            53 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            54 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            55 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            56 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            57 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            58 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            59 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            60 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            61 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            62 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            63 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            64 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            65 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            66 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            67 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            68 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            69 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            70 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            71 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            72 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            73 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            74 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            75 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            76 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            77 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            78 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            79 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            80 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            81 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            82 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            83 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            84 => function ($stackPos) {
+                 $this->semValue = new Node\Identifier($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            85 => function ($stackPos) {
+                 $this->semValue = new Node\Identifier($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            86 => function ($stackPos) {
+                 $this->semValue = new Node\Identifier($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            87 => function ($stackPos) {
+                 $this->semValue = new Node\Identifier($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            88 => function ($stackPos) {
+                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            89 => function ($stackPos) {
+                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            90 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            91 => function ($stackPos) {
+                 $this->semValue = new Name(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            92 => function ($stackPos) {
+                 $this->semValue = new Expr\Variable(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            93 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            94 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            95 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            96 => function ($stackPos) {
+                 $this->semValue = new Stmt\HaltCompiler($this->lexer->handleHaltCompiler(), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            97 => function ($stackPos) {
+                 $this->semValue = new Stmt\Namespace_($this->semStack[$stackPos-(3-2)], null, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             $this->semValue->setAttribute('kind', Stmt\Namespace_::KIND_SEMICOLON);
             $this->checkNamespace($this->semValue);
-    }
-
-    protected function reduceRule90() {
-         $this->semValue = new Stmt\Namespace_($this->semStack[$this->stackPos-(5-2)], $this->semStack[$this->stackPos-(5-4)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes);
+            },
+            98 => function ($stackPos) {
+                 $this->semValue = new Stmt\Namespace_($this->semStack[$stackPos-(5-2)], $this->semStack[$stackPos-(5-4)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
             $this->semValue->setAttribute('kind', Stmt\Namespace_::KIND_BRACED);
             $this->checkNamespace($this->semValue);
-    }
-
-    protected function reduceRule91() {
-         $this->semValue = new Stmt\Namespace_(null, $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
+            },
+            99 => function ($stackPos) {
+                 $this->semValue = new Stmt\Namespace_(null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             $this->semValue->setAttribute('kind', Stmt\Namespace_::KIND_BRACED);
             $this->checkNamespace($this->semValue);
-    }
+            },
+            100 => function ($stackPos) {
+                 $this->semValue = new Stmt\Use_($this->semStack[$stackPos-(3-2)], Stmt\Use_::TYPE_NORMAL, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            101 => function ($stackPos) {
+                 $this->semValue = new Stmt\Use_($this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-2)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            102 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            103 => function ($stackPos) {
+                 $this->semValue = new Stmt\Const_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            104 => function ($stackPos) {
+                 $this->semValue = Stmt\Use_::TYPE_FUNCTION;
+            },
+            105 => function ($stackPos) {
+                 $this->semValue = Stmt\Use_::TYPE_CONSTANT;
+            },
+            106 => function ($stackPos) {
+                 $this->semValue = new Stmt\GroupUse($this->semStack[$stackPos-(7-3)], $this->semStack[$stackPos-(7-6)], $this->semStack[$stackPos-(7-2)], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes);
+            },
+            107 => function ($stackPos) {
+                 $this->semValue = new Stmt\GroupUse($this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-5)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
+            },
+            108 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            109 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            110 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            111 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            112 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            113 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            114 => function ($stackPos) {
+                 $this->semValue = new Stmt\UseUse($this->semStack[$stackPos-(1-1)], null, Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->checkUseUse($this->semValue, $stackPos-(1-1));
+            },
+            115 => function ($stackPos) {
+                 $this->semValue = new Stmt\UseUse($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->checkUseUse($this->semValue, $stackPos-(3-3));
+            },
+            116 => function ($stackPos) {
+                 $this->semValue = new Stmt\UseUse($this->semStack[$stackPos-(1-1)], null, Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->checkUseUse($this->semValue, $stackPos-(1-1));
+            },
+            117 => function ($stackPos) {
+                 $this->semValue = new Stmt\UseUse($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->checkUseUse($this->semValue, $stackPos-(3-3));
+            },
+            118 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)]; $this->semValue->type = Stmt\Use_::TYPE_NORMAL;
+            },
+            119 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-2)]; $this->semValue->type = $this->semStack[$stackPos-(2-1)];
+            },
+            120 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            121 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            122 => function ($stackPos) {
+                 $this->semValue = new Node\Const_($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            123 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            124 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            125 => function ($stackPos) {
+                 $this->semValue = new Node\Const_($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            126 => function ($stackPos) {
+                 if (is_array($this->semStack[$stackPos-(2-2)])) { $this->semValue = array_merge($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]); } else { $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; };
+            },
+            127 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            128 => function ($stackPos) {
+                 $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop($this->createCommentNopAttributes($startAttributes['comments'])); } else { $nop = null; };
+            if ($nop !== null) { $this->semStack[$stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            129 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            130 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            131 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            132 => function ($stackPos) {
+                 throw new Error('__HALT_COMPILER() can only be used from the outermost scope', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            133 => function ($stackPos) {
 
-    protected function reduceRule92() {
-         $this->semValue = new Stmt\Use_($this->semStack[$this->stackPos-(3-2)], Stmt\Use_::TYPE_NORMAL, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule93() {
-         $this->semValue = new Stmt\Use_($this->semStack[$this->stackPos-(4-3)], $this->semStack[$this->stackPos-(4-2)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule94() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule95() {
-         $this->semValue = new Stmt\Const_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule96() {
-         $this->semValue = Stmt\Use_::TYPE_FUNCTION;
-    }
-
-    protected function reduceRule97() {
-         $this->semValue = Stmt\Use_::TYPE_CONSTANT;
-    }
-
-    protected function reduceRule98() {
-         $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$this->stackPos-(7-3)], $this->startAttributeStack[$this->stackPos-(7-3)] + $this->endAttributeStack[$this->stackPos-(7-3)]), $this->semStack[$this->stackPos-(7-6)], $this->semStack[$this->stackPos-(7-2)], $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule99() {
-         $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$this->stackPos-(8-4)], $this->startAttributeStack[$this->stackPos-(8-4)] + $this->endAttributeStack[$this->stackPos-(8-4)]), $this->semStack[$this->stackPos-(8-7)], $this->semStack[$this->stackPos-(8-2)], $this->startAttributeStack[$this->stackPos-(8-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule100() {
-         $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$this->stackPos-(6-2)], $this->startAttributeStack[$this->stackPos-(6-2)] + $this->endAttributeStack[$this->stackPos-(6-2)]), $this->semStack[$this->stackPos-(6-5)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule101() {
-         $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$this->stackPos-(7-3)], $this->startAttributeStack[$this->stackPos-(7-3)] + $this->endAttributeStack[$this->stackPos-(7-3)]), $this->semStack[$this->stackPos-(7-6)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule102() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule103() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule104() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule105() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule106() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule107() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule108() {
-         $this->semValue = new Stmt\UseUse($this->semStack[$this->stackPos-(1-1)], null, Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); $this->checkUseUse($this->semValue, $this->stackPos-(1-1));
-    }
-
-    protected function reduceRule109() {
-         $this->semValue = new Stmt\UseUse($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); $this->checkUseUse($this->semValue, $this->stackPos-(3-3));
-    }
-
-    protected function reduceRule110() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule111() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-2)];
-    }
-
-    protected function reduceRule112() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)]; $this->semValue->type = Stmt\Use_::TYPE_NORMAL;
-    }
-
-    protected function reduceRule113() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-2)]; $this->semValue->type = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule114() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule115() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule116() {
-         $this->semValue = new Node\Const_($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule117() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule118() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule119() {
-         $this->semValue = new Node\Const_($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule120() {
-         if (is_array($this->semStack[$this->stackPos-(2-2)])) { $this->semValue = array_merge($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)]); } else { $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; };
-    }
-
-    protected function reduceRule121() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule122() {
-         $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop(['comments' => $startAttributes['comments']]); } else { $nop = null; };
-            if ($nop !== null) { $this->semStack[$this->stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule123() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule124() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule125() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule126() {
-         throw new Error('__HALT_COMPILER() can only be used from the outermost scope', $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule127() {
-
-        if ($this->semStack[$this->stackPos-(3-2)]) {
-            $this->semValue = $this->semStack[$this->stackPos-(3-2)]; $attrs = $this->startAttributeStack[$this->stackPos-(3-1)]; $stmts = $this->semValue; if (!empty($attrs['comments'])) {$stmts[0]->setAttribute('comments', array_merge($attrs['comments'], $stmts[0]->getAttribute('comments', []))); };
+        if ($this->semStack[$stackPos-(3-2)]) {
+            $this->semValue = $this->semStack[$stackPos-(3-2)]; $attrs = $this->startAttributeStack[$stackPos-(3-1)]; $stmts = $this->semValue; if (!empty($attrs['comments'])) {$stmts[0]->setAttribute('comments', array_merge($attrs['comments'], $stmts[0]->getAttribute('comments', []))); };
         } else {
-            $startAttributes = $this->startAttributeStack[$this->stackPos-(3-1)]; if (isset($startAttributes['comments'])) { $this->semValue = new Stmt\Nop(['comments' => $startAttributes['comments']]); } else { $this->semValue = null; };
+            $startAttributes = $this->startAttributeStack[$stackPos-(3-1)]; if (isset($startAttributes['comments'])) { $this->semValue = new Stmt\Nop($startAttributes + $this->endAttributes); } else { $this->semValue = null; };
             if (null === $this->semValue) { $this->semValue = array(); }
         }
 
-    }
-
-    protected function reduceRule128() {
-         $this->semValue = new Stmt\If_($this->semStack[$this->stackPos-(5-2)], ['stmts' => is_array($this->semStack[$this->stackPos-(5-3)]) ? $this->semStack[$this->stackPos-(5-3)] : array($this->semStack[$this->stackPos-(5-3)]), 'elseifs' => $this->semStack[$this->stackPos-(5-4)], 'else' => $this->semStack[$this->stackPos-(5-5)]], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule129() {
-         $this->semValue = new Stmt\If_($this->semStack[$this->stackPos-(8-2)], ['stmts' => $this->semStack[$this->stackPos-(8-4)], 'elseifs' => $this->semStack[$this->stackPos-(8-5)], 'else' => $this->semStack[$this->stackPos-(8-6)]], $this->startAttributeStack[$this->stackPos-(8-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule130() {
-         $this->semValue = new Stmt\While_($this->semStack[$this->stackPos-(3-2)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule131() {
-         $this->semValue = new Stmt\Do_($this->semStack[$this->stackPos-(5-4)], is_array($this->semStack[$this->stackPos-(5-2)]) ? $this->semStack[$this->stackPos-(5-2)] : array($this->semStack[$this->stackPos-(5-2)]), $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule132() {
-         $this->semValue = new Stmt\For_(['init' => $this->semStack[$this->stackPos-(9-3)], 'cond' => $this->semStack[$this->stackPos-(9-5)], 'loop' => $this->semStack[$this->stackPos-(9-7)], 'stmts' => $this->semStack[$this->stackPos-(9-9)]], $this->startAttributeStack[$this->stackPos-(9-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule133() {
-         $this->semValue = new Stmt\Switch_($this->semStack[$this->stackPos-(3-2)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule134() {
-         $this->semValue = new Stmt\Break_(null, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule135() {
-         $this->semValue = new Stmt\Break_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule136() {
-         $this->semValue = new Stmt\Continue_(null, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule137() {
-         $this->semValue = new Stmt\Continue_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule138() {
-         $this->semValue = new Stmt\Return_(null, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule139() {
-         $this->semValue = new Stmt\Return_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule140() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule141() {
-         $this->semValue = new Stmt\Global_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule142() {
-         $this->semValue = new Stmt\Static_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule143() {
-         $this->semValue = new Stmt\Echo_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule144() {
-         $this->semValue = new Stmt\InlineHTML($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule145() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule146() {
-         $this->semValue = new Stmt\Unset_($this->semStack[$this->stackPos-(5-3)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule147() {
-         $this->semValue = new Stmt\Foreach_($this->semStack[$this->stackPos-(7-3)], $this->semStack[$this->stackPos-(7-5)][0], ['keyVar' => null, 'byRef' => $this->semStack[$this->stackPos-(7-5)][1], 'stmts' => $this->semStack[$this->stackPos-(7-7)]], $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule148() {
-         $this->semValue = new Stmt\Foreach_($this->semStack[$this->stackPos-(9-3)], $this->semStack[$this->stackPos-(9-7)][0], ['keyVar' => $this->semStack[$this->stackPos-(9-5)], 'byRef' => $this->semStack[$this->stackPos-(9-7)][1], 'stmts' => $this->semStack[$this->stackPos-(9-9)]], $this->startAttributeStack[$this->stackPos-(9-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule149() {
-         $this->semValue = new Stmt\Declare_($this->semStack[$this->stackPos-(5-3)], $this->semStack[$this->stackPos-(5-5)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule150() {
-         $this->semValue = new Stmt\TryCatch($this->semStack[$this->stackPos-(6-3)], $this->semStack[$this->stackPos-(6-5)], $this->semStack[$this->stackPos-(6-6)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes); $this->checkTryCatch($this->semValue);
-    }
-
-    protected function reduceRule151() {
-         $this->semValue = new Stmt\Throw_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule152() {
-         $this->semValue = new Stmt\Goto_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule153() {
-         $this->semValue = new Stmt\Label($this->semStack[$this->stackPos-(2-1)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule154() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule155() {
-         $this->semValue = array(); /* means: no statement */
-    }
-
-    protected function reduceRule156() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule157() {
-         $startAttributes = $this->startAttributeStack[$this->stackPos-(1-1)]; if (isset($startAttributes['comments'])) { $this->semValue = new Stmt\Nop(['comments' => $startAttributes['comments']]); } else { $this->semValue = null; };
+            },
+            134 => function ($stackPos) {
+                 $this->semValue = new Stmt\If_($this->semStack[$stackPos-(5-2)], ['stmts' => is_array($this->semStack[$stackPos-(5-3)]) ? $this->semStack[$stackPos-(5-3)] : array($this->semStack[$stackPos-(5-3)]), 'elseifs' => $this->semStack[$stackPos-(5-4)], 'else' => $this->semStack[$stackPos-(5-5)]], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+            },
+            135 => function ($stackPos) {
+                 $this->semValue = new Stmt\If_($this->semStack[$stackPos-(8-2)], ['stmts' => $this->semStack[$stackPos-(8-4)], 'elseifs' => $this->semStack[$stackPos-(8-5)], 'else' => $this->semStack[$stackPos-(8-6)]], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes);
+            },
+            136 => function ($stackPos) {
+                 $this->semValue = new Stmt\While_($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            137 => function ($stackPos) {
+                 $this->semValue = new Stmt\Do_($this->semStack[$stackPos-(5-4)], is_array($this->semStack[$stackPos-(5-2)]) ? $this->semStack[$stackPos-(5-2)] : array($this->semStack[$stackPos-(5-2)]), $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+            },
+            138 => function ($stackPos) {
+                 $this->semValue = new Stmt\For_(['init' => $this->semStack[$stackPos-(9-3)], 'cond' => $this->semStack[$stackPos-(9-5)], 'loop' => $this->semStack[$stackPos-(9-7)], 'stmts' => $this->semStack[$stackPos-(9-9)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
+            },
+            139 => function ($stackPos) {
+                 $this->semValue = new Stmt\Switch_($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            140 => function ($stackPos) {
+                 $this->semValue = new Stmt\Break_(null, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            141 => function ($stackPos) {
+                 $this->semValue = new Stmt\Break_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            142 => function ($stackPos) {
+                 $this->semValue = new Stmt\Continue_(null, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            143 => function ($stackPos) {
+                 $this->semValue = new Stmt\Continue_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            144 => function ($stackPos) {
+                 $this->semValue = new Stmt\Return_(null, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            145 => function ($stackPos) {
+                 $this->semValue = new Stmt\Return_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            146 => function ($stackPos) {
+                 $this->semValue = new Stmt\Global_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            147 => function ($stackPos) {
+                 $this->semValue = new Stmt\Static_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            148 => function ($stackPos) {
+                 $this->semValue = new Stmt\Echo_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            149 => function ($stackPos) {
+                 $this->semValue = new Stmt\InlineHTML($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            150 => function ($stackPos) {
+                 $this->semValue = new Stmt\Expression($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            151 => function ($stackPos) {
+                 $this->semValue = new Stmt\Expression($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            152 => function ($stackPos) {
+                 $this->semValue = new Stmt\Unset_($this->semStack[$stackPos-(5-3)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+            },
+            153 => function ($stackPos) {
+                 $this->semValue = new Stmt\Foreach_($this->semStack[$stackPos-(7-3)], $this->semStack[$stackPos-(7-5)][0], ['keyVar' => null, 'byRef' => $this->semStack[$stackPos-(7-5)][1], 'stmts' => $this->semStack[$stackPos-(7-7)]], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes);
+            },
+            154 => function ($stackPos) {
+                 $this->semValue = new Stmt\Foreach_($this->semStack[$stackPos-(9-3)], $this->semStack[$stackPos-(9-7)][0], ['keyVar' => $this->semStack[$stackPos-(9-5)], 'byRef' => $this->semStack[$stackPos-(9-7)][1], 'stmts' => $this->semStack[$stackPos-(9-9)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
+            },
+            155 => function ($stackPos) {
+                 $this->semValue = new Stmt\Declare_($this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+            },
+            156 => function ($stackPos) {
+                 $this->semValue = new Stmt\TryCatch($this->semStack[$stackPos-(6-3)], $this->semStack[$stackPos-(6-5)], $this->semStack[$stackPos-(6-6)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); $this->checkTryCatch($this->semValue);
+            },
+            157 => function ($stackPos) {
+                 $this->semValue = new Stmt\Throw_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            158 => function ($stackPos) {
+                 $this->semValue = new Stmt\Goto_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            159 => function ($stackPos) {
+                 $this->semValue = new Stmt\Label($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            160 => function ($stackPos) {
+                 $this->semValue = new Stmt\Expression($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            161 => function ($stackPos) {
+                 $this->semValue = array(); /* means: no statement */
+            },
+            162 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            163 => function ($stackPos) {
+                 $startAttributes = $this->startAttributeStack[$stackPos-(1-1)]; if (isset($startAttributes['comments'])) { $this->semValue = new Stmt\Nop($startAttributes + $this->endAttributes); } else { $this->semValue = null; };
             if ($this->semValue === null) $this->semValue = array(); /* means: no statement */
-    }
-
-    protected function reduceRule158() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule159() {
-         $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule160() {
-         $this->semValue = new Stmt\Catch_(array($this->semStack[$this->stackPos-(8-3)]), substr($this->semStack[$this->stackPos-(8-4)], 1), $this->semStack[$this->stackPos-(8-7)], $this->startAttributeStack[$this->stackPos-(8-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule161() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule162() {
-         $this->semValue = new Stmt\Finally_($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule163() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule164() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule165() {
-         $this->semValue = false;
-    }
-
-    protected function reduceRule166() {
-         $this->semValue = true;
-    }
-
-    protected function reduceRule167() {
-         $this->semValue = false;
-    }
-
-    protected function reduceRule168() {
-         $this->semValue = true;
-    }
-
-    protected function reduceRule169() {
-         $this->semValue = new Stmt\Function_($this->semStack[$this->stackPos-(10-3)], ['byRef' => $this->semStack[$this->stackPos-(10-2)], 'params' => $this->semStack[$this->stackPos-(10-5)], 'returnType' => $this->semStack[$this->stackPos-(10-7)], 'stmts' => $this->semStack[$this->stackPos-(10-9)]], $this->startAttributeStack[$this->stackPos-(10-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule170() {
-         $this->semValue = new Stmt\Class_($this->semStack[$this->stackPos-(7-2)], ['type' => $this->semStack[$this->stackPos-(7-1)], 'extends' => $this->semStack[$this->stackPos-(7-3)], 'implements' => $this->semStack[$this->stackPos-(7-4)], 'stmts' => $this->semStack[$this->stackPos-(7-6)]], $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes);
-            $this->checkClass($this->semValue, $this->stackPos-(7-2));
-    }
-
-    protected function reduceRule171() {
-         $this->semValue = new Stmt\Interface_($this->semStack[$this->stackPos-(6-2)], ['extends' => $this->semStack[$this->stackPos-(6-3)], 'stmts' => $this->semStack[$this->stackPos-(6-5)]], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes);
-            $this->checkInterface($this->semValue, $this->stackPos-(6-2));
-    }
-
-    protected function reduceRule172() {
-         $this->semValue = new Stmt\Trait_($this->semStack[$this->stackPos-(5-2)], ['stmts' => $this->semStack[$this->stackPos-(5-4)]], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule173() {
-         $this->semValue = 0;
-    }
-
-    protected function reduceRule174() {
-         $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT;
-    }
-
-    protected function reduceRule175() {
-         $this->semValue = Stmt\Class_::MODIFIER_FINAL;
-    }
-
-    protected function reduceRule176() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule177() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-2)];
-    }
-
-    protected function reduceRule178() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule179() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-2)];
-    }
-
-    protected function reduceRule180() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule181() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-2)];
-    }
-
-    protected function reduceRule182() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule183() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule184() {
-         $this->semValue = is_array($this->semStack[$this->stackPos-(1-1)]) ? $this->semStack[$this->stackPos-(1-1)] : array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule185() {
-         $this->semValue = $this->semStack[$this->stackPos-(4-2)];
-    }
-
-    protected function reduceRule186() {
-         $this->semValue = is_array($this->semStack[$this->stackPos-(1-1)]) ? $this->semStack[$this->stackPos-(1-1)] : array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule187() {
-         $this->semValue = $this->semStack[$this->stackPos-(4-2)];
-    }
-
-    protected function reduceRule188() {
-         $this->semValue = is_array($this->semStack[$this->stackPos-(1-1)]) ? $this->semStack[$this->stackPos-(1-1)] : array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule189() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule190() {
-         $this->semValue = $this->semStack[$this->stackPos-(4-2)];
-    }
-
-    protected function reduceRule191() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule192() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule193() {
-         $this->semValue = new Stmt\DeclareDeclare($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule194() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
-    }
-
-    protected function reduceRule195() {
-         $this->semValue = $this->semStack[$this->stackPos-(4-3)];
-    }
-
-    protected function reduceRule196() {
-         $this->semValue = $this->semStack[$this->stackPos-(4-2)];
-    }
-
-    protected function reduceRule197() {
-         $this->semValue = $this->semStack[$this->stackPos-(5-3)];
-    }
-
-    protected function reduceRule198() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule199() {
-         $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule200() {
-         $this->semValue = new Stmt\Case_($this->semStack[$this->stackPos-(4-2)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule201() {
-         $this->semValue = new Stmt\Case_(null, $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule202() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule203() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule204() {
-         $this->semValue = is_array($this->semStack[$this->stackPos-(1-1)]) ? $this->semStack[$this->stackPos-(1-1)] : array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule205() {
-         $this->semValue = $this->semStack[$this->stackPos-(4-2)];
-    }
-
-    protected function reduceRule206() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule207() {
-         $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule208() {
-         $this->semValue = new Stmt\ElseIf_($this->semStack[$this->stackPos-(3-2)], is_array($this->semStack[$this->stackPos-(3-3)]) ? $this->semStack[$this->stackPos-(3-3)] : array($this->semStack[$this->stackPos-(3-3)]), $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule209() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule210() {
-         $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule211() {
-         $this->semValue = new Stmt\ElseIf_($this->semStack[$this->stackPos-(4-2)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule212() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule213() {
-         $this->semValue = new Stmt\Else_(is_array($this->semStack[$this->stackPos-(2-2)]) ? $this->semStack[$this->stackPos-(2-2)] : array($this->semStack[$this->stackPos-(2-2)]), $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule214() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule215() {
-         $this->semValue = new Stmt\Else_($this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule216() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)], false);
-    }
-
-    protected function reduceRule217() {
-         $this->semValue = array($this->semStack[$this->stackPos-(2-2)], true);
-    }
-
-    protected function reduceRule218() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)], false);
-    }
-
-    protected function reduceRule219() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule220() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule221() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule222() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule223() {
-         $this->semValue = new Node\Param(substr($this->semStack[$this->stackPos-(4-4)], 1), null, $this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-2)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); $this->checkParam($this->semValue);
-    }
-
-    protected function reduceRule224() {
-         $this->semValue = new Node\Param(substr($this->semStack[$this->stackPos-(6-4)], 1), $this->semStack[$this->stackPos-(6-6)], $this->semStack[$this->stackPos-(6-1)], $this->semStack[$this->stackPos-(6-2)], $this->semStack[$this->stackPos-(6-3)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes); $this->checkParam($this->semValue);
-    }
-
-    protected function reduceRule225() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule226() {
-         $this->semValue = 'array';
-    }
-
-    protected function reduceRule227() {
-         $this->semValue = 'callable';
-    }
-
-    protected function reduceRule228() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule229() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule230() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule231() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-2)];
-    }
-
-    protected function reduceRule232() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule233() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
-    }
-
-    protected function reduceRule234() {
-         $this->semValue = array(new Node\Arg($this->semStack[$this->stackPos-(3-2)], false, false, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes));
-    }
-
-    protected function reduceRule235() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule236() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule237() {
-         $this->semValue = new Node\Arg($this->semStack[$this->stackPos-(1-1)], false, false, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule238() {
-         $this->semValue = new Node\Arg($this->semStack[$this->stackPos-(2-2)], true, false, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule239() {
-         $this->semValue = new Node\Arg($this->semStack[$this->stackPos-(2-2)], false, true, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule240() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule241() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule242() {
-         $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule243() {
-         $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule244() {
-         $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule245() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule246() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule247() {
-         $this->semValue = new Stmt\StaticVar(substr($this->semStack[$this->stackPos-(1-1)], 1), null, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule248() {
-         $this->semValue = new Stmt\StaticVar(substr($this->semStack[$this->stackPos-(3-1)], 1), $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule249() {
-         $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule250() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule251() {
-         $this->semValue = new Stmt\Property($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); $this->checkProperty($this->semValue, $this->stackPos-(3-1));
-    }
-
-    protected function reduceRule252() {
-         $this->semValue = new Stmt\ClassConst($this->semStack[$this->stackPos-(3-2)], 0, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule253() {
-         $this->semValue = new Stmt\ClassMethod($this->semStack[$this->stackPos-(9-4)], ['type' => $this->semStack[$this->stackPos-(9-1)], 'byRef' => $this->semStack[$this->stackPos-(9-3)], 'params' => $this->semStack[$this->stackPos-(9-6)], 'returnType' => $this->semStack[$this->stackPos-(9-8)], 'stmts' => $this->semStack[$this->stackPos-(9-9)]], $this->startAttributeStack[$this->stackPos-(9-1)] + $this->endAttributes);
-            $this->checkClassMethod($this->semValue, $this->stackPos-(9-1));
-    }
-
-    protected function reduceRule254() {
-         $this->semValue = new Stmt\TraitUse($this->semStack[$this->stackPos-(3-2)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule255() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule256() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
-    }
-
-    protected function reduceRule257() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule258() {
-         $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule259() {
-         $this->semValue = new Stmt\TraitUseAdaptation\Precedence($this->semStack[$this->stackPos-(4-1)][0], $this->semStack[$this->stackPos-(4-1)][1], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule260() {
-         $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$this->stackPos-(5-1)][0], $this->semStack[$this->stackPos-(5-1)][1], $this->semStack[$this->stackPos-(5-3)], $this->semStack[$this->stackPos-(5-4)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule261() {
-         $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$this->stackPos-(4-1)][0], $this->semStack[$this->stackPos-(4-1)][1], $this->semStack[$this->stackPos-(4-3)], null, $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule262() {
-         $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$this->stackPos-(4-1)][0], $this->semStack[$this->stackPos-(4-1)][1], null, $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule263() {
-         $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$this->stackPos-(4-1)][0], $this->semStack[$this->stackPos-(4-1)][1], null, $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule264() {
-         $this->semValue = array($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)]);
-    }
-
-    protected function reduceRule265() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule266() {
-         $this->semValue = array(null, $this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule267() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule268() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
-    }
-
-    protected function reduceRule269() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule270() {
-         $this->semValue = 0;
-    }
-
-    protected function reduceRule271() {
-         $this->semValue = 0;
-    }
-
-    protected function reduceRule272() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule273() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule274() {
-         $this->checkModifier($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)], $this->stackPos-(2-2)); $this->semValue = $this->semStack[$this->stackPos-(2-1)] | $this->semStack[$this->stackPos-(2-2)];
-    }
-
-    protected function reduceRule275() {
-         $this->semValue = Stmt\Class_::MODIFIER_PUBLIC;
-    }
-
-    protected function reduceRule276() {
-         $this->semValue = Stmt\Class_::MODIFIER_PROTECTED;
-    }
-
-    protected function reduceRule277() {
-         $this->semValue = Stmt\Class_::MODIFIER_PRIVATE;
-    }
-
-    protected function reduceRule278() {
-         $this->semValue = Stmt\Class_::MODIFIER_STATIC;
-    }
-
-    protected function reduceRule279() {
-         $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT;
-    }
-
-    protected function reduceRule280() {
-         $this->semValue = Stmt\Class_::MODIFIER_FINAL;
-    }
-
-    protected function reduceRule281() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule282() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule283() {
-         $this->semValue = new Stmt\PropertyProperty(substr($this->semStack[$this->stackPos-(1-1)], 1), null, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule284() {
-         $this->semValue = new Stmt\PropertyProperty(substr($this->semStack[$this->stackPos-(3-1)], 1), $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule285() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule286() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule287() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule288() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule289() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule290() {
-         $this->semValue = new Expr\Assign($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule291() {
-         $this->semValue = new Expr\Assign($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule292() {
-         $this->semValue = new Expr\AssignRef($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule293() {
-         $this->semValue = new Expr\AssignRef($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule294() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule295() {
-         $this->semValue = new Expr\Clone_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule296() {
-         $this->semValue = new Expr\AssignOp\Plus($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule297() {
-         $this->semValue = new Expr\AssignOp\Minus($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule298() {
-         $this->semValue = new Expr\AssignOp\Mul($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule299() {
-         $this->semValue = new Expr\AssignOp\Div($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule300() {
-         $this->semValue = new Expr\AssignOp\Concat($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule301() {
-         $this->semValue = new Expr\AssignOp\Mod($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule302() {
-         $this->semValue = new Expr\AssignOp\BitwiseAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule303() {
-         $this->semValue = new Expr\AssignOp\BitwiseOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule304() {
-         $this->semValue = new Expr\AssignOp\BitwiseXor($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule305() {
-         $this->semValue = new Expr\AssignOp\ShiftLeft($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule306() {
-         $this->semValue = new Expr\AssignOp\ShiftRight($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule307() {
-         $this->semValue = new Expr\AssignOp\Pow($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule308() {
-         $this->semValue = new Expr\PostInc($this->semStack[$this->stackPos-(2-1)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule309() {
-         $this->semValue = new Expr\PreInc($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule310() {
-         $this->semValue = new Expr\PostDec($this->semStack[$this->stackPos-(2-1)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule311() {
-         $this->semValue = new Expr\PreDec($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule312() {
-         $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule313() {
-         $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule314() {
-         $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule315() {
-         $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule316() {
-         $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule317() {
-         $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule318() {
-         $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule319() {
-         $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule320() {
-         $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule321() {
-         $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule322() {
-         $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule323() {
-         $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule324() {
-         $this->semValue = new Expr\BinaryOp\Div($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule325() {
-         $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule326() {
-         $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule327() {
-         $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule328() {
-         $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule329() {
-         $this->semValue = new Expr\UnaryPlus($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule330() {
-         $this->semValue = new Expr\UnaryMinus($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule331() {
-         $this->semValue = new Expr\BooleanNot($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule332() {
-         $this->semValue = new Expr\BitwiseNot($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule333() {
-         $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule334() {
-         $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule335() {
-         $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule336() {
-         $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule337() {
-         $this->semValue = new Expr\BinaryOp\Spaceship($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule338() {
-         $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule339() {
-         $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule340() {
-         $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule341() {
-         $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule342() {
-         $this->semValue = new Expr\Instanceof_($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule343() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule344() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
-    }
-
-    protected function reduceRule345() {
-         $this->semValue = new Expr\Ternary($this->semStack[$this->stackPos-(5-1)], $this->semStack[$this->stackPos-(5-3)], $this->semStack[$this->stackPos-(5-5)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule346() {
-         $this->semValue = new Expr\Ternary($this->semStack[$this->stackPos-(4-1)], null, $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule347() {
-         $this->semValue = new Expr\BinaryOp\Coalesce($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule348() {
-         $this->semValue = new Expr\Isset_($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule349() {
-         $this->semValue = new Expr\Empty_($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule350() {
-         $this->semValue = new Expr\Include_($this->semStack[$this->stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule351() {
-         $this->semValue = new Expr\Include_($this->semStack[$this->stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE_ONCE, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule352() {
-         $this->semValue = new Expr\Eval_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule353() {
-         $this->semValue = new Expr\Include_($this->semStack[$this->stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule354() {
-         $this->semValue = new Expr\Include_($this->semStack[$this->stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE_ONCE, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule355() {
-         $this->semValue = new Expr\Cast\Int_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule356() {
-         $this->semValue = new Expr\Cast\Double($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule357() {
-         $this->semValue = new Expr\Cast\String_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule358() {
-         $this->semValue = new Expr\Cast\Array_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule359() {
-         $this->semValue = new Expr\Cast\Object_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule360() {
-         $this->semValue = new Expr\Cast\Bool_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule361() {
-         $this->semValue = new Expr\Cast\Unset_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule362() {
-         $attrs = $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes;
-            $attrs['kind'] = strtolower($this->semStack[$this->stackPos-(2-1)]) === 'exit' ? Expr\Exit_::KIND_EXIT : Expr\Exit_::KIND_DIE;
-            $this->semValue = new Expr\Exit_($this->semStack[$this->stackPos-(2-2)], $attrs);
-    }
-
-    protected function reduceRule363() {
-         $this->semValue = new Expr\ErrorSuppress($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule364() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule365() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule366() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule367() {
-         $this->semValue = new Expr\ShellExec($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule368() {
-         $this->semValue = new Expr\Print_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule369() {
-         $this->semValue = new Expr\Yield_(null, null, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule370() {
-         $this->semValue = new Expr\YieldFrom($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule371() {
-         $this->semValue = new Expr\Closure(['static' => false, 'byRef' => $this->semStack[$this->stackPos-(10-2)], 'params' => $this->semStack[$this->stackPos-(10-4)], 'uses' => $this->semStack[$this->stackPos-(10-6)], 'returnType' => $this->semStack[$this->stackPos-(10-7)], 'stmts' => $this->semStack[$this->stackPos-(10-9)]], $this->startAttributeStack[$this->stackPos-(10-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule372() {
-         $this->semValue = new Expr\Closure(['static' => true, 'byRef' => $this->semStack[$this->stackPos-(11-3)], 'params' => $this->semStack[$this->stackPos-(11-5)], 'uses' => $this->semStack[$this->stackPos-(11-7)], 'returnType' => $this->semStack[$this->stackPos-(11-8)], 'stmts' => $this->semStack[$this->stackPos-(11-10)]], $this->startAttributeStack[$this->stackPos-(11-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule373() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
-    }
-
-    protected function reduceRule374() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
-    }
-
-    protected function reduceRule375() {
-         $this->semValue = new Expr\Yield_($this->semStack[$this->stackPos-(2-2)], null, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule376() {
-         $this->semValue = new Expr\Yield_($this->semStack[$this->stackPos-(4-4)], $this->semStack[$this->stackPos-(4-2)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule377() {
-         $attrs = $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_LONG;
-            $this->semValue = new Expr\Array_($this->semStack[$this->stackPos-(4-3)], $attrs);
-    }
-
-    protected function reduceRule378() {
-         $attrs = $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_SHORT;
-            $this->semValue = new Expr\Array_($this->semStack[$this->stackPos-(3-2)], $attrs);
-    }
-
-    protected function reduceRule379() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule380() {
-         $attrs = $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes; $attrs['kind'] = ($this->semStack[$this->stackPos-(4-1)][0] === "'" || ($this->semStack[$this->stackPos-(4-1)][1] === "'" && ($this->semStack[$this->stackPos-(4-1)][0] === 'b' || $this->semStack[$this->stackPos-(4-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED);
-            $this->semValue = new Expr\ArrayDimFetch(new Scalar\String_(Scalar\String_::parse($this->semStack[$this->stackPos-(4-1)]), $attrs), $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule381() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule382() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule383() {
-         $this->semValue = array(new Stmt\Class_(null, ['type' => 0, 'extends' => $this->semStack[$this->stackPos-(7-3)], 'implements' => $this->semStack[$this->stackPos-(7-4)], 'stmts' => $this->semStack[$this->stackPos-(7-6)]], $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes), $this->semStack[$this->stackPos-(7-2)]);
+            },
+            164 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            165 => function ($stackPos) {
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            166 => function ($stackPos) {
+                 $this->semValue = new Stmt\Catch_(array($this->semStack[$stackPos-(8-3)]), $this->semStack[$stackPos-(8-4)], $this->semStack[$stackPos-(8-7)], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes);
+            },
+            167 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            168 => function ($stackPos) {
+                 $this->semValue = new Stmt\Finally_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            169 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            170 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            171 => function ($stackPos) {
+                 $this->semValue = false;
+            },
+            172 => function ($stackPos) {
+                 $this->semValue = true;
+            },
+            173 => function ($stackPos) {
+                 $this->semValue = false;
+            },
+            174 => function ($stackPos) {
+                 $this->semValue = true;
+            },
+            175 => function ($stackPos) {
+                 $this->semValue = false;
+            },
+            176 => function ($stackPos) {
+                 $this->semValue = true;
+            },
+            177 => function ($stackPos) {
+                 $this->semValue = new Stmt\Function_($this->semStack[$stackPos-(10-3)], ['byRef' => $this->semStack[$stackPos-(10-2)], 'params' => $this->semStack[$stackPos-(10-5)], 'returnType' => $this->semStack[$stackPos-(10-7)], 'stmts' => $this->semStack[$stackPos-(10-9)]], $this->startAttributeStack[$stackPos-(10-1)] + $this->endAttributes);
+            },
+            178 => function ($stackPos) {
+                 $this->semValue = new Stmt\Class_($this->semStack[$stackPos-(7-2)], ['type' => $this->semStack[$stackPos-(7-1)], 'extends' => $this->semStack[$stackPos-(7-3)], 'implements' => $this->semStack[$stackPos-(7-4)], 'stmts' => $this->semStack[$stackPos-(7-6)]], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes);
+            $this->checkClass($this->semValue, $stackPos-(7-2));
+            },
+            179 => function ($stackPos) {
+                 $this->semValue = new Stmt\Interface_($this->semStack[$stackPos-(6-2)], ['extends' => $this->semStack[$stackPos-(6-3)], 'stmts' => $this->semStack[$stackPos-(6-5)]], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
+            $this->checkInterface($this->semValue, $stackPos-(6-2));
+            },
+            180 => function ($stackPos) {
+                 $this->semValue = new Stmt\Trait_($this->semStack[$stackPos-(5-2)], ['stmts' => $this->semStack[$stackPos-(5-4)]], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+            },
+            181 => function ($stackPos) {
+                 $this->semValue = 0;
+            },
+            182 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT;
+            },
+            183 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_FINAL;
+            },
+            184 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            185 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-2)];
+            },
+            186 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            187 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-2)];
+            },
+            188 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            189 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-2)];
+            },
+            190 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            191 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            192 => function ($stackPos) {
+                 $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]);
+            },
+            193 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(4-2)];
+            },
+            194 => function ($stackPos) {
+                 $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]);
+            },
+            195 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(4-2)];
+            },
+            196 => function ($stackPos) {
+                 $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]);
+            },
+            197 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            198 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(4-2)];
+            },
+            199 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            200 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            201 => function ($stackPos) {
+                 $this->semValue = new Stmt\DeclareDeclare($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            202 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            203 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(4-3)];
+            },
+            204 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(4-2)];
+            },
+            205 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(5-3)];
+            },
+            206 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            207 => function ($stackPos) {
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            208 => function ($stackPos) {
+                 $this->semValue = new Stmt\Case_($this->semStack[$stackPos-(4-2)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            209 => function ($stackPos) {
+                 $this->semValue = new Stmt\Case_(null, $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            210 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            211 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            212 => function ($stackPos) {
+                 $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]);
+            },
+            213 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(4-2)];
+            },
+            214 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            215 => function ($stackPos) {
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            216 => function ($stackPos) {
+                 $this->semValue = new Stmt\ElseIf_($this->semStack[$stackPos-(3-2)], is_array($this->semStack[$stackPos-(3-3)]) ? $this->semStack[$stackPos-(3-3)] : array($this->semStack[$stackPos-(3-3)]), $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            217 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            218 => function ($stackPos) {
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            219 => function ($stackPos) {
+                 $this->semValue = new Stmt\ElseIf_($this->semStack[$stackPos-(4-2)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            220 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            221 => function ($stackPos) {
+                 $this->semValue = new Stmt\Else_(is_array($this->semStack[$stackPos-(2-2)]) ? $this->semStack[$stackPos-(2-2)] : array($this->semStack[$stackPos-(2-2)]), $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            222 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            223 => function ($stackPos) {
+                 $this->semValue = new Stmt\Else_($this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            224 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)], false);
+            },
+            225 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(2-2)], true);
+            },
+            226 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)], false);
+            },
+            227 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            228 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            229 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            230 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            231 => function ($stackPos) {
+                 $this->semValue = new Node\Param($this->semStack[$stackPos-(4-4)], null, $this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-2)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes); $this->checkParam($this->semValue);
+            },
+            232 => function ($stackPos) {
+                 $this->semValue = new Node\Param($this->semStack[$stackPos-(6-4)], $this->semStack[$stackPos-(6-6)], $this->semStack[$stackPos-(6-1)], $this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-3)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); $this->checkParam($this->semValue);
+            },
+            233 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            234 => function ($stackPos) {
+                 $this->semValue = new Node\Identifier('array', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            235 => function ($stackPos) {
+                 $this->semValue = new Node\Identifier('callable', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            236 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            237 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            238 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            239 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-2)];
+            },
+            240 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            241 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            242 => function ($stackPos) {
+                 $this->semValue = array(new Node\Arg($this->semStack[$stackPos-(3-2)], false, false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes));
+            },
+            243 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            244 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            245 => function ($stackPos) {
+                 $this->semValue = new Node\Arg($this->semStack[$stackPos-(1-1)], false, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            246 => function ($stackPos) {
+                 $this->semValue = new Node\Arg($this->semStack[$stackPos-(2-2)], true, false, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            247 => function ($stackPos) {
+                 $this->semValue = new Node\Arg($this->semStack[$stackPos-(2-2)], false, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            248 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            249 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            250 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            251 => function ($stackPos) {
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            252 => function ($stackPos) {
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            253 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            254 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            255 => function ($stackPos) {
+                 $this->semValue = new Stmt\StaticVar($this->semStack[$stackPos-(1-1)], null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            256 => function ($stackPos) {
+                 $this->semValue = new Stmt\StaticVar($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            257 => function ($stackPos) {
+                 if ($this->semStack[$stackPos-(2-2)] !== null) { $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; }
+            },
+            258 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            259 => function ($stackPos) {
+                 $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop($this->createCommentNopAttributes($startAttributes['comments'])); } else { $nop = null; };
+            if ($nop !== null) { $this->semStack[$stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            260 => function ($stackPos) {
+                 $this->semValue = new Stmt\Property($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->checkProperty($this->semValue, $stackPos-(3-1));
+            },
+            261 => function ($stackPos) {
+                 $this->semValue = new Stmt\ClassConst($this->semStack[$stackPos-(3-2)], 0, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            262 => function ($stackPos) {
+                 $this->semValue = new Stmt\ClassMethod($this->semStack[$stackPos-(9-4)], ['type' => $this->semStack[$stackPos-(9-1)], 'byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-6)], 'returnType' => $this->semStack[$stackPos-(9-8)], 'stmts' => $this->semStack[$stackPos-(9-9)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
+            $this->checkClassMethod($this->semValue, $stackPos-(9-1));
+            },
+            263 => function ($stackPos) {
+                 $this->semValue = new Stmt\TraitUse($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            264 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            265 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            266 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            267 => function ($stackPos) {
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            268 => function ($stackPos) {
+                 $this->semValue = new Stmt\TraitUseAdaptation\Precedence($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            269 => function ($stackPos) {
+                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(5-1)][0], $this->semStack[$stackPos-(5-1)][1], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-4)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+            },
+            270 => function ($stackPos) {
+                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], null, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            271 => function ($stackPos) {
+                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            272 => function ($stackPos) {
+                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            273 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]);
+            },
+            274 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            275 => function ($stackPos) {
+                 $this->semValue = array(null, $this->semStack[$stackPos-(1-1)]);
+            },
+            276 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            277 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            278 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            279 => function ($stackPos) {
+                 $this->semValue = 0;
+            },
+            280 => function ($stackPos) {
+                 $this->semValue = 0;
+            },
+            281 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            282 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            283 => function ($stackPos) {
+                 $this->checkModifier($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $this->semValue = $this->semStack[$stackPos-(2-1)] | $this->semStack[$stackPos-(2-2)];
+            },
+            284 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_PUBLIC;
+            },
+            285 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_PROTECTED;
+            },
+            286 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_PRIVATE;
+            },
+            287 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_STATIC;
+            },
+            288 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT;
+            },
+            289 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_FINAL;
+            },
+            290 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            291 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            292 => function ($stackPos) {
+                 $this->semValue = new Node\VarLikeIdentifier(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            293 => function ($stackPos) {
+                 $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(1-1)], null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            294 => function ($stackPos) {
+                 $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            295 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            296 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            297 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            298 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            299 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            300 => function ($stackPos) {
+                 $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            301 => function ($stackPos) {
+                 $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            302 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignRef($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            303 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignRef($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            304 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            305 => function ($stackPos) {
+                 $this->semValue = new Expr\Clone_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            306 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            307 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            308 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            309 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            310 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            311 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            312 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            313 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            314 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            315 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            316 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            317 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            318 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\Coalesce($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            319 => function ($stackPos) {
+                 $this->semValue = new Expr\PostInc($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            320 => function ($stackPos) {
+                 $this->semValue = new Expr\PreInc($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            321 => function ($stackPos) {
+                 $this->semValue = new Expr\PostDec($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            322 => function ($stackPos) {
+                 $this->semValue = new Expr\PreDec($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            323 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            324 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            325 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            326 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            327 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            328 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            329 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            330 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            331 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            332 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            333 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            334 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            335 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            336 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            337 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            338 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            339 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            340 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            341 => function ($stackPos) {
+                 $this->semValue = new Expr\UnaryPlus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            342 => function ($stackPos) {
+                 $this->semValue = new Expr\UnaryMinus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            343 => function ($stackPos) {
+                 $this->semValue = new Expr\BooleanNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            344 => function ($stackPos) {
+                 $this->semValue = new Expr\BitwiseNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            345 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            346 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            347 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            348 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            349 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Spaceship($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            350 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            351 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            352 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            353 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            354 => function ($stackPos) {
+                 $this->semValue = new Expr\Instanceof_($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            355 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            356 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            357 => function ($stackPos) {
+                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(5-1)], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+            },
+            358 => function ($stackPos) {
+                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(4-1)], null, $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            359 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Coalesce($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            360 => function ($stackPos) {
+                 $this->semValue = new Expr\Isset_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            361 => function ($stackPos) {
+                 $this->semValue = new Expr\Empty_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            362 => function ($stackPos) {
+                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            363 => function ($stackPos) {
+                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            364 => function ($stackPos) {
+                 $this->semValue = new Expr\Eval_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            365 => function ($stackPos) {
+                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            366 => function ($stackPos) {
+                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            367 => function ($stackPos) {
+                 $this->semValue = new Expr\Cast\Int_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            368 => function ($stackPos) {
+                 $attrs = $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes;
+            $attrs['kind'] = $this->getFloatCastKind($this->semStack[$stackPos-(2-1)]);
+            $this->semValue = new Expr\Cast\Double($this->semStack[$stackPos-(2-2)], $attrs);
+            },
+            369 => function ($stackPos) {
+                 $this->semValue = new Expr\Cast\String_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            370 => function ($stackPos) {
+                 $this->semValue = new Expr\Cast\Array_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            371 => function ($stackPos) {
+                 $this->semValue = new Expr\Cast\Object_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            372 => function ($stackPos) {
+                 $this->semValue = new Expr\Cast\Bool_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            373 => function ($stackPos) {
+                 $this->semValue = new Expr\Cast\Unset_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            374 => function ($stackPos) {
+                 $attrs = $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes;
+            $attrs['kind'] = strtolower($this->semStack[$stackPos-(2-1)]) === 'exit' ? Expr\Exit_::KIND_EXIT : Expr\Exit_::KIND_DIE;
+            $this->semValue = new Expr\Exit_($this->semStack[$stackPos-(2-2)], $attrs);
+            },
+            375 => function ($stackPos) {
+                 $this->semValue = new Expr\ErrorSuppress($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            376 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            377 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            378 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            379 => function ($stackPos) {
+                 $this->semValue = new Expr\ShellExec($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            380 => function ($stackPos) {
+                 $this->semValue = new Expr\Print_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            381 => function ($stackPos) {
+                 $this->semValue = new Expr\Yield_(null, null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            382 => function ($stackPos) {
+                 $this->semValue = new Expr\YieldFrom($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            383 => function ($stackPos) {
+                 $this->semValue = new Expr\Closure(['static' => false, 'byRef' => $this->semStack[$stackPos-(10-2)], 'params' => $this->semStack[$stackPos-(10-4)], 'uses' => $this->semStack[$stackPos-(10-6)], 'returnType' => $this->semStack[$stackPos-(10-7)], 'stmts' => $this->semStack[$stackPos-(10-9)]], $this->startAttributeStack[$stackPos-(10-1)] + $this->endAttributes);
+            },
+            384 => function ($stackPos) {
+                 $this->semValue = new Expr\Closure(['static' => true, 'byRef' => $this->semStack[$stackPos-(11-3)], 'params' => $this->semStack[$stackPos-(11-5)], 'uses' => $this->semStack[$stackPos-(11-7)], 'returnType' => $this->semStack[$stackPos-(11-8)], 'stmts' => $this->semStack[$stackPos-(11-10)]], $this->startAttributeStack[$stackPos-(11-1)] + $this->endAttributes);
+            },
+            385 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            386 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            387 => function ($stackPos) {
+                 $this->semValue = new Expr\Yield_($this->semStack[$stackPos-(2-2)], null, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            388 => function ($stackPos) {
+                 $this->semValue = new Expr\Yield_($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-2)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            389 => function ($stackPos) {
+                 $attrs = $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_LONG;
+            $this->semValue = new Expr\Array_($this->semStack[$stackPos-(4-3)], $attrs);
+            },
+            390 => function ($stackPos) {
+                 $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_SHORT;
+            $this->semValue = new Expr\Array_($this->semStack[$stackPos-(3-2)], $attrs);
+            },
+            391 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            392 => function ($stackPos) {
+                 $attrs = $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes; $attrs['kind'] = ($this->semStack[$stackPos-(4-1)][0] === "'" || ($this->semStack[$stackPos-(4-1)][1] === "'" && ($this->semStack[$stackPos-(4-1)][0] === 'b' || $this->semStack[$stackPos-(4-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED);
+            $this->semValue = new Expr\ArrayDimFetch(new Scalar\String_(Scalar\String_::parse($this->semStack[$stackPos-(4-1)]), $attrs), $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            393 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            394 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            395 => function ($stackPos) {
+                 $this->semValue = array(new Stmt\Class_(null, ['type' => 0, 'extends' => $this->semStack[$stackPos-(7-3)], 'implements' => $this->semStack[$stackPos-(7-4)], 'stmts' => $this->semStack[$stackPos-(7-6)]], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes), $this->semStack[$stackPos-(7-2)]);
             $this->checkClass($this->semValue[0], -1);
-    }
-
-    protected function reduceRule384() {
-         $this->semValue = new Expr\New_($this->semStack[$this->stackPos-(3-2)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule385() {
-         list($class, $ctorArgs) = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = new Expr\New_($class, $ctorArgs, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule386() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule387() {
-         $this->semValue = $this->semStack[$this->stackPos-(4-3)];
-    }
-
-    protected function reduceRule388() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule389() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule390() {
-         $this->semValue = new Expr\ClosureUse(substr($this->semStack[$this->stackPos-(2-2)], 1), $this->semStack[$this->stackPos-(2-1)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule391() {
-         $this->semValue = new Expr\FuncCall($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule392() {
-         $this->semValue = new Expr\StaticCall($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule393() {
-         $this->semValue = new Expr\StaticCall($this->semStack[$this->stackPos-(6-1)], $this->semStack[$this->stackPos-(6-4)], $this->semStack[$this->stackPos-(6-6)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule394() {
-
-            if ($this->semStack[$this->stackPos-(2-1)] instanceof Node\Expr\StaticPropertyFetch) {
-                $this->semValue = new Expr\StaticCall($this->semStack[$this->stackPos-(2-1)]->class, new Expr\Variable($this->semStack[$this->stackPos-(2-1)]->name, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes), $this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-            } elseif ($this->semStack[$this->stackPos-(2-1)] instanceof Node\Expr\ArrayDimFetch) {
-                $tmp = $this->semStack[$this->stackPos-(2-1)];
-                while ($tmp->var instanceof Node\Expr\ArrayDimFetch) {
-                    $tmp = $tmp->var;
-                }
-
-                $this->semValue = new Expr\StaticCall($tmp->var->class, $this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-                $tmp->var = new Expr\Variable($tmp->var->name, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-            } else {
-                throw new \Exception;
-            }
-
-    }
-
-    protected function reduceRule395() {
-         $this->semValue = new Expr\FuncCall($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule396() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule397() {
-         $this->semValue = new Name($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule398() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule399() {
-         $this->semValue = new Name($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule400() {
-         $this->semValue = new Name\FullyQualified($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule401() {
-         $this->semValue = new Name\Relative($this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule402() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule403() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule404() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule405() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule406() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule407() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule408() {
-         $this->semValue = new Expr\PropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule409() {
-         $this->semValue = new Expr\PropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule410() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule411() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule412() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule413() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule414() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule415() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule416() {
-         $this->semValue = array(new Scalar\EncapsedStringPart(Scalar\String_::parseEscapeSequences($this->semStack[$this->stackPos-(1-1)], '`', false), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes));
-    }
-
-    protected function reduceRule417() {
-         foreach ($this->semStack[$this->stackPos-(1-1)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '`', false); } }; $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule418() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule419() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule420() {
-         $this->semValue = $this->parseLNumber($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes, true);
-    }
-
-    protected function reduceRule421() {
-         $this->semValue = new Scalar\DNumber(Scalar\DNumber::parse($this->semStack[$this->stackPos-(1-1)]), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule422() {
-         $attrs = $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes; $attrs['kind'] = ($this->semStack[$this->stackPos-(1-1)][0] === "'" || ($this->semStack[$this->stackPos-(1-1)][1] === "'" && ($this->semStack[$this->stackPos-(1-1)][0] === 'b' || $this->semStack[$this->stackPos-(1-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED);
-            $this->semValue = new Scalar\String_(Scalar\String_::parse($this->semStack[$this->stackPos-(1-1)], false), $attrs);
-    }
-
-    protected function reduceRule423() {
-         $this->semValue = new Scalar\MagicConst\Line($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule424() {
-         $this->semValue = new Scalar\MagicConst\File($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule425() {
-         $this->semValue = new Scalar\MagicConst\Dir($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule426() {
-         $this->semValue = new Scalar\MagicConst\Class_($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule427() {
-         $this->semValue = new Scalar\MagicConst\Trait_($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule428() {
-         $this->semValue = new Scalar\MagicConst\Method($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule429() {
-         $this->semValue = new Scalar\MagicConst\Function_($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule430() {
-         $this->semValue = new Scalar\MagicConst\Namespace_($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule431() {
-         $attrs = $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$this->stackPos-(3-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$this->stackPos-(3-1)], $matches); $attrs['docLabel'] = $matches[1];;
-            $this->semValue = new Scalar\String_(Scalar\String_::parseDocString($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-2)], false), $attrs);
-    }
-
-    protected function reduceRule432() {
-         $attrs = $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$this->stackPos-(2-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$this->stackPos-(2-1)], $matches); $attrs['docLabel'] = $matches[1];;
-            $this->semValue = new Scalar\String_('', $attrs);
-    }
-
-    protected function reduceRule433() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule434() {
-         $this->semValue = new Expr\ClassConstFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule435() {
-         $this->semValue = new Expr\ConstFetch($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule436() {
-         $this->semValue = new Expr\Array_($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule437() {
-         $this->semValue = new Expr\Array_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule438() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule439() {
-         $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule440() {
-         $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule441() {
-         $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule442() {
-         $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule443() {
-         $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule444() {
-         $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule445() {
-         $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule446() {
-         $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule447() {
-         $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule448() {
-         $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule449() {
-         $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule450() {
-         $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule451() {
-         $this->semValue = new Expr\BinaryOp\Div($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule452() {
-         $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule453() {
-         $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule454() {
-         $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule455() {
-         $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule456() {
-         $this->semValue = new Expr\UnaryPlus($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule457() {
-         $this->semValue = new Expr\UnaryMinus($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule458() {
-         $this->semValue = new Expr\BooleanNot($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule459() {
-         $this->semValue = new Expr\BitwiseNot($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule460() {
-         $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule461() {
-         $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule462() {
-         $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule463() {
-         $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule464() {
-         $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule465() {
-         $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule466() {
-         $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule467() {
-         $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule468() {
-         $this->semValue = new Expr\Ternary($this->semStack[$this->stackPos-(5-1)], $this->semStack[$this->stackPos-(5-3)], $this->semStack[$this->stackPos-(5-5)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule469() {
-         $this->semValue = new Expr\Ternary($this->semStack[$this->stackPos-(4-1)], null, $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule470() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule471() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
-    }
-
-    protected function reduceRule472() {
-         $this->semValue = new Expr\ConstFetch($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule473() {
-         $this->semValue = new Expr\ClassConstFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule474() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule475() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule476() {
-         $attrs = $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED;
-            foreach ($this->semStack[$this->stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '"', true); } }; $this->semValue = new Scalar\Encapsed($this->semStack[$this->stackPos-(3-2)], $attrs);
-    }
-
-    protected function reduceRule477() {
-         $attrs = $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$this->stackPos-(3-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$this->stackPos-(3-1)], $matches); $attrs['docLabel'] = $matches[1];;
-            foreach ($this->semStack[$this->stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, null, true); } } $s->value = preg_replace('~(\r\n|\n|\r)\z~', '', $s->value); if ('' === $s->value) array_pop($this->semStack[$this->stackPos-(3-2)]);; $this->semValue = new Scalar\Encapsed($this->semStack[$this->stackPos-(3-2)], $attrs);
-    }
-
-    protected function reduceRule478() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule479() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule480() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule481() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule482() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule483() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule484() {
-         $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(3-3)], $this->semStack[$this->stackPos-(3-1)], false, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule485() {
-         $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(1-1)], null, false, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule486() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule487() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule488() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule489() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule490() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(6-2)], $this->semStack[$this->stackPos-(6-5)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule491() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule492() {
-         $this->semValue = new Expr\PropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule493() {
-         $this->semValue = new Expr\MethodCall($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule494() {
-         $this->semValue = new Expr\FuncCall($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule495() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule496() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule497() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule498() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
-    }
-
-    protected function reduceRule499() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule500() {
-         $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule501() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule502() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule503() {
-         $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule504() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule505() {
-         $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$this->stackPos-(3-1)], substr($this->semStack[$this->stackPos-(3-3)], 1), $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule506() {
-         $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$this->stackPos-(6-1)], $this->semStack[$this->stackPos-(6-5)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule507() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule508() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule509() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule510() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule511() {
-         $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule512() {
-         $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule513() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule514() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule515() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule516() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
-    }
-
-    protected function reduceRule517() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule518() {
-         $this->semValue = new Expr\Error($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2;
-    }
-
-    protected function reduceRule519() {
-         $this->semValue = new Expr\List_($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule520() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule521() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule522() {
-         $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(1-1)], null, false, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule523() {
-         $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(1-1)], null, false, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule524() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule525() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule526() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule527() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule528() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule529() {
-         $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(3-3)], $this->semStack[$this->stackPos-(3-1)], false, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule530() {
-         $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(1-1)], null, false, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule531() {
-         $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(4-4)], $this->semStack[$this->stackPos-(4-1)], true, $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule532() {
-         $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(2-2)], null, true, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule533() {
-         $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule534() {
-         $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule535() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule536() {
-         $this->semValue = array($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)]);
-    }
-
-    protected function reduceRule537() {
-         $this->semValue = new Scalar\EncapsedStringPart($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule538() {
-         $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule539() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule540() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule541() {
-         $this->semValue = new Expr\PropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule542() {
-         $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule543() {
-         $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule544() {
-         $this->semValue = new Expr\ArrayDimFetch(new Expr\Variable($this->semStack[$this->stackPos-(6-2)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes), $this->semStack[$this->stackPos-(6-4)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule545() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
-    }
-
-    protected function reduceRule546() {
-         $this->semValue = new Scalar\String_($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule547() {
-         $this->semValue = $this->parseNumString($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule548() {
-         $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
+            },
+            396 => function ($stackPos) {
+                 $this->semValue = new Expr\New_($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            397 => function ($stackPos) {
+                 list($class, $ctorArgs) = $this->semStack[$stackPos-(2-2)]; $this->semValue = new Expr\New_($class, $ctorArgs, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            398 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            399 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(4-3)];
+            },
+            400 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            401 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            402 => function ($stackPos) {
+                 $this->semValue = new Expr\ClosureUse($this->semStack[$stackPos-(2-2)], $this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            403 => function ($stackPos) {
+                 $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            404 => function ($stackPos) {
+                 $this->semValue = new Expr\StaticCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            405 => function ($stackPos) {
+                 $this->semValue = new Expr\StaticCall($this->semStack[$stackPos-(6-1)], $this->semStack[$stackPos-(6-4)], $this->semStack[$stackPos-(6-6)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
+            },
+            406 => function ($stackPos) {
+                 $this->semValue = $this->fixupPhp5StaticPropCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            407 => function ($stackPos) {
+                 $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            408 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            409 => function ($stackPos) {
+                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            410 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            411 => function ($stackPos) {
+                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            412 => function ($stackPos) {
+                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            413 => function ($stackPos) {
+                 $this->semValue = new Name\FullyQualified(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            414 => function ($stackPos) {
+                 $this->semValue = new Name\Relative(substr($this->semStack[$stackPos-(1-1)], 10), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            415 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            416 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            417 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            418 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            419 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            420 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            421 => function ($stackPos) {
+                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            422 => function ($stackPos) {
+                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            423 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            424 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            425 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            426 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            427 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            428 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            429 => function ($stackPos) {
+                 $this->semValue = array(new Scalar\EncapsedStringPart(Scalar\String_::parseEscapeSequences($this->semStack[$stackPos-(1-1)], '`', false), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes));
+            },
+            430 => function ($stackPos) {
+                 foreach ($this->semStack[$stackPos-(1-1)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '`', false); } }; $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            431 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            432 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            433 => function ($stackPos) {
+                 $this->semValue = $this->parseLNumber($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes, true);
+            },
+            434 => function ($stackPos) {
+                 $this->semValue = new Scalar\DNumber(Scalar\DNumber::parse($this->semStack[$stackPos-(1-1)]), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            435 => function ($stackPos) {
+                 $attrs = $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes; $attrs['kind'] = ($this->semStack[$stackPos-(1-1)][0] === "'" || ($this->semStack[$stackPos-(1-1)][1] === "'" && ($this->semStack[$stackPos-(1-1)][0] === 'b' || $this->semStack[$stackPos-(1-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED);
+            $this->semValue = new Scalar\String_(Scalar\String_::parse($this->semStack[$stackPos-(1-1)], false), $attrs);
+            },
+            436 => function ($stackPos) {
+                 $this->semValue = new Scalar\MagicConst\Line($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            437 => function ($stackPos) {
+                 $this->semValue = new Scalar\MagicConst\File($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            438 => function ($stackPos) {
+                 $this->semValue = new Scalar\MagicConst\Dir($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            439 => function ($stackPos) {
+                 $this->semValue = new Scalar\MagicConst\Class_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            440 => function ($stackPos) {
+                 $this->semValue = new Scalar\MagicConst\Trait_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            441 => function ($stackPos) {
+                 $this->semValue = new Scalar\MagicConst\Method($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            442 => function ($stackPos) {
+                 $this->semValue = new Scalar\MagicConst\Function_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            443 => function ($stackPos) {
+                 $this->semValue = new Scalar\MagicConst\Namespace_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            444 => function ($stackPos) {
+                 $this->semValue = $this->parseDocString($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)], false);
+            },
+            445 => function ($stackPos) {
+                 $this->semValue = $this->parseDocString($this->semStack[$stackPos-(2-1)], '', $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(2-2)] + $this->endAttributeStack[$stackPos-(2-2)], false);
+            },
+            446 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            447 => function ($stackPos) {
+                 $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            448 => function ($stackPos) {
+                 $this->semValue = new Expr\ConstFetch($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            449 => function ($stackPos) {
+                 $this->semValue = new Expr\Array_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            450 => function ($stackPos) {
+                 $this->semValue = new Expr\Array_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            451 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            452 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            453 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            454 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            455 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            456 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            457 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            458 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            459 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            460 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            461 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            462 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            463 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            464 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            465 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            466 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            467 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            468 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            469 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            470 => function ($stackPos) {
+                 $this->semValue = new Expr\UnaryPlus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            471 => function ($stackPos) {
+                 $this->semValue = new Expr\UnaryMinus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            472 => function ($stackPos) {
+                 $this->semValue = new Expr\BooleanNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            473 => function ($stackPos) {
+                 $this->semValue = new Expr\BitwiseNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            474 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            475 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            476 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            477 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            478 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            479 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            480 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            481 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            482 => function ($stackPos) {
+                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(5-1)], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+            },
+            483 => function ($stackPos) {
+                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(4-1)], null, $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            484 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            485 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            486 => function ($stackPos) {
+                 $this->semValue = new Expr\ConstFetch($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            487 => function ($stackPos) {
+                 $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            488 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            489 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            490 => function ($stackPos) {
+                 $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED;
+            foreach ($this->semStack[$stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '"', true); } }; $this->semValue = new Scalar\Encapsed($this->semStack[$stackPos-(3-2)], $attrs);
+            },
+            491 => function ($stackPos) {
+                 $this->semValue = $this->parseDocString($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)], true);
+            },
+            492 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            493 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            494 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            495 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            496 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            497 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            498 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            499 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            500 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            501 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            502 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            503 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            504 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-5)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
+            },
+            505 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            506 => function ($stackPos) {
+                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            507 => function ($stackPos) {
+                 $this->semValue = new Expr\MethodCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            508 => function ($stackPos) {
+                 $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            509 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            510 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            511 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            512 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            513 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            514 => function ($stackPos) {
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            515 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            516 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            517 => function ($stackPos) {
+                 $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            518 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            519 => function ($stackPos) {
+                 $var = substr($this->semStack[$stackPos-(1-1)], 1); $this->semValue = \is_string($var) ? new Node\VarLikeIdentifier($var, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes) : $var;
+            },
+            520 => function ($stackPos) {
+                 $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            521 => function ($stackPos) {
+                 $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(6-1)], $this->semStack[$stackPos-(6-5)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
+            },
+            522 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            523 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            524 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            525 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            526 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            527 => function ($stackPos) {
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            528 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            529 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            530 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            531 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            532 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            533 => function ($stackPos) {
+                 $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2;
+            },
+            534 => function ($stackPos) {
+                 $this->semValue = new Expr\List_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            535 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            536 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            537 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            538 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            539 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            540 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            541 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            542 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            543 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            544 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            545 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            546 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-1)], true, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            547 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            548 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, false, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            549 => function ($stackPos) {
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            550 => function ($stackPos) {
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            551 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            552 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]);
+            },
+            553 => function ($stackPos) {
+                 $this->semValue = new Scalar\EncapsedStringPart($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            554 => function ($stackPos) {
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            555 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            556 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            557 => function ($stackPos) {
+                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            558 => function ($stackPos) {
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            559 => function ($stackPos) {
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            560 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-4)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
+            },
+            561 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            562 => function ($stackPos) {
+                 $this->semValue = new Scalar\String_($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            563 => function ($stackPos) {
+                 $this->semValue = $this->parseNumString($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            564 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+        ];
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Parser/Php7.php b/lib/nikic/php-parser/lib/PhpParser/Parser/Php7.php
index 591bd61fc..7a0854b30 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Parser/Php7.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Parser/Php7.php
@@ -17,21 +17,22 @@ use PhpParser\Node\Stmt;
  */
 class Php7 extends \PhpParser\ParserAbstract
 {
-    protected $tokenToSymbolMapSize = 392;
-    protected $actionTableSize = 915;
-    protected $gotoTableSize = 429;
+    protected $tokenToSymbolMapSize = 396;
+    protected $actionTableSize = 1196;
+    protected $gotoTableSize = 545;
 
-    protected $invalidSymbol = 157;
+    protected $invalidSymbol = 168;
     protected $errorSymbol = 1;
     protected $defaultAction = -32766;
     protected $unexpectedTokenRule = 32767;
 
-    protected $YY2TBLSTATE  = 330;
-    protected $YYNLSTATES   = 578;
+    protected $YY2TBLSTATE = 420;
+    protected $numNonLeafStates = 710;
 
     protected $symbolToName = array(
         "EOF",
         "error",
+        "T_THROW",
         "T_INCLUDE",
         "T_INCLUDE_ONCE",
         "T_EVAL",
@@ -58,6 +59,7 @@ class Php7 extends \PhpParser\ParserAbstract
         "T_SL_EQUAL",
         "T_SR_EQUAL",
         "T_POW_EQUAL",
+        "T_COALESCE_EQUAL",
         "'?'",
         "':'",
         "T_COALESCE",
@@ -65,7 +67,8 @@ class Php7 extends \PhpParser\ParserAbstract
         "T_BOOLEAN_AND",
         "'|'",
         "'^'",
-        "'&'",
+        "T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG",
+        "T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG",
         "T_IS_EQUAL",
         "T_IS_NOT_EQUAL",
         "T_IS_IDENTICAL",
@@ -126,6 +129,7 @@ class Php7 extends \PhpParser\ParserAbstract
         "T_ENDDECLARE",
         "T_AS",
         "T_SWITCH",
+        "T_MATCH",
         "T_ENDSWITCH",
         "T_CASE",
         "T_DEFAULT",
@@ -133,12 +137,12 @@ class Php7 extends \PhpParser\ParserAbstract
         "T_CONTINUE",
         "T_GOTO",
         "T_FUNCTION",
+        "T_FN",
         "T_CONST",
         "T_RETURN",
         "T_TRY",
         "T_CATCH",
         "T_FINALLY",
-        "T_THROW",
         "T_USE",
         "T_INSTEADOF",
         "T_GLOBAL",
@@ -148,6 +152,7 @@ class Php7 extends \PhpParser\ParserAbstract
         "T_PRIVATE",
         "T_PROTECTED",
         "T_PUBLIC",
+        "T_READONLY",
         "T_VAR",
         "T_UNSET",
         "T_ISSET",
@@ -156,9 +161,11 @@ class Php7 extends \PhpParser\ParserAbstract
         "T_CLASS",
         "T_TRAIT",
         "T_INTERFACE",
+        "T_ENUM",
         "T_EXTENDS",
         "T_IMPLEMENTS",
         "T_OBJECT_OPERATOR",
+        "T_NULLSAFE_OBJECT_OPERATOR",
         "T_LIST",
         "T_ARRAY",
         "T_CALLABLE",
@@ -178,585 +185,719 @@ class Php7 extends \PhpParser\ParserAbstract
         "T_DIR",
         "T_NS_SEPARATOR",
         "T_ELLIPSIS",
+        "T_NAME_FULLY_QUALIFIED",
+        "T_NAME_QUALIFIED",
+        "T_NAME_RELATIVE",
+        "T_ATTRIBUTE",
         "';'",
+        "']'",
         "'{'",
         "'}'",
         "'('",
         "')'",
         "'`'",
-        "']'",
         "'\"'",
         "'$'"
     );
 
     protected $tokenToSymbol = array(
-            0,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,   53,  155,  157,  156,   52,   35,  157,
-          151,  152,   50,   47,    7,   48,   49,   51,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,   29,  148,
-           41,   15,   43,   28,   65,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,   67,  157,  154,   34,  157,  153,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  149,   33,  150,   55,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
-          157,  157,  157,  157,  157,  157,    1,    2,    3,    4,
-            5,    6,    8,    9,   10,   11,   12,   13,   14,   16,
+            0,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,   56,  166,  168,  167,   55,  168,  168,
+          163,  164,   53,   50,    8,   51,   52,   54,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,   31,  159,
+           44,   16,   46,   30,   68,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,   70,  168,  160,   36,  168,  165,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  161,   35,  162,   58,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+          168,  168,  168,  168,  168,  168,    1,    2,    3,    4,
+            5,    6,    7,    9,   10,   11,   12,   13,   14,   15,
            17,   18,   19,   20,   21,   22,   23,   24,   25,   26,
-           27,   30,   31,   32,   36,   37,   38,   39,   40,   42,
-           44,   45,   46,   54,   56,   57,   58,   59,   60,   61,
-           62,   63,   64,   66,   68,   69,   70,   71,   72,   73,
-           74,   75,   76,   77,   78,   79,   80,   81,  157,  157,
-           82,   83,   84,   85,   86,   87,   88,   89,   90,   91,
+           27,   28,   29,   32,   33,   34,   37,   38,   39,   40,
+           41,   42,   43,   45,   47,   48,   49,   57,   59,   60,
+           61,   62,   63,   64,   65,   66,   67,   69,   71,   72,
+           73,   74,   75,   76,   77,   78,   79,   80,   81,   82,
+           83,   84,   85,   86,   87,   88,   89,   90,   91,   92,
+           93,   94,   95,   96,   97,   98,   99,  100,  101,  102,
+          103,  104,  105,  106,  107,  108,  109,  110,  111,  112,
+          113,  114,  115,  116,  117,  118,  119,  120,  121,  122,
+          123,  124,  125,  126,  127,  128,  129,  130,  131,  132,
+          133,  134,  135,  136,  137,  138,  139,  140,  141,  142,
+          143,  144,  145,  146,  147,  148,  149,  150,  151,  152,
+          153,  154,  155,  156,  157,  158
+    );
+
+    protected $action = array(
+          132,  133,  134,  569,  135,  136,    0,  722,  723,  724,
+          137,   37,  834,  911,  835,  469,-32766,-32766,-32766,-32767,
+        -32767,-32767,-32767,  101,  102,  103,  104,  105, 1068, 1069,
+         1070, 1067, 1066, 1065, 1071,  716,  715,-32766,-32766,-32766,
+        -32766,-32766,-32766,-32766,-32766,-32766,-32767,-32767,-32767,-32767,
+        -32767,  545,  546,-32766,-32766,  725,-32766,-32766,-32766,  998,
+          999,  806,  922,  447,  448,  449,  370,  371,    2,  267,
+          138,  396,  729,  730,  731,  732,  414,-32766,  420,-32766,
+        -32766,-32766,-32766,-32766,  990,  733,  734,  735,  736,  737,
+          738,  739,  740,  741,  742,  743,  763,  570,  764,  765,
+          766,  767,  755,  756,  336,  337,  758,  759,  744,  745,
+          746,  748,  749,  750,  346,  790,  791,  792,  793,  794,
+          795,  751,  752,  571,  572,  784,  775,  773,  774,  787,
+          770,  771,  283,  420,  573,  574,  769,  575,  576,  577,
+          578,  579,  580,  598, -575,  470,   14,  798,  772,  581,
+          582, -575,  139,-32766,-32766,-32766,  132,  133,  134,  569,
+          135,  136, 1017,  722,  723,  724,  137,   37, 1060,-32766,
+        -32766,-32766, 1303,  696,-32766, 1304,-32766,-32766,-32766,-32766,
+        -32766,-32766,-32766, 1068, 1069, 1070, 1067, 1066, 1065, 1071,
+        -32766,  716,  715,  372,  371, 1258,-32766,-32766,-32766, -572,
+          106,  107,  108,  414,  270,  891, -572,  240, 1193, 1192,
+         1194,  725,-32766,-32766,-32766, 1046,  109,-32766,-32766,-32766,
+        -32766,  986,  985,  984,  987,  267,  138,  396,  729,  730,
+          731,  732,   12,-32766,  420,-32766,-32766,-32766,-32766,  998,
+          999,  733,  734,  735,  736,  737,  738,  739,  740,  741,
+          742,  743,  763,  570,  764,  765,  766,  767,  755,  756,
+          336,  337,  758,  759,  744,  745,  746,  748,  749,  750,
+          346,  790,  791,  792,  793,  794,  795,  751,  752,  571,
+          572,  784,  775,  773,  774,  787,  770,  771,  881,  321,
+          573,  574,  769,  575,  576,  577,  578,  579,  580,-32766,
+           82,   83,   84, -575,  772,  581,  582, -575,  148,  747,
+          717,  718,  719,  720,  721, 1278,  722,  723,  724,  760,
+          761,   36, 1277,   85,   86,   87,   88,   89,   90,   91,
+           92,   93,   94,   95,   96,   97,   98,   99,  100,  101,
+          102,  103,  104,  105,  106,  107,  108,  996,  270,  150,
+        -32766,-32766,-32766,  455,  456,   81,   34, -264, -572, 1016,
+          109,  320, -572,  893,  725,  682,  803,  128,  998,  999,
+          592,-32766, 1044,-32766,-32766,-32766,  809,  151,  726,  727,
+          728,  729,  730,  731,  732,  -88, 1198,  796,  278, -526,
+          283,-32766,-32766,-32766,  733,  734,  735,  736,  737,  738,
+          739,  740,  741,  742,  743,  763,  786,  764,  765,  766,
+          767,  755,  756,  757,  785,  758,  759,  744,  745,  746,
+          748,  749,  750,  789,  790,  791,  792,  793,  794,  795,
+          751,  752,  753,  754,  784,  775,  773,  774,  787,  770,
+          771,  144,  804,  762,  768,  769,  776,  777,  779,  778,
+          780,  781, -314, -526, -526, -193, -192,  772,  783,  782,
+           49,   50,   51,  500,   52,   53,  239,  807, -526,  -86,
+           54,   55, -111,   56,  996,  253,-32766, -111,  800, -111,
+         -526,  541, -532, -352,  300, -352,  304, -111, -111, -111,
+         -111, -111, -111, -111, -111,  998,  999,  998,  999,  153,
+        -32766,-32766,-32766, 1191,  807,  126,  306, 1293,   57,   58,
+          103,  104,  105, -111,   59, 1218,   60,  246,  247,   61,
+           62,   63,   64,   65,   66,   67,   68, -525,   27,  268,
+           69,  436,  501, -328,  808,  -86, 1224, 1225,  502, 1189,
+          807, 1198, 1230,  293, 1222,   41,   24,  503,   74,  504,
+          953,  505,  320,  506,  802,  154,  507,  508,  279,  684,
+          280,   43,   44,  437,  367,  366,  891,   45,  509,   35,
+          249,  -16, -566,  358,  332,  318, -566, 1198, 1193, 1192,
+         1194, -527,  510,  511,  512,  333, -524, 1274,   48,  716,
+          715, -525, -525,  334,  513,  514,  807, 1212, 1213, 1214,
+         1215, 1209, 1210,  292,  360,  284, -525,  285, -314, 1216,
+         1211, -193, -192, 1193, 1192, 1194,  293,  891, -525,  364,
+         -531,   70,  807,  316,  317,  320,   31,  110,  111,  112,
+          113,  114,  115,  116,  117,  118,  119,  120,  121,  122,
+         -153, -153, -153,  638,   25, -527, -527,  687,  379,  881,
+         -524, -524,  296,  297,  891, -153,  432, -153,  807, -153,
+         -527, -153,  716,  715,  433, -524,  798,  363, -111, 1105,
+         1107,  365, -527,  434,  891,  140,  435, -524,  954,  127,
+         -524,  320, -111, -111,  688,  813,  381, -529,   11,  834,
+          155,  835,  867, -111, -111, -111, -111,   47,  293,-32766,
+          881,  654,  655,   74,  689, 1191, 1045,  320,  708,  149,
+          399,  157,-32766,-32766,-32766,   32,-32766,  -79,-32766,  123,
+        -32766,  716,  715,-32766,  893,  891,  682, -153,-32766,-32766,
+        -32766,  716,  715,  891,-32766,-32766,  124,  881,  129,   74,
+        -32766,  411,  130,  320, -524, -524,  143,  141,  -75,-32766,
+          158, -529, -529,  320,   27,  691,  159,  881,  160, -524,
+          161,  294,  295,  698,  368,  369,  807,  -73,-32766,  -72,
+         1222, -524,  373,  374, 1191,  893,  -71,  682, -529,   73,
+          -70,-32766,-32766,-32766,  -69,-32766,  -68,-32766,  125,-32766,
+          630,  631,-32766,  -67,  -66,  -47,  -51,-32766,-32766,-32766,
+          -18,  147,  271,-32766,-32766,  277,  697,  700,  881,-32766,
+          411,  890,  893,  146,  682,  282,  881,  907,-32766,  281,
+          513,  514,  286, 1212, 1213, 1214, 1215, 1209, 1210,  326,
+          131,  145,  939,  287,  682, 1216, 1211,  109,  270,-32766,
+          798,  807,-32766,  662,  639, 1191,  657,   72,  675, 1075,
+          317,  320,-32766,-32766,-32766, 1305,-32766,  301,-32766,  628,
+        -32766,  431,  543,-32766,-32766,  923,  555,  924,-32766,-32766,
+        -32766, 1229,  549,-32766,-32766,-32766,   -4,  891, -490, 1191,
+        -32766,  411,  644,  893,  299,  682,-32766,-32766,-32766,-32766,
+        -32766,  893,-32766,  682,-32766,   13, 1231,-32766,  452,  480,
+          645,  909,-32766,-32766,-32766,-32766,  658, -480,-32766,-32766,
+            0, 1191,    0,    0,-32766,  411,    0,  298,-32766,-32766,
+        -32766,  305,-32766,-32766,-32766,    0,-32766,    0,  806,-32766,
+            0,    0,    0,  475,-32766,-32766,-32766,-32766,    0,    7,
+        -32766,-32766,   16, 1191,  561,  596,-32766,  411, 1219,  891,
+        -32766,-32766,-32766,  362,-32766,-32766,-32766,  818,-32766, -267,
+          881,-32766,   39,  293,    0,    0,-32766,-32766,-32766,   40,
+          705,  706,-32766,-32766,  872,  963,  940,  947,-32766,  411,
+          937,  948,  365,  870,  427,  891,  935,-32766, 1049,  291,
+         1244, 1052, 1053, -111, -111, 1050, 1051, 1057, -560, 1262,
+         1296,  633,    0,  826, -111, -111, -111, -111,   33,  315,
+        -32766,  361,  683,  686,  690,  692, 1191,  693,  694,  695,
+          699,  685,  320,-32766,-32766,-32766,    9,-32766,  702,-32766,
+          868,-32766,  881, 1300,-32766,  893, 1302,  682,   -4,-32766,
+        -32766,-32766,  829,  828,  837,-32766,-32766,  916, -242, -242,
+         -242,-32766,  411,  955,  365,   27,  836, 1301,  915,  917,
+        -32766,  914, 1177,  900,  910, -111, -111,  807,  881,  898,
+          945, 1222,  946, 1299, 1256,  867, -111, -111, -111, -111,
+         1245, 1263, 1269, 1272, -241, -241, -241, -558, -532, -531,
+          365, -530,    1,   28,   29,   38,   42,   46,   71,    0,
+           75, -111, -111,   76,   77,   78,   79,  893,   80,  682,
+         -242,  867, -111, -111, -111, -111,  142,  152,  156,  245,
+          322,  347,  514,  348, 1212, 1213, 1214, 1215, 1209, 1210,
+          349,  350,  351,  352,  353,  354, 1216, 1211,  355,  356,
+          357,  359,  428,  893, -265,  682, -241, -264,   72,    0,
+           18,  317,  320,   19,   20,   21,   23,  398,  471,  472,
+          479,  482,  483,  484,  485,  489,  490,  491,  498,  669,
+         1202, 1145, 1220, 1019, 1018, 1181, -269, -103,   17,   22,
+           26,  290,  397,  589,  593,  620,  674, 1149, 1197, 1146,
+         1275,    0, -494, 1162,    0, 1223
+    );
+
+    protected $actionCheck = array(
+            2,    3,    4,    5,    6,    7,    0,    9,   10,   11,
+           12,   13,  106,    1,  108,   31,    9,   10,   11,   44,
+           45,   46,   47,   48,   49,   50,   51,   52,  116,  117,
+          118,  119,  120,  121,  122,   37,   38,   30,  116,   32,
+           33,   34,   35,   36,   37,   38,   39,   40,   41,   42,
+           43,  117,  118,    9,   10,   57,    9,   10,   11,  137,
+          138,  155,  128,  129,  130,  131,  106,  107,    8,   71,
+           72,   73,   74,   75,   76,   77,  116,   30,   80,   32,
+           33,   34,   35,   36,    1,   87,   88,   89,   90,   91,
            92,   93,   94,   95,   96,   97,   98,   99,  100,  101,
           102,  103,  104,  105,  106,  107,  108,  109,  110,  111,
           112,  113,  114,  115,  116,  117,  118,  119,  120,  121,
           122,  123,  124,  125,  126,  127,  128,  129,  130,  131,
-          132,  133,  134,  135,  136,  137,  157,  157,  157,  157,
-          157,  157,  138,  139,  140,  141,  142,  143,  144,  145,
-          146,  147
-    );
-
-    protected $action = array(
-          583,  584,  585,  586,  587, 1037,  588,  589,  590,  626,
-          627,  479,   29,  101,  102,  103,  104,  105,  106,  107,
-          108,  109,  110,  111,  112,-32766,-32766,-32766,   97,   98,
-           99,    0,  241,  387, -282,-32766,-32766,-32766,-32766, -487,
-         1081,  544, 1084, 1082,  100,-32766,  664,-32766,-32766,-32766,
-        -32766,-32766,  591,  901,  903,-32766,   30,-32766,-32766,-32766,
-        -32766,-32766,-32766, 1034,-32766,  295,  592,  593,  594,  595,
-          596,  597,  598,-32766,  274,  658,  869,  870,  871,  868,
-          867,  866,  599,  600,  601,  602,  603,  604,  605,  606,
-          607,  608,  609,  629,  630,  631,  632,  633,  621,  622,
-          623,  624,  625,  610,  611,  612,  613,  614,  615,  616,
-          652,  653,  654,  655,  656,  657,  617,  618,  619,  620,
-          650,  641,  639,  640,  636,  637, -251,  628,  634,  635,
-          642,  643,  645,  644,  646,  647,   74,   75,   76,  556,
-          266,  638,  649,  648,  739,   44,   45,  392,   46,   47,
-          375,  680,  681,   73,   48,   49,   28,   50,   77,   78,
-           79,   80,   81,   82,   83,   84,   85,   86,   87,   88,
-           89,   90,   91,   92,   93,   94,   95,   96,   97,   98,
-           99,  218,  241,  996, -487, -443, -487,-32766,-32766,-32766,
-           51,   52,  116,  663,  100,  339,   53,  242,   54,  221,
-          222,   55,   56,   57,   58,   59,   60,   61,   62, -173,
-           24,  234,   63,  347,  393,-32766,-32766,-32766, 1001, 1002,
-          394,  228, 1034,  217,  729,-32766, 1000,   34,   19,  395,
-         1051,  396,  127,  397,  118,  398, -442,   24,  399,  984,
-           43,  267,   36,   37,  400,  351, -443,   38,  401, 1034,
-          248,   64,  289, 1000,  288,  290,  248,-32766,  741,  226,
-         -443, 1034,  404,  405,  406,  442,  291, -443,  371, -446,
-          376, -251,  409,  410,   26, 1006, 1007, 1008, 1009, 1003,
-         1004,  245,  977,-32766,-32766,-32766,  419, 1010, 1005,  349,
-         -488,  226,  549,  278,   65,-32766,  257, -442,  262,  266,
-          410,  660,  467,-32766, 1073,-32766, 1048, 1072,-32766,-32766,
-        -32766, -442,-32766,-32766,-32766, 1078,-32766, 1034, -442,-32766,
-         -445,   67, 1014,-32766,-32766,-32766,  266,-32766,-32766,-32766,
-         -479,  123,-32766,  660, -172,-32766,  418,-32766,  266,  531,
-        -32766,-32766,-32766,-32766,-32766,-32766,-32766,  223,-32766,  560,
-          977,-32766,  818,  819, -173,-32766,-32766,-32766,  818,  819,
-        -32766,-32766, -227,  561,-32766,   27,  224,-32766,  418,-32766,
-        -32766,  122, -441,-32766, -232,-32766,  824,   40,  124,  227,
-          -88,  791,  265,-32766,  984, 1052,-32766,-32766,-32766,  660,
-           94,   95,   96,-32766,  266,  364,-32766,-32766,-32766,   42,
-        -32766,  553,-32766,  122,-32766,-32766,-32766,-32766,-32766,-32766,
-        -32766,-32766,-32766,-32766,-32766,-32766,-32766,-32766,  363,  532,
-        -32766,  660,  554,-32766,  418,-32766, -477,    9,-32766,-32766,
-        -32766,-32766,-32766, -441,-32766, -488,-32766, -488,  249,-32766,
-          248,  660,  121,-32766,-32766,-32766,-32766, -441,-32766,-32766,
-          359,  555,-32766,  551, -441,-32766,  418,  517,  518,  115,
-          250,-32766, 1034,-32766,-32767,-32767,-32767,-32767,   92,   93,
-           94,   95,   96,   23,  308, -479,  504,   20,  344, -172,
-          225,  117,  741,  126,-32766,  533, -441,  564,  349,-32766,
-          660,  133,  847,-32766,-32766,  977,  120,-32766,-32766,-32766,
-          792,-32766,  119,-32766,  114,-32766,  345,  419,-32766,  113,
-          349,  130,-32766,-32766,-32766,  132,-32766,-32766,-32766,  738,
-          741,-32766,  660,  241,-32766,  418,-32766,  244,-32766,-32766,
-        -32766,-32766,-32766,-32766,  128,-32766,  753,-32766,  527,  266,
-        -32766,  741,  818,  819,-32766,-32766,-32766, -441,  100,-32766,
-        -32766,  129,  313,-32766,  680,  681,-32766,  418,   41,-32766,
-          660, -441,-32766,  453,-32766,  660,  321,-32766, -441,-32766,
-          777, -477,-32766,-32766,-32766, 1083,-32766,  261,-32766,  441,
-        -32766,  385,    8,-32766,  437,   24,  360,-32766,-32766,-32766,
-          497,  498,-32766,-32766,-32766,  501,-32766, 1034,-32766,-32766,
-          418, 1000,  818,  819,  660,  846,  575,-32766,-32766,  358,
-           -4,-32766,-32766,-32766,  301,-32766, 1076,-32766,  661,-32766,
-          455,  696,-32766,  858,  565,  513,-32766,-32766,-32766,  440,
-          977,-32766,-32766,  973,  446,-32766,  505,-32766,-32766,  418,
-         -133, -133, -133,-32766,-32766,-32766,-32766,  409,  410,  451,
-          542,  528,  509,  521,  510, -133,   12, -133,  -80, -133,
-          216, -133,  495,-32766,  458,-32766,-32766,-32766,-32766,   67,
-          348,  356,  259,  258,  266, 1016,-32766,-32766,-32766,-32766,
-          260,  402,  403,  869,  870,  871,  868,  867,  866,  861,
-          715,  760,  407,  408,  977,  761,  762,-32766,   11,-32766,
-        -32766,-32766,-32766,-32766,-32766,-32767,-32767,-32767,-32767,-32767,
-          264,  229,  348,  337, 1013,  852,  741,   17, -133,  256,
-         -212, -212, -212,  402,  403, -400,  348,    5,  307,  775,
-          758,   21,  672,  760,  407,  408,  329,  402,  403, -211,
-         -211, -211,  448,   24,  326,  348,  715,  760,  407,  408,
-          341,  340,  318,  276,  325, 1034,  402,  403,  741, 1000,
-           -4,-32766,-32766,-32766,  359,  715,  760,  407,  408,  755,
-          552,   33,  741,  573, -212,  574,  720,  842,  794,  778,
-           32,-32766,  851,-32766,-32766,  854,  853,  850,  977,  773,
-          785,  741,  718, -211,  786,  843,  741,  252,  334,  550,
-          557,  558,  559,  562,  272,  409,  410,  273,  571,  570,
-          568,  566,  563,  335,    0,  757,  965,  783,  859,    0,
-          746,  964,  963,  756,  748,  683,    0,   67, 1079,  682,
-          685,  784,  266,  567,  716, 1080,  675,  674,  684,  759,
-         1049, 1046, 1041, 1077, 1035, 1028,    0, -444, -467, -446,
-         -445,   22,   25,   31,   35,   39,   66,  338,  336,  275,
-          240,  239,  238,  237,  220,  219,  134,  131,  125,   72,
-           71,   70,   69,   68, -469,    0,  310,  475,  941,  491,
-          541,  944,   13,  969,  825,  998,  940,  988, -230,  -88,
-          538,  390,  383,  380,  377,  311,   18,   16,   15,   14,
-         -227, -228,    0,  957, -412,    0,  503,    0, 1040, 1075,
-         1026, 1027,  997,    0, 1015
-    );
-
-    protected $actionCheck = array(
-            2,    3,    4,    5,    6,    1,    8,    9,   10,   11,
-           12,   48,   15,   16,   17,   18,   19,   20,   21,   22,
-           23,   24,   25,   26,   27,    8,    9,   10,   50,   51,
-           52,    0,   54,    7,   79,    8,    9,   10,    8,    7,
-           77,   77,   79,   80,   66,   28,    1,   30,   31,   32,
-           33,   34,   54,   56,   57,   28,   13,   30,   31,   32,
-           33,   34,   35,   79,  109,    7,   68,   69,   70,   71,
-           72,   73,   74,  118,    7,   77,  112,  113,  114,  115,
-          116,  117,   84,   85,   86,   87,   88,   89,   90,   91,
-           92,   93,   94,   95,   96,   97,   98,   99,  100,  101,
-          102,  103,  104,  105,  106,  107,  108,  109,  110,  111,
-          112,  113,  114,  115,  116,  117,  118,  119,  120,  121,
-          122,  123,  124,  125,  126,  127,    7,  129,  130,  131,
-          132,  133,  134,  135,  136,  137,    8,    9,   10,   29,
-          156,  143,  144,  145,    1,    2,    3,    4,    5,    6,
-           29,  102,  103,  149,   11,   12,   28,   14,   30,   31,
-           32,   33,   34,   35,   36,   37,   38,   39,   40,   41,
-           42,   43,   44,   45,   46,   47,   48,   49,   50,   51,
-           52,   13,   54,    1,  152,   67,  154,    8,    9,   10,
-           47,   48,   13,  148,   66,  146,   53,    7,   55,   56,
-           57,   58,   59,   60,   61,   62,   63,   64,   65,    7,
-           67,   68,   69,   70,   71,    8,    9,   10,   75,   76,
-           77,    7,   79,   13,   81,    1,   83,   84,   85,   86,
-            1,   88,   67,   90,    7,   92,   67,   67,   95,    1,
-            7,   67,   99,  100,  101,  102,  128,  104,  105,   79,
-           28,  108,    7,   83,  111,  112,   28,    1,  148,   35,
-          142,   79,  119,  120,  121,   82,    7,  149,    7,  151,
-          149,  152,  129,  130,    7,  132,  133,  134,  135,  136,
-          137,  138,  112,    8,    9,   10,  143,  144,  145,  146,
-            7,   35,  149,   33,  151,   71,  153,  128,  155,  156,
-          130,   77,  128,   28,   79,   81,   77,   82,   84,   85,
-           86,  142,   88,    1,   90,  150,   92,   79,  149,   95,
-          151,  151,  139,   99,  100,  101,  156,   71,  104,  105,
-            7,  149,  108,   77,    7,  111,  112,   81,  156,   79,
-           84,   85,   86,  119,   88,    1,   90,   35,   92,   29,
-          112,   95,  130,  131,  152,   99,  100,  101,  130,  131,
-          104,  105,  152,   29,  108,  140,  141,  111,  112,    8,
-            9,  147,   67,  149,  152,  119,  152,   67,  149,   35,
-          152,   29,    7,   71,    1,  152,    8,    9,   10,   77,
-           47,   48,   49,   81,  156,    7,   84,   85,   86,   67,
-           88,   29,   90,  147,   92,  149,   28,   95,   30,   31,
-           32,   99,  100,  101,    1,   71,  104,  105,    7,   77,
-          108,   77,   29,  111,  112,   81,    7,    7,   84,   85,
-           86,  119,   88,  128,   90,  152,   92,  154,  128,   95,
-           28,   77,   29,   99,  100,  101,    1,  142,  104,  105,
-          146,   29,  108,  149,  149,  111,  112,   72,   73,  149,
-          128,  149,   79,  119,   41,   42,   43,   44,   45,   46,
-           47,   48,   49,    7,  142,  152,   72,   73,    7,  152,
-           35,  149,  148,   15,   71,  143,   67,   29,  146,    1,
-           77,   15,  150,  149,   81,  112,   15,   84,   85,   86,
-          148,   88,   15,   90,   15,   92,  123,  143,   95,   15,
-          146,   15,   99,  100,  101,   15,   71,  104,  105,   29,
-          148,  108,   77,   54,  111,  112,   81,   29,    1,   84,
-           85,   86,  119,   88,   29,   90,   35,   92,   74,  156,
-           95,  148,  130,  131,   99,  100,  101,  128,   66,  104,
-          105,   97,   98,  108,  102,  103,  111,  112,   67,   71,
-           77,  142,  149,   77,  119,   77,   78,   82,  149,   81,
-          148,  152,   84,   85,   86,   80,   88,  110,   90,   77,
-           92,  102,  103,   95,   77,   67,   77,   99,  100,  101,
-          106,  107,  104,  105,  149,   79,  108,   79,   71,  111,
-          112,   83,  130,  131,   77,  148,  149,  119,   81,   77,
-            0,   84,   85,   86,   77,   88,   77,   90,   77,   92,
-           77,   77,   95,  148,  149,   79,   99,  100,  101,   79,
-          112,  104,  105,   79,   82,  108,   87,  149,  111,  112,
-           72,   73,   74,    8,    9,   10,  119,  129,  130,   86,
-           89,   91,   93,   96,   96,   87,   94,   89,   94,   91,
-           94,   93,  109,   28,   94,   30,   31,   32,   33,  151,
-          102,  102,  127,  126,  156,  139,  149,    8,    9,   10,
-          109,  113,  114,  112,  113,  114,  115,  116,  117,  118,
-          122,  123,  124,  125,  112,  123,  123,   28,  142,   30,
-           31,   32,   33,   34,   35,   36,   37,   38,   39,   40,
-          126,   35,  102,  103,  139,  148,  148,  152,  150,  109,
-           96,   97,   98,  113,  114,  142,  102,  142,  142,  148,
-          150,  152,  122,  123,  124,  125,  146,  113,  114,   96,
-           97,   98,  146,   67,  146,  102,  122,  123,  124,  125,
-          146,  146,  146,  143,  146,   79,  113,  114,  148,   83,
-          150,    8,    9,   10,  146,  122,  123,  124,  125,  147,
-          149,  148,  148,  148,  150,  148,  148,  148,  148,  148,
-          148,   28,  148,   30,   31,  148,  148,  148,  112,  148,
-          148,  148,  148,  150,  148,  148,  148,  152,  149,  149,
-          149,  149,  149,  149,  149,  129,  130,  149,  149,  149,
-          149,  149,  149,  149,   -1,  150,  150,  150,  150,   -1,
-          150,  150,  150,  150,  150,  150,   -1,  151,  150,  150,
-          150,  150,  156,  150,  150,  150,  150,  150,  150,  150,
-          150,  150,  150,  150,  150,  150,   -1,  151,  151,  151,
-          151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
-          151,  151,  151,  151,  151,  151,  151,  151,  151,  151,
-          151,  151,  151,  151,  151,   -1,  152,  152,  152,  152,
-          152,  152,  152,  152,  152,  152,  152,  152,  152,  152,
-          152,  152,  152,  152,  152,  152,  152,  152,  152,  152,
-          152,  152,   -1,  153,  153,   -1,  154,   -1,  154,  154,
-          154,  154,  154,   -1,  155
+          132,  133,   30,   80,  136,  137,  138,  139,  140,  141,
+          142,  143,  144,   51,    1,  161,  101,   80,  150,  151,
+          152,    8,  154,    9,   10,   11,    2,    3,    4,    5,
+            6,    7,  164,    9,   10,   11,   12,   13,  123,    9,
+           10,   11,   80,  161,   30,   83,   32,   33,   34,   35,
+           36,   37,   38,  116,  117,  118,  119,  120,  121,  122,
+           30,   37,   38,  106,  107,    1,    9,   10,   11,    1,
+           53,   54,   55,  116,   57,    1,    8,   14,  155,  156,
+          157,   57,    9,   10,   11,  162,   69,   30,  116,   32,
+           33,  119,  120,  121,  122,   71,   72,   73,   74,   75,
+           76,   77,    8,   30,   80,   32,   33,   34,   35,  137,
+          138,   87,   88,   89,   90,   91,   92,   93,   94,   95,
+           96,   97,   98,   99,  100,  101,  102,  103,  104,  105,
+          106,  107,  108,  109,  110,  111,  112,  113,  114,  115,
+          116,  117,  118,  119,  120,  121,  122,  123,  124,  125,
+          126,  127,  128,  129,  130,  131,  132,  133,   84,   70,
+          136,  137,  138,  139,  140,  141,  142,  143,  144,    9,
+            9,   10,   11,  160,  150,  151,  152,  164,  154,    2,
+            3,    4,    5,    6,    7,    1,    9,   10,   11,   12,
+           13,   30,    8,   32,   33,   34,   35,   36,   37,   38,
+           39,   40,   41,   42,   43,   44,   45,   46,   47,   48,
+           49,   50,   51,   52,   53,   54,   55,  116,   57,   14,
+            9,   10,   11,  134,  135,  161,    8,  164,  160,    1,
+           69,  167,  164,  159,   57,  161,   80,    8,  137,  138,
+            1,   30,    1,   32,   33,   34,    1,   14,   71,   72,
+           73,   74,   75,   76,   77,   31,    1,   80,   30,   70,
+           30,    9,   10,   11,   87,   88,   89,   90,   91,   92,
+           93,   94,   95,   96,   97,   98,   99,  100,  101,  102,
+          103,  104,  105,  106,  107,  108,  109,  110,  111,  112,
+          113,  114,  115,  116,  117,  118,  119,  120,  121,  122,
+          123,  124,  125,  126,  127,  128,  129,  130,  131,  132,
+          133,    8,  156,  136,  137,  138,  139,  140,  141,  142,
+          143,  144,    8,  134,  135,    8,    8,  150,  151,  152,
+            2,    3,    4,    5,    6,    7,   97,   82,  149,   31,
+           12,   13,  101,   15,  116,    8,  116,  106,   80,  108,
+          161,   85,  163,  106,  113,  108,    8,  116,  117,  118,
+          119,  120,  121,  122,  123,  137,  138,  137,  138,   14,
+            9,   10,   11,   80,   82,   14,    8,   85,   50,   51,
+           50,   51,   52,  128,   56,    1,   58,   59,   60,   61,
+           62,   63,   64,   65,   66,   67,   68,   70,   70,   71,
+           72,   73,   74,  162,  159,   97,   78,   79,   80,  116,
+           82,    1,  146,  158,   86,   87,   88,   89,  163,   91,
+           31,   93,  167,   95,  156,   14,   98,   99,   35,  161,
+           37,  103,  104,  105,  106,  107,    1,  109,  110,  147,
+          148,   31,  160,  115,  116,    8,  164,    1,  155,  156,
+          157,   70,  124,  125,  126,    8,   70,    1,   70,   37,
+           38,  134,  135,    8,  136,  137,   82,  139,  140,  141,
+          142,  143,  144,  145,    8,   35,  149,   37,  164,  151,
+          152,  164,  164,  155,  156,  157,  158,    1,  161,    8,
+          163,  163,   82,  165,  166,  167,   16,   17,   18,   19,
+           20,   21,   22,   23,   24,   25,   26,   27,   28,   29,
+           75,   76,   77,   75,   76,  134,  135,   31,    8,   84,
+          134,  135,  134,  135,    1,   90,    8,   92,   82,   94,
+          149,   96,   37,   38,    8,  149,   80,  149,  128,   59,
+           60,  106,  161,    8,    1,  161,    8,  161,  159,  161,
+           70,  167,  117,  118,   31,    8,  106,   70,  108,  106,
+           14,  108,  127,  128,  129,  130,  131,   70,  158,   74,
+           84,   75,   76,  163,   31,   80,  159,  167,  161,  101,
+          102,   14,   87,   88,   89,   14,   91,   31,   93,   16,
+           95,   37,   38,   98,  159,    1,  161,  162,  103,  104,
+          105,   37,   38,    1,  109,  110,   16,   84,   16,  163,
+          115,  116,   16,  167,  134,  135,   16,  161,   31,  124,
+           16,  134,  135,  167,   70,   31,   16,   84,   16,  149,
+           16,  134,  135,   31,  106,  107,   82,   31,   74,   31,
+           86,  161,  106,  107,   80,  159,   31,  161,  161,  154,
+           31,   87,   88,   89,   31,   91,   31,   93,  161,   95,
+          111,  112,   98,   31,   31,   31,   31,  103,  104,  105,
+           31,   31,   31,  109,  110,   31,   31,   31,   84,  115,
+          116,   31,  159,   31,  161,   37,   84,   38,  124,   35,
+          136,  137,   35,  139,  140,  141,  142,  143,  144,   35,
+           31,   70,  159,   37,  161,  151,  152,   69,   57,   74,
+           80,   82,   85,   77,   90,   80,   94,  163,   92,   82,
+          166,  167,   87,   88,   89,   83,   91,  114,   93,  113,
+           95,  128,   85,   98,  116,  128,  153,  128,  103,  104,
+          105,  146,   89,   74,  109,  110,    0,    1,  149,   80,
+          115,  116,   96,  159,  133,  161,   87,   88,   89,  124,
+           91,  159,   93,  161,   95,   97,  146,   98,   97,   97,
+          100,  154,  103,  104,  105,   74,  100,  149,  109,  110,
+           -1,   80,   -1,   -1,  115,  116,   -1,  132,   87,   88,
+           89,  132,   91,  124,   93,   -1,   95,   -1,  155,   98,
+           -1,   -1,   -1,  102,  103,  104,  105,   74,   -1,  149,
+          109,  110,  149,   80,   81,  153,  115,  116,  160,    1,
+           87,   88,   89,  149,   91,  124,   93,  160,   95,  164,
+           84,   98,  159,  158,   -1,   -1,  103,  104,  105,  159,
+          159,  159,  109,  110,  159,  159,  159,  159,  115,  116,
+          159,  159,  106,  159,  108,    1,  159,  124,  159,  113,
+          160,  159,  159,  117,  118,  159,  159,  159,  163,  160,
+          160,  160,   -1,  127,  128,  129,  130,  131,  161,  161,
+           74,  161,  161,  161,  161,  161,   80,  161,  161,  161,
+          161,  161,  167,   87,   88,   89,  150,   91,  162,   93,
+          162,   95,   84,  162,   98,  159,  162,  161,  162,  103,
+          104,  105,  162,  162,  162,  109,  110,  162,  100,  101,
+          102,  115,  116,  162,  106,   70,  162,  162,  162,  162,
+          124,  162,  162,  162,  162,  117,  118,   82,   84,  162,
+          162,   86,  162,  162,  162,  127,  128,  129,  130,  131,
+          162,  162,  162,  162,  100,  101,  102,  163,  163,  163,
+          106,  163,  163,  163,  163,  163,  163,  163,  163,   -1,
+          163,  117,  118,  163,  163,  163,  163,  159,  163,  161,
+          162,  127,  128,  129,  130,  131,  163,  163,  163,  163,
+          163,  163,  137,  163,  139,  140,  141,  142,  143,  144,
+          163,  163,  163,  163,  163,  163,  151,  152,  163,  163,
+          163,  163,  163,  159,  164,  161,  162,  164,  163,   -1,
+          164,  166,  167,  164,  164,  164,  164,  164,  164,  164,
+          164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
+          164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
+          164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
+          164,   -1,  165,  165,   -1,  166
     );
 
     protected $actionBase = array(
-            0,  568,  610,  624,  643,  182,  342,  567,   -2,   -2,
-           -2,   -2,  -36,  393,  110,  334,  110,  372,  422,  648,
-          648,  648,  224,  256,  312,  312,  312,  488,  413,  445,
-          344,  527,  527,  527,  527,  527,  527,  527,  527,  527,
-          527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
-          527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
-          527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
-          527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
-          527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
-          527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
-          527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
-          527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
-          527,  527,  527,  527,  527,  527,  527,  527,  527,  527,
-          527,  527,  527,  527,  527,   45,   45,  352,   43,  645,
-          729,  725,  565,  730,  566,  724,  726,  168,  693,  694,
-          505,  695,  692,  691,  690,  727,  752,  579,  728,  128,
-          128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
-          128,  128,  128,  128,  128,   30,  179,  361,  207,  207,
-          207,  207,  207,  207,  207,  207,  207,  207,  207,  207,
-          207,  207,  207,  207,  207,  207,  207,  275,  275,  275,
-          753,  378,  419,  635,   17,  305,   27,  669,  669,  669,
-          669,  669,  423,  423,  423,  423,  676,  676,  518,  170,
-          170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
-          689,  580,  665,  666,  383,  343,  343,  222,  222,  222,
-          222,  238,  228,  -45,  412,  183,  536,  759,  472,  229,
-          229,  118,  169,  -22,  -22,  -22,   49,  552,  582,  582,
-          582,  582,  225,  225,  582,  582,    4,  -37,  305,  305,
-          332,  305,  452,  452,  452,  364,  304,  485,  364,  621,
-          558,  667,  557,  681,  310,  283,   32,  605,  -16,  604,
-          569,  -16,  484,  404,  385,  737,   45,  583,   45,   45,
-           45,   45,   45,   45,   45,   45,   45,  -16,  -16,   45,
-          121,   45,  457,  352,  475,  469,  543,  174,  655,  327,
-          233,  165,  469,  469,  469,  658,  649,  119,  210,  664,
-          202,  479,  323,  260,  483,  483,  501,  507,  486,  483,
-          483,  483,  483,  516,  483,  700,  700,  704,  501,  483,
-          700,  501,  227,  411,  245,  259,  501,  388,  547,  483,
-          584,  584,  261,  507,  550,  214,  466,  545,  700,  700,
-          545,  486,  190,  501,  375,  625,  627,  553,  622,   67,
-          498,  498,  471,  553,   26,  501,  498,  516,  420,   58,
-          498,   31,  705,  722,  490,  721,  702,  720,  706,  719,
-          537,  650,  572,  573,  714,  713,  718,  502,  532,  703,
-          701,  596,  509,  494,  489,  585,  491,  696,  569,  618,
-          482,  482,  482,  491,  698,  482,  482,  482,  482,  482,
-          482,  482,  482,  758,  267,  586,  563,  487,  606,  570,
-          481,  662,  575,  596,  596,  684,  751,  750,  541,  712,
-          735,  717,  632,  468,  744,  711,  683,  608,  544,  598,
-          710,  743,  734,  661,  494,  733,  685,  539,  596,  686,
-          482,  697,  723,  756,  757,  699,  754,  742,  590,  495,
-          755,  687,  732,  660,  659,  623,  747,  736,  741,  688,
-          740,  628,  549,  749,  559,  707,  546,  708,  651,  680,
-          679,  496,  629,  678,  716,  630,  746,  745,  748,  631,
-          642,  652,  653,  500,  675,  476,  647,  715,  320,  464,
-          560,  646,  554,  731,  674,  654,  709,  644,  581,  673,
-          672,  738,  564,  618,  556,  467,  562,  561,  663,  671,
-          739,  458,  641,  639,  638,  637,  670,  634,  668,    0,
+            0,   -2,  154,  565,  876,  948,  984,  514,   53,  398,
+          837,  307,  307,   67,  307,  307,  307,  653,  724,  724,
+          732,  724,  616,  673,  204,  204,  204,  625,  625,  625,
+          625,  694,  694,  831,  831,  863,  799,  765,  936,  936,
+          936,  936,  936,  936,  936,  936,  936,  936,  936,  936,
+          936,  936,  936,  936,  936,  936,  936,  936,  936,  936,
+          936,  936,  936,  936,  936,  936,  936,  936,  936,  936,
+          936,  936,  936,  936,  936,  936,  936,  936,  936,  936,
+          936,  936,  936,  936,  936,  936,  936,  936,  936,  936,
+          936,  936,  936,  936,  936,  936,  936,  936,  936,  936,
+          936,  936,  936,  936,  936,  936,  936,  936,  936,  936,
+          936,  936,  936,  936,  936,  936,  936,  936,  936,  936,
+          936,  936,  936,  936,  936,  936,  936,  936,  936,  936,
+          936,  936,  936,  936,  936,  936,  936,  936,  936,  936,
+          936,  936,  936,  936,  936,  936,  936,  936,  936,  936,
+          936,  936,  936,  936,  936,  936,  936,  936,  936,  936,
+          936,  936,  375,  519,  369,  701, 1017, 1023, 1019, 1024,
+         1015, 1014, 1018, 1020, 1025,  911,  912,  782,  918,  919,
+          920,  921, 1021,  841, 1016, 1022,  291,  291,  291,  291,
+          291,  291,  291,  291,  291,  291,  291,  291,  291,  291,
+          291,  291,  291,  291,  291,  291,  291,  291,  291,  291,
+          291,  291,  290,  491,   44,  382,  382,  382,  382,  382,
+          382,  382,  382,  382,  382,  382,  382,  382,  382,  382,
+          382,  382,  382,  382,  382,  160,  160,  160,  187,  684,
+          684,  341,  203,  610,   47,  985,  985,  985,  985,  985,
+          985,  985,  985,  985,  985,  144,  144,    7,    7,    7,
+            7,    7,  371,  -25,  -25,  -25,  -25,  540,  385,  102,
+          576,  358,   45,  377,  460,  460,  360,  231,  231,  231,
+          231,  231,  231,  -78,  -78,  -78,  -78,  -78,  -66,  319,
+          457,  -94,  396,  423,  586,  586,  586,  586,  423,  423,
+          423,  423,  750, 1029,  423,  423,  423,  511,  516,  516,
+          518,  147,  147,  147,  516,  583,  777,  422,  583,  422,
+          194,   92,  748,  -40,   87,  412,  748,  617,  627,  198,
+          143,  773,  658,  773, 1013,  757,  764,  717,  838,  860,
+         1026,  800,  908,  806,  910,  219,  686, 1012, 1012, 1012,
+         1012, 1012, 1012, 1012, 1012, 1012, 1012, 1012,  855,  552,
+         1013,  286,  855,  855,  855,  552,  552,  552,  552,  552,
+          552,  552,  552,  552,  552,  679,  286,  568,  626,  286,
+          794,  552,  375,  758,  375,  375,  375,  375,  958,  375,
+          375,  375,  375,  375,  375,  970,  769,  -16,  375,  519,
+           12,   12,  547,   83,   12,   12,   12,   12,  375,  375,
+          375,  658,  781,  713,  666,  792,  448,  781,  781,  781,
+          438,  444,  193,  447,  570,  523,  580,  760,  760,  767,
+          929,  929,  760,  759,  760,  767,  934,  760,  929,  805,
+          359,  648,  577,  611,  656,  929,  478,  760,  760,  760,
+          760,  665,  760,  467,  433,  760,  760,  785,  774,  789,
+           60,  929,  929,  929,  789,  596,  751,  751,  751,  811,
+          812,  746,  771,  567,  498,  677,  348,  779,  771,  771,
+          760,  640,  746,  771,  746,  771,  747,  771,  771,  771,
+          746,  771,  759,  585,  771,  734,  668,  224,  771,    6,
+          935,  937,  354,  940,  932,  941,  979,  942,  943,  851,
+          956,  933,  945,  931,  930,  780,  703,  720,  790,  729,
+          928,  768,  768,  768,  925,  768,  768,  768,  768,  768,
+          768,  768,  768,  703,  788,  804,  733,  783,  960,  722,
+          726,  725,  868, 1027, 1028,  737,  739,  958, 1006,  953,
+          803,  730,  992,  967,  866,  848,  968,  969,  993, 1007,
+         1008,  871,  761,  874,  880,  797,  971,  852,  768,  935,
+          943,  933,  945,  931,  930,  763,  762,  753,  755,  749,
+          745,  736,  738,  770, 1009,  924,  835,  830,  970,  926,
+          703,  839,  986,  847,  994,  995,  850,  801,  772,  840,
+          881,  972,  975,  976,  853, 1010,  810,  989,  795,  996,
+          802,  882,  997,  998,  999, 1000,  885,  854,  856,  857,
+          815,  754,  980,  786,  891,  335,  787,  796,  978,  363,
+          957,  858,  894,  895, 1001, 1002, 1003,  896,  954,  816,
+          990,  752,  991,  983,  817,  818,  485,  784,  778,  541,
+          676,  897,  899,  900,  955,  775,  766,  821,  822, 1011,
+          901,  697,  824,  740,  902, 1005,  742,  744,  756,  859,
+          793,  743,  798,  977,  776,  827,  907,  829,  832,  833,
+         1004,  836,    0,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,    0,    0,    0,  143,
-          143,  143,  143,   -2,   -2,   -2,    0,    0,    0,    0,
-           -2,  143,  143,  143,  143,  143,  143,  143,  143,  143,
-          143,  143,  143,  143,  143,  143,  143,  143,  143,  143,
-          143,  143,  143,  143,  143,  143,  143,  143,  143,  143,
-          143,  143,  143,  143,  143,  143,  143,  143,  143,  143,
-          143,  143,  143,  143,  143,  143,  143,  143,  143,  143,
-          143,  143,  143,  143,  143,  143,  143,  143,  143,  143,
-          143,  143,  143,  143,  143,  143,  143,  143,  143,  143,
-          143,  143,  143,  143,  143,  143,  143,  143,  143,  143,
-          143,  143,  143,  143,  143,  143,  143,  143,  143,  143,
-          143,  143,  143,  143,  143,  143,  143,  143,  143,  143,
-          143,  143,  143,  143,  143,  143,  143,  143,  143,  143,
-          143,  143,  143,  143,  143,  143,  143,  143,  143,  143,
-          143,  143,  143,  128,  128,  128,  128,  128,  128,  128,
-          128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
-          128,  128,  128,  128,  128,  128,  128,    0,    0,    0,
+            0,  458,  458,  458,  458,  458,  458,  307,  307,  307,
+          307,    0,    0,  307,    0,    0,    0,  458,  458,  458,
+          458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
+          458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
+          458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
+          458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
+          458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
+          458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
+          458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
+          458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
+          458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
+          458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
+          458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
+          458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
+          458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
+          458,  458,  458,  458,  458,  458,  458,  458,  458,  458,
+          458,  458,  291,  291,  291,  291,  291,  291,  291,  291,
+          291,  291,  291,  291,  291,  291,  291,  291,  291,  291,
+          291,  291,  291,  291,  291,  291,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,  128,  128,  128,  128,  128,  128,  128,
-          128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
-          128,  128,  128,  128,  128,  128,  128,  128,  128,  128,
-           -3,  128,  128,   -3,  128,  128,  128,  128,  128,  128,
-          -22,  -22,  -22,  -22,  364,  364,  364,  364,  364,  364,
-          364,  364,  364,  364,  364,  364,  364,  364,  571,  571,
-          571,  571,  364,  -22,  -22,  364,  364,  364,  364,  364,
-          364,  571,  364,  225,  225,  225,  364,  -16,  -16,    0,
-            0,    0,    0,    0,  483,  225,  364,  364,  364,  364,
-            0,    0,  364,  364,  -16,    0,    0,    0,    0,    0,
-          483,  483,  483,    0,  483,  225,    0,   45,  454,  454,
-          454,  454,    0,    0,    0,  483,    0,  483,  550,    0,
-            0,    0,    0,  501,    0,  700,    0,    0,    0,    0,
             0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,  482,  712,    0,  541,    0,    0,    0,
-          482,  482,  482,  541,  541,    0,    0,  541
+            0,    0,  291,  291,  291,  291,  291,  291,  291,  291,
+          291,  291,  291,  291,  291,  291,  291,  291,  291,  291,
+          291,  291,  291,  291,  291,  291,  291,  291,  291,  423,
+          423,  291,  291,    0,  291,  423,  423,  423,  423,  423,
+          423,  423,  423,  423,  423,  291,  291,  291,  291,  291,
+          291,  291,  805,  147,  147,  147,  147,  423,  423,  423,
+          423,  423,  -88,  -88,  147,  147,  423,  423,  423,  423,
+          423,  423,  423,  423,  423,  423,  423,  423,    0,    0,
+            0,  286,  422,    0,  759,  759,  759,  759,    0,    0,
+            0,    0,  422,  422,    0,    0,    0,    0,    0,    0,
+            0,    0,    0,    0,    0,  286,  422,    0,  286,    0,
+          759,  759,  423,  805,  805,  314,  423,    0,    0,    0,
+            0,  286,  759,  286,  552,  422,  552,  552,   12,  375,
+          314,  608,  608,  608,  608,    0,  658,  805,  805,  805,
+          805,  805,  805,  805,  805,  805,  805,  805,  759,    0,
+          805,    0,  759,  759,  759,    0,    0,    0,    0,    0,
+            0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+          759,    0,    0,  929,    0,    0,    0,    0,  760,    0,
+            0,    0,    0,    0,    0,  760,  934,    0,    0,    0,
+            0,    0,    0,  759,    0,    0,    0,    0,    0,    0,
+            0,    0,  768,  801,    0,  801,    0,  768,  768,  768
     );
 
     protected $actionDefault = array(
-            3,32767,32767,32767,32767,32767,32767,32767,32767,   88,
-        32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,   88,  489,  489,  489,32767,32767,32767,
-        32767,  302,  302,  302,32767,  481,  439,  439,  439,  439,
-          439,  439,  439,  481,32767,32767,32767,32767,32767,  381,
+            3,32767,  103,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,  101,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,  578,  578,  578,
+          578,32767,32767,  246,  103,32767,32767,  454,  372,  372,
+          372,32767,32767,  522,  522,  522,  522,  522,  522,32767,
+        32767,32767,32767,32767,32767,  454,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,32767,   88,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,  101,32767,
+        32767,32767,   37,    7,    8,   10,   11,   50,   17,  310,
+        32767,32767,32767,32767,  103,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,32767,  486,32767,
+        32767,32767,32767,32767,32767,  571,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,32767,32767,  364,
-          365,  367,  368,  301,  440,  250,  485,  300,  126,  261,
-          252,  204,  298,  236,  130,  329,  382,  331,  380,  384,
-          330,  307,  311,  312,  313,  314,  315,  316,  317,  318,
-          319,  320,  321,  322,  305,  306,  383,  361,  360,  359,
-          327,  328,  304,  332,  334,  304,  333,  350,  351,  348,
-          349,  352,  353,  354,  355,  356,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,32767,   88,32767,
-          284,  284,  284,  284,32767,  341,  342,  242,  242,  242,
-          242,32767,  242,  285,32767,32767,32767,32767,32767,32767,
-        32767,  433,  358,  336,  337,  335,32767,  411,32767,32767,
-        32767,32767,32767,  413,32767,   88,32767,32767,  324,  326,
-          405,  308,32767,32767,   90,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,  408,  441,  441,32767,32767,   88,
-          399,   88,  169,  223,  225,  174,32767,  416,32767,32767,
+        32767,32767,32767,32767,32767,32767,  458,  437,  438,  440,
+          441,  371,  523,  577,  313,  574,  370,  146,  325,  315,
+          234,  316,  250,  459,  251,  460,  463,  464,  211,  279,
+          367,  150,  401,  455,  403,  453,  457,  402,  377,  382,
+          383,  384,  385,  386,  387,  388,  389,  390,  391,  392,
+          393,  394,  375,  376,  456,  434,  433,  432,  399,32767,
+        32767,  400,  404,  374,  407,32767,32767,32767,32767,32767,
+        32767,32767,32767,  103,32767,  405,  406,  423,  424,  421,
+          422,  425,32767,  426,  427,  428,  429,32767,32767,  302,
+        32767,32767,  351,  349,  414,  415,  302,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,32767,  516,
+          431,32767,32767,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,32767,  103,32767,  101,  518,  396,  398,
+          486,  409,  410,  408,  378,32767,  493,32767,  103,  495,
+        32767,32767,32767,  112,32767,32767,32767,  517,32767,  524,
+          524,32767,  479,  101,  194,32767,  194,  194,32767,32767,
+        32767,32767,32767,32767,32767,  585,  479,  111,  111,  111,
+          111,  111,  111,  111,  111,  111,  111,  111,32767,  194,
+          111,32767,32767,32767,  101,  194,  194,  194,  194,  194,
+          194,  194,  194,  194,  194,  189,32767,  260,  262,  103,
+          539,  194,32767,  498,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,  491,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,  346,32767,  496,32767,  441,
-        32767,32767,  338,  339,  340,32767,32767,  441,  441,32767,
-          441,32767,  441,32767,32767,32767,  174,32767,32767,32767,
-        32767,32767,32767,32767,   90,  414,  414,  409,  174,32767,
-        32767,  174,   87,   87,   87,   87,  174,   87,  187,32767,
-          185,  185,   87,   88,   88,   87,   87,  189,32767,  455,
-          189,   88,   87,  174,   87,  209,  209,  390,  176,   89,
-          244,  244,   89,  390,   87,  174,  244,   88,   87,   87,
-          244,32767,32767,32767,   82,32767,32767,32767,32767,32767,
+        32767,  479,  419,  139,32767,  139,  524,  411,  412,  413,
+          481,  524,  524,  524,  298,  281,32767,32767,32767,32767,
+          496,  496,  101,  101,  101,  101,  491,32767,32767,  112,
+          100,  100,  100,  100,  100,  104,  102,32767,32767,32767,
+        32767,  100,32767,  102,  102,32767,32767,  217,  208,  215,
+          102,32767,  543,  544,  215,  102,  219,  219,  219,  239,
+          239,  470,  304,  102,  100,  102,  102,  196,  304,  304,
+        32767,  102,  470,  304,  470,  304,  198,  304,  304,  304,
+          470,  304,32767,  102,  304,  210,  100,  100,  304,32767,
+        32767,32767,  481,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,  511,32767,  528,
+          541,  417,  418,  420,  526,  442,  443,  444,  445,  446,
+          447,  448,  450,  573,32767,  485,32767,32767,32767,32767,
+          324,  583,32767,  583,32767,32767,32767,32767,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,  401,32767,32767,  421,32767,  434,  453,  399,32767,
-          344,  345,  347,32767,  443,  369,  370,  371,  372,  373,
-          374,  375,  377,32767,  482,  404,32767,32767,   84,  117,
-          260,32767,  494,   84,  402,32767,  494,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,   84,32767,   84,
-        32767,32767,32767,32767,  478,32767,  441,32767,  403,32767,
-          343,  417,  460,32767,32767,  442,32767,32767,   84,32767,
-        32767,32767,32767,32767,32767,32767,32767,  421,32767,32767,
-        32767,32767,32767,  441,32767,32767,32767,32767,32767,32767,
-        32767,  297,32767,32767,32767,32767,32767,32767,  441,32767,
-        32767,32767,32767,  235,32767,32767,32767,32767,32767,32767,
+        32767,  584,32767,  524,32767,32767,32767,32767,  416,    9,
+           76,   43,   44,   52,   58,  502,  503,  504,  505,  499,
+          500,  506,  501,32767,32767,  507,  549,32767,32767,  525,
+          576,32767,32767,32767,32767,32767,32767,  139,32767,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,  511,32767,
+          137,32767,32767,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,  524,32767,32767,32767,  300,  301,32767,32767,
         32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
-        32767,32767,   82,   60,32767,  278,32767,32767,32767,32767,
-        32767,32767,32767,32767,32767,32767,32767,32767,32767,  132,
-          132,    3,    3,  132,  132,  132,  132,  132,  132,  132,
-          132,  132,  132,  132,  132,  132,  263,  164,  263,  217,
-          263,  263,  220,  209,  209,  270,  132,  132
+        32767,32767,32767,  524,32767,32767,32767,  283,  284,32767,
+        32767,32767,32767,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,32767,  278,32767,32767,  366,32767,32767,32767,
+        32767,  345,32767,32767,32767,32767,32767,32767,32767,32767,
+        32767,32767,  152,  152,    3,    3,  327,  152,  152,  152,
+          327,  152,  327,  327,  327,  152,  152,  152,  152,  152,
+          152,  272,  184,  254,  257,  239,  239,  152,  337,  152
     );
 
     protected $goto = array(
-          165,  165,  138,  138,  138,  148,  150,  181,  166,  163,
-          163,  163,  163,  147,  164,  164,  164,  164,  164,  164,
-          164,  147,  159,  160,  161,  162,  178,  176,  179,  420,
-          421,  315,  422,  425,  426,  427,  428,  429,  430,  431,
-          432,  888,  136,  139,  140,  141,  142,  143,  144,  145,
-          146,  149,  175,  177,  180,  197,  200,  201,  203,  204,
-          206,  207,  208,  209,  210,  211,  212,  213,  214,  215,
-          235,  236,  253,  254,  255,  322,  323,  324,  470,  182,
-          183,  184,  185,  186,  187,  188,  189,  190,  191,  192,
-          193,  194,  195,  151,  196,  152,  167,  168,  169,  198,
-          170,  153,  154,  155,  171,  156,  199,  137,  172,  157,
-          173,  174,  158,  534,  202,  438,  736,  281,  471,  857,
-          547,    7,  202,  526,  855,  472,  669,  231,  464,  232,
-          233,  443,  443,  443,  671,  443,  464,  793,  774,  772,
-          774,  569,  670,  436,  802,  797,  459,  456,  443,  545,
-          572,  492,  494,  520,  524,  529,  530,  804,  537,  539,
-          546,  800,  548,  424,  424,  424,  424,  424,  424,  424,
-          424,  424,  424,  424,  424,  424,  424,  423,  423,  423,
-          423,  423,  423,  423,  423,  423,  423,  423,  423,  423,
-          423,  485,  506,  443,  443,  488,  490,  540,  457,  478,
-          443,  443,  974,  443,  768,  312,  543,  706,  444,  300,
-          303,  450,  473,  474,  476,  469,  481,  733,  468,  487,
-          487,  999,  999,  999,  999,  999,  999,  999,  999,  999,
-          999,  999,  999,  701,  689,  831,  435,  835,  776,  697,
-         1068, 1068,  779,  435,  263,  749,  482,    3,    4,  247,
-          316,  827,  809,  449,  769,  975,  465, 1068,  460,  673,
-          770,  770,  770,  770,  872, 1061,  764,  771,  705,  970,
-          697, 1071,  697,  976, 1030,  378,  678,  298,  728,  723,
-          724,  737,  679,  725,  676,  726,  727,   10, 1053,  677,
-          507,  731,  462,  935,  823,  328,  508,  332,  319,  319,
-          268,  269,  285,  466,  271,  327,  286,  330,  493,  807,
-          807, 1058, 1069, 1069,  282,  283,  812,  688,  688,  816,
-         1042,  512,  698,  698,  698,  700,  525,  687,  499, 1069,
-          314,  287,  693,  279,  309,  690,  832,  576,  966,  514,
-          370,  978,  971,  484,  817,  817,  817,  817,  978,  817,
-          836,  817,  865,  702, 1039,  817,  781,  686,  874,  386,
-            0, 1039,    0,    0,    0,  978,  978,  978,  978, 1050,
-         1050,  978,  978,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,  744,    0,    0,  745, 1036,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,    0,    0,  834,    0,
-            0,  834,    0,    0,    0,    0,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,    0, 1043, 1044
+          194,  194,  670,  422,  643,  463, 1264, 1265, 1022,  416,
+          308,  309,  329,  563,  314,  421,  330,  423,  622,  801,
+          678,  637,  586,  651,  652,  653,  165,  165,  165,  165,
+          218,  195,  191,  191,  175,  177,  213,  191,  191,  191,
+          191,  191,  192,  192,  192,  192,  192,  192,  186,  187,
+          188,  189,  190,  215,  213,  216,  521,  522,  412,  523,
+          525,  526,  527,  528,  529,  530,  531,  532, 1091,  166,
+          167,  168,  193,  169,  170,  171,  164,  172,  173,  174,
+          176,  212,  214,  217,  235,  238,  241,  242,  244,  255,
+          256,  257,  258,  259,  260,  261,  263,  264,  265,  266,
+          274,  275,  311,  312,  313,  417,  418,  419,  568,  219,
+          220,  221,  222,  223,  224,  225,  226,  227,  228,  229,
+          230,  231,  232,  233,  178,  234,  179,  196,  197,  198,
+          236,  186,  187,  188,  189,  190,  215, 1091,  199,  180,
+          181,  182,  200,  196,  183,  237,  201,  199,  163,  202,
+          203,  184,  204,  205,  206,  185,  207,  208,  209,  210,
+          211,  323,  323,  323,  323,  827,  608,  608,  824,  547,
+          538,  342, 1221, 1221, 1221, 1221, 1221, 1221, 1221, 1221,
+         1221, 1221, 1239, 1239,  288,  288,  288,  288, 1239, 1239,
+         1239, 1239, 1239, 1239, 1239, 1239, 1239, 1239,  388,  538,
+          547,  556,  557,  395,  566,  588,  602,  603,  832,  825,
+          880,  875,  876,  889,   15,  833,  877,  830,  878,  879,
+          831,  799,  251,  251,  883,  919,  992, 1000, 1004, 1001,
+         1005, 1237, 1237,  938, 1043, 1039, 1040, 1237, 1237, 1237,
+         1237, 1237, 1237, 1237, 1237, 1237, 1237,  858,  248,  248,
+          248,  248,  250,  252,  533,  533,  533,  533,  487,  590,
+          488, 1190, 1190,  997, 1190,  997,  494, 1290, 1290,  560,
+          997,  997,  997,  997,  997,  997,  997,  997,  997,  997,
+          997,  997, 1261, 1261, 1290, 1261,  340, 1190,  930,  402,
+          677, 1279, 1190, 1190, 1190, 1190,  959,  345, 1190, 1190,
+         1190, 1271, 1271, 1271, 1271,  606,  640,  345,  345, 1273,
+         1273, 1273, 1273,  820,  820,  805,  896,  884,  840,  885,
+          897,  345,  345,    5,  345,    6, 1306,  384,  535,  535,
+          559,  535,  415,  852,  597, 1257,  839,  540,  524,  524,
+          345, 1289, 1289,  642,  524,  524,  524,  524,  524,  524,
+          524,  524,  524,  524,  445,  805, 1140,  805, 1289,  932,
+          932,  932,  932, 1063, 1064,  445,  926,  933,  386,  390,
+          548,  587,  591, 1030, 1292,  331,  554, 1259, 1259, 1030,
+          704,  621,  623,  823,  641, 1250,  319,  303,  660,  664,
+          973,  668,  676,  969,  429,  553,  962,  936,  936,  934,
+          936,  703,  601,  537,  971,  966,  343,  344,  663,  817,
+          595,  609,  612,  613,  614,  615,  634,  635,  636,  680,
+          439, 1186,  845,  454,  454,  439,  439, 1266, 1267,  820,
+          901, 1079,  454,  394,  539,  551, 1183,  605,  540,  539,
+          842,  551,  978,  272,  387,  618,  619,  981,  536,  536,
+          844,  707,  646,  957,  567,  457,  458,  459,  838,  850,
+          254,  254, 1297, 1298,  400,  401,  976,  976,  464,  649,
+         1182,  650, 1028,  404,  405,  406, 1187,  661,  424, 1032,
+          407,  564,  600,  815,  338,  424,  854,  848,  853,  841,
+         1027, 1031, 1009, 1002, 1006, 1003, 1007, 1185,  941, 1188,
+         1247, 1248,  943,    0, 1074,  439,  439,  439,  439,  439,
+          439,  439,  439,  439,  439,  439,    0,  468,  439,  585,
+         1056,  931,  681,  667,  667,    0,  495,  673, 1054, 1171,
+          912,    0,    0, 1172, 1175,  913, 1176,    0,    0,    0,
+            0,    0,    0, 1072,  857
     );
 
     protected $gotoCheck = array(
-           30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-           30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-           30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-           30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-           30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-           30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-           30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-           30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-           30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-           30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-           30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-           30,   30,   30,   60,   53,    8,   10,   76,    7,    7,
-            7,  106,   53,    7,    7,   93,   13,   69,   81,   69,
-           69,    8,    8,    8,   15,    8,   81,   13,   13,   13,
-           13,   13,   14,   13,   13,   13,    8,   36,    8,    5,
-           36,   36,   36,   36,   36,   36,   36,   36,   36,   36,
-           36,   36,   36,  131,  131,  131,  131,  131,  131,  131,
-          131,  131,  131,  131,  131,  131,  131,  129,  129,  129,
-          129,  129,  129,  129,  129,  129,  129,  129,  129,  129,
-          129,   43,   43,    8,    8,   64,   64,   64,    8,    8,
-            8,    8,   88,    8,   72,   72,   72,   33,    8,   46,
-           46,   46,   46,   46,   46,    2,    2,   52,    8,   82,
-           82,   82,   82,   82,   82,   82,   82,   82,   82,   82,
-           82,   82,   82,   11,   11,   11,   71,   11,   37,   23,
-          139,  139,   11,   71,  128,   11,   11,   34,   34,  128,
-           62,   90,   11,   62,   11,   88,  130,  139,   62,   10,
-           71,   71,   71,   71,   11,  138,   71,   71,   11,   11,
-           23,  139,   23,   88,   88,   62,   10,   49,   10,   10,
-           10,   10,   10,   10,   10,   10,   10,   62,  136,   10,
-           51,   10,   50,  112,   86,   53,   53,   53,   53,   53,
-           53,   53,   53,   53,   53,   53,   53,   53,   53,   81,
-           81,   81,  140,  140,   76,   76,   84,   23,   23,   87,
-          133,   65,   23,   23,   23,   23,   65,   23,   21,  140,
-           65,   17,   27,    9,   16,   25,   92,   78,  118,   20,
-           67,   60,  121,   68,   60,   60,   60,   60,   60,   60,
-           95,   60,  106,   29,   93,   60,   75,   12,  109,  116,
-           -1,   93,   -1,   -1,   -1,   60,   60,   60,   60,   93,
-           93,   60,   60,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-           -1,   -1,   60,   -1,   -1,   60,   93,   -1,   -1,   -1,
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   -1,
-           -1,   93,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
-           -1,   -1,   -1,   -1,   -1,   -1,   -1,   93,   93
+           42,   42,   72,   65,   65,  166,  166,  166,  119,   65,
+           65,   65,   65,   65,   65,   65,   65,   65,   65,    7,
+            9,   84,  122,   84,   84,   84,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+           42,   23,   23,   23,   23,   15,  104,  104,   26,   75,
+           75,   93,  104,  104,  104,  104,  104,  104,  104,  104,
+          104,  104,  160,  160,   24,   24,   24,   24,  160,  160,
+          160,  160,  160,  160,  160,  160,  160,  160,   75,   75,
+           75,   75,   75,   75,   75,   75,   75,   75,   15,   27,
+           15,   15,   15,   15,   75,   15,   15,   15,   15,   15,
+           15,    6,    5,    5,   15,   87,   87,   87,   87,   87,
+           87,  161,  161,   49,   15,   15,   15,  161,  161,  161,
+          161,  161,  161,  161,  161,  161,  161,   45,    5,    5,
+            5,    5,    5,    5,  103,  103,  103,  103,  147,  103,
+          147,   72,   72,   72,   72,   72,  147,  173,  173,  162,
+           72,   72,   72,   72,   72,   72,   72,   72,   72,   72,
+           72,   72,  122,  122,  173,  122,  169,   72,   89,   89,
+           89,  171,   72,   72,   72,   72,   99,   14,   72,   72,
+           72,    9,    9,    9,    9,   55,   55,   14,   14,  122,
+          122,  122,  122,   22,   22,   12,   72,   64,   35,   64,
+           72,   14,   14,   46,   14,   46,   14,   61,   19,   19,
+          100,   19,   13,   35,   13,  122,   35,   14,  163,  163,
+           14,  172,  172,   63,  163,  163,  163,  163,  163,  163,
+          163,  163,  163,  163,   19,   12,  143,   12,  172,   19,
+           19,   19,   19,  136,  136,   19,   19,   19,   58,   58,
+           58,   58,   58,  122,  172,   29,   48,  122,  122,  122,
+           48,   48,   48,   25,   48,   14,  159,  159,   48,   48,
+           48,   48,   48,   48,  109,    9,   25,   25,   25,   25,
+           25,   25,    9,   25,   25,   25,   93,   93,   14,   18,
+           79,   79,   79,   79,   79,   79,   79,   79,   79,   79,
+           23,   20,   39,  141,  141,   23,   23,  168,  168,   22,
+           17,   17,  141,   28,    9,    9,  152,   17,   14,    9,
+           37,    9,   17,   24,    9,   83,   83,  106,   24,   24,
+           17,   95,   17,   17,    9,    9,    9,    9,   17,    9,
+            5,    5,    9,    9,   80,   80,  103,  103,  149,   80,
+           17,   80,  121,   80,   80,   80,   20,   80,  113,  124,
+           80,    2,    2,   20,   80,  113,   41,    9,   16,   16,
+           16,   16,  113,  113,  113,  113,  113,   14,   16,   20,
+           20,   20,   92,   -1,  139,   23,   23,   23,   23,   23,
+           23,   23,   23,   23,   23,   23,   -1,   82,   23,    8,
+            8,   16,    8,    8,    8,   -1,    8,    8,    8,   78,
+           78,   -1,   -1,   78,   78,   78,   78,   -1,   -1,   -1,
+           -1,   -1,   -1,   16,   16
     );
 
     protected $gotoBase = array(
-            0,    0, -336,    0,    0,  137,    0,  113, -141,   57,
-          -20, -120,  -25,  124,  140,  132,   47,   75,    0,    0,
-            4,   55,    0,  -17,    0,   46,    0,   58,    0,  -10,
-          -22,    0,    0,  198, -329,    0, -403,  220,    0,    0,
-            0,    0,    0,  159,    0,    0,  172,    0,    0,  243,
-           72,   73,  201,   79,    0,    0,    0,    0,    0,    0,
-          107,    0,  -98,    0,  -43,  -60,    0,  -21,  -27, -441,
-            0,    2,  -55,    0,    0,  -15, -259,    0,   24,    0,
-            0,   93,    3,    0,   74,    0,   50,   71,  -95,    0,
-          228,    0,   45,  120,    0,  -14,    0,    0,    0,    0,
-            0,    0,    0,    0,    0,    0,  109,    0,    0,  -29,
-            0,    0,   52,    0,    0,    0,  -24,    0,   -8,    0,
-            0,    6,    0,    0,    0,    0,    0,    0,  -13,  -39,
-          231,  -53,    0,   70,    0,    0,  245,    0,  239,   -6,
-           66,    0,    0
+            0,    0, -203,    0,    0,  221,  208,   10,  512,    7,
+            0,    0,   24,    1,    5, -174,   47,  -23,  105,   61,
+           38,    0,  -10,  158,  181,  379,  164,  205,  102,   84,
+            0,    0,    0,    0,    0,  -43,    0,  107,    0,  104,
+            0,   54,   -1,    0,    0,  235, -384,    0, -307,  210,
+            0,    0,    0,    0,    0,  266,    0,    0,  324,    0,
+            0,  286,    0,  103,  298, -236,    0,    0,    0,    0,
+            0,    0,   -6,    0,    0, -167,    0,    0,  129,   62,
+          -14,    0,   53,  -22, -669,    0,    0,  -52,    0,  -11,
+            0,    0,   68, -299,    0,   52,    0,    0,    0,  262,
+          288,    0,    0,  227,  -73,    0,   87,    0,    0,  118,
+            0,    0,    0,  209,    0,    0,    0,    0,    0,    6,
+            0,  108,   15,    0,   46,    0,    0,    0,    0,    0,
+            0,    0,    0,    0,    0,    0,   91,    0,    0,   69,
+            0,  390,    0,   86,    0,    0,    0, -224,    0,   37,
+            0,    0,   77,    0,    0,    0,    0,    0,    0,   70,
+          -57,   -8,  241,   99,    0,    0, -290,    0,   65,  257,
+            0,  261,   39,  -35,    0,    0
     );
 
     protected $gotoDefault = array(
-        -32768,  391,  579,    2,  580,  651,  659,  515,  411,  439,
-          730,  877,  692,  712,  713,  714,  304,  342,  296,  302,
-          500,  489,  382,  699,  354,  691,  379,  694,  353,  703,
-          135,  516,  388,  707,    1,  709,  445,  740,  293,  717,
-          294,  519,  719,  452,  721,  722,  299,  305,  306,  881,
-          461,  486,  732,  205,  454,  734,  292,  735,  743,  333,
-          297,  365,  522,  496,  477,  511,  412,  367,  483,  230,
-          463,  985,  766,  374,  362,  780,  280,  788,  577,  796,
-          799,  413,  414,  372,  811,  373,  821,  815,  993,  366,
-          826,  355,  833, 1025,  357,  837,  840,  343,  502,  331,
-          844,  845,    6,  849,  535,  536,  864,  243,  384,  873,
-          352,  887,  346,  954,  956,  447,  381,  967,  361,  523,
-          389,  972, 1029,  350,  415,  368,  270,  284,  246,  416,
-          433,  251,  417,  369, 1032,  320, 1054,  434, 1062, 1070,
-          277,  317,  480
+        -32768,  499,  711,    4,  712,  905,  788,  797,  583,  515,
+          679,  339,  610,  413, 1255,  882, 1078,  565,  816, 1199,
+         1207,  446,  819,  324,  701,  864,  865,  866,  391,  376,
+          382,  389,  632,  611,  481,  851,  442,  843,  473,  846,
+          441,  855,  162,  410,  497,  859,    3,  861,  542,  892,
+          377,  869,  378,  656,  871,  550,  873,  874,  385,  392,
+          393, 1083,  558,  607,  886,  243,  552,  887,  375,  888,
+          895,  380,  383,  665,  453,  492,  486,  403, 1058,  594,
+          629,  450,  467,  617,  616,  604,  466,  425,  408,  928,
+          474,  451,  942,  341,  950,  709, 1090,  624,  476,  958,
+          625,  965,  968,  516,  517,  465,  980,  269,  983,  477,
+         1015,  647,  648,  995,  626,  627, 1013,  460,  584, 1021,
+          443, 1029, 1243,  444, 1033,  262, 1036,  276,  409,  426,
+         1041, 1042,    8, 1048,  671,  672,   10,  273,  496, 1073,
+          666,  440, 1089,  430, 1159, 1161,  544,  478, 1179, 1178,
+          659,  493, 1184, 1246,  438,  518,  461,  310,  519,  302,
+          327,  307,  534,  289,  328,  520,  462, 1252, 1260,  325,
+           30, 1280, 1291,  335,  562,  599
     );
 
     protected $ruleToNonTerminal = array(
-            0,    1,    3,    3,    2,    5,    5,    5,    5,    5,
-            5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-            5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-            5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-            5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-            5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-            5,    5,    5,    5,    5,    5,    5,    5,    5,    5,
-            5,    5,    5,    6,    6,    6,    6,    6,    6,    6,
-            7,    7,    8,    8,    9,   10,   10,   11,   11,   12,
-           12,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-            4,    4,   17,   17,   18,   18,   18,   18,   20,   22,
-           22,   16,   24,   24,   21,   26,   26,   23,   23,   25,
-           25,   27,   27,   19,   28,   28,   29,   31,   32,   32,
-           33,   34,   34,   36,   35,   35,   35,   35,   37,   37,
-           37,   37,   37,   37,   37,   37,   37,   37,   37,   37,
-           37,   37,   37,   37,   37,   37,   37,   37,   37,   37,
-           37,   37,   13,   13,   56,   56,   59,   59,   58,   57,
-           57,   50,   61,   61,   62,   62,   63,   63,   14,   15,
-           15,   15,   66,   66,   66,   67,   67,   70,   70,   68,
-           68,   72,   73,   73,   44,   44,   52,   52,   55,   55,
-           55,   54,   74,   74,   75,   45,   45,   45,   45,   76,
-           76,   77,   77,   78,   78,   42,   42,   38,   38,   79,
-           40,   40,   80,   39,   39,   41,   41,   51,   51,   51,
-           51,   64,   64,   83,   83,   84,   84,   86,   86,   87,
-           87,   87,   85,   85,   65,   65,   88,   88,   89,   89,
-           90,   90,   90,   47,   91,   91,   92,   48,   94,   94,
-           95,   95,   69,   69,   96,   96,   96,   96,  101,  101,
-          102,  102,  103,  103,  103,  103,  103,  104,  105,  105,
-          100,  100,   97,   97,   99,   99,  107,  107,  106,  106,
-          106,  106,  106,  106,   98,  108,  108,  109,  109,   49,
-          110,  110,   43,   43,   30,   30,   30,   30,   30,   30,
-           30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-           30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-           30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-           30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-           30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-           30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-           30,   30,   30,   30,   30,   30,   30,   30,   30,   30,
-           30,   30,   30,   30,   30,   30,   30,  117,  111,  111,
-          116,  116,  119,  120,  120,  121,  122,  122,  122,   71,
-           71,   60,   60,   60,  112,  112,  112,  124,  124,  113,
-          113,  115,  115,  115,  118,  118,  129,  129,  129,   82,
-          131,  131,  131,  114,  114,  114,  114,  114,  114,  114,
-          114,  114,  114,  114,  114,  114,  114,  114,  114,   46,
-           46,  127,  127,  127,  123,  123,  123,  132,  132,  132,
-          132,  132,  132,   53,   53,   53,   93,   93,   93,   93,
-          134,  126,  126,  126,  126,  126,  126,  125,  125,  125,
-          133,  133,  133,  133,   81,  135,  135,  136,  136,  136,
-          136,  136,  130,  137,  137,  138,  138,  138,  138,  138,
-          128,  128,  128,  128,  140,  141,  139,  139,  139,  139,
-          139,  139,  139,  142,  142,  142,  142
+            0,    1,    3,    3,    2,    5,    5,    6,    6,    6,
+            6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+            6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+            6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+            6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+            6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+            6,    6,    6,    6,    6,    6,    6,    6,    6,    6,
+            6,    6,    6,    6,    6,    6,    6,    6,    7,    7,
+            7,    7,    7,    7,    7,    7,    8,    8,    9,   10,
+           11,   11,   11,   12,   12,   13,   13,   14,   15,   15,
+           16,   16,   17,   17,   18,   18,   21,   21,   22,   23,
+           23,   24,   24,    4,    4,    4,    4,    4,    4,    4,
+            4,    4,    4,    4,   29,   29,   30,   30,   32,   34,
+           34,   28,   36,   36,   33,   38,   38,   35,   35,   37,
+           37,   39,   39,   31,   40,   40,   41,   43,   44,   44,
+           45,   46,   46,   48,   47,   47,   47,   47,   49,   49,
+           49,   49,   49,   49,   49,   49,   49,   49,   49,   49,
+           49,   49,   49,   49,   49,   49,   49,   49,   49,   49,
+           49,   49,   25,   25,   68,   68,   71,   71,   70,   69,
+           69,   62,   74,   74,   75,   75,   76,   76,   77,   77,
+           78,   78,   26,   26,   27,   27,   27,   27,   86,   86,
+           88,   88,   81,   81,   81,   82,   82,   85,   85,   83,
+           83,   89,   90,   90,   56,   56,   64,   64,   67,   67,
+           67,   66,   91,   91,   92,   57,   57,   57,   57,   93,
+           93,   94,   94,   95,   95,   96,   97,   97,   98,   98,
+           99,   99,   54,   54,   50,   50,  101,   52,   52,  102,
+           51,   51,   53,   53,   63,   63,   63,   63,   79,   79,
+          105,  105,  107,  107,  108,  108,  108,  108,  106,  106,
+          106,  110,  110,  110,  110,   87,   87,  113,  113,  113,
+          111,  111,  114,  114,  112,  112,  115,  115,  116,  116,
+          116,  116,  109,  109,   80,   80,   80,   20,   20,   20,
+          118,  117,  117,  119,  119,  119,  119,   59,  120,  120,
+          121,   60,  123,  123,  124,  124,  125,  125,   84,  126,
+          126,  126,  126,  126,  126,  131,  131,  132,  132,  133,
+          133,  133,  133,  133,  134,  135,  135,  130,  130,  127,
+          127,  129,  129,  137,  137,  136,  136,  136,  136,  136,
+          136,  136,  128,  138,  138,  140,  139,  139,   61,  100,
+          141,  141,   55,   55,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,   42,   42,   42,
+           42,   42,   42,   42,   42,   42,   42,  148,  142,  142,
+          147,  147,  150,  151,  151,  152,  153,  153,  153,   19,
+           19,   72,   72,   72,   72,  143,  143,  143,  143,  155,
+          155,  144,  144,  146,  146,  146,  149,  149,  160,  160,
+          160,  160,  160,  160,  160,  160,  160,  161,  161,  104,
+          163,  163,  163,  163,  145,  145,  145,  145,  145,  145,
+          145,  145,   58,   58,  158,  158,  158,  158,  164,  164,
+          154,  154,  154,  165,  165,  165,  165,  165,  165,   73,
+           73,   65,   65,   65,   65,  122,  122,  122,  122,  168,
+          167,  157,  157,  157,  157,  157,  157,  157,  156,  156,
+          156,  166,  166,  166,  166,  103,  162,  170,  170,  169,
+          169,  171,  171,  171,  171,  171,  171,  171,  171,  159,
+          159,  159,  159,  173,  174,  172,  172,  172,  172,  172,
+          172,  172,  172,  175,  175,  175,  175
     );
 
     protected $ruleToLength = array(
@@ -768,2105 +909,1896 @@ class Php7 extends \PhpParser\ParserAbstract
             1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
             1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
             1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-            1,    1,    1,    3,    1,    1,    1,    0,    1,    0,
-            1,    1,    1,    1,    1,    3,    5,    4,    3,    4,
-            2,    3,    1,    1,    7,    8,    6,    7,    2,    3,
+            1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+            1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+            0,    1,    0,    1,    1,    2,    1,    3,    4,    1,
+            2,    0,    1,    1,    1,    1,    1,    3,    5,    4,
+            3,    4,    2,    3,    1,    1,    7,    6,    2,    3,
             1,    2,    3,    1,    2,    3,    1,    1,    3,    1,
-            2,    1,    2,    2,    3,    1,    3,    2,    3,    1,
+            3,    1,    2,    2,    3,    1,    3,    2,    3,    1,
             3,    2,    0,    1,    1,    1,    1,    1,    3,    7,
            10,    5,    7,    9,    5,    3,    3,    3,    3,    3,
-            3,    1,    2,    5,    7,    9,    5,    6,    3,    3,
+            3,    1,    2,    5,    7,    9,    6,    5,    6,    3,
             2,    1,    1,    1,    0,    2,    1,    3,    8,    0,
-            4,    2,    1,    3,    0,    1,    0,    1,   10,    7,
-            6,    5,    1,    2,    2,    0,    2,    0,    2,    0,
+            4,    2,    1,    3,    0,    1,    0,    1,    0,    1,
+            3,    1,    8,    9,    8,    7,    6,    8,    0,    2,
+            0,    2,    1,    2,    2,    0,    2,    0,    2,    0,
             2,    2,    1,    3,    1,    4,    1,    4,    1,    1,
             4,    2,    1,    3,    3,    3,    4,    4,    5,    0,
-            2,    4,    3,    1,    1,    1,    4,    0,    2,    5,
-            0,    2,    6,    0,    2,    0,    3,    1,    2,    1,
-            1,    2,    0,    1,    3,    4,    6,    1,    2,    1,
-            1,    1,    0,    1,    0,    2,    2,    4,    1,    3,
-            1,    2,    2,    2,    3,    1,    1,    2,    3,    1,
-            1,    3,    2,    0,    3,    4,    9,    3,    1,    3,
-            0,    2,    4,    5,    4,    4,    4,    3,    1,    1,
-            1,    3,    1,    1,    0,    1,    1,    2,    1,    1,
-            1,    1,    1,    1,    2,    1,    3,    1,    3,    2,
+            2,    4,    3,    1,    1,    7,    0,    2,    1,    3,
+            3,    4,    1,    4,    0,    2,    5,    0,    2,    6,
+            0,    2,    0,    3,    1,    2,    1,    1,    2,    0,
+            1,    3,    0,    2,    1,    1,    1,    1,    6,    8,
+            6,    1,    2,    1,    1,    1,    1,    1,    1,    1,
+            3,    3,    3,    3,    3,    3,    3,    3,    1,    2,
+            1,    1,    0,    1,    0,    2,    2,    2,    4,    3,
+            1,    1,    3,    1,    2,    2,    3,    2,    3,    1,
+            1,    2,    3,    1,    1,    3,    2,    0,    1,    5,
+            5,   10,    3,    5,    1,    1,    3,    0,    2,    4,
+            5,    4,    4,    4,    3,    1,    1,    1,    1,    1,
+            1,    0,    1,    1,    2,    1,    1,    1,    1,    1,
+            1,    1,    2,    1,    3,    1,    1,    3,    2,    2,
             3,    1,    0,    1,    1,    3,    3,    3,    4,    1,
-            2,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-            3,    3,    3,    2,    2,    2,    2,    3,    3,    3,
+            1,    2,    3,    3,    3,    3,    3,    3,    3,    3,
+            3,    3,    3,    3,    3,    2,    2,    2,    2,    3,
             3,    3,    3,    3,    3,    3,    3,    3,    3,    3,
-            3,    3,    3,    3,    2,    2,    2,    2,    3,    3,
-            3,    3,    3,    3,    3,    3,    3,    3,    3,    5,
-            4,    3,    4,    4,    2,    2,    4,    2,    2,    2,
-            2,    2,    2,    2,    2,    2,    2,    2,    1,    3,
-            2,    1,    2,    4,    2,   10,   11,    7,    3,    2,
+            3,    3,    3,    3,    3,    3,    3,    2,    2,    2,
+            2,    3,    3,    3,    3,    3,    3,    3,    3,    3,
+            3,    3,    5,    4,    3,    4,    4,    2,    2,    4,
+            2,    2,    2,    2,    2,    2,    2,    2,    2,    2,
+            2,    1,    3,    2,    1,    2,    4,    2,    2,    8,
+            9,    8,    9,    9,   10,    9,   10,    8,    3,    2,
             0,    4,    2,    1,    3,    2,    2,    2,    4,    1,
-            1,    1,    2,    3,    1,    1,    1,    1,    1,    0,
-            3,    0,    1,    1,    0,    1,    1,    3,    3,    3,
-            4,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-            1,    1,    1,    1,    1,    3,    2,    3,    3,    0,
-            1,    1,    3,    1,    1,    3,    1,    1,    4,    4,
-            4,    1,    4,    1,    1,    3,    1,    4,    2,    2,
-            3,    1,    4,    4,    3,    3,    3,    1,    3,    1,
-            1,    3,    1,    1,    4,    3,    1,    1,    1,    3,
-            3,    0,    1,    3,    1,    3,    1,    4,    2,    0,
-            2,    2,    1,    2,    1,    1,    1,    4,    3,    3,
+            1,    1,    1,    1,    1,    1,    1,    3,    1,    1,
+            1,    0,    3,    0,    1,    1,    0,    1,    1,    1,
+            1,    1,    1,    1,    1,    1,    1,    3,    3,    3,
+            4,    1,    1,    3,    1,    1,    1,    1,    1,    3,
+            2,    3,    0,    1,    1,    3,    1,    1,    1,    1,
+            1,    3,    1,    1,    4,    4,    1,    4,    4,    0,
+            1,    1,    1,    3,    3,    1,    4,    2,    2,    1,
+            3,    1,    4,    4,    3,    3,    3,    3,    1,    3,
+            1,    1,    3,    1,    1,    4,    1,    1,    1,    3,
+            1,    1,    2,    1,    3,    4,    3,    2,    0,    2,
+            2,    1,    2,    1,    1,    1,    4,    3,    3,    3,
             3,    6,    3,    1,    1,    2,    1
     );
 
-    protected function reduceRule0() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule1() {
-         $this->semValue = $this->handleNamespaces($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule2() {
-         if (is_array($this->semStack[$this->stackPos-(2-2)])) { $this->semValue = array_merge($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)]); } else { $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; };
-    }
-
-    protected function reduceRule3() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule4() {
-         $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop(['comments' => $startAttributes['comments']]); } else { $nop = null; };
-            if ($nop !== null) { $this->semStack[$this->stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule5() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule6() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule7() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule8() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule9() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule10() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule11() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule12() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule13() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule14() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule15() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule16() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule17() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule18() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule19() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule20() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule21() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule22() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule23() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule24() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule25() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule26() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule27() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule28() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule29() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule30() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule31() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule32() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule33() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule34() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule35() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule36() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule37() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule38() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule39() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule40() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule41() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule42() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule43() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule44() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule45() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule46() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule47() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule48() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule49() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule50() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule51() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule52() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule53() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule54() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule55() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule56() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule57() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule58() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule59() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule60() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule61() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule62() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule63() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule64() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule65() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule66() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule67() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule68() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule69() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule70() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule71() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule72() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule73() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule74() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule75() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule76() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule77() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule78() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule79() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule80() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule81() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule82() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule83() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule84() {
-         $this->semValue = new Name($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule85() {
-         /* nothing */
-    }
-
-    protected function reduceRule86() {
-         /* nothing */
-    }
-
-    protected function reduceRule87() {
-         /* nothing */
-    }
-
-    protected function reduceRule88() {
-         $this->emitError(new Error('A trailing comma is not allowed here', $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes));
-    }
-
-    protected function reduceRule89() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule90() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule91() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule92() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule93() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule94() {
-         $this->semValue = new Stmt\HaltCompiler($this->lexer->handleHaltCompiler(), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule95() {
-         $this->semValue = new Stmt\Namespace_($this->semStack[$this->stackPos-(3-2)], null, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
+    protected function initReduceCallbacks() {
+        $this->reduceCallbacks = [
+            0 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            1 => function ($stackPos) {
+                 $this->semValue = $this->handleNamespaces($this->semStack[$stackPos-(1-1)]);
+            },
+            2 => function ($stackPos) {
+                 if (is_array($this->semStack[$stackPos-(2-2)])) { $this->semValue = array_merge($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]); } else { $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; };
+            },
+            3 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            4 => function ($stackPos) {
+                 $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop($this->createCommentNopAttributes($startAttributes['comments'])); } else { $nop = null; };
+            if ($nop !== null) { $this->semStack[$stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            5 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            6 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            7 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            8 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            9 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            10 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            11 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            12 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            13 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            14 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            15 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            16 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            17 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            18 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            19 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            20 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            21 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            22 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            23 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            24 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            25 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            26 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            27 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            28 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            29 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            30 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            31 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            32 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            33 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            34 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            35 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            36 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            37 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            38 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            39 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            40 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            41 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            42 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            43 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            44 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            45 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            46 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            47 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            48 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            49 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            50 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            51 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            52 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            53 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            54 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            55 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            56 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            57 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            58 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            59 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            60 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            61 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            62 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            63 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            64 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            65 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            66 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            67 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            68 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            69 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            70 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            71 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            72 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            73 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            74 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            75 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            76 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            77 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            78 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            79 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            80 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            81 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            82 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            83 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            84 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            85 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            86 => function ($stackPos) {
+                 $this->semValue = new Node\Identifier($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            87 => function ($stackPos) {
+                 $this->semValue = new Node\Identifier($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            88 => function ($stackPos) {
+                 $this->semValue = new Node\Identifier($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            89 => function ($stackPos) {
+                 $this->semValue = new Node\Identifier($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            90 => function ($stackPos) {
+                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            91 => function ($stackPos) {
+                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            92 => function ($stackPos) {
+                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            93 => function ($stackPos) {
+                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            94 => function ($stackPos) {
+                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            95 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            96 => function ($stackPos) {
+                 $this->semValue = new Name(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            97 => function ($stackPos) {
+                 $this->semValue = new Expr\Variable(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            98 => function ($stackPos) {
+                 /* nothing */
+            },
+            99 => function ($stackPos) {
+                 /* nothing */
+            },
+            100 => function ($stackPos) {
+                 /* nothing */
+            },
+            101 => function ($stackPos) {
+                 $this->emitError(new Error('A trailing comma is not allowed here', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes));
+            },
+            102 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            103 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            104 => function ($stackPos) {
+                 $this->semValue = new Node\Attribute($this->semStack[$stackPos-(1-1)], [], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            105 => function ($stackPos) {
+                 $this->semValue = new Node\Attribute($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            106 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            107 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            108 => function ($stackPos) {
+                 $this->semValue = new Node\AttributeGroup($this->semStack[$stackPos-(4-2)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            109 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            110 => function ($stackPos) {
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            111 => function ($stackPos) {
+                 $this->semValue = [];
+            },
+            112 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            113 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            114 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            115 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            116 => function ($stackPos) {
+                 $this->semValue = new Stmt\HaltCompiler($this->lexer->handleHaltCompiler(), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            117 => function ($stackPos) {
+                 $this->semValue = new Stmt\Namespace_($this->semStack[$stackPos-(3-2)], null, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
             $this->semValue->setAttribute('kind', Stmt\Namespace_::KIND_SEMICOLON);
             $this->checkNamespace($this->semValue);
-    }
-
-    protected function reduceRule96() {
-         $this->semValue = new Stmt\Namespace_($this->semStack[$this->stackPos-(5-2)], $this->semStack[$this->stackPos-(5-4)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes);
+            },
+            118 => function ($stackPos) {
+                 $this->semValue = new Stmt\Namespace_($this->semStack[$stackPos-(5-2)], $this->semStack[$stackPos-(5-4)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
             $this->semValue->setAttribute('kind', Stmt\Namespace_::KIND_BRACED);
             $this->checkNamespace($this->semValue);
-    }
-
-    protected function reduceRule97() {
-         $this->semValue = new Stmt\Namespace_(null, $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
+            },
+            119 => function ($stackPos) {
+                 $this->semValue = new Stmt\Namespace_(null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
             $this->semValue->setAttribute('kind', Stmt\Namespace_::KIND_BRACED);
             $this->checkNamespace($this->semValue);
-    }
+            },
+            120 => function ($stackPos) {
+                 $this->semValue = new Stmt\Use_($this->semStack[$stackPos-(3-2)], Stmt\Use_::TYPE_NORMAL, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            121 => function ($stackPos) {
+                 $this->semValue = new Stmt\Use_($this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-2)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            122 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            123 => function ($stackPos) {
+                 $this->semValue = new Stmt\Const_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            124 => function ($stackPos) {
+                 $this->semValue = Stmt\Use_::TYPE_FUNCTION;
+            },
+            125 => function ($stackPos) {
+                 $this->semValue = Stmt\Use_::TYPE_CONSTANT;
+            },
+            126 => function ($stackPos) {
+                 $this->semValue = new Stmt\GroupUse($this->semStack[$stackPos-(7-3)], $this->semStack[$stackPos-(7-6)], $this->semStack[$stackPos-(7-2)], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes);
+            },
+            127 => function ($stackPos) {
+                 $this->semValue = new Stmt\GroupUse($this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-5)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
+            },
+            128 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            129 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            130 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            131 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            132 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            133 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            134 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            135 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            136 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            137 => function ($stackPos) {
+                 $this->semValue = new Stmt\UseUse($this->semStack[$stackPos-(1-1)], null, Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->checkUseUse($this->semValue, $stackPos-(1-1));
+            },
+            138 => function ($stackPos) {
+                 $this->semValue = new Stmt\UseUse($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->checkUseUse($this->semValue, $stackPos-(3-3));
+            },
+            139 => function ($stackPos) {
+                 $this->semValue = new Stmt\UseUse($this->semStack[$stackPos-(1-1)], null, Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->checkUseUse($this->semValue, $stackPos-(1-1));
+            },
+            140 => function ($stackPos) {
+                 $this->semValue = new Stmt\UseUse($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->checkUseUse($this->semValue, $stackPos-(3-3));
+            },
+            141 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)]; $this->semValue->type = Stmt\Use_::TYPE_NORMAL;
+            },
+            142 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-2)]; $this->semValue->type = $this->semStack[$stackPos-(2-1)];
+            },
+            143 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            144 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            145 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            146 => function ($stackPos) {
+                 $this->semValue = new Node\Const_($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            147 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            148 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            149 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            150 => function ($stackPos) {
+                 $this->semValue = new Node\Const_($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            151 => function ($stackPos) {
+                 if (is_array($this->semStack[$stackPos-(2-2)])) { $this->semValue = array_merge($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]); } else { $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; };
+            },
+            152 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            153 => function ($stackPos) {
+                 $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop($this->createCommentNopAttributes($startAttributes['comments'])); } else { $nop = null; };
+            if ($nop !== null) { $this->semStack[$stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            154 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            155 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            156 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            157 => function ($stackPos) {
+                 throw new Error('__HALT_COMPILER() can only be used from the outermost scope', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            158 => function ($stackPos) {
 
-    protected function reduceRule98() {
-         $this->semValue = new Stmt\Use_($this->semStack[$this->stackPos-(3-2)], Stmt\Use_::TYPE_NORMAL, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule99() {
-         $this->semValue = new Stmt\Use_($this->semStack[$this->stackPos-(4-3)], $this->semStack[$this->stackPos-(4-2)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule100() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule101() {
-         $this->semValue = new Stmt\Const_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule102() {
-         $this->semValue = Stmt\Use_::TYPE_FUNCTION;
-    }
-
-    protected function reduceRule103() {
-         $this->semValue = Stmt\Use_::TYPE_CONSTANT;
-    }
-
-    protected function reduceRule104() {
-         $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$this->stackPos-(7-3)], $this->startAttributeStack[$this->stackPos-(7-3)] + $this->endAttributeStack[$this->stackPos-(7-3)]), $this->semStack[$this->stackPos-(7-6)], $this->semStack[$this->stackPos-(7-2)], $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule105() {
-         $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$this->stackPos-(8-4)], $this->startAttributeStack[$this->stackPos-(8-4)] + $this->endAttributeStack[$this->stackPos-(8-4)]), $this->semStack[$this->stackPos-(8-7)], $this->semStack[$this->stackPos-(8-2)], $this->startAttributeStack[$this->stackPos-(8-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule106() {
-         $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$this->stackPos-(6-2)], $this->startAttributeStack[$this->stackPos-(6-2)] + $this->endAttributeStack[$this->stackPos-(6-2)]), $this->semStack[$this->stackPos-(6-5)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule107() {
-         $this->semValue = new Stmt\GroupUse(new Name($this->semStack[$this->stackPos-(7-3)], $this->startAttributeStack[$this->stackPos-(7-3)] + $this->endAttributeStack[$this->stackPos-(7-3)]), $this->semStack[$this->stackPos-(7-6)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule108() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule109() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule110() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule111() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule112() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule113() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule114() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule115() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule116() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule117() {
-         $this->semValue = new Stmt\UseUse($this->semStack[$this->stackPos-(1-1)], null, Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); $this->checkUseUse($this->semValue, $this->stackPos-(1-1));
-    }
-
-    protected function reduceRule118() {
-         $this->semValue = new Stmt\UseUse($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], Stmt\Use_::TYPE_UNKNOWN, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); $this->checkUseUse($this->semValue, $this->stackPos-(3-3));
-    }
-
-    protected function reduceRule119() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule120() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-2)];
-    }
-
-    protected function reduceRule121() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)]; $this->semValue->type = Stmt\Use_::TYPE_NORMAL;
-    }
-
-    protected function reduceRule122() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-2)]; $this->semValue->type = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule123() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule124() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule125() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule126() {
-         $this->semValue = new Node\Const_($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule127() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule128() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule129() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule130() {
-         $this->semValue = new Node\Const_($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule131() {
-         if (is_array($this->semStack[$this->stackPos-(2-2)])) { $this->semValue = array_merge($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)]); } else { $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)]; };
-    }
-
-    protected function reduceRule132() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule133() {
-         $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop(['comments' => $startAttributes['comments']]); } else { $nop = null; };
-            if ($nop !== null) { $this->semStack[$this->stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule134() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule135() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule136() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule137() {
-         throw new Error('__HALT_COMPILER() can only be used from the outermost scope', $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule138() {
-
-        if ($this->semStack[$this->stackPos-(3-2)]) {
-            $this->semValue = $this->semStack[$this->stackPos-(3-2)]; $attrs = $this->startAttributeStack[$this->stackPos-(3-1)]; $stmts = $this->semValue; if (!empty($attrs['comments'])) {$stmts[0]->setAttribute('comments', array_merge($attrs['comments'], $stmts[0]->getAttribute('comments', []))); };
+        if ($this->semStack[$stackPos-(3-2)]) {
+            $this->semValue = $this->semStack[$stackPos-(3-2)]; $attrs = $this->startAttributeStack[$stackPos-(3-1)]; $stmts = $this->semValue; if (!empty($attrs['comments'])) {$stmts[0]->setAttribute('comments', array_merge($attrs['comments'], $stmts[0]->getAttribute('comments', []))); };
         } else {
-            $startAttributes = $this->startAttributeStack[$this->stackPos-(3-1)]; if (isset($startAttributes['comments'])) { $this->semValue = new Stmt\Nop(['comments' => $startAttributes['comments']]); } else { $this->semValue = null; };
+            $startAttributes = $this->startAttributeStack[$stackPos-(3-1)]; if (isset($startAttributes['comments'])) { $this->semValue = new Stmt\Nop($startAttributes + $this->endAttributes); } else { $this->semValue = null; };
             if (null === $this->semValue) { $this->semValue = array(); }
         }
 
-    }
+            },
+            159 => function ($stackPos) {
+                 $this->semValue = new Stmt\If_($this->semStack[$stackPos-(7-3)], ['stmts' => is_array($this->semStack[$stackPos-(7-5)]) ? $this->semStack[$stackPos-(7-5)] : array($this->semStack[$stackPos-(7-5)]), 'elseifs' => $this->semStack[$stackPos-(7-6)], 'else' => $this->semStack[$stackPos-(7-7)]], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes);
+            },
+            160 => function ($stackPos) {
+                 $this->semValue = new Stmt\If_($this->semStack[$stackPos-(10-3)], ['stmts' => $this->semStack[$stackPos-(10-6)], 'elseifs' => $this->semStack[$stackPos-(10-7)], 'else' => $this->semStack[$stackPos-(10-8)]], $this->startAttributeStack[$stackPos-(10-1)] + $this->endAttributes);
+            },
+            161 => function ($stackPos) {
+                 $this->semValue = new Stmt\While_($this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+            },
+            162 => function ($stackPos) {
+                 $this->semValue = new Stmt\Do_($this->semStack[$stackPos-(7-5)], is_array($this->semStack[$stackPos-(7-2)]) ? $this->semStack[$stackPos-(7-2)] : array($this->semStack[$stackPos-(7-2)]), $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes);
+            },
+            163 => function ($stackPos) {
+                 $this->semValue = new Stmt\For_(['init' => $this->semStack[$stackPos-(9-3)], 'cond' => $this->semStack[$stackPos-(9-5)], 'loop' => $this->semStack[$stackPos-(9-7)], 'stmts' => $this->semStack[$stackPos-(9-9)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
+            },
+            164 => function ($stackPos) {
+                 $this->semValue = new Stmt\Switch_($this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+            },
+            165 => function ($stackPos) {
+                 $this->semValue = new Stmt\Break_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            166 => function ($stackPos) {
+                 $this->semValue = new Stmt\Continue_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            167 => function ($stackPos) {
+                 $this->semValue = new Stmt\Return_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            168 => function ($stackPos) {
+                 $this->semValue = new Stmt\Global_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            169 => function ($stackPos) {
+                 $this->semValue = new Stmt\Static_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            170 => function ($stackPos) {
+                 $this->semValue = new Stmt\Echo_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            171 => function ($stackPos) {
+                 $this->semValue = new Stmt\InlineHTML($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            172 => function ($stackPos) {
 
-    protected function reduceRule139() {
-         $this->semValue = new Stmt\If_($this->semStack[$this->stackPos-(7-3)], ['stmts' => is_array($this->semStack[$this->stackPos-(7-5)]) ? $this->semStack[$this->stackPos-(7-5)] : array($this->semStack[$this->stackPos-(7-5)]), 'elseifs' => $this->semStack[$this->stackPos-(7-6)], 'else' => $this->semStack[$this->stackPos-(7-7)]], $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes);
-    }
+        $e = $this->semStack[$stackPos-(2-1)];
+        if ($e instanceof Expr\Throw_) {
+            // For backwards-compatibility reasons, convert throw in statement position into
+            // Stmt\Throw_ rather than Stmt\Expression(Expr\Throw_).
+            $this->semValue = new Stmt\Throw_($e->expr, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+        } else {
+            $this->semValue = new Stmt\Expression($e, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+        }
 
-    protected function reduceRule140() {
-         $this->semValue = new Stmt\If_($this->semStack[$this->stackPos-(10-3)], ['stmts' => $this->semStack[$this->stackPos-(10-6)], 'elseifs' => $this->semStack[$this->stackPos-(10-7)], 'else' => $this->semStack[$this->stackPos-(10-8)]], $this->startAttributeStack[$this->stackPos-(10-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule141() {
-         $this->semValue = new Stmt\While_($this->semStack[$this->stackPos-(5-3)], $this->semStack[$this->stackPos-(5-5)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule142() {
-         $this->semValue = new Stmt\Do_($this->semStack[$this->stackPos-(7-5)], is_array($this->semStack[$this->stackPos-(7-2)]) ? $this->semStack[$this->stackPos-(7-2)] : array($this->semStack[$this->stackPos-(7-2)]), $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule143() {
-         $this->semValue = new Stmt\For_(['init' => $this->semStack[$this->stackPos-(9-3)], 'cond' => $this->semStack[$this->stackPos-(9-5)], 'loop' => $this->semStack[$this->stackPos-(9-7)], 'stmts' => $this->semStack[$this->stackPos-(9-9)]], $this->startAttributeStack[$this->stackPos-(9-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule144() {
-         $this->semValue = new Stmt\Switch_($this->semStack[$this->stackPos-(5-3)], $this->semStack[$this->stackPos-(5-5)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule145() {
-         $this->semValue = new Stmt\Break_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule146() {
-         $this->semValue = new Stmt\Continue_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule147() {
-         $this->semValue = new Stmt\Return_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule148() {
-         $this->semValue = new Stmt\Global_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule149() {
-         $this->semValue = new Stmt\Static_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule150() {
-         $this->semValue = new Stmt\Echo_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule151() {
-         $this->semValue = new Stmt\InlineHTML($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule152() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule153() {
-         $this->semValue = new Stmt\Unset_($this->semStack[$this->stackPos-(5-3)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule154() {
-         $this->semValue = new Stmt\Foreach_($this->semStack[$this->stackPos-(7-3)], $this->semStack[$this->stackPos-(7-5)][0], ['keyVar' => null, 'byRef' => $this->semStack[$this->stackPos-(7-5)][1], 'stmts' => $this->semStack[$this->stackPos-(7-7)]], $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule155() {
-         $this->semValue = new Stmt\Foreach_($this->semStack[$this->stackPos-(9-3)], $this->semStack[$this->stackPos-(9-7)][0], ['keyVar' => $this->semStack[$this->stackPos-(9-5)], 'byRef' => $this->semStack[$this->stackPos-(9-7)][1], 'stmts' => $this->semStack[$this->stackPos-(9-9)]], $this->startAttributeStack[$this->stackPos-(9-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule156() {
-         $this->semValue = new Stmt\Declare_($this->semStack[$this->stackPos-(5-3)], $this->semStack[$this->stackPos-(5-5)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule157() {
-         $this->semValue = new Stmt\TryCatch($this->semStack[$this->stackPos-(6-3)], $this->semStack[$this->stackPos-(6-5)], $this->semStack[$this->stackPos-(6-6)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes); $this->checkTryCatch($this->semValue);
-    }
-
-    protected function reduceRule158() {
-         $this->semValue = new Stmt\Throw_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule159() {
-         $this->semValue = new Stmt\Goto_($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule160() {
-         $this->semValue = new Stmt\Label($this->semStack[$this->stackPos-(2-1)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule161() {
-         $this->semValue = array(); /* means: no statement */
-    }
-
-    protected function reduceRule162() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule163() {
-         $startAttributes = $this->startAttributeStack[$this->stackPos-(1-1)]; if (isset($startAttributes['comments'])) { $this->semValue = new Stmt\Nop(['comments' => $startAttributes['comments']]); } else { $this->semValue = null; };
+            },
+            173 => function ($stackPos) {
+                 $this->semValue = new Stmt\Unset_($this->semStack[$stackPos-(5-3)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+            },
+            174 => function ($stackPos) {
+                 $this->semValue = new Stmt\Foreach_($this->semStack[$stackPos-(7-3)], $this->semStack[$stackPos-(7-5)][0], ['keyVar' => null, 'byRef' => $this->semStack[$stackPos-(7-5)][1], 'stmts' => $this->semStack[$stackPos-(7-7)]], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes);
+            },
+            175 => function ($stackPos) {
+                 $this->semValue = new Stmt\Foreach_($this->semStack[$stackPos-(9-3)], $this->semStack[$stackPos-(9-7)][0], ['keyVar' => $this->semStack[$stackPos-(9-5)], 'byRef' => $this->semStack[$stackPos-(9-7)][1], 'stmts' => $this->semStack[$stackPos-(9-9)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
+            },
+            176 => function ($stackPos) {
+                 $this->semValue = new Stmt\Foreach_($this->semStack[$stackPos-(6-3)], new Expr\Error($this->startAttributeStack[$stackPos-(6-4)] + $this->endAttributeStack[$stackPos-(6-4)]), ['stmts' => $this->semStack[$stackPos-(6-6)]], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
+            },
+            177 => function ($stackPos) {
+                 $this->semValue = new Stmt\Declare_($this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+            },
+            178 => function ($stackPos) {
+                 $this->semValue = new Stmt\TryCatch($this->semStack[$stackPos-(6-3)], $this->semStack[$stackPos-(6-5)], $this->semStack[$stackPos-(6-6)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes); $this->checkTryCatch($this->semValue);
+            },
+            179 => function ($stackPos) {
+                 $this->semValue = new Stmt\Goto_($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            180 => function ($stackPos) {
+                 $this->semValue = new Stmt\Label($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            181 => function ($stackPos) {
+                 $this->semValue = array(); /* means: no statement */
+            },
+            182 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            183 => function ($stackPos) {
+                 $startAttributes = $this->startAttributeStack[$stackPos-(1-1)]; if (isset($startAttributes['comments'])) { $this->semValue = new Stmt\Nop($startAttributes + $this->endAttributes); } else { $this->semValue = null; };
             if ($this->semValue === null) $this->semValue = array(); /* means: no statement */
-    }
-
-    protected function reduceRule164() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule165() {
-         $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule166() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule167() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule168() {
-         $this->semValue = new Stmt\Catch_($this->semStack[$this->stackPos-(8-3)], substr($this->semStack[$this->stackPos-(8-4)], 1), $this->semStack[$this->stackPos-(8-7)], $this->startAttributeStack[$this->stackPos-(8-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule169() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule170() {
-         $this->semValue = new Stmt\Finally_($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule171() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule172() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule173() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule174() {
-         $this->semValue = false;
-    }
-
-    protected function reduceRule175() {
-         $this->semValue = true;
-    }
-
-    protected function reduceRule176() {
-         $this->semValue = false;
-    }
-
-    protected function reduceRule177() {
-         $this->semValue = true;
-    }
-
-    protected function reduceRule178() {
-         $this->semValue = new Stmt\Function_($this->semStack[$this->stackPos-(10-3)], ['byRef' => $this->semStack[$this->stackPos-(10-2)], 'params' => $this->semStack[$this->stackPos-(10-5)], 'returnType' => $this->semStack[$this->stackPos-(10-7)], 'stmts' => $this->semStack[$this->stackPos-(10-9)]], $this->startAttributeStack[$this->stackPos-(10-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule179() {
-         $this->semValue = new Stmt\Class_($this->semStack[$this->stackPos-(7-2)], ['type' => $this->semStack[$this->stackPos-(7-1)], 'extends' => $this->semStack[$this->stackPos-(7-3)], 'implements' => $this->semStack[$this->stackPos-(7-4)], 'stmts' => $this->semStack[$this->stackPos-(7-6)]], $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes);
-            $this->checkClass($this->semValue, $this->stackPos-(7-2));
-    }
-
-    protected function reduceRule180() {
-         $this->semValue = new Stmt\Interface_($this->semStack[$this->stackPos-(6-2)], ['extends' => $this->semStack[$this->stackPos-(6-3)], 'stmts' => $this->semStack[$this->stackPos-(6-5)]], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes);
-            $this->checkInterface($this->semValue, $this->stackPos-(6-2));
-    }
-
-    protected function reduceRule181() {
-         $this->semValue = new Stmt\Trait_($this->semStack[$this->stackPos-(5-2)], ['stmts' => $this->semStack[$this->stackPos-(5-4)]], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule182() {
-         $this->semValue = 0;
-    }
-
-    protected function reduceRule183() {
-         $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT;
-    }
-
-    protected function reduceRule184() {
-         $this->semValue = Stmt\Class_::MODIFIER_FINAL;
-    }
-
-    protected function reduceRule185() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule186() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-2)];
-    }
-
-    protected function reduceRule187() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule188() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-2)];
-    }
-
-    protected function reduceRule189() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule190() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-2)];
-    }
-
-    protected function reduceRule191() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule192() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule193() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule194() {
-         $this->semValue = is_array($this->semStack[$this->stackPos-(1-1)]) ? $this->semStack[$this->stackPos-(1-1)] : array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule195() {
-         $this->semValue = $this->semStack[$this->stackPos-(4-2)];
-    }
-
-    protected function reduceRule196() {
-         $this->semValue = is_array($this->semStack[$this->stackPos-(1-1)]) ? $this->semStack[$this->stackPos-(1-1)] : array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule197() {
-         $this->semValue = $this->semStack[$this->stackPos-(4-2)];
-    }
-
-    protected function reduceRule198() {
-         $this->semValue = is_array($this->semStack[$this->stackPos-(1-1)]) ? $this->semStack[$this->stackPos-(1-1)] : array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule199() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule200() {
-         $this->semValue = $this->semStack[$this->stackPos-(4-2)];
-    }
-
-    protected function reduceRule201() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule202() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule203() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule204() {
-         $this->semValue = new Stmt\DeclareDeclare($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule205() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
-    }
-
-    protected function reduceRule206() {
-         $this->semValue = $this->semStack[$this->stackPos-(4-3)];
-    }
-
-    protected function reduceRule207() {
-         $this->semValue = $this->semStack[$this->stackPos-(4-2)];
-    }
-
-    protected function reduceRule208() {
-         $this->semValue = $this->semStack[$this->stackPos-(5-3)];
-    }
-
-    protected function reduceRule209() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule210() {
-         $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule211() {
-         $this->semValue = new Stmt\Case_($this->semStack[$this->stackPos-(4-2)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule212() {
-         $this->semValue = new Stmt\Case_(null, $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule213() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule214() {
-        $this->semValue = $this->semStack[$this->stackPos];
-    }
-
-    protected function reduceRule215() {
-         $this->semValue = is_array($this->semStack[$this->stackPos-(1-1)]) ? $this->semStack[$this->stackPos-(1-1)] : array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule216() {
-         $this->semValue = $this->semStack[$this->stackPos-(4-2)];
-    }
-
-    protected function reduceRule217() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule218() {
-         $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule219() {
-         $this->semValue = new Stmt\ElseIf_($this->semStack[$this->stackPos-(5-3)], is_array($this->semStack[$this->stackPos-(5-5)]) ? $this->semStack[$this->stackPos-(5-5)] : array($this->semStack[$this->stackPos-(5-5)]), $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule220() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule221() {
-         $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule222() {
-         $this->semValue = new Stmt\ElseIf_($this->semStack[$this->stackPos-(6-3)], $this->semStack[$this->stackPos-(6-6)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule223() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule224() {
-         $this->semValue = new Stmt\Else_(is_array($this->semStack[$this->stackPos-(2-2)]) ? $this->semStack[$this->stackPos-(2-2)] : array($this->semStack[$this->stackPos-(2-2)]), $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule225() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule226() {
-         $this->semValue = new Stmt\Else_($this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule227() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)], false);
-    }
-
-    protected function reduceRule228() {
-         $this->semValue = array($this->semStack[$this->stackPos-(2-2)], true);
-    }
-
-    protected function reduceRule229() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)], false);
-    }
-
-    protected function reduceRule230() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)], false);
-    }
-
-    protected function reduceRule231() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule232() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule233() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule234() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule235() {
-         $this->semValue = new Node\Param(substr($this->semStack[$this->stackPos-(4-4)], 1), null, $this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-2)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); $this->checkParam($this->semValue);
-    }
-
-    protected function reduceRule236() {
-         $this->semValue = new Node\Param(substr($this->semStack[$this->stackPos-(6-4)], 1), $this->semStack[$this->stackPos-(6-6)], $this->semStack[$this->stackPos-(6-1)], $this->semStack[$this->stackPos-(6-2)], $this->semStack[$this->stackPos-(6-3)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes); $this->checkParam($this->semValue);
-    }
-
-    protected function reduceRule237() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule238() {
-         $this->semValue = new Node\NullableType($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule239() {
-         $this->semValue = $this->handleBuiltinTypes($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule240() {
-         $this->semValue = 'array';
-    }
-
-    protected function reduceRule241() {
-         $this->semValue = 'callable';
-    }
-
-    protected function reduceRule242() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule243() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule244() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule245() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-2)];
-    }
-
-    protected function reduceRule246() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule247() {
-         $this->semValue = $this->semStack[$this->stackPos-(4-2)];
-    }
-
-    protected function reduceRule248() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule249() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule250() {
-         $this->semValue = new Node\Arg($this->semStack[$this->stackPos-(1-1)], false, false, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule251() {
-         $this->semValue = new Node\Arg($this->semStack[$this->stackPos-(2-2)], true, false, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule252() {
-         $this->semValue = new Node\Arg($this->semStack[$this->stackPos-(2-2)], false, true, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule253() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule254() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule255() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule256() {
-         $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule257() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule258() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule259() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule260() {
-         $this->semValue = new Stmt\StaticVar(substr($this->semStack[$this->stackPos-(1-1)], 1), null, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule261() {
-         $this->semValue = new Stmt\StaticVar(substr($this->semStack[$this->stackPos-(3-1)], 1), $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule262() {
-         $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule263() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule264() {
-         $this->semValue = new Stmt\Property($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); $this->checkProperty($this->semValue, $this->stackPos-(3-1));
-    }
-
-    protected function reduceRule265() {
-         $this->semValue = new Stmt\ClassConst($this->semStack[$this->stackPos-(4-3)], $this->semStack[$this->stackPos-(4-1)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes); $this->checkClassConst($this->semValue, $this->stackPos-(4-1));
-    }
-
-    protected function reduceRule266() {
-         $this->semValue = new Stmt\ClassMethod($this->semStack[$this->stackPos-(9-4)], ['type' => $this->semStack[$this->stackPos-(9-1)], 'byRef' => $this->semStack[$this->stackPos-(9-3)], 'params' => $this->semStack[$this->stackPos-(9-6)], 'returnType' => $this->semStack[$this->stackPos-(9-8)], 'stmts' => $this->semStack[$this->stackPos-(9-9)]], $this->startAttributeStack[$this->stackPos-(9-1)] + $this->endAttributes);
-            $this->checkClassMethod($this->semValue, $this->stackPos-(9-1));
-    }
-
-    protected function reduceRule267() {
-         $this->semValue = new Stmt\TraitUse($this->semStack[$this->stackPos-(3-2)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule268() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule269() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
-    }
-
-    protected function reduceRule270() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule271() {
-         $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule272() {
-         $this->semValue = new Stmt\TraitUseAdaptation\Precedence($this->semStack[$this->stackPos-(4-1)][0], $this->semStack[$this->stackPos-(4-1)][1], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule273() {
-         $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$this->stackPos-(5-1)][0], $this->semStack[$this->stackPos-(5-1)][1], $this->semStack[$this->stackPos-(5-3)], $this->semStack[$this->stackPos-(5-4)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule274() {
-         $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$this->stackPos-(4-1)][0], $this->semStack[$this->stackPos-(4-1)][1], $this->semStack[$this->stackPos-(4-3)], null, $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule275() {
-         $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$this->stackPos-(4-1)][0], $this->semStack[$this->stackPos-(4-1)][1], null, $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule276() {
-         $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$this->stackPos-(4-1)][0], $this->semStack[$this->stackPos-(4-1)][1], null, $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule277() {
-         $this->semValue = array($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)]);
-    }
-
-    protected function reduceRule278() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule279() {
-         $this->semValue = array(null, $this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule280() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule281() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
-    }
-
-    protected function reduceRule282() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule283() {
-         $this->semValue = 0;
-    }
-
-    protected function reduceRule284() {
-         $this->semValue = 0;
-    }
-
-    protected function reduceRule285() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule286() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule287() {
-         $this->checkModifier($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)], $this->stackPos-(2-2)); $this->semValue = $this->semStack[$this->stackPos-(2-1)] | $this->semStack[$this->stackPos-(2-2)];
-    }
-
-    protected function reduceRule288() {
-         $this->semValue = Stmt\Class_::MODIFIER_PUBLIC;
-    }
-
-    protected function reduceRule289() {
-         $this->semValue = Stmt\Class_::MODIFIER_PROTECTED;
-    }
-
-    protected function reduceRule290() {
-         $this->semValue = Stmt\Class_::MODIFIER_PRIVATE;
-    }
-
-    protected function reduceRule291() {
-         $this->semValue = Stmt\Class_::MODIFIER_STATIC;
-    }
-
-    protected function reduceRule292() {
-         $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT;
-    }
-
-    protected function reduceRule293() {
-         $this->semValue = Stmt\Class_::MODIFIER_FINAL;
-    }
-
-    protected function reduceRule294() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule295() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule296() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule297() {
-         $this->semValue = new Stmt\PropertyProperty(substr($this->semStack[$this->stackPos-(1-1)], 1), null, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule298() {
-         $this->semValue = new Stmt\PropertyProperty(substr($this->semStack[$this->stackPos-(3-1)], 1), $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule299() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule300() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule301() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule302() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule303() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule304() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule305() {
-         $this->semValue = new Expr\Assign($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule306() {
-         $this->semValue = new Expr\Assign($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule307() {
-         $this->semValue = new Expr\Assign($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule308() {
-         $this->semValue = new Expr\AssignRef($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule309() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule310() {
-         $this->semValue = new Expr\Clone_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule311() {
-         $this->semValue = new Expr\AssignOp\Plus($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule312() {
-         $this->semValue = new Expr\AssignOp\Minus($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule313() {
-         $this->semValue = new Expr\AssignOp\Mul($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule314() {
-         $this->semValue = new Expr\AssignOp\Div($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule315() {
-         $this->semValue = new Expr\AssignOp\Concat($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule316() {
-         $this->semValue = new Expr\AssignOp\Mod($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule317() {
-         $this->semValue = new Expr\AssignOp\BitwiseAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule318() {
-         $this->semValue = new Expr\AssignOp\BitwiseOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule319() {
-         $this->semValue = new Expr\AssignOp\BitwiseXor($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule320() {
-         $this->semValue = new Expr\AssignOp\ShiftLeft($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule321() {
-         $this->semValue = new Expr\AssignOp\ShiftRight($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule322() {
-         $this->semValue = new Expr\AssignOp\Pow($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule323() {
-         $this->semValue = new Expr\PostInc($this->semStack[$this->stackPos-(2-1)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule324() {
-         $this->semValue = new Expr\PreInc($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule325() {
-         $this->semValue = new Expr\PostDec($this->semStack[$this->stackPos-(2-1)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule326() {
-         $this->semValue = new Expr\PreDec($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule327() {
-         $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule328() {
-         $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule329() {
-         $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule330() {
-         $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule331() {
-         $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule332() {
-         $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule333() {
-         $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule334() {
-         $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule335() {
-         $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule336() {
-         $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule337() {
-         $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule338() {
-         $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule339() {
-         $this->semValue = new Expr\BinaryOp\Div($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule340() {
-         $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule341() {
-         $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule342() {
-         $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule343() {
-         $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule344() {
-         $this->semValue = new Expr\UnaryPlus($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule345() {
-         $this->semValue = new Expr\UnaryMinus($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule346() {
-         $this->semValue = new Expr\BooleanNot($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule347() {
-         $this->semValue = new Expr\BitwiseNot($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule348() {
-         $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule349() {
-         $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule350() {
-         $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule351() {
-         $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule352() {
-         $this->semValue = new Expr\BinaryOp\Spaceship($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule353() {
-         $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule354() {
-         $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule355() {
-         $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule356() {
-         $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule357() {
-         $this->semValue = new Expr\Instanceof_($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule358() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
-    }
-
-    protected function reduceRule359() {
-         $this->semValue = new Expr\Ternary($this->semStack[$this->stackPos-(5-1)], $this->semStack[$this->stackPos-(5-3)], $this->semStack[$this->stackPos-(5-5)], $this->startAttributeStack[$this->stackPos-(5-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule360() {
-         $this->semValue = new Expr\Ternary($this->semStack[$this->stackPos-(4-1)], null, $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule361() {
-         $this->semValue = new Expr\BinaryOp\Coalesce($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule362() {
-         $this->semValue = new Expr\Isset_($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule363() {
-         $this->semValue = new Expr\Empty_($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule364() {
-         $this->semValue = new Expr\Include_($this->semStack[$this->stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule365() {
-         $this->semValue = new Expr\Include_($this->semStack[$this->stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE_ONCE, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule366() {
-         $this->semValue = new Expr\Eval_($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule367() {
-         $this->semValue = new Expr\Include_($this->semStack[$this->stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule368() {
-         $this->semValue = new Expr\Include_($this->semStack[$this->stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE_ONCE, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule369() {
-         $this->semValue = new Expr\Cast\Int_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule370() {
-         $this->semValue = new Expr\Cast\Double($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule371() {
-         $this->semValue = new Expr\Cast\String_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule372() {
-         $this->semValue = new Expr\Cast\Array_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule373() {
-         $this->semValue = new Expr\Cast\Object_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule374() {
-         $this->semValue = new Expr\Cast\Bool_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule375() {
-         $this->semValue = new Expr\Cast\Unset_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule376() {
-         $attrs = $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes;
-            $attrs['kind'] = strtolower($this->semStack[$this->stackPos-(2-1)]) === 'exit' ? Expr\Exit_::KIND_EXIT : Expr\Exit_::KIND_DIE;
-            $this->semValue = new Expr\Exit_($this->semStack[$this->stackPos-(2-2)], $attrs);
-    }
-
-    protected function reduceRule377() {
-         $this->semValue = new Expr\ErrorSuppress($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule378() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule379() {
-         $this->semValue = new Expr\ShellExec($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule380() {
-         $this->semValue = new Expr\Print_($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule381() {
-         $this->semValue = new Expr\Yield_(null, null, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule382() {
-         $this->semValue = new Expr\Yield_($this->semStack[$this->stackPos-(2-2)], null, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule383() {
-         $this->semValue = new Expr\Yield_($this->semStack[$this->stackPos-(4-4)], $this->semStack[$this->stackPos-(4-2)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule384() {
-         $this->semValue = new Expr\YieldFrom($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule385() {
-         $this->semValue = new Expr\Closure(['static' => false, 'byRef' => $this->semStack[$this->stackPos-(10-2)], 'params' => $this->semStack[$this->stackPos-(10-4)], 'uses' => $this->semStack[$this->stackPos-(10-6)], 'returnType' => $this->semStack[$this->stackPos-(10-7)], 'stmts' => $this->semStack[$this->stackPos-(10-9)]], $this->startAttributeStack[$this->stackPos-(10-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule386() {
-         $this->semValue = new Expr\Closure(['static' => true, 'byRef' => $this->semStack[$this->stackPos-(11-3)], 'params' => $this->semStack[$this->stackPos-(11-5)], 'uses' => $this->semStack[$this->stackPos-(11-7)], 'returnType' => $this->semStack[$this->stackPos-(11-8)], 'stmts' => $this->semStack[$this->stackPos-(11-10)]], $this->startAttributeStack[$this->stackPos-(11-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule387() {
-         $this->semValue = array(new Stmt\Class_(null, ['type' => 0, 'extends' => $this->semStack[$this->stackPos-(7-3)], 'implements' => $this->semStack[$this->stackPos-(7-4)], 'stmts' => $this->semStack[$this->stackPos-(7-6)]], $this->startAttributeStack[$this->stackPos-(7-1)] + $this->endAttributes), $this->semStack[$this->stackPos-(7-2)]);
+            },
+            184 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            185 => function ($stackPos) {
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            186 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            187 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            188 => function ($stackPos) {
+                 $this->semValue = new Stmt\Catch_($this->semStack[$stackPos-(8-3)], $this->semStack[$stackPos-(8-4)], $this->semStack[$stackPos-(8-7)], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes);
+            },
+            189 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            190 => function ($stackPos) {
+                 $this->semValue = new Stmt\Finally_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            191 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            192 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            193 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            194 => function ($stackPos) {
+                 $this->semValue = false;
+            },
+            195 => function ($stackPos) {
+                 $this->semValue = true;
+            },
+            196 => function ($stackPos) {
+                 $this->semValue = false;
+            },
+            197 => function ($stackPos) {
+                 $this->semValue = true;
+            },
+            198 => function ($stackPos) {
+                 $this->semValue = false;
+            },
+            199 => function ($stackPos) {
+                 $this->semValue = true;
+            },
+            200 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            201 => function ($stackPos) {
+                 $this->semValue = [];
+            },
+            202 => function ($stackPos) {
+                 $this->semValue = new Stmt\Function_($this->semStack[$stackPos-(8-3)], ['byRef' => $this->semStack[$stackPos-(8-2)], 'params' => $this->semStack[$stackPos-(8-5)], 'returnType' => $this->semStack[$stackPos-(8-7)], 'stmts' => $this->semStack[$stackPos-(8-8)], 'attrGroups' => []], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes);
+            },
+            203 => function ($stackPos) {
+                 $this->semValue = new Stmt\Function_($this->semStack[$stackPos-(9-4)], ['byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-6)], 'returnType' => $this->semStack[$stackPos-(9-8)], 'stmts' => $this->semStack[$stackPos-(9-9)], 'attrGroups' => $this->semStack[$stackPos-(9-1)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
+            },
+            204 => function ($stackPos) {
+                 $this->semValue = new Stmt\Class_($this->semStack[$stackPos-(8-3)], ['type' => $this->semStack[$stackPos-(8-2)], 'extends' => $this->semStack[$stackPos-(8-4)], 'implements' => $this->semStack[$stackPos-(8-5)], 'stmts' => $this->semStack[$stackPos-(8-7)], 'attrGroups' => $this->semStack[$stackPos-(8-1)]], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes);
+            $this->checkClass($this->semValue, $stackPos-(8-3));
+            },
+            205 => function ($stackPos) {
+                 $this->semValue = new Stmt\Interface_($this->semStack[$stackPos-(7-3)], ['extends' => $this->semStack[$stackPos-(7-4)], 'stmts' => $this->semStack[$stackPos-(7-6)], 'attrGroups' => $this->semStack[$stackPos-(7-1)]], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes);
+            $this->checkInterface($this->semValue, $stackPos-(7-3));
+            },
+            206 => function ($stackPos) {
+                 $this->semValue = new Stmt\Trait_($this->semStack[$stackPos-(6-3)], ['stmts' => $this->semStack[$stackPos-(6-5)], 'attrGroups' => $this->semStack[$stackPos-(6-1)]], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
+            },
+            207 => function ($stackPos) {
+                 $this->semValue = new Stmt\Enum_($this->semStack[$stackPos-(8-3)], ['scalarType' => $this->semStack[$stackPos-(8-4)], 'implements' => $this->semStack[$stackPos-(8-5)], 'stmts' => $this->semStack[$stackPos-(8-7)], 'attrGroups' => $this->semStack[$stackPos-(8-1)]], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes);
+            $this->checkEnum($this->semValue, $stackPos-(8-3));
+            },
+            208 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            209 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-2)];
+            },
+            210 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            211 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-2)];
+            },
+            212 => function ($stackPos) {
+                 $this->semValue = 0;
+            },
+            213 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT;
+            },
+            214 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_FINAL;
+            },
+            215 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            216 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-2)];
+            },
+            217 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            218 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-2)];
+            },
+            219 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            220 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-2)];
+            },
+            221 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            222 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            223 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            224 => function ($stackPos) {
+                 $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]);
+            },
+            225 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(4-2)];
+            },
+            226 => function ($stackPos) {
+                 $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]);
+            },
+            227 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(4-2)];
+            },
+            228 => function ($stackPos) {
+                 $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]);
+            },
+            229 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            230 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(4-2)];
+            },
+            231 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            232 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            233 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            234 => function ($stackPos) {
+                 $this->semValue = new Stmt\DeclareDeclare($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            235 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            236 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(4-3)];
+            },
+            237 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(4-2)];
+            },
+            238 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(5-3)];
+            },
+            239 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            240 => function ($stackPos) {
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            241 => function ($stackPos) {
+                 $this->semValue = new Stmt\Case_($this->semStack[$stackPos-(4-2)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            242 => function ($stackPos) {
+                 $this->semValue = new Stmt\Case_(null, $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            243 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            244 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            245 => function ($stackPos) {
+                 $this->semValue = new Expr\Match_($this->semStack[$stackPos-(7-3)], $this->semStack[$stackPos-(7-6)], $this->startAttributeStack[$stackPos-(7-1)] + $this->endAttributes);
+            },
+            246 => function ($stackPos) {
+                 $this->semValue = [];
+            },
+            247 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            248 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            249 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            250 => function ($stackPos) {
+                 $this->semValue = new Node\MatchArm($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            251 => function ($stackPos) {
+                 $this->semValue = new Node\MatchArm(null, $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            252 => function ($stackPos) {
+                 $this->semValue = is_array($this->semStack[$stackPos-(1-1)]) ? $this->semStack[$stackPos-(1-1)] : array($this->semStack[$stackPos-(1-1)]);
+            },
+            253 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(4-2)];
+            },
+            254 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            255 => function ($stackPos) {
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            256 => function ($stackPos) {
+                 $this->semValue = new Stmt\ElseIf_($this->semStack[$stackPos-(5-3)], is_array($this->semStack[$stackPos-(5-5)]) ? $this->semStack[$stackPos-(5-5)] : array($this->semStack[$stackPos-(5-5)]), $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+            },
+            257 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            258 => function ($stackPos) {
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            259 => function ($stackPos) {
+                 $this->semValue = new Stmt\ElseIf_($this->semStack[$stackPos-(6-3)], $this->semStack[$stackPos-(6-6)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
+            },
+            260 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            261 => function ($stackPos) {
+                 $this->semValue = new Stmt\Else_(is_array($this->semStack[$stackPos-(2-2)]) ? $this->semStack[$stackPos-(2-2)] : array($this->semStack[$stackPos-(2-2)]), $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            262 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            263 => function ($stackPos) {
+                 $this->semValue = new Stmt\Else_($this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            264 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)], false);
+            },
+            265 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(2-2)], true);
+            },
+            266 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)], false);
+            },
+            267 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)], false);
+            },
+            268 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            269 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            270 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            271 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            272 => function ($stackPos) {
+                 $this->semValue = 0;
+            },
+            273 => function ($stackPos) {
+                 $this->checkModifier($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $this->semValue = $this->semStack[$stackPos-(2-1)] | $this->semStack[$stackPos-(2-2)];
+            },
+            274 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_PUBLIC;
+            },
+            275 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_PROTECTED;
+            },
+            276 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_PRIVATE;
+            },
+            277 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_READONLY;
+            },
+            278 => function ($stackPos) {
+                 $this->semValue = new Node\Param($this->semStack[$stackPos-(6-6)], null, $this->semStack[$stackPos-(6-3)], $this->semStack[$stackPos-(6-4)], $this->semStack[$stackPos-(6-5)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes, $this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-1)]);
+            $this->checkParam($this->semValue);
+            },
+            279 => function ($stackPos) {
+                 $this->semValue = new Node\Param($this->semStack[$stackPos-(8-6)], $this->semStack[$stackPos-(8-8)], $this->semStack[$stackPos-(8-3)], $this->semStack[$stackPos-(8-4)], $this->semStack[$stackPos-(8-5)], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes, $this->semStack[$stackPos-(8-2)], $this->semStack[$stackPos-(8-1)]);
+            $this->checkParam($this->semValue);
+            },
+            280 => function ($stackPos) {
+                 $this->semValue = new Node\Param(new Expr\Error($this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes), null, $this->semStack[$stackPos-(6-3)], $this->semStack[$stackPos-(6-4)], $this->semStack[$stackPos-(6-5)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes, $this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-1)]);
+            },
+            281 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            282 => function ($stackPos) {
+                 $this->semValue = new Node\NullableType($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            283 => function ($stackPos) {
+                 $this->semValue = new Node\UnionType($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            284 => function ($stackPos) {
+                 $this->semValue = new Node\IntersectionType($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            285 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            286 => function ($stackPos) {
+                 $this->semValue = new Node\Name('static', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            287 => function ($stackPos) {
+                 $this->semValue = $this->handleBuiltinTypes($this->semStack[$stackPos-(1-1)]);
+            },
+            288 => function ($stackPos) {
+                 $this->semValue = new Node\Identifier('array', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            289 => function ($stackPos) {
+                 $this->semValue = new Node\Identifier('callable', $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            290 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]);
+            },
+            291 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            292 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]);
+            },
+            293 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            294 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]);
+            },
+            295 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            296 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]);
+            },
+            297 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            298 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            299 => function ($stackPos) {
+                 $this->semValue = new Node\NullableType($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            300 => function ($stackPos) {
+                 $this->semValue = new Node\UnionType($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            301 => function ($stackPos) {
+                 $this->semValue = new Node\IntersectionType($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            302 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            303 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            304 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            305 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-2)];
+            },
+            306 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            307 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            308 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(4-2)];
+            },
+            309 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(3-2)]);
+            },
+            310 => function ($stackPos) {
+                 $this->semValue = new Node\VariadicPlaceholder($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            311 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            312 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            313 => function ($stackPos) {
+                 $this->semValue = new Node\Arg($this->semStack[$stackPos-(1-1)], false, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            314 => function ($stackPos) {
+                 $this->semValue = new Node\Arg($this->semStack[$stackPos-(2-2)], true, false, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            315 => function ($stackPos) {
+                 $this->semValue = new Node\Arg($this->semStack[$stackPos-(2-2)], false, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            316 => function ($stackPos) {
+                 $this->semValue = new Node\Arg($this->semStack[$stackPos-(3-3)], false, false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes, $this->semStack[$stackPos-(3-1)]);
+            },
+            317 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            318 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            319 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            320 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            321 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            322 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            323 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            324 => function ($stackPos) {
+                 $this->semValue = new Stmt\StaticVar($this->semStack[$stackPos-(1-1)], null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            325 => function ($stackPos) {
+                 $this->semValue = new Stmt\StaticVar($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            326 => function ($stackPos) {
+                 if ($this->semStack[$stackPos-(2-2)] !== null) { $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)]; }
+            },
+            327 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            328 => function ($stackPos) {
+                 $startAttributes = $this->lookaheadStartAttributes; if (isset($startAttributes['comments'])) { $nop = new Stmt\Nop($this->createCommentNopAttributes($startAttributes['comments'])); } else { $nop = null; };
+            if ($nop !== null) { $this->semStack[$stackPos-(1-1)][] = $nop; } $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            329 => function ($stackPos) {
+                 $this->semValue = new Stmt\Property($this->semStack[$stackPos-(5-2)], $this->semStack[$stackPos-(5-4)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes, $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-1)]);
+            $this->checkProperty($this->semValue, $stackPos-(5-2));
+            },
+            330 => function ($stackPos) {
+                 $this->semValue = new Stmt\ClassConst($this->semStack[$stackPos-(5-4)], $this->semStack[$stackPos-(5-2)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes, $this->semStack[$stackPos-(5-1)]);
+            $this->checkClassConst($this->semValue, $stackPos-(5-2));
+            },
+            331 => function ($stackPos) {
+                 $this->semValue = new Stmt\ClassMethod($this->semStack[$stackPos-(10-5)], ['type' => $this->semStack[$stackPos-(10-2)], 'byRef' => $this->semStack[$stackPos-(10-4)], 'params' => $this->semStack[$stackPos-(10-7)], 'returnType' => $this->semStack[$stackPos-(10-9)], 'stmts' => $this->semStack[$stackPos-(10-10)], 'attrGroups' => $this->semStack[$stackPos-(10-1)]], $this->startAttributeStack[$stackPos-(10-1)] + $this->endAttributes);
+            $this->checkClassMethod($this->semValue, $stackPos-(10-2));
+            },
+            332 => function ($stackPos) {
+                 $this->semValue = new Stmt\TraitUse($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            333 => function ($stackPos) {
+                 $this->semValue = new Stmt\EnumCase($this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-4)], $this->semStack[$stackPos-(5-1)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+            },
+            334 => function ($stackPos) {
+                 $this->semValue = null; /* will be skipped */
+            },
+            335 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            336 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            337 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            338 => function ($stackPos) {
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            339 => function ($stackPos) {
+                 $this->semValue = new Stmt\TraitUseAdaptation\Precedence($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            340 => function ($stackPos) {
+                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(5-1)][0], $this->semStack[$stackPos-(5-1)][1], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-4)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+            },
+            341 => function ($stackPos) {
+                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], $this->semStack[$stackPos-(4-3)], null, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            342 => function ($stackPos) {
+                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            343 => function ($stackPos) {
+                 $this->semValue = new Stmt\TraitUseAdaptation\Alias($this->semStack[$stackPos-(4-1)][0], $this->semStack[$stackPos-(4-1)][1], null, $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            344 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)]);
+            },
+            345 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            346 => function ($stackPos) {
+                 $this->semValue = array(null, $this->semStack[$stackPos-(1-1)]);
+            },
+            347 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            348 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            349 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            350 => function ($stackPos) {
+                 $this->semValue = 0;
+            },
+            351 => function ($stackPos) {
+                 $this->semValue = 0;
+            },
+            352 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            353 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            354 => function ($stackPos) {
+                 $this->checkModifier($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $stackPos-(2-2)); $this->semValue = $this->semStack[$stackPos-(2-1)] | $this->semStack[$stackPos-(2-2)];
+            },
+            355 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_PUBLIC;
+            },
+            356 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_PROTECTED;
+            },
+            357 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_PRIVATE;
+            },
+            358 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_STATIC;
+            },
+            359 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_ABSTRACT;
+            },
+            360 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_FINAL;
+            },
+            361 => function ($stackPos) {
+                 $this->semValue = Stmt\Class_::MODIFIER_READONLY;
+            },
+            362 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            363 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            364 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            365 => function ($stackPos) {
+                 $this->semValue = new Node\VarLikeIdentifier(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            366 => function ($stackPos) {
+                 $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(1-1)], null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            367 => function ($stackPos) {
+                 $this->semValue = new Stmt\PropertyProperty($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            368 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            369 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            370 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            371 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            372 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            373 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            374 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            375 => function ($stackPos) {
+                 $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            376 => function ($stackPos) {
+                 $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            377 => function ($stackPos) {
+                 $this->semValue = new Expr\Assign($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            378 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignRef($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            379 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            380 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            381 => function ($stackPos) {
+                 $this->semValue = new Expr\Clone_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            382 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            383 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            384 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            385 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            386 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            387 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            388 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            389 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            390 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            391 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            392 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            393 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            394 => function ($stackPos) {
+                 $this->semValue = new Expr\AssignOp\Coalesce($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            395 => function ($stackPos) {
+                 $this->semValue = new Expr\PostInc($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            396 => function ($stackPos) {
+                 $this->semValue = new Expr\PreInc($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            397 => function ($stackPos) {
+                 $this->semValue = new Expr\PostDec($this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            398 => function ($stackPos) {
+                 $this->semValue = new Expr\PreDec($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            399 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\BooleanOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            400 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\BooleanAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            401 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\LogicalOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            402 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\LogicalAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            403 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\LogicalXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            404 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\BitwiseOr($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            405 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            406 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\BitwiseAnd($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            407 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\BitwiseXor($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            408 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Concat($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            409 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Plus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            410 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Minus($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            411 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Mul($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            412 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Div($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            413 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Mod($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            414 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\ShiftLeft($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            415 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\ShiftRight($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            416 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Pow($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            417 => function ($stackPos) {
+                 $this->semValue = new Expr\UnaryPlus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            418 => function ($stackPos) {
+                 $this->semValue = new Expr\UnaryMinus($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            419 => function ($stackPos) {
+                 $this->semValue = new Expr\BooleanNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            420 => function ($stackPos) {
+                 $this->semValue = new Expr\BitwiseNot($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            421 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Identical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            422 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\NotIdentical($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            423 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Equal($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            424 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\NotEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            425 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Spaceship($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            426 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Smaller($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            427 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\SmallerOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            428 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Greater($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            429 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\GreaterOrEqual($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            430 => function ($stackPos) {
+                 $this->semValue = new Expr\Instanceof_($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            431 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            432 => function ($stackPos) {
+                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(5-1)], $this->semStack[$stackPos-(5-3)], $this->semStack[$stackPos-(5-5)], $this->startAttributeStack[$stackPos-(5-1)] + $this->endAttributes);
+            },
+            433 => function ($stackPos) {
+                 $this->semValue = new Expr\Ternary($this->semStack[$stackPos-(4-1)], null, $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            434 => function ($stackPos) {
+                 $this->semValue = new Expr\BinaryOp\Coalesce($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            435 => function ($stackPos) {
+                 $this->semValue = new Expr\Isset_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            436 => function ($stackPos) {
+                 $this->semValue = new Expr\Empty_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            437 => function ($stackPos) {
+                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            438 => function ($stackPos) {
+                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_INCLUDE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            439 => function ($stackPos) {
+                 $this->semValue = new Expr\Eval_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            440 => function ($stackPos) {
+                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            441 => function ($stackPos) {
+                 $this->semValue = new Expr\Include_($this->semStack[$stackPos-(2-2)], Expr\Include_::TYPE_REQUIRE_ONCE, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            442 => function ($stackPos) {
+                 $this->semValue = new Expr\Cast\Int_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            443 => function ($stackPos) {
+                 $attrs = $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes;
+            $attrs['kind'] = $this->getFloatCastKind($this->semStack[$stackPos-(2-1)]);
+            $this->semValue = new Expr\Cast\Double($this->semStack[$stackPos-(2-2)], $attrs);
+            },
+            444 => function ($stackPos) {
+                 $this->semValue = new Expr\Cast\String_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            445 => function ($stackPos) {
+                 $this->semValue = new Expr\Cast\Array_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            446 => function ($stackPos) {
+                 $this->semValue = new Expr\Cast\Object_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            447 => function ($stackPos) {
+                 $this->semValue = new Expr\Cast\Bool_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            448 => function ($stackPos) {
+                 $this->semValue = new Expr\Cast\Unset_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            449 => function ($stackPos) {
+                 $attrs = $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes;
+            $attrs['kind'] = strtolower($this->semStack[$stackPos-(2-1)]) === 'exit' ? Expr\Exit_::KIND_EXIT : Expr\Exit_::KIND_DIE;
+            $this->semValue = new Expr\Exit_($this->semStack[$stackPos-(2-2)], $attrs);
+            },
+            450 => function ($stackPos) {
+                 $this->semValue = new Expr\ErrorSuppress($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            451 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            452 => function ($stackPos) {
+                 $this->semValue = new Expr\ShellExec($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            453 => function ($stackPos) {
+                 $this->semValue = new Expr\Print_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            454 => function ($stackPos) {
+                 $this->semValue = new Expr\Yield_(null, null, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            455 => function ($stackPos) {
+                 $this->semValue = new Expr\Yield_($this->semStack[$stackPos-(2-2)], null, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            456 => function ($stackPos) {
+                 $this->semValue = new Expr\Yield_($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-2)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            457 => function ($stackPos) {
+                 $this->semValue = new Expr\YieldFrom($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            458 => function ($stackPos) {
+                 $this->semValue = new Expr\Throw_($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            459 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrowFunction(['static' => false, 'byRef' => $this->semStack[$stackPos-(8-2)], 'params' => $this->semStack[$stackPos-(8-4)], 'returnType' => $this->semStack[$stackPos-(8-6)], 'expr' => $this->semStack[$stackPos-(8-8)], 'attrGroups' => []], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes);
+            },
+            460 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrowFunction(['static' => true, 'byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-5)], 'returnType' => $this->semStack[$stackPos-(9-7)], 'expr' => $this->semStack[$stackPos-(9-9)], 'attrGroups' => []], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
+            },
+            461 => function ($stackPos) {
+                 $this->semValue = new Expr\Closure(['static' => false, 'byRef' => $this->semStack[$stackPos-(8-2)], 'params' => $this->semStack[$stackPos-(8-4)], 'uses' => $this->semStack[$stackPos-(8-6)], 'returnType' => $this->semStack[$stackPos-(8-7)], 'stmts' => $this->semStack[$stackPos-(8-8)], 'attrGroups' => []], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes);
+            },
+            462 => function ($stackPos) {
+                 $this->semValue = new Expr\Closure(['static' => true, 'byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-5)], 'uses' => $this->semStack[$stackPos-(9-7)], 'returnType' => $this->semStack[$stackPos-(9-8)], 'stmts' => $this->semStack[$stackPos-(9-9)], 'attrGroups' => []], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
+            },
+            463 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrowFunction(['static' => false, 'byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-5)], 'returnType' => $this->semStack[$stackPos-(9-7)], 'expr' => $this->semStack[$stackPos-(9-9)], 'attrGroups' => $this->semStack[$stackPos-(9-1)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
+            },
+            464 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrowFunction(['static' => true, 'byRef' => $this->semStack[$stackPos-(10-4)], 'params' => $this->semStack[$stackPos-(10-6)], 'returnType' => $this->semStack[$stackPos-(10-8)], 'expr' => $this->semStack[$stackPos-(10-10)], 'attrGroups' => $this->semStack[$stackPos-(10-1)]], $this->startAttributeStack[$stackPos-(10-1)] + $this->endAttributes);
+            },
+            465 => function ($stackPos) {
+                 $this->semValue = new Expr\Closure(['static' => false, 'byRef' => $this->semStack[$stackPos-(9-3)], 'params' => $this->semStack[$stackPos-(9-5)], 'uses' => $this->semStack[$stackPos-(9-7)], 'returnType' => $this->semStack[$stackPos-(9-8)], 'stmts' => $this->semStack[$stackPos-(9-9)], 'attrGroups' => $this->semStack[$stackPos-(9-1)]], $this->startAttributeStack[$stackPos-(9-1)] + $this->endAttributes);
+            },
+            466 => function ($stackPos) {
+                 $this->semValue = new Expr\Closure(['static' => true, 'byRef' => $this->semStack[$stackPos-(10-4)], 'params' => $this->semStack[$stackPos-(10-6)], 'uses' => $this->semStack[$stackPos-(10-8)], 'returnType' => $this->semStack[$stackPos-(10-9)], 'stmts' => $this->semStack[$stackPos-(10-10)], 'attrGroups' => $this->semStack[$stackPos-(10-1)]], $this->startAttributeStack[$stackPos-(10-1)] + $this->endAttributes);
+            },
+            467 => function ($stackPos) {
+                 $this->semValue = array(new Stmt\Class_(null, ['type' => 0, 'extends' => $this->semStack[$stackPos-(8-4)], 'implements' => $this->semStack[$stackPos-(8-5)], 'stmts' => $this->semStack[$stackPos-(8-7)], 'attrGroups' => $this->semStack[$stackPos-(8-1)]], $this->startAttributeStack[$stackPos-(8-1)] + $this->endAttributes), $this->semStack[$stackPos-(8-3)]);
             $this->checkClass($this->semValue[0], -1);
-    }
-
-    protected function reduceRule388() {
-         $this->semValue = new Expr\New_($this->semStack[$this->stackPos-(3-2)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule389() {
-         list($class, $ctorArgs) = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = new Expr\New_($class, $ctorArgs, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule390() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule391() {
-         $this->semValue = $this->semStack[$this->stackPos-(4-3)];
-    }
-
-    protected function reduceRule392() {
-         $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule393() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule394() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule395() {
-         $this->semValue = new Expr\ClosureUse(substr($this->semStack[$this->stackPos-(2-2)], 1), $this->semStack[$this->stackPos-(2-1)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule396() {
-         $this->semValue = new Expr\FuncCall($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule397() {
-         $this->semValue = new Expr\FuncCall($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule398() {
-         $this->semValue = new Expr\StaticCall($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule399() {
-         $this->semValue = new Name($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule400() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule401() {
-         $this->semValue = new Name($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule402() {
-         $this->semValue = new Name\FullyQualified($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule403() {
-         $this->semValue = new Name\Relative($this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule404() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule405() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule406() {
-         $this->semValue = new Expr\Error($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2;
-    }
-
-    protected function reduceRule407() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule408() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule409() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule410() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
-    }
-
-    protected function reduceRule411() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule412() {
-         $this->semValue = array(new Scalar\EncapsedStringPart(Scalar\String_::parseEscapeSequences($this->semStack[$this->stackPos-(1-1)], '`'), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes));
-    }
-
-    protected function reduceRule413() {
-         foreach ($this->semStack[$this->stackPos-(1-1)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '`', true); } }; $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule414() {
-         $this->semValue = array();
-    }
-
-    protected function reduceRule415() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule416() {
-         $this->semValue = new Expr\ConstFetch($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule417() {
-         $this->semValue = new Expr\ClassConstFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule418() {
-         $this->semValue = new Expr\ClassConstFetch($this->semStack[$this->stackPos-(3-1)], new Expr\Error($this->startAttributeStack[$this->stackPos-(3-3)] + $this->endAttributeStack[$this->stackPos-(3-3)]), $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes); $this->errorState = 2;
-    }
-
-    protected function reduceRule419() {
-         $attrs = $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_SHORT;
-            $this->semValue = new Expr\Array_($this->semStack[$this->stackPos-(3-2)], $attrs);
-    }
-
-    protected function reduceRule420() {
-         $attrs = $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_LONG;
-            $this->semValue = new Expr\Array_($this->semStack[$this->stackPos-(4-3)], $attrs);
-    }
-
-    protected function reduceRule421() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule422() {
-         $attrs = $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes; $attrs['kind'] = ($this->semStack[$this->stackPos-(1-1)][0] === "'" || ($this->semStack[$this->stackPos-(1-1)][1] === "'" && ($this->semStack[$this->stackPos-(1-1)][0] === 'b' || $this->semStack[$this->stackPos-(1-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED);
-            $this->semValue = new Scalar\String_(Scalar\String_::parse($this->semStack[$this->stackPos-(1-1)]), $attrs);
-    }
-
-    protected function reduceRule423() {
-         $this->semValue = $this->parseLNumber($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule424() {
-         $this->semValue = new Scalar\DNumber(Scalar\DNumber::parse($this->semStack[$this->stackPos-(1-1)]), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule425() {
-         $this->semValue = new Scalar\MagicConst\Line($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule426() {
-         $this->semValue = new Scalar\MagicConst\File($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule427() {
-         $this->semValue = new Scalar\MagicConst\Dir($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule428() {
-         $this->semValue = new Scalar\MagicConst\Class_($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule429() {
-         $this->semValue = new Scalar\MagicConst\Trait_($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule430() {
-         $this->semValue = new Scalar\MagicConst\Method($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule431() {
-         $this->semValue = new Scalar\MagicConst\Function_($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule432() {
-         $this->semValue = new Scalar\MagicConst\Namespace_($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule433() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule434() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule435() {
-         $attrs = $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$this->stackPos-(3-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$this->stackPos-(3-1)], $matches); $attrs['docLabel'] = $matches[1];;
-            $this->semValue = new Scalar\String_(Scalar\String_::parseDocString($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-2)]), $attrs);
-    }
-
-    protected function reduceRule436() {
-         $attrs = $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$this->stackPos-(2-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$this->stackPos-(2-1)], $matches); $attrs['docLabel'] = $matches[1];;
-            $this->semValue = new Scalar\String_('', $attrs);
-    }
-
-    protected function reduceRule437() {
-         $attrs = $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED;
-            foreach ($this->semStack[$this->stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '"', true); } }; $this->semValue = new Scalar\Encapsed($this->semStack[$this->stackPos-(3-2)], $attrs);
-    }
-
-    protected function reduceRule438() {
-         $attrs = $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = strpos($this->semStack[$this->stackPos-(3-1)], "'") === false ? Scalar\String_::KIND_HEREDOC : Scalar\String_::KIND_NOWDOC; preg_match('/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/', $this->semStack[$this->stackPos-(3-1)], $matches); $attrs['docLabel'] = $matches[1];;
-            foreach ($this->semStack[$this->stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, null, true); } } $s->value = preg_replace('~(\r\n|\n|\r)\z~', '', $s->value); if ('' === $s->value) array_pop($this->semStack[$this->stackPos-(3-2)]);; $this->semValue = new Scalar\Encapsed($this->semStack[$this->stackPos-(3-2)], $attrs);
-    }
-
-    protected function reduceRule439() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule440() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule441() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule442() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
-    }
-
-    protected function reduceRule443() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule444() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule445() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
-    }
-
-    protected function reduceRule446() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule447() {
-         $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule448() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule449() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule450() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule451() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule452() {
-         $this->semValue = new Expr\MethodCall($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->semStack[$this->stackPos-(4-4)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule453() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule454() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule455() {
-         $this->semValue = new Expr\PropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule456() {
-         $this->semValue = substr($this->semStack[$this->stackPos-(1-1)], 1);
-    }
-
-    protected function reduceRule457() {
-         $this->semValue = $this->semStack[$this->stackPos-(4-3)];
-    }
-
-    protected function reduceRule458() {
-         $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule459() {
-         $this->semValue = new Expr\Error($this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes); $this->errorState = 2;
-    }
-
-    protected function reduceRule460() {
-         $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule461() {
-         $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule462() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule463() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule464() {
-         $this->semValue = new Expr\PropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule465() {
-         $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule466() {
-         $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule467() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule468() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
-    }
-
-    protected function reduceRule469() {
-         $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule470() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule471() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
-    }
-
-    protected function reduceRule472() {
-         $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule473() {
-         $this->semValue = new Expr\Error($this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2;
-    }
-
-    protected function reduceRule474() {
-         $this->semValue = new Expr\List_($this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule475() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule476() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule477() {
-         $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(1-1)], null, false, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule478() {
-         $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(1-1)], null, false, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule479() {
-         $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(3-3)], $this->semStack[$this->stackPos-(3-1)], false, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule480() {
-         $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(3-3)], $this->semStack[$this->stackPos-(3-1)], false, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule481() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule482() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)]; $end = count($this->semValue)-1; if ($this->semValue[$end] === null) unset($this->semValue[$end]);
-    }
-
-    protected function reduceRule483() {
-         $this->semStack[$this->stackPos-(3-1)][] = $this->semStack[$this->stackPos-(3-3)]; $this->semValue = $this->semStack[$this->stackPos-(3-1)];
-    }
-
-    protected function reduceRule484() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule485() {
-         $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(3-3)], $this->semStack[$this->stackPos-(3-1)], false, $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule486() {
-         $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(1-1)], null, false, $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule487() {
-         $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(4-4)], $this->semStack[$this->stackPos-(4-1)], true, $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule488() {
-         $this->semValue = new Expr\ArrayItem($this->semStack[$this->stackPos-(2-2)], null, true, $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule489() {
-         $this->semValue = null;
-    }
-
-    protected function reduceRule490() {
-         $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule491() {
-         $this->semStack[$this->stackPos-(2-1)][] = $this->semStack[$this->stackPos-(2-2)]; $this->semValue = $this->semStack[$this->stackPos-(2-1)];
-    }
-
-    protected function reduceRule492() {
-         $this->semValue = array($this->semStack[$this->stackPos-(1-1)]);
-    }
-
-    protected function reduceRule493() {
-         $this->semValue = array($this->semStack[$this->stackPos-(2-1)], $this->semStack[$this->stackPos-(2-2)]);
-    }
-
-    protected function reduceRule494() {
-         $this->semValue = new Scalar\EncapsedStringPart($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule495() {
-         $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule496() {
-         $this->semValue = $this->semStack[$this->stackPos-(1-1)];
-    }
-
-    protected function reduceRule497() {
-         $this->semValue = new Expr\ArrayDimFetch($this->semStack[$this->stackPos-(4-1)], $this->semStack[$this->stackPos-(4-3)], $this->startAttributeStack[$this->stackPos-(4-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule498() {
-         $this->semValue = new Expr\PropertyFetch($this->semStack[$this->stackPos-(3-1)], $this->semStack[$this->stackPos-(3-3)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule499() {
-         $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule500() {
-         $this->semValue = new Expr\Variable($this->semStack[$this->stackPos-(3-2)], $this->startAttributeStack[$this->stackPos-(3-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule501() {
-         $this->semValue = new Expr\ArrayDimFetch(new Expr\Variable($this->semStack[$this->stackPos-(6-2)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes), $this->semStack[$this->stackPos-(6-4)], $this->startAttributeStack[$this->stackPos-(6-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule502() {
-         $this->semValue = $this->semStack[$this->stackPos-(3-2)];
-    }
-
-    protected function reduceRule503() {
-         $this->semValue = new Scalar\String_($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule504() {
-         $this->semValue = $this->parseNumString($this->semStack[$this->stackPos-(1-1)], $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule505() {
-         $this->semValue = $this->parseNumString('-' . $this->semStack[$this->stackPos-(2-2)], $this->startAttributeStack[$this->stackPos-(2-1)] + $this->endAttributes);
-    }
-
-    protected function reduceRule506() {
-         $this->semValue = new Expr\Variable(substr($this->semStack[$this->stackPos-(1-1)], 1), $this->startAttributeStack[$this->stackPos-(1-1)] + $this->endAttributes);
+            },
+            468 => function ($stackPos) {
+                 $this->semValue = new Expr\New_($this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            469 => function ($stackPos) {
+                 list($class, $ctorArgs) = $this->semStack[$stackPos-(2-2)]; $this->semValue = new Expr\New_($class, $ctorArgs, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            470 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            471 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(4-3)];
+            },
+            472 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            473 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            474 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            475 => function ($stackPos) {
+                 $this->semValue = new Expr\ClosureUse($this->semStack[$stackPos-(2-2)], $this->semStack[$stackPos-(2-1)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            476 => function ($stackPos) {
+                 $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            477 => function ($stackPos) {
+                 $this->semValue = new Expr\FuncCall($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            478 => function ($stackPos) {
+                 $this->semValue = new Expr\StaticCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            479 => function ($stackPos) {
+                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            480 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            481 => function ($stackPos) {
+                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            482 => function ($stackPos) {
+                 $this->semValue = new Name($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            483 => function ($stackPos) {
+                 $this->semValue = new Name\FullyQualified(substr($this->semStack[$stackPos-(1-1)], 1), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            484 => function ($stackPos) {
+                 $this->semValue = new Name\Relative(substr($this->semStack[$stackPos-(1-1)], 10), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            485 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            486 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            487 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            488 => function ($stackPos) {
+                 $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2;
+            },
+            489 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            490 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            491 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            492 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            493 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            494 => function ($stackPos) {
+                 $this->semValue = array(new Scalar\EncapsedStringPart(Scalar\String_::parseEscapeSequences($this->semStack[$stackPos-(1-1)], '`'), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes));
+            },
+            495 => function ($stackPos) {
+                 foreach ($this->semStack[$stackPos-(1-1)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '`', true); } }; $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            496 => function ($stackPos) {
+                 $this->semValue = array();
+            },
+            497 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            498 => function ($stackPos) {
+                 $this->semValue = new Expr\ConstFetch($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            499 => function ($stackPos) {
+                 $this->semValue = new Scalar\MagicConst\Line($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            500 => function ($stackPos) {
+                 $this->semValue = new Scalar\MagicConst\File($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            501 => function ($stackPos) {
+                 $this->semValue = new Scalar\MagicConst\Dir($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            502 => function ($stackPos) {
+                 $this->semValue = new Scalar\MagicConst\Class_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            503 => function ($stackPos) {
+                 $this->semValue = new Scalar\MagicConst\Trait_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            504 => function ($stackPos) {
+                 $this->semValue = new Scalar\MagicConst\Method($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            505 => function ($stackPos) {
+                 $this->semValue = new Scalar\MagicConst\Function_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            506 => function ($stackPos) {
+                 $this->semValue = new Scalar\MagicConst\Namespace_($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            507 => function ($stackPos) {
+                 $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            508 => function ($stackPos) {
+                 $this->semValue = new Expr\ClassConstFetch($this->semStack[$stackPos-(3-1)], new Expr\Error($this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)]), $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes); $this->errorState = 2;
+            },
+            509 => function ($stackPos) {
+                 $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_SHORT;
+            $this->semValue = new Expr\Array_($this->semStack[$stackPos-(3-2)], $attrs);
+            },
+            510 => function ($stackPos) {
+                 $attrs = $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes; $attrs['kind'] = Expr\Array_::KIND_LONG;
+            $this->semValue = new Expr\Array_($this->semStack[$stackPos-(4-3)], $attrs);
+            },
+            511 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            512 => function ($stackPos) {
+                 $attrs = $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes; $attrs['kind'] = ($this->semStack[$stackPos-(1-1)][0] === "'" || ($this->semStack[$stackPos-(1-1)][1] === "'" && ($this->semStack[$stackPos-(1-1)][0] === 'b' || $this->semStack[$stackPos-(1-1)][0] === 'B')) ? Scalar\String_::KIND_SINGLE_QUOTED : Scalar\String_::KIND_DOUBLE_QUOTED);
+            $this->semValue = new Scalar\String_(Scalar\String_::parse($this->semStack[$stackPos-(1-1)]), $attrs);
+            },
+            513 => function ($stackPos) {
+                 $attrs = $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes; $attrs['kind'] = Scalar\String_::KIND_DOUBLE_QUOTED;
+            foreach ($this->semStack[$stackPos-(3-2)] as $s) { if ($s instanceof Node\Scalar\EncapsedStringPart) { $s->value = Node\Scalar\String_::parseEscapeSequences($s->value, '"', true); } }; $this->semValue = new Scalar\Encapsed($this->semStack[$stackPos-(3-2)], $attrs);
+            },
+            514 => function ($stackPos) {
+                 $this->semValue = $this->parseLNumber($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            515 => function ($stackPos) {
+                 $this->semValue = new Scalar\DNumber(Scalar\DNumber::parse($this->semStack[$stackPos-(1-1)]), $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            516 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            517 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            518 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            519 => function ($stackPos) {
+                 $this->semValue = $this->parseDocString($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)], true);
+            },
+            520 => function ($stackPos) {
+                 $this->semValue = $this->parseDocString($this->semStack[$stackPos-(2-1)], '', $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(2-2)] + $this->endAttributeStack[$stackPos-(2-2)], true);
+            },
+            521 => function ($stackPos) {
+                 $this->semValue = $this->parseDocString($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-2)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes, $this->startAttributeStack[$stackPos-(3-3)] + $this->endAttributeStack[$stackPos-(3-3)], true);
+            },
+            522 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            523 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            524 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            525 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            526 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            527 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            528 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            529 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            530 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            531 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            532 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            533 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            534 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            535 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            536 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            537 => function ($stackPos) {
+                 $this->semValue = new Expr\MethodCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            538 => function ($stackPos) {
+                 $this->semValue = new Expr\NullsafeMethodCall($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->semStack[$stackPos-(4-4)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            539 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            540 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            541 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            542 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            543 => function ($stackPos) {
+                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            544 => function ($stackPos) {
+                 $this->semValue = new Expr\NullsafePropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            545 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            546 => function ($stackPos) {
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            547 => function ($stackPos) {
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            548 => function ($stackPos) {
+                 $this->semValue = new Expr\Variable(new Expr\Error($this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes), $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes); $this->errorState = 2;
+            },
+            549 => function ($stackPos) {
+                 $var = $this->semStack[$stackPos-(1-1)]->name; $this->semValue = \is_string($var) ? new Node\VarLikeIdentifier($var, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes) : $var;
+            },
+            550 => function ($stackPos) {
+                 $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            551 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            552 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            553 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            554 => function ($stackPos) {
+                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            555 => function ($stackPos) {
+                 $this->semValue = new Expr\NullsafePropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            556 => function ($stackPos) {
+                 $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            557 => function ($stackPos) {
+                 $this->semValue = new Expr\StaticPropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            558 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            559 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            560 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            561 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            562 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            563 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            564 => function ($stackPos) {
+                 $this->semValue = new Expr\Error($this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes); $this->errorState = 2;
+            },
+            565 => function ($stackPos) {
+                 $this->semValue = new Expr\List_($this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            566 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)]; $end = count($this->semValue)-1; if ($this->semValue[$end] === null) array_pop($this->semValue);
+            },
+            567 => function ($stackPos) {
+                $this->semValue = $this->semStack[$stackPos];
+            },
+            568 => function ($stackPos) {
+                 /* do nothing -- prevent default action of $$=$this->semStack[$1]. See $551. */
+            },
+            569 => function ($stackPos) {
+                 $this->semStack[$stackPos-(3-1)][] = $this->semStack[$stackPos-(3-3)]; $this->semValue = $this->semStack[$stackPos-(3-1)];
+            },
+            570 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            571 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            572 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            573 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(1-1)], null, false, $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            574 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            575 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(4-4)], $this->semStack[$stackPos-(4-1)], true, $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            576 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(3-3)], $this->semStack[$stackPos-(3-1)], false, $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            577 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayItem($this->semStack[$stackPos-(2-2)], null, false, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes, true, $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            578 => function ($stackPos) {
+                 $this->semValue = null;
+            },
+            579 => function ($stackPos) {
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            580 => function ($stackPos) {
+                 $this->semStack[$stackPos-(2-1)][] = $this->semStack[$stackPos-(2-2)]; $this->semValue = $this->semStack[$stackPos-(2-1)];
+            },
+            581 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(1-1)]);
+            },
+            582 => function ($stackPos) {
+                 $this->semValue = array($this->semStack[$stackPos-(2-1)], $this->semStack[$stackPos-(2-2)]);
+            },
+            583 => function ($stackPos) {
+                 $this->semValue = new Scalar\EncapsedStringPart($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            584 => function ($stackPos) {
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            585 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+            586 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(4-1)], $this->semStack[$stackPos-(4-3)], $this->startAttributeStack[$stackPos-(4-1)] + $this->endAttributes);
+            },
+            587 => function ($stackPos) {
+                 $this->semValue = new Expr\PropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            588 => function ($stackPos) {
+                 $this->semValue = new Expr\NullsafePropertyFetch($this->semStack[$stackPos-(3-1)], $this->semStack[$stackPos-(3-3)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            589 => function ($stackPos) {
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            590 => function ($stackPos) {
+                 $this->semValue = new Expr\Variable($this->semStack[$stackPos-(3-2)], $this->startAttributeStack[$stackPos-(3-1)] + $this->endAttributes);
+            },
+            591 => function ($stackPos) {
+                 $this->semValue = new Expr\ArrayDimFetch($this->semStack[$stackPos-(6-2)], $this->semStack[$stackPos-(6-4)], $this->startAttributeStack[$stackPos-(6-1)] + $this->endAttributes);
+            },
+            592 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(3-2)];
+            },
+            593 => function ($stackPos) {
+                 $this->semValue = new Scalar\String_($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            594 => function ($stackPos) {
+                 $this->semValue = $this->parseNumString($this->semStack[$stackPos-(1-1)], $this->startAttributeStack[$stackPos-(1-1)] + $this->endAttributes);
+            },
+            595 => function ($stackPos) {
+                 $this->semValue = $this->parseNumString('-' . $this->semStack[$stackPos-(2-2)], $this->startAttributeStack[$stackPos-(2-1)] + $this->endAttributes);
+            },
+            596 => function ($stackPos) {
+                 $this->semValue = $this->semStack[$stackPos-(1-1)];
+            },
+        ];
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Parser/Tokens.php b/lib/nikic/php-parser/lib/PhpParser/Parser/Tokens.php
index 861663fae..b76a5d94c 100644
--- a/lib/nikic/php-parser/lib/PhpParser/Parser/Tokens.php
+++ b/lib/nikic/php-parser/lib/PhpParser/Parser/Tokens.php
@@ -6,131 +6,131 @@ namespace PhpParser\Parser;
 final class Tokens
 {
     const YYERRTOK = 256;
-    const T_INCLUDE = 257;
-    const T_INCLUDE_ONCE = 258;
-    const T_EVAL = 259;
-    const T_REQUIRE = 260;
-    const T_REQUIRE_ONCE = 261;
-    const T_LOGICAL_OR = 262;
-    const T_LOGICAL_XOR = 263;
-    const T_LOGICAL_AND = 264;
-    const T_PRINT = 265;
-    const T_YIELD = 266;
-    const T_DOUBLE_ARROW = 267;
-    const T_YIELD_FROM = 268;
-    const T_PLUS_EQUAL = 269;
-    const T_MINUS_EQUAL = 270;
-    const T_MUL_EQUAL = 271;
-    const T_DIV_EQUAL = 272;
-    const T_CONCAT_EQUAL = 273;
-    const T_MOD_EQUAL = 274;
-    const T_AND_EQUAL = 275;
-    const T_OR_EQUAL = 276;
-    const T_XOR_EQUAL = 277;
-    const T_SL_EQUAL = 278;
-    const T_SR_EQUAL = 279;
-    const T_POW_EQUAL = 280;
-    const T_COALESCE = 281;
-    const T_BOOLEAN_OR = 282;
-    const T_BOOLEAN_AND = 283;
-    const T_IS_EQUAL = 284;
-    const T_IS_NOT_EQUAL = 285;
-    const T_IS_IDENTICAL = 286;
-    const T_IS_NOT_IDENTICAL = 287;
-    const T_SPACESHIP = 288;
-    const T_IS_SMALLER_OR_EQUAL = 289;
-    const T_IS_GREATER_OR_EQUAL = 290;
-    const T_SL = 291;
-    const T_SR = 292;
-    const T_INSTANCEOF = 293;
-    const T_INC = 294;
-    const T_DEC = 295;
-    const T_INT_CAST = 296;
-    const T_DOUBLE_CAST = 297;
-    const T_STRING_CAST = 298;
-    const T_ARRAY_CAST = 299;
-    const T_OBJECT_CAST = 300;
-    const T_BOOL_CAST = 301;
-    const T_UNSET_CAST = 302;
-    const T_POW = 303;
-    const T_NEW = 304;
-    const T_CLONE = 305;
-    const T_EXIT = 306;
-    const T_IF = 307;
-    const T_ELSEIF = 308;
-    const T_ELSE = 309;
-    const T_ENDIF = 310;
-    const T_LNUMBER = 311;
-    const T_DNUMBER = 312;
-    const T_STRING = 313;
-    const T_STRING_VARNAME = 314;
-    const T_VARIABLE = 315;
-    const T_NUM_STRING = 316;
-    const T_INLINE_HTML = 317;
-    const T_CHARACTER = 318;
-    const T_BAD_CHARACTER = 319;
-    const T_ENCAPSED_AND_WHITESPACE = 320;
-    const T_CONSTANT_ENCAPSED_STRING = 321;
-    const T_ECHO = 322;
-    const T_DO = 323;
-    const T_WHILE = 324;
-    const T_ENDWHILE = 325;
-    const T_FOR = 326;
-    const T_ENDFOR = 327;
-    const T_FOREACH = 328;
-    const T_ENDFOREACH = 329;
-    const T_DECLARE = 330;
-    const T_ENDDECLARE = 331;
-    const T_AS = 332;
-    const T_SWITCH = 333;
-    const T_ENDSWITCH = 334;
-    const T_CASE = 335;
-    const T_DEFAULT = 336;
-    const T_BREAK = 337;
-    const T_CONTINUE = 338;
-    const T_GOTO = 339;
-    const T_FUNCTION = 340;
-    const T_CONST = 341;
-    const T_RETURN = 342;
-    const T_TRY = 343;
-    const T_CATCH = 344;
-    const T_FINALLY = 345;
-    const T_THROW = 346;
-    const T_USE = 347;
-    const T_INSTEADOF = 348;
-    const T_GLOBAL = 349;
-    const T_STATIC = 350;
-    const T_ABSTRACT = 351;
-    const T_FINAL = 352;
-    const T_PRIVATE = 353;
-    const T_PROTECTED = 354;
-    const T_PUBLIC = 355;
-    const T_VAR = 356;
-    const T_UNSET = 357;
-    const T_ISSET = 358;
-    const T_EMPTY = 359;
-    const T_HALT_COMPILER = 360;
-    const T_CLASS = 361;
-    const T_TRAIT = 362;
-    const T_INTERFACE = 363;
-    const T_EXTENDS = 364;
-    const T_IMPLEMENTS = 365;
-    const T_OBJECT_OPERATOR = 366;
-    const T_LIST = 367;
-    const T_ARRAY = 368;
-    const T_CALLABLE = 369;
-    const T_CLASS_C = 370;
-    const T_TRAIT_C = 371;
-    const T_METHOD_C = 372;
-    const T_FUNC_C = 373;
-    const T_LINE = 374;
-    const T_FILE = 375;
-    const T_COMMENT = 376;
-    const T_DOC_COMMENT = 377;
-    const T_OPEN_TAG = 378;
-    const T_OPEN_TAG_WITH_ECHO = 379;
-    const T_CLOSE_TAG = 380;
-    const T_WHITESPACE = 381;
+    const T_THROW = 257;
+    const T_INCLUDE = 258;
+    const T_INCLUDE_ONCE = 259;
+    const T_EVAL = 260;
+    const T_REQUIRE = 261;
+    const T_REQUIRE_ONCE = 262;
+    const T_LOGICAL_OR = 263;
+    const T_LOGICAL_XOR = 264;
+    const T_LOGICAL_AND = 265;
+    const T_PRINT = 266;
+    const T_YIELD = 267;
+    const T_DOUBLE_ARROW = 268;
+    const T_YIELD_FROM = 269;
+    const T_PLUS_EQUAL = 270;
+    const T_MINUS_EQUAL = 271;
+    const T_MUL_EQUAL = 272;
+    const T_DIV_EQUAL = 273;
+    const T_CONCAT_EQUAL = 274;
+    const T_MOD_EQUAL = 275;
+    const T_AND_EQUAL = 276;
+    const T_OR_EQUAL = 277;
+    const T_XOR_EQUAL = 278;
+    const T_SL_EQUAL = 279;
+    const T_SR_EQUAL = 280;
+    const T_POW_EQUAL = 281;
+    const T_COALESCE_EQUAL = 282;
+    const T_COALESCE = 283;
+    const T_BOOLEAN_OR = 284;
+    const T_BOOLEAN_AND = 285;
+    const T_AMPERSAND_NOT_FOLLOWED_BY_VAR_OR_VARARG = 286;
+    const T_AMPERSAND_FOLLOWED_BY_VAR_OR_VARARG = 287;
+    const T_IS_EQUAL = 288;
+    const T_IS_NOT_EQUAL = 289;
+    const T_IS_IDENTICAL = 290;
+    const T_IS_NOT_IDENTICAL = 291;
+    const T_SPACESHIP = 292;
+    const T_IS_SMALLER_OR_EQUAL = 293;
+    const T_IS_GREATER_OR_EQUAL = 294;
+    const T_SL = 295;
+    const T_SR = 296;
+    const T_INSTANCEOF = 297;
+    const T_INC = 298;
+    const T_DEC = 299;
+    const T_INT_CAST = 300;
+    const T_DOUBLE_CAST = 301;
+    const T_STRING_CAST = 302;
+    const T_ARRAY_CAST = 303;
+    const T_OBJECT_CAST = 304;
+    const T_BOOL_CAST = 305;
+    const T_UNSET_CAST = 306;
+    const T_POW = 307;
+    const T_NEW = 308;
+    const T_CLONE = 309;
+    const T_EXIT = 310;
+    const T_IF = 311;
+    const T_ELSEIF = 312;
+    const T_ELSE = 313;
+    const T_ENDIF = 314;
+    const T_LNUMBER = 315;
+    const T_DNUMBER = 316;
+    const T_STRING = 317;
+    const T_STRING_VARNAME = 318;
+    const T_VARIABLE = 319;
+    const T_NUM_STRING = 320;
+    const T_INLINE_HTML = 321;
+    const T_ENCAPSED_AND_WHITESPACE = 322;
+    const T_CONSTANT_ENCAPSED_STRING = 323;
+    const T_ECHO = 324;
+    const T_DO = 325;
+    const T_WHILE = 326;
+    const T_ENDWHILE = 327;
+    const T_FOR = 328;
+    const T_ENDFOR = 329;
+    const T_FOREACH = 330;
+    const T_ENDFOREACH = 331;
+    const T_DECLARE = 332;
+    const T_ENDDECLARE = 333;
+    const T_AS = 334;
+    const T_SWITCH = 335;
+    const T_MATCH = 336;
+    const T_ENDSWITCH = 337;
+    const T_CASE = 338;
+    const T_DEFAULT = 339;
+    const T_BREAK = 340;
+    const T_CONTINUE = 341;
+    const T_GOTO = 342;
+    const T_FUNCTION = 343;
+    const T_FN = 344;
+    const T_CONST = 345;
+    const T_RETURN = 346;
+    const T_TRY = 347;
+    const T_CATCH = 348;
+    const T_FINALLY = 349;
+    const T_USE = 350;
+    const T_INSTEADOF = 351;
+    const T_GLOBAL = 352;
+    const T_STATIC = 353;
+    const T_ABSTRACT = 354;
+    const T_FINAL = 355;
+    const T_PRIVATE = 356;
+    const T_PROTECTED = 357;
+    const T_PUBLIC = 358;
+    const T_READONLY = 359;
+    const T_VAR = 360;
+    const T_UNSET = 361;
+    const T_ISSET = 362;
+    const T_EMPTY = 363;
+    const T_HALT_COMPILER = 364;
+    const T_CLASS = 365;
+    const T_TRAIT = 366;
+    const T_INTERFACE = 367;
+    const T_ENUM = 368;
+    const T_EXTENDS = 369;
+    const T_IMPLEMENTS = 370;
+    const T_OBJECT_OPERATOR = 371;
+    const T_NULLSAFE_OBJECT_OPERATOR = 372;
+    const T_LIST = 373;
+    const T_ARRAY = 374;
+    const T_CALLABLE = 375;
+    const T_CLASS_C = 376;
+    const T_TRAIT_C = 377;
+    const T_METHOD_C = 378;
+    const T_FUNC_C = 379;
+    const T_LINE = 380;
+    const T_FILE = 381;
     const T_START_HEREDOC = 382;
     const T_END_HEREDOC = 383;
     const T_DOLLAR_OPEN_CURLY_BRACES = 384;
@@ -141,4 +141,8 @@ final class Tokens
     const T_DIR = 389;
     const T_NS_SEPARATOR = 390;
     const T_ELLIPSIS = 391;
+    const T_NAME_FULLY_QUALIFIED = 392;
+    const T_NAME_QUALIFIED = 393;
+    const T_NAME_RELATIVE = 394;
+    const T_ATTRIBUTE = 395;
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/ParserAbstract.php b/lib/nikic/php-parser/lib/PhpParser/ParserAbstract.php
index e0f6e2592..5ee5a64bb 100644
--- a/lib/nikic/php-parser/lib/PhpParser/ParserAbstract.php
+++ b/lib/nikic/php-parser/lib/PhpParser/ParserAbstract.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser;
 
@@ -6,18 +6,23 @@ namespace PhpParser;
  * This parser is based on a skeleton written by Moriyoshi Koizumi, which in
  * turn is based on work by Masato Bito.
  */
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\Cast\Double;
 use PhpParser\Node\Name;
 use PhpParser\Node\Param;
+use PhpParser\Node\Scalar\Encapsed;
 use PhpParser\Node\Scalar\LNumber;
 use PhpParser\Node\Scalar\String_;
 use PhpParser\Node\Stmt\Class_;
 use PhpParser\Node\Stmt\ClassConst;
 use PhpParser\Node\Stmt\ClassMethod;
+use PhpParser\Node\Stmt\Enum_;
 use PhpParser\Node\Stmt\Interface_;
 use PhpParser\Node\Stmt\Namespace_;
 use PhpParser\Node\Stmt\Property;
 use PhpParser\Node\Stmt\TryCatch;
 use PhpParser\Node\Stmt\UseUse;
+use PhpParser\Node\VarLikeIdentifier;
 
 abstract class ParserAbstract implements Parser
 {
@@ -44,42 +49,45 @@ abstract class ParserAbstract implements Parser
     protected $unexpectedTokenRule;
 
     protected $YY2TBLSTATE;
-    protected $YYNLSTATES;
+    /** @var int Number of non-leaf states */
+    protected $numNonLeafStates;
 
-    /** @var array Map of lexer tokens to internal symbols */
+    /** @var int[] Map of lexer tokens to internal symbols */
     protected $tokenToSymbol;
-    /** @var array Map of symbols to their names */
+    /** @var string[] Map of symbols to their names */
     protected $symbolToName;
     /** @var array Names of the production rules (only necessary for debugging) */
     protected $productions;
 
-    /** @var array Map of states to a displacement into the $action table. The corresponding action for this
+    /** @var int[] Map of states to a displacement into the $action table. The corresponding action for this
      *             state/symbol pair is $action[$actionBase[$state] + $symbol]. If $actionBase[$state] is 0, the
-                   action is defaulted, i.e. $actionDefault[$state] should be used instead. */
+     *             action is defaulted, i.e. $actionDefault[$state] should be used instead. */
     protected $actionBase;
-    /** @var array Table of actions. Indexed according to $actionBase comment. */
+    /** @var int[] Table of actions. Indexed according to $actionBase comment. */
     protected $action;
-    /** @var array Table indexed analogously to $action. If $actionCheck[$actionBase[$state] + $symbol] != $symbol
+    /** @var int[] Table indexed analogously to $action. If $actionCheck[$actionBase[$state] + $symbol] != $symbol
      *             then the action is defaulted, i.e. $actionDefault[$state] should be used instead. */
     protected $actionCheck;
-    /** @var array Map of states to their default action */
+    /** @var int[] Map of states to their default action */
     protected $actionDefault;
+    /** @var callable[] Semantic action callbacks */
+    protected $reduceCallbacks;
 
-    /** @var array Map of non-terminals to a displacement into the $goto table. The corresponding goto state for this
+    /** @var int[] Map of non-terminals to a displacement into the $goto table. The corresponding goto state for this
      *             non-terminal/state pair is $goto[$gotoBase[$nonTerminal] + $state] (unless defaulted) */
     protected $gotoBase;
-    /** @var array Table of states to goto after reduction. Indexed according to $gotoBase comment. */
+    /** @var int[] Table of states to goto after reduction. Indexed according to $gotoBase comment. */
     protected $goto;
-    /** @var array Table indexed analogously to $goto. If $gotoCheck[$gotoBase[$nonTerminal] + $state] != $nonTerminal
+    /** @var int[] Table indexed analogously to $goto. If $gotoCheck[$gotoBase[$nonTerminal] + $state] != $nonTerminal
      *             then the goto state is defaulted, i.e. $gotoDefault[$nonTerminal] should be used. */
     protected $gotoCheck;
-    /** @var array Map of non-terminals to the default state to goto after their reduction */
+    /** @var int[] Map of non-terminals to the default state to goto after their reduction */
     protected $gotoDefault;
 
-    /** @var array Map of rules to the non-terminal on their left-hand side, i.e. the non-terminal to use for
+    /** @var int[] Map of rules to the non-terminal on their left-hand side, i.e. the non-terminal to use for
      *             determining the state to goto after reduction. */
     protected $ruleToNonTerminal;
-    /** @var array Map of rules to the length of their right-hand side, which is the number of elements that have to
+    /** @var int[] Map of rules to the length of their right-hand side, which is the number of elements that have to
      *             be popped from the stack(s) on reduction. */
     protected $ruleToLength;
 
@@ -91,8 +99,6 @@ abstract class ParserAbstract implements Parser
     protected $lexer;
     /** @var mixed Temporary value containing the result of last semantic action (reduction) */
     protected $semValue;
-    /** @var int Position in stacks (state stack, semantic value stack, attribute stack) */
-    protected $stackPos;
     /** @var array Semantic value stack (contains values of tokens and semantic action results) */
     protected $semStack;
     /** @var array[] Start attribute stack */
@@ -106,25 +112,31 @@ abstract class ParserAbstract implements Parser
 
     /** @var ErrorHandler Error handler */
     protected $errorHandler;
-    /** @var Error[] Errors collected during last parse */
-    protected $errors;
     /** @var int Error state, used to avoid error floods */
     protected $errorState;
 
+    /**
+     * Initialize $reduceCallbacks map.
+     */
+    abstract protected function initReduceCallbacks();
+
     /**
      * Creates a parser instance.
      *
+     * Options: Currently none.
+     *
      * @param Lexer $lexer A lexer
-     * @param array $options Options array. Currently no options are supported.
+     * @param array $options Options array.
      */
-    public function __construct(Lexer $lexer, array $options = array()) {
+    public function __construct(Lexer $lexer, array $options = []) {
         $this->lexer = $lexer;
-        $this->errors = array();
 
         if (isset($options['throwOnError'])) {
             throw new \LogicException(
                 '"throwOnError" is no longer supported, use "errorHandler" instead');
         }
+
+        $this->initReduceCallbacks();
     }
 
     /**
@@ -137,45 +149,56 @@ abstract class ParserAbstract implements Parser
      * @param ErrorHandler|null $errorHandler Error handler to use for lexer/parser errors, defaults
      *                                        to ErrorHandler\Throwing.
      *
-     * @return Node[]|null Array of statements (or null if the 'throwOnError' option is disabled and the parser was
-     *                     unable to recover from an error).
+     * @return Node\Stmt[]|null Array of statements (or null non-throwing error handler is used and
+     *                          the parser was unable to recover from an error).
      */
-    public function parse($code, ErrorHandler $errorHandler = null) {
+    public function parse(string $code, ErrorHandler $errorHandler = null) {
         $this->errorHandler = $errorHandler ?: new ErrorHandler\Throwing;
 
-        // Initialize the lexer
         $this->lexer->startLexing($code, $this->errorHandler);
+        $result = $this->doParse();
 
+        // Clear out some of the interior state, so we don't hold onto unnecessary
+        // memory between uses of the parser
+        $this->startAttributeStack = [];
+        $this->endAttributeStack = [];
+        $this->semStack = [];
+        $this->semValue = null;
+
+        return $result;
+    }
+
+    protected function doParse() {
         // We start off with no lookahead-token
         $symbol = self::SYMBOL_NONE;
 
         // The attributes for a node are taken from the first and last token of the node.
         // From the first token only the startAttributes are taken and from the last only
         // the endAttributes. Both are merged using the array union operator (+).
-        $startAttributes = '*POISON';
-        $endAttributes = '*POISON';
+        $startAttributes = [];
+        $endAttributes = [];
         $this->endAttributes = $endAttributes;
 
         // Keep stack of start and end attributes
-        $this->startAttributeStack = array();
-        $this->endAttributeStack = array($endAttributes);
+        $this->startAttributeStack = [];
+        $this->endAttributeStack = [$endAttributes];
 
         // Start off in the initial state and keep a stack of previous states
         $state = 0;
-        $stateStack = array($state);
+        $stateStack = [$state];
 
         // Semantic value stack (contains values of tokens and semantic action results)
-        $this->semStack = array();
+        $this->semStack = [];
 
         // Current position in the stack(s)
-        $this->stackPos = 0;
+        $stackPos = 0;
 
         $this->errorState = 0;
 
         for (;;) {
             //$this->traceNewState($state, $symbol);
 
-            if ($this->actionBase[$state] == 0) {
+            if ($this->actionBase[$state] === 0) {
                 $rule = $this->actionDefault[$state];
             } else {
                 if ($symbol === self::SYMBOL_NONE) {
@@ -197,23 +220,20 @@ abstract class ParserAbstract implements Parser
                         ));
                     }
 
-                    // This is necessary to assign some meaningful attributes to /* empty */ productions. They'll get
-                    // the attributes of the next token, even though they don't contain it themselves.
-                    $this->startAttributeStack[$this->stackPos+1] = $startAttributes;
-                    $this->endAttributeStack[$this->stackPos+1] = $endAttributes;
+                    // Allow productions to access the start attributes of the lookahead token.
                     $this->lookaheadStartAttributes = $startAttributes;
 
                     //$this->traceRead($symbol);
                 }
 
                 $idx = $this->actionBase[$state] + $symbol;
-                if ((($idx >= 0 && $idx < $this->actionTableSize && $this->actionCheck[$idx] == $symbol)
+                if ((($idx >= 0 && $idx < $this->actionTableSize && $this->actionCheck[$idx] === $symbol)
                      || ($state < $this->YY2TBLSTATE
-                         && ($idx = $this->actionBase[$state + $this->YYNLSTATES] + $symbol) >= 0
-                         && $idx < $this->actionTableSize && $this->actionCheck[$idx] == $symbol))
-                    && ($action = $this->action[$idx]) != $this->defaultAction) {
+                         && ($idx = $this->actionBase[$state + $this->numNonLeafStates] + $symbol) >= 0
+                         && $idx < $this->actionTableSize && $this->actionCheck[$idx] === $symbol))
+                    && ($action = $this->action[$idx]) !== $this->defaultAction) {
                     /*
-                     * >= YYNLSTATES: shift and reduce
+                     * >= numNonLeafStates: shift and reduce
                      * > 0: shift
                      * = 0: accept
                      * < 0: reduce
@@ -223,11 +243,11 @@ abstract class ParserAbstract implements Parser
                         /* shift */
                         //$this->traceShift($symbol);
 
-                        ++$this->stackPos;
-                        $stateStack[$this->stackPos] = $state = $action;
-                        $this->semStack[$this->stackPos] = $tokenValue;
-                        $this->startAttributeStack[$this->stackPos] = $startAttributes;
-                        $this->endAttributeStack[$this->stackPos] = $endAttributes;
+                        ++$stackPos;
+                        $stateStack[$stackPos] = $state = $action;
+                        $this->semStack[$stackPos] = $tokenValue;
+                        $this->startAttributeStack[$stackPos] = $startAttributes;
+                        $this->endAttributeStack[$stackPos] = $endAttributes;
                         $this->endAttributes = $endAttributes;
                         $symbol = self::SYMBOL_NONE;
 
@@ -235,12 +255,12 @@ abstract class ParserAbstract implements Parser
                             --$this->errorState;
                         }
 
-                        if ($action < $this->YYNLSTATES) {
+                        if ($action < $this->numNonLeafStates) {
                             continue;
                         }
 
-                        /* $yyn >= YYNLSTATES means shift-and-reduce */
-                        $rule = $action - $this->YYNLSTATES;
+                        /* $yyn >= numNonLeafStates means shift-and-reduce */
+                        $rule = $action - $this->numNonLeafStates;
                     } else {
                         $rule = -$action;
                     }
@@ -259,7 +279,7 @@ abstract class ParserAbstract implements Parser
                     //$this->traceReduce($rule);
 
                     try {
-                        $this->{'reduceRule' . $rule}();
+                        $this->reduceCallbacks[$rule]($stackPos);
                     } catch (Error $e) {
                         if (-1 === $e->getStartLine() && isset($startAttributes['startLine'])) {
                             $e->setStartLine($startAttributes['startLine']);
@@ -271,20 +291,25 @@ abstract class ParserAbstract implements Parser
                     }
 
                     /* Goto - shift nonterminal */
-                    $lastEndAttributes = $this->endAttributeStack[$this->stackPos];
-                    $this->stackPos -= $this->ruleToLength[$rule];
+                    $lastEndAttributes = $this->endAttributeStack[$stackPos];
+                    $ruleLength = $this->ruleToLength[$rule];
+                    $stackPos -= $ruleLength;
                     $nonTerminal = $this->ruleToNonTerminal[$rule];
-                    $idx = $this->gotoBase[$nonTerminal] + $stateStack[$this->stackPos];
-                    if ($idx >= 0 && $idx < $this->gotoTableSize && $this->gotoCheck[$idx] == $nonTerminal) {
+                    $idx = $this->gotoBase[$nonTerminal] + $stateStack[$stackPos];
+                    if ($idx >= 0 && $idx < $this->gotoTableSize && $this->gotoCheck[$idx] === $nonTerminal) {
                         $state = $this->goto[$idx];
                     } else {
                         $state = $this->gotoDefault[$nonTerminal];
                     }
 
-                    ++$this->stackPos;
-                    $stateStack[$this->stackPos]     = $state;
-                    $this->semStack[$this->stackPos] = $this->semValue;
-                    $this->endAttributeStack[$this->stackPos] = $lastEndAttributes;
+                    ++$stackPos;
+                    $stateStack[$stackPos]     = $state;
+                    $this->semStack[$stackPos] = $this->semValue;
+                    $this->endAttributeStack[$stackPos] = $lastEndAttributes;
+                    if ($ruleLength === 0) {
+                        // Empty productions use the start attributes of the lookahead token.
+                        $this->startAttributeStack[$stackPos] = $this->lookaheadStartAttributes;
+                    }
                 } else {
                     /* error */
                     switch ($this->errorState) {
@@ -299,27 +324,28 @@ abstract class ParserAbstract implements Parser
                             // Pop until error-expecting state uncovered
                             while (!(
                                 (($idx = $this->actionBase[$state] + $this->errorSymbol) >= 0
-                                    && $idx < $this->actionTableSize && $this->actionCheck[$idx] == $this->errorSymbol)
+                                    && $idx < $this->actionTableSize && $this->actionCheck[$idx] === $this->errorSymbol)
                                 || ($state < $this->YY2TBLSTATE
-                                    && ($idx = $this->actionBase[$state + $this->YYNLSTATES] + $this->errorSymbol) >= 0
-                                    && $idx < $this->actionTableSize && $this->actionCheck[$idx] == $this->errorSymbol)
-                            ) || ($action = $this->action[$idx]) == $this->defaultAction) { // Not totally sure about this
-                                if ($this->stackPos <= 0) {
+                                    && ($idx = $this->actionBase[$state + $this->numNonLeafStates] + $this->errorSymbol) >= 0
+                                    && $idx < $this->actionTableSize && $this->actionCheck[$idx] === $this->errorSymbol)
+                            ) || ($action = $this->action[$idx]) === $this->defaultAction) { // Not totally sure about this
+                                if ($stackPos <= 0) {
                                     // Could not recover from error
                                     return null;
                                 }
-                                $state = $stateStack[--$this->stackPos];
+                                $state = $stateStack[--$stackPos];
                                 //$this->tracePop($state);
                             }
 
                             //$this->traceShift($this->errorSymbol);
-                            ++$this->stackPos;
-                            $stateStack[$this->stackPos] = $state = $action;
+                            ++$stackPos;
+                            $stateStack[$stackPos] = $state = $action;
 
                             // We treat the error symbol as being empty, so we reset the end attributes
                             // to the end attributes of the last non-error symbol
-                            $this->endAttributeStack[$this->stackPos] = $this->endAttributeStack[$this->stackPos - 1];
-                            $this->endAttributes = $this->endAttributeStack[$this->stackPos - 1];
+                            $this->startAttributeStack[$stackPos] = $this->lookaheadStartAttributes;
+                            $this->endAttributeStack[$stackPos] = $this->endAttributeStack[$stackPos - 1];
+                            $this->endAttributes = $this->endAttributeStack[$stackPos - 1];
                             break;
 
                         case 3:
@@ -334,12 +360,12 @@ abstract class ParserAbstract implements Parser
                     }
                 }
 
-                if ($state < $this->YYNLSTATES) {
+                if ($state < $this->numNonLeafStates) {
                     break;
                 }
 
-                /* >= YYNLSTATES means shift-and-reduce */
-                $rule = $state - $this->YYNLSTATES;
+                /* >= numNonLeafStates means shift-and-reduce */
+                $rule = $state - $this->numNonLeafStates;
             }
         }
 
@@ -350,7 +376,15 @@ abstract class ParserAbstract implements Parser
         $this->errorHandler->handleError($error);
     }
 
-    protected function getErrorMessage($symbol, $state) {
+    /**
+     * Format error message including expected tokens.
+     *
+     * @param int $symbol Unexpected symbol
+     * @param int $state  State at time of error
+     *
+     * @return string Formatted error message
+     */
+    protected function getErrorMessage(int $symbol, int $state) : string {
         $expectedString = '';
         if ($expected = $this->getExpectedTokens($state)) {
             $expectedString = ', expecting ' . implode(' or ', $expected);
@@ -359,24 +393,31 @@ abstract class ParserAbstract implements Parser
         return 'Syntax error, unexpected ' . $this->symbolToName[$symbol] . $expectedString;
     }
 
-    protected function getExpectedTokens($state) {
-        $expected = array();
+    /**
+     * Get limited number of expected tokens in given state.
+     *
+     * @param int $state State
+     *
+     * @return string[] Expected tokens. If too many, an empty array is returned.
+     */
+    protected function getExpectedTokens(int $state) : array {
+        $expected = [];
 
         $base = $this->actionBase[$state];
         foreach ($this->symbolToName as $symbol => $name) {
             $idx = $base + $symbol;
             if ($idx >= 0 && $idx < $this->actionTableSize && $this->actionCheck[$idx] === $symbol
                 || $state < $this->YY2TBLSTATE
-                && ($idx = $this->actionBase[$state + $this->YYNLSTATES] + $symbol) >= 0
+                && ($idx = $this->actionBase[$state + $this->numNonLeafStates] + $symbol) >= 0
                 && $idx < $this->actionTableSize && $this->actionCheck[$idx] === $symbol
             ) {
-                if ($this->action[$idx] != $this->unexpectedTokenRule
-                    && $this->action[$idx] != $this->defaultAction
-                    && $symbol != $this->errorSymbol
+                if ($this->action[$idx] !== $this->unexpectedTokenRule
+                    && $this->action[$idx] !== $this->defaultAction
+                    && $symbol !== $this->errorSymbol
                 ) {
-                    if (count($expected) == 4) {
+                    if (count($expected) === 4) {
                         /* Too many expected tokens */
-                        return array();
+                        return [];
                     }
 
                     $expected[] = $name;
@@ -429,10 +470,10 @@ abstract class ParserAbstract implements Parser
     /**
      * Moves statements of semicolon-style namespaces into $ns->stmts and checks various error conditions.
      *
-     * @param Node[] $stmts
-     * @return Node[]
+     * @param Node\Stmt[] $stmts
+     * @return Node\Stmt[]
      */
-    protected function handleNamespaces(array $stmts) {
+    protected function handleNamespaces(array $stmts) : array {
         $hasErrored = false;
         $style = $this->getNamespacingStyle($stmts);
         if (null === $style) {
@@ -455,12 +496,16 @@ abstract class ParserAbstract implements Parser
             return $stmts;
         } else {
             // For semicolon namespaces we have to move the statements after a namespace declaration into ->stmts
-            $resultStmts = array();
+            $resultStmts = [];
             $targetStmts =& $resultStmts;
+            $lastNs = null;
             foreach ($stmts as $stmt) {
                 if ($stmt instanceof Node\Stmt\Namespace_) {
+                    if ($lastNs !== null) {
+                        $this->fixupNamespaceAttributes($lastNs);
+                    }
                     if ($stmt->stmts === null) {
-                        $stmt->stmts = array();
+                        $stmt->stmts = [];
                         $targetStmts =& $stmt->stmts;
                         $resultStmts[] = $stmt;
                     } else {
@@ -468,6 +513,7 @@ abstract class ParserAbstract implements Parser
                         $resultStmts[] = $stmt;
                         $targetStmts =& $resultStmts;
                     }
+                    $lastNs = $stmt;
                 } elseif ($stmt instanceof Node\Stmt\HaltCompiler) {
                     // __halt_compiler() is not moved into the namespace
                     $resultStmts[] = $stmt;
@@ -475,10 +521,38 @@ abstract class ParserAbstract implements Parser
                     $targetStmts[] = $stmt;
                 }
             }
+            if ($lastNs !== null) {
+                $this->fixupNamespaceAttributes($lastNs);
+            }
             return $resultStmts;
         }
     }
 
+    private function fixupNamespaceAttributes(Node\Stmt\Namespace_ $stmt) {
+        // We moved the statements into the namespace node, as such the end of the namespace node
+        // needs to be extended to the end of the statements.
+        if (empty($stmt->stmts)) {
+            return;
+        }
+
+        // We only move the builtin end attributes here. This is the best we can do with the
+        // knowledge we have.
+        $endAttributes = ['endLine', 'endFilePos', 'endTokenPos'];
+        $lastStmt = $stmt->stmts[count($stmt->stmts) - 1];
+        foreach ($endAttributes as $endAttribute) {
+            if ($lastStmt->hasAttribute($endAttribute)) {
+                $stmt->setAttribute($endAttribute, $lastStmt->getAttribute($endAttribute));
+            }
+        }
+    }
+
+    /**
+     * Determine namespacing style (semicolon or brace)
+     *
+     * @param Node[] $stmts Top-level statements.
+     *
+     * @return null|string One of "semicolon", "brace" or null (no namespaces)
+     */
     private function getNamespacingStyle(array $stmts) {
         $style = null;
         $hasNotAllowedStmts = false;
@@ -512,7 +586,7 @@ abstract class ParserAbstract implements Parser
             }
 
             /* There may be a hashbang line at the very start of the file */
-            if ($i == 0 && $stmt instanceof Node\Stmt\InlineHTML && preg_match('/\A#!.*\r?\n\z/', $stmt->value)) {
+            if ($i === 0 && $stmt instanceof Node\Stmt\InlineHTML && preg_match('/\A#!.*\r?\n\z/', $stmt->value)) {
                 continue;
             }
 
@@ -522,8 +596,63 @@ abstract class ParserAbstract implements Parser
         return $style;
     }
 
+    /**
+     * Fix up parsing of static property calls in PHP 5.
+     *
+     * In PHP 5 A::$b[c][d] and A::$b[c][d]() have very different interpretation. The former is
+     * interpreted as (A::$b)[c][d], while the latter is the same as A::{$b[c][d]}(). We parse the
+     * latter as the former initially and this method fixes the AST into the correct form when we
+     * encounter the "()".
+     *
+     * @param  Node\Expr\StaticPropertyFetch|Node\Expr\ArrayDimFetch $prop
+     * @param  Node\Arg[] $args
+     * @param  array      $attributes
+     *
+     * @return Expr\StaticCall
+     */
+    protected function fixupPhp5StaticPropCall($prop, array $args, array $attributes) : Expr\StaticCall {
+        if ($prop instanceof Node\Expr\StaticPropertyFetch) {
+            $name = $prop->name instanceof VarLikeIdentifier
+                ? $prop->name->toString() : $prop->name;
+            $var = new Expr\Variable($name, $prop->name->getAttributes());
+            return new Expr\StaticCall($prop->class, $var, $args, $attributes);
+        } elseif ($prop instanceof Node\Expr\ArrayDimFetch) {
+            $tmp = $prop;
+            while ($tmp->var instanceof Node\Expr\ArrayDimFetch) {
+                $tmp = $tmp->var;
+            }
+
+            /** @var Expr\StaticPropertyFetch $staticProp */
+            $staticProp = $tmp->var;
+
+            // Set start attributes to attributes of innermost node
+            $tmp = $prop;
+            $this->fixupStartAttributes($tmp, $staticProp->name);
+            while ($tmp->var instanceof Node\Expr\ArrayDimFetch) {
+                $tmp = $tmp->var;
+                $this->fixupStartAttributes($tmp, $staticProp->name);
+            }
+
+            $name = $staticProp->name instanceof VarLikeIdentifier
+                ? $staticProp->name->toString() : $staticProp->name;
+            $tmp->var = new Expr\Variable($name, $staticProp->name->getAttributes());
+            return new Expr\StaticCall($staticProp->class, $prop, $args, $attributes);
+        } else {
+            throw new \Exception;
+        }
+    }
+
+    protected function fixupStartAttributes(Node $to, Node $from) {
+        $startAttributes = ['startLine', 'startFilePos', 'startTokenPos'];
+        foreach ($startAttributes as $startAttribute) {
+            if ($from->hasAttribute($startAttribute)) {
+                $to->setAttribute($startAttribute, $from->getAttribute($startAttribute));
+            }
+        }
+    }
+
     protected function handleBuiltinTypes(Name $name) {
-        $scalarTypes = [
+        $builtinTypes = [
             'bool'     => true,
             'int'      => true,
             'float'    => true,
@@ -531,26 +660,49 @@ abstract class ParserAbstract implements Parser
             'iterable' => true,
             'void'     => true,
             'object'   => true,
+            'null'     => true,
+            'false'    => true,
+            'mixed'    => true,
+            'never'    => true,
         ];
 
         if (!$name->isUnqualified()) {
             return $name;
         }
 
-        $lowerName = strtolower($name->toString());
-        return isset($scalarTypes[$lowerName]) ? $lowerName : $name;
+        $lowerName = $name->toLowerString();
+        if (!isset($builtinTypes[$lowerName])) {
+            return $name;
+        }
+
+        return new Node\Identifier($lowerName, $name->getAttributes());
     }
 
-    protected static $specialNames = array(
-        'self'   => true,
-        'parent' => true,
-        'static' => true,
-    );
-
-    protected function getAttributesAt($pos) {
+    /**
+     * Get combined start and end attributes at a stack location
+     *
+     * @param int $pos Stack location
+     *
+     * @return array Combined start and end attributes
+     */
+    protected function getAttributesAt(int $pos) : array {
         return $this->startAttributeStack[$pos] + $this->endAttributeStack[$pos];
     }
 
+    protected function getFloatCastKind(string $cast): int
+    {
+        $cast = strtolower($cast);
+        if (strpos($cast, 'float') !== false) {
+            return Double::KIND_FLOAT;
+        }
+
+        if (strpos($cast, 'real') !== false) {
+            return Double::KIND_REAL;
+        }
+
+        return Double::KIND_DOUBLE;
+    }
+
     protected function parseLNumber($str, $attributes, $allowInvalidOctal = false) {
         try {
             return LNumber::fromString($str, $attributes, $allowInvalidOctal);
@@ -561,7 +713,15 @@ abstract class ParserAbstract implements Parser
         }
     }
 
-    protected function parseNumString($str, $attributes) {
+    /**
+     * Parse a T_NUM_STRING token into either an integer or string node.
+     *
+     * @param string $str        Number string
+     * @param array  $attributes Attributes
+     *
+     * @return LNumber|String_ Integer or string node.
+     */
+    protected function parseNumString(string $str, array $attributes) {
         if (!preg_match('/^(?:0|-?[1-9][0-9]*)$/', $str)) {
             return new String_($str, $attributes);
         }
@@ -574,6 +734,147 @@ abstract class ParserAbstract implements Parser
         return new LNumber($num, $attributes);
     }
 
+    protected function stripIndentation(
+        string $string, int $indentLen, string $indentChar,
+        bool $newlineAtStart, bool $newlineAtEnd, array $attributes
+    ) {
+        if ($indentLen === 0) {
+            return $string;
+        }
+
+        $start = $newlineAtStart ? '(?:(?<=\n)|\A)' : '(?<=\n)';
+        $end = $newlineAtEnd ? '(?:(?=[\r\n])|\z)' : '(?=[\r\n])';
+        $regex = '/' . $start . '([ \t]*)(' . $end . ')?/';
+        return preg_replace_callback(
+            $regex,
+            function ($matches) use ($indentLen, $indentChar, $attributes) {
+                $prefix = substr($matches[1], 0, $indentLen);
+                if (false !== strpos($prefix, $indentChar === " " ? "\t" : " ")) {
+                    $this->emitError(new Error(
+                        'Invalid indentation - tabs and spaces cannot be mixed', $attributes
+                    ));
+                } elseif (strlen($prefix) < $indentLen && !isset($matches[2])) {
+                    $this->emitError(new Error(
+                        'Invalid body indentation level ' .
+                        '(expecting an indentation level of at least ' . $indentLen . ')',
+                        $attributes
+                    ));
+                }
+                return substr($matches[0], strlen($prefix));
+            },
+            $string
+        );
+    }
+
+    protected function parseDocString(
+        string $startToken, $contents, string $endToken,
+        array $attributes, array $endTokenAttributes, bool $parseUnicodeEscape
+    ) {
+        $kind = strpos($startToken, "'") === false
+            ? String_::KIND_HEREDOC : String_::KIND_NOWDOC;
+
+        $regex = '/\A[bB]?<<<[ \t]*[\'"]?([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)[\'"]?(?:\r\n|\n|\r)\z/';
+        $result = preg_match($regex, $startToken, $matches);
+        assert($result === 1);
+        $label = $matches[1];
+
+        $result = preg_match('/\A[ \t]*/', $endToken, $matches);
+        assert($result === 1);
+        $indentation = $matches[0];
+
+        $attributes['kind'] = $kind;
+        $attributes['docLabel'] = $label;
+        $attributes['docIndentation'] = $indentation;
+
+        $indentHasSpaces = false !== strpos($indentation, " ");
+        $indentHasTabs = false !== strpos($indentation, "\t");
+        if ($indentHasSpaces && $indentHasTabs) {
+            $this->emitError(new Error(
+                'Invalid indentation - tabs and spaces cannot be mixed',
+                $endTokenAttributes
+            ));
+
+            // Proceed processing as if this doc string is not indented
+            $indentation = '';
+        }
+
+        $indentLen = \strlen($indentation);
+        $indentChar = $indentHasSpaces ? " " : "\t";
+
+        if (\is_string($contents)) {
+            if ($contents === '') {
+                return new String_('', $attributes);
+            }
+
+            $contents = $this->stripIndentation(
+                $contents, $indentLen, $indentChar, true, true, $attributes
+            );
+            $contents = preg_replace('~(\r\n|\n|\r)\z~', '', $contents);
+
+            if ($kind === String_::KIND_HEREDOC) {
+                $contents = String_::parseEscapeSequences($contents, null, $parseUnicodeEscape);
+            }
+
+            return new String_($contents, $attributes);
+        } else {
+            assert(count($contents) > 0);
+            if (!$contents[0] instanceof Node\Scalar\EncapsedStringPart) {
+                // If there is no leading encapsed string part, pretend there is an empty one
+                $this->stripIndentation(
+                    '', $indentLen, $indentChar, true, false, $contents[0]->getAttributes()
+                );
+            }
+
+            $newContents = [];
+            foreach ($contents as $i => $part) {
+                if ($part instanceof Node\Scalar\EncapsedStringPart) {
+                    $isLast = $i === \count($contents) - 1;
+                    $part->value = $this->stripIndentation(
+                        $part->value, $indentLen, $indentChar,
+                        $i === 0, $isLast, $part->getAttributes()
+                    );
+                    $part->value = String_::parseEscapeSequences($part->value, null, $parseUnicodeEscape);
+                    if ($isLast) {
+                        $part->value = preg_replace('~(\r\n|\n|\r)\z~', '', $part->value);
+                    }
+                    if ('' === $part->value) {
+                        continue;
+                    }
+                }
+                $newContents[] = $part;
+            }
+            return new Encapsed($newContents, $attributes);
+        }
+    }
+
+    /**
+     * Create attributes for a zero-length common-capturing nop.
+     *
+     * @param Comment[] $comments
+     * @return array
+     */
+    protected function createCommentNopAttributes(array $comments) {
+        $comment = $comments[count($comments) - 1];
+        $commentEndLine = $comment->getEndLine();
+        $commentEndFilePos = $comment->getEndFilePos();
+        $commentEndTokenPos = $comment->getEndTokenPos();
+
+        $attributes = ['comments' => $comments];
+        if (-1 !== $commentEndLine) {
+            $attributes['startLine'] = $commentEndLine;
+            $attributes['endLine'] = $commentEndLine;
+        }
+        if (-1 !== $commentEndFilePos) {
+            $attributes['startFilePos'] = $commentEndFilePos + 1;
+            $attributes['endFilePos'] = $commentEndFilePos;
+        }
+        if (-1 !== $commentEndTokenPos) {
+            $attributes['startTokenPos'] = $commentEndTokenPos + 1;
+            $attributes['endTokenPos'] = $commentEndTokenPos;
+        }
+        return $attributes;
+    }
+
     protected function checkModifier($a, $b, $modifierPos) {
         // Jumping through some hoops here because verifyModifier() is also used elsewhere
         try {
@@ -602,13 +903,6 @@ abstract class ParserAbstract implements Parser
     }
 
     protected function checkNamespace(Namespace_ $node) {
-        if (isset(self::$specialNames[strtolower($node->name)])) {
-            $this->emitError(new Error(
-                sprintf('Cannot use \'%s\' as namespace name', $node->name),
-                $node->name->getAttributes()
-            ));
-        }
-
         if (null !== $node->stmts) {
             foreach ($node->stmts as $stmt) {
                 if ($stmt instanceof Namespace_) {
@@ -620,52 +914,52 @@ abstract class ParserAbstract implements Parser
         }
     }
 
-    protected function checkClass(Class_ $node, $namePos) {
-        if (null !== $node->name && isset(self::$specialNames[strtolower($node->name)])) {
+    private function checkClassName($name, $namePos) {
+        if (null !== $name && $name->isSpecialClassName()) {
             $this->emitError(new Error(
-                sprintf('Cannot use \'%s\' as class name as it is reserved', $node->name),
+                sprintf('Cannot use \'%s\' as class name as it is reserved', $name),
                 $this->getAttributesAt($namePos)
             ));
         }
+    }
 
-        if (isset(self::$specialNames[strtolower($node->extends)])) {
+    private function checkImplementedInterfaces(array $interfaces) {
+        foreach ($interfaces as $interface) {
+            if ($interface->isSpecialClassName()) {
+                $this->emitError(new Error(
+                    sprintf('Cannot use \'%s\' as interface name as it is reserved', $interface),
+                    $interface->getAttributes()
+                ));
+            }
+        }
+    }
+
+    protected function checkClass(Class_ $node, $namePos) {
+        $this->checkClassName($node->name, $namePos);
+
+        if ($node->extends && $node->extends->isSpecialClassName()) {
             $this->emitError(new Error(
                 sprintf('Cannot use \'%s\' as class name as it is reserved', $node->extends),
                 $node->extends->getAttributes()
             ));
         }
 
-        foreach ($node->implements as $interface) {
-            if (isset(self::$specialNames[strtolower($interface)])) {
-                $this->emitError(new Error(
-                    sprintf('Cannot use \'%s\' as interface name as it is reserved', $interface),
-                    $interface->getAttributes()
-                ));
-            }
-        }
+        $this->checkImplementedInterfaces($node->implements);
     }
 
     protected function checkInterface(Interface_ $node, $namePos) {
-        if (null !== $node->name && isset(self::$specialNames[strtolower($node->name)])) {
-            $this->emitError(new Error(
-                sprintf('Cannot use \'%s\' as class name as it is reserved', $node->name),
-                $this->getAttributesAt($namePos)
-            ));
-        }
+        $this->checkClassName($node->name, $namePos);
+        $this->checkImplementedInterfaces($node->extends);
+    }
 
-        foreach ($node->extends as $interface) {
-            if (isset(self::$specialNames[strtolower($interface)])) {
-                $this->emitError(new Error(
-                    sprintf('Cannot use \'%s\' as interface name as it is reserved', $interface),
-                    $interface->getAttributes()
-                ));
-            }
-        }
+    protected function checkEnum(Enum_ $node, $namePos) {
+        $this->checkClassName($node->name, $namePos);
+        $this->checkImplementedInterfaces($node->implements);
     }
 
     protected function checkClassMethod(ClassMethod $node, $modifierPos) {
         if ($node->flags & Class_::MODIFIER_STATIC) {
-            switch (strtolower($node->name)) {
+            switch ($node->name->toLowerString()) {
                 case '__construct':
                     $this->emitError(new Error(
                         sprintf('Constructor %s() cannot be static', $node->name),
@@ -683,6 +977,12 @@ abstract class ParserAbstract implements Parser
                     break;
             }
         }
+
+        if ($node->flags & Class_::MODIFIER_READONLY) {
+            $this->emitError(new Error(
+                sprintf('Method %s() cannot be readonly', $node->name),
+                $this->getAttributesAt($modifierPos)));
+        }
     }
 
     protected function checkClassConst(ClassConst $node, $modifierPos) {
@@ -696,9 +996,9 @@ abstract class ParserAbstract implements Parser
                 "Cannot use 'abstract' as constant modifier",
                 $this->getAttributesAt($modifierPos)));
         }
-        if ($node->flags & Class_::MODIFIER_FINAL) {
+        if ($node->flags & Class_::MODIFIER_READONLY) {
             $this->emitError(new Error(
-                "Cannot use 'final' as constant modifier",
+                "Cannot use 'readonly' as constant modifier",
                 $this->getAttributesAt($modifierPos)));
         }
     }
@@ -716,7 +1016,7 @@ abstract class ParserAbstract implements Parser
     }
 
     protected function checkUseUse(UseUse $node, $namePos) {
-        if ('self' == strtolower($node->alias) || 'parent' == strtolower($node->alias)) {
+        if ($node->alias && $node->alias->isSpecialClassName()) {
             $this->emitError(new Error(
                 sprintf(
                     'Cannot use %s as %s because \'%2$s\' is a special class name',
diff --git a/lib/nikic/php-parser/lib/PhpParser/ParserFactory.php b/lib/nikic/php-parser/lib/PhpParser/ParserFactory.php
index 28b9070d4..f041e7ffe 100644
--- a/lib/nikic/php-parser/lib/PhpParser/ParserFactory.php
+++ b/lib/nikic/php-parser/lib/PhpParser/ParserFactory.php
@@ -1,8 +1,9 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser;
 
-class ParserFactory {
+class ParserFactory
+{
     const PREFER_PHP7 = 1;
     const PREFER_PHP5 = 2;
     const ONLY_PHP7 = 3;
@@ -17,7 +18,7 @@ class ParserFactory {
      *
      * @return Parser The parser instance
      */
-    public function create($kind, Lexer $lexer = null, array $parserOptions = array()) {
+    public function create(int $kind, Lexer $lexer = null, array $parserOptions = []) : Parser {
         if (null === $lexer) {
             $lexer = new Lexer\Emulative();
         }
diff --git a/lib/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php b/lib/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php
index 1825a3194..bb70de659 100644
--- a/lib/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php
+++ b/lib/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php
@@ -1,4 +1,4 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser\PrettyPrinter;
 
@@ -18,15 +18,23 @@ class Standard extends PrettyPrinterAbstract
     // Special nodes
 
     protected function pParam(Node\Param $node) {
-        return ($node->type ? $this->pType($node->type) . ' ' : '')
+        return $this->pAttrGroups($node->attrGroups, true)
+             . $this->pModifiers($node->flags)
+             . ($node->type ? $this->p($node->type) . ' ' : '')
              . ($node->byRef ? '&' : '')
              . ($node->variadic ? '...' : '')
-             . '$' . $node->name
+             . $this->p($node->var)
              . ($node->default ? ' = ' . $this->p($node->default) : '');
     }
 
     protected function pArg(Node\Arg $node) {
-        return ($node->byRef ? '&' : '') . ($node->unpack ? '...' : '') . $this->p($node->value);
+        return ($node->name ? $node->name->toString() . ': ' : '')
+             . ($node->byRef ? '&' : '') . ($node->unpack ? '...' : '')
+             . $this->p($node->value);
+    }
+
+    protected function pVariadicPlaceholder(Node\VariadicPlaceholder $node) {
+        return '...';
     }
 
     protected function pConst(Node\Const_ $node) {
@@ -34,7 +42,32 @@ class Standard extends PrettyPrinterAbstract
     }
 
     protected function pNullableType(Node\NullableType $node) {
-        return '?' . $this->pType($node->type);
+        return '?' . $this->p($node->type);
+    }
+
+    protected function pUnionType(Node\UnionType $node) {
+        return $this->pImplode($node->types, '|');
+    }
+
+    protected function pIntersectionType(Node\IntersectionType $node) {
+        return $this->pImplode($node->types, '&');
+    }
+
+    protected function pIdentifier(Node\Identifier $node) {
+        return $node->name;
+    }
+
+    protected function pVarLikeIdentifier(Node\VarLikeIdentifier $node) {
+        return '$' . $node->name;
+    }
+
+    protected function pAttribute(Node\Attribute $node) {
+        return $this->p($node->name)
+             . ($node->args ? '(' . $this->pCommaSeparated($node->args) . ')' : '');
+    }
+
+    protected function pAttributeGroup(Node\AttributeGroup $node) {
+        return '#[' . $this->pCommaSeparated($node->attrs) . ']';
     }
 
     // Names
@@ -94,24 +127,24 @@ class Standard extends PrettyPrinterAbstract
                 $label = $node->getAttribute('docLabel');
                 if ($label && !$this->containsEndLabel($node->value, $label)) {
                     if ($node->value === '') {
-                        return $this->pNoIndent("<<<'$label'\n$label") . $this->docStringEndToken;
+                        return "<<<'$label'\n$label" . $this->docStringEndToken;
                     }
 
-                    return $this->pNoIndent("<<<'$label'\n$node->value\n$label")
+                    return "<<<'$label'\n$node->value\n$label"
                          . $this->docStringEndToken;
                 }
                 /* break missing intentionally */
             case Scalar\String_::KIND_SINGLE_QUOTED:
-                return '\'' . $this->pNoIndent(addcslashes($node->value, '\'\\')) . '\'';
+                return $this->pSingleQuotedString($node->value);
             case Scalar\String_::KIND_HEREDOC:
                 $label = $node->getAttribute('docLabel');
                 if ($label && !$this->containsEndLabel($node->value, $label)) {
                     if ($node->value === '') {
-                        return $this->pNoIndent("<<<$label\n$label") . $this->docStringEndToken;
+                        return "<<<$label\n$label" . $this->docStringEndToken;
                     }
 
                     $escaped = $this->escapeString($node->value, null);
-                    return $this->pNoIndent("<<<$label\n" . $escaped ."\n$label")
+                    return "<<<$label\n" . $escaped . "\n$label"
                          . $this->docStringEndToken;
                 }
             /* break missing intentionally */
@@ -129,12 +162,11 @@ class Standard extends PrettyPrinterAbstract
                     && $node->parts[0] instanceof Scalar\EncapsedStringPart
                     && $node->parts[0]->value === ''
                 ) {
-                    return $this->pNoIndent("<<<$label\n$label") . $this->docStringEndToken;
+                    return "<<<$label\n$label" . $this->docStringEndToken;
                 }
 
-                return $this->pNoIndent(
-                    "<<<$label\n" . $this->pEncapsList($node->parts, null) . "\n$label"
-                ) . $this->docStringEndToken;
+                return "<<<$label\n" . $this->pEncapsList($node->parts, null) . "\n$label"
+                     . $this->docStringEndToken;
             }
         }
         return '"' . $this->pEncapsList($node->parts, '"') . '"';
@@ -152,8 +184,13 @@ class Standard extends PrettyPrinterAbstract
             return (string) $node->value;
         }
 
-        $sign = $node->value < 0 ? '-' : '';
-        $str = (string) $node->value;
+        if ($node->value < 0) {
+            $sign = '-';
+            $str = (string) -$node->value;
+        } else {
+            $sign = '';
+            $str = (string) $node->value;
+        }
         switch ($kind) {
             case Scalar\LNumber::KIND_BIN:
                 return $sign . '0b' . base_convert($str, 10, 2);
@@ -191,186 +228,197 @@ class Standard extends PrettyPrinterAbstract
         return preg_match('/^-?[0-9]+$/', $stringValue) ? $stringValue . '.0' : $stringValue;
     }
 
+    protected function pScalar_EncapsedStringPart(Scalar\EncapsedStringPart $node) {
+        throw new \LogicException('Cannot directly print EncapsedStringPart');
+    }
+
     // Assignments
 
     protected function pExpr_Assign(Expr\Assign $node) {
-        return $this->pInfixOp('Expr_Assign', $node->var, ' = ', $node->expr);
+        return $this->pInfixOp(Expr\Assign::class, $node->var, ' = ', $node->expr);
     }
 
     protected function pExpr_AssignRef(Expr\AssignRef $node) {
-        return $this->pInfixOp('Expr_AssignRef', $node->var, ' =& ', $node->expr);
+        return $this->pInfixOp(Expr\AssignRef::class, $node->var, ' =& ', $node->expr);
     }
 
     protected function pExpr_AssignOp_Plus(AssignOp\Plus $node) {
-        return $this->pInfixOp('Expr_AssignOp_Plus', $node->var, ' += ', $node->expr);
+        return $this->pInfixOp(AssignOp\Plus::class, $node->var, ' += ', $node->expr);
     }
 
     protected function pExpr_AssignOp_Minus(AssignOp\Minus $node) {
-        return $this->pInfixOp('Expr_AssignOp_Minus', $node->var, ' -= ', $node->expr);
+        return $this->pInfixOp(AssignOp\Minus::class, $node->var, ' -= ', $node->expr);
     }
 
     protected function pExpr_AssignOp_Mul(AssignOp\Mul $node) {
-        return $this->pInfixOp('Expr_AssignOp_Mul', $node->var, ' *= ', $node->expr);
+        return $this->pInfixOp(AssignOp\Mul::class, $node->var, ' *= ', $node->expr);
     }
 
     protected function pExpr_AssignOp_Div(AssignOp\Div $node) {
-        return $this->pInfixOp('Expr_AssignOp_Div', $node->var, ' /= ', $node->expr);
+        return $this->pInfixOp(AssignOp\Div::class, $node->var, ' /= ', $node->expr);
     }
 
     protected function pExpr_AssignOp_Concat(AssignOp\Concat $node) {
-        return $this->pInfixOp('Expr_AssignOp_Concat', $node->var, ' .= ', $node->expr);
+        return $this->pInfixOp(AssignOp\Concat::class, $node->var, ' .= ', $node->expr);
     }
 
     protected function pExpr_AssignOp_Mod(AssignOp\Mod $node) {
-        return $this->pInfixOp('Expr_AssignOp_Mod', $node->var, ' %= ', $node->expr);
+        return $this->pInfixOp(AssignOp\Mod::class, $node->var, ' %= ', $node->expr);
     }
 
     protected function pExpr_AssignOp_BitwiseAnd(AssignOp\BitwiseAnd $node) {
-        return $this->pInfixOp('Expr_AssignOp_BitwiseAnd', $node->var, ' &= ', $node->expr);
+        return $this->pInfixOp(AssignOp\BitwiseAnd::class, $node->var, ' &= ', $node->expr);
     }
 
     protected function pExpr_AssignOp_BitwiseOr(AssignOp\BitwiseOr $node) {
-        return $this->pInfixOp('Expr_AssignOp_BitwiseOr', $node->var, ' |= ', $node->expr);
+        return $this->pInfixOp(AssignOp\BitwiseOr::class, $node->var, ' |= ', $node->expr);
     }
 
     protected function pExpr_AssignOp_BitwiseXor(AssignOp\BitwiseXor $node) {
-        return $this->pInfixOp('Expr_AssignOp_BitwiseXor', $node->var, ' ^= ', $node->expr);
+        return $this->pInfixOp(AssignOp\BitwiseXor::class, $node->var, ' ^= ', $node->expr);
     }
 
     protected function pExpr_AssignOp_ShiftLeft(AssignOp\ShiftLeft $node) {
-        return $this->pInfixOp('Expr_AssignOp_ShiftLeft', $node->var, ' <<= ', $node->expr);
+        return $this->pInfixOp(AssignOp\ShiftLeft::class, $node->var, ' <<= ', $node->expr);
     }
 
     protected function pExpr_AssignOp_ShiftRight(AssignOp\ShiftRight $node) {
-        return $this->pInfixOp('Expr_AssignOp_ShiftRight', $node->var, ' >>= ', $node->expr);
+        return $this->pInfixOp(AssignOp\ShiftRight::class, $node->var, ' >>= ', $node->expr);
     }
 
     protected function pExpr_AssignOp_Pow(AssignOp\Pow $node) {
-        return $this->pInfixOp('Expr_AssignOp_Pow', $node->var, ' **= ', $node->expr);
+        return $this->pInfixOp(AssignOp\Pow::class, $node->var, ' **= ', $node->expr);
+    }
+
+    protected function pExpr_AssignOp_Coalesce(AssignOp\Coalesce $node) {
+        return $this->pInfixOp(AssignOp\Coalesce::class, $node->var, ' ??= ', $node->expr);
     }
 
     // Binary expressions
 
     protected function pExpr_BinaryOp_Plus(BinaryOp\Plus $node) {
-        return $this->pInfixOp('Expr_BinaryOp_Plus', $node->left, ' + ', $node->right);
+        return $this->pInfixOp(BinaryOp\Plus::class, $node->left, ' + ', $node->right);
     }
 
     protected function pExpr_BinaryOp_Minus(BinaryOp\Minus $node) {
-        return $this->pInfixOp('Expr_BinaryOp_Minus', $node->left, ' - ', $node->right);
+        return $this->pInfixOp(BinaryOp\Minus::class, $node->left, ' - ', $node->right);
     }
 
     protected function pExpr_BinaryOp_Mul(BinaryOp\Mul $node) {
-        return $this->pInfixOp('Expr_BinaryOp_Mul', $node->left, ' * ', $node->right);
+        return $this->pInfixOp(BinaryOp\Mul::class, $node->left, ' * ', $node->right);
     }
 
     protected function pExpr_BinaryOp_Div(BinaryOp\Div $node) {
-        return $this->pInfixOp('Expr_BinaryOp_Div', $node->left, ' / ', $node->right);
+        return $this->pInfixOp(BinaryOp\Div::class, $node->left, ' / ', $node->right);
     }
 
     protected function pExpr_BinaryOp_Concat(BinaryOp\Concat $node) {
-        return $this->pInfixOp('Expr_BinaryOp_Concat', $node->left, ' . ', $node->right);
+        return $this->pInfixOp(BinaryOp\Concat::class, $node->left, ' . ', $node->right);
     }
 
     protected function pExpr_BinaryOp_Mod(BinaryOp\Mod $node) {
-        return $this->pInfixOp('Expr_BinaryOp_Mod', $node->left, ' % ', $node->right);
+        return $this->pInfixOp(BinaryOp\Mod::class, $node->left, ' % ', $node->right);
     }
 
     protected function pExpr_BinaryOp_BooleanAnd(BinaryOp\BooleanAnd $node) {
-        return $this->pInfixOp('Expr_BinaryOp_BooleanAnd', $node->left, ' && ', $node->right);
+        return $this->pInfixOp(BinaryOp\BooleanAnd::class, $node->left, ' && ', $node->right);
     }
 
     protected function pExpr_BinaryOp_BooleanOr(BinaryOp\BooleanOr $node) {
-        return $this->pInfixOp('Expr_BinaryOp_BooleanOr', $node->left, ' || ', $node->right);
+        return $this->pInfixOp(BinaryOp\BooleanOr::class, $node->left, ' || ', $node->right);
     }
 
     protected function pExpr_BinaryOp_BitwiseAnd(BinaryOp\BitwiseAnd $node) {
-        return $this->pInfixOp('Expr_BinaryOp_BitwiseAnd', $node->left, ' & ', $node->right);
+        return $this->pInfixOp(BinaryOp\BitwiseAnd::class, $node->left, ' & ', $node->right);
     }
 
     protected function pExpr_BinaryOp_BitwiseOr(BinaryOp\BitwiseOr $node) {
-        return $this->pInfixOp('Expr_BinaryOp_BitwiseOr', $node->left, ' | ', $node->right);
+        return $this->pInfixOp(BinaryOp\BitwiseOr::class, $node->left, ' | ', $node->right);
     }
 
     protected function pExpr_BinaryOp_BitwiseXor(BinaryOp\BitwiseXor $node) {
-        return $this->pInfixOp('Expr_BinaryOp_BitwiseXor', $node->left, ' ^ ', $node->right);
+        return $this->pInfixOp(BinaryOp\BitwiseXor::class, $node->left, ' ^ ', $node->right);
     }
 
     protected function pExpr_BinaryOp_ShiftLeft(BinaryOp\ShiftLeft $node) {
-        return $this->pInfixOp('Expr_BinaryOp_ShiftLeft', $node->left, ' << ', $node->right);
+        return $this->pInfixOp(BinaryOp\ShiftLeft::class, $node->left, ' << ', $node->right);
     }
 
     protected function pExpr_BinaryOp_ShiftRight(BinaryOp\ShiftRight $node) {
-        return $this->pInfixOp('Expr_BinaryOp_ShiftRight', $node->left, ' >> ', $node->right);
+        return $this->pInfixOp(BinaryOp\ShiftRight::class, $node->left, ' >> ', $node->right);
     }
 
     protected function pExpr_BinaryOp_Pow(BinaryOp\Pow $node) {
-        return $this->pInfixOp('Expr_BinaryOp_Pow', $node->left, ' ** ', $node->right);
+        return $this->pInfixOp(BinaryOp\Pow::class, $node->left, ' ** ', $node->right);
     }
 
     protected function pExpr_BinaryOp_LogicalAnd(BinaryOp\LogicalAnd $node) {
-        return $this->pInfixOp('Expr_BinaryOp_LogicalAnd', $node->left, ' and ', $node->right);
+        return $this->pInfixOp(BinaryOp\LogicalAnd::class, $node->left, ' and ', $node->right);
     }
 
     protected function pExpr_BinaryOp_LogicalOr(BinaryOp\LogicalOr $node) {
-        return $this->pInfixOp('Expr_BinaryOp_LogicalOr', $node->left, ' or ', $node->right);
+        return $this->pInfixOp(BinaryOp\LogicalOr::class, $node->left, ' or ', $node->right);
     }
 
     protected function pExpr_BinaryOp_LogicalXor(BinaryOp\LogicalXor $node) {
-        return $this->pInfixOp('Expr_BinaryOp_LogicalXor', $node->left, ' xor ', $node->right);
+        return $this->pInfixOp(BinaryOp\LogicalXor::class, $node->left, ' xor ', $node->right);
     }
 
     protected function pExpr_BinaryOp_Equal(BinaryOp\Equal $node) {
-        return $this->pInfixOp('Expr_BinaryOp_Equal', $node->left, ' == ', $node->right);
+        return $this->pInfixOp(BinaryOp\Equal::class, $node->left, ' == ', $node->right);
     }
 
     protected function pExpr_BinaryOp_NotEqual(BinaryOp\NotEqual $node) {
-        return $this->pInfixOp('Expr_BinaryOp_NotEqual', $node->left, ' != ', $node->right);
+        return $this->pInfixOp(BinaryOp\NotEqual::class, $node->left, ' != ', $node->right);
     }
 
     protected function pExpr_BinaryOp_Identical(BinaryOp\Identical $node) {
-        return $this->pInfixOp('Expr_BinaryOp_Identical', $node->left, ' === ', $node->right);
+        return $this->pInfixOp(BinaryOp\Identical::class, $node->left, ' === ', $node->right);
     }
 
     protected function pExpr_BinaryOp_NotIdentical(BinaryOp\NotIdentical $node) {
-        return $this->pInfixOp('Expr_BinaryOp_NotIdentical', $node->left, ' !== ', $node->right);
+        return $this->pInfixOp(BinaryOp\NotIdentical::class, $node->left, ' !== ', $node->right);
     }
 
     protected function pExpr_BinaryOp_Spaceship(BinaryOp\Spaceship $node) {
-        return $this->pInfixOp('Expr_BinaryOp_Spaceship', $node->left, ' <=> ', $node->right);
+        return $this->pInfixOp(BinaryOp\Spaceship::class, $node->left, ' <=> ', $node->right);
     }
 
     protected function pExpr_BinaryOp_Greater(BinaryOp\Greater $node) {
-        return $this->pInfixOp('Expr_BinaryOp_Greater', $node->left, ' > ', $node->right);
+        return $this->pInfixOp(BinaryOp\Greater::class, $node->left, ' > ', $node->right);
     }
 
     protected function pExpr_BinaryOp_GreaterOrEqual(BinaryOp\GreaterOrEqual $node) {
-        return $this->pInfixOp('Expr_BinaryOp_GreaterOrEqual', $node->left, ' >= ', $node->right);
+        return $this->pInfixOp(BinaryOp\GreaterOrEqual::class, $node->left, ' >= ', $node->right);
     }
 
     protected function pExpr_BinaryOp_Smaller(BinaryOp\Smaller $node) {
-        return $this->pInfixOp('Expr_BinaryOp_Smaller', $node->left, ' < ', $node->right);
+        return $this->pInfixOp(BinaryOp\Smaller::class, $node->left, ' < ', $node->right);
     }
 
     protected function pExpr_BinaryOp_SmallerOrEqual(BinaryOp\SmallerOrEqual $node) {
-        return $this->pInfixOp('Expr_BinaryOp_SmallerOrEqual', $node->left, ' <= ', $node->right);
+        return $this->pInfixOp(BinaryOp\SmallerOrEqual::class, $node->left, ' <= ', $node->right);
     }
 
     protected function pExpr_BinaryOp_Coalesce(BinaryOp\Coalesce $node) {
-        return $this->pInfixOp('Expr_BinaryOp_Coalesce', $node->left, ' ?? ', $node->right);
+        return $this->pInfixOp(BinaryOp\Coalesce::class, $node->left, ' ?? ', $node->right);
     }
 
     protected function pExpr_Instanceof(Expr\Instanceof_ $node) {
-        return $this->pInfixOp('Expr_Instanceof', $node->expr, ' instanceof ', $node->class);
+        list($precedence, $associativity) = $this->precedenceMap[Expr\Instanceof_::class];
+        return $this->pPrec($node->expr, $precedence, $associativity, -1)
+             . ' instanceof '
+             . $this->pNewVariable($node->class);
     }
 
     // Unary expressions
 
     protected function pExpr_BooleanNot(Expr\BooleanNot $node) {
-        return $this->pPrefixOp('Expr_BooleanNot', '!', $node->expr);
+        return $this->pPrefixOp(Expr\BooleanNot::class, '!', $node->expr);
     }
 
     protected function pExpr_BitwiseNot(Expr\BitwiseNot $node) {
-        return $this->pPrefixOp('Expr_BitwiseNot', '~', $node->expr);
+        return $this->pPrefixOp(Expr\BitwiseNot::class, '~', $node->expr);
     }
 
     protected function pExpr_UnaryMinus(Expr\UnaryMinus $node) {
@@ -378,7 +426,7 @@ class Standard extends PrettyPrinterAbstract
             // Enforce -(-$expr) instead of --$expr
             return '-(' . $this->p($node->expr) . ')';
         }
-        return $this->pPrefixOp('Expr_UnaryMinus', '-', $node->expr);
+        return $this->pPrefixOp(Expr\UnaryMinus::class, '-', $node->expr);
     }
 
     protected function pExpr_UnaryPlus(Expr\UnaryPlus $node) {
@@ -386,65 +434,73 @@ class Standard extends PrettyPrinterAbstract
             // Enforce +(+$expr) instead of ++$expr
             return '+(' . $this->p($node->expr) . ')';
         }
-        return $this->pPrefixOp('Expr_UnaryPlus', '+', $node->expr);
+        return $this->pPrefixOp(Expr\UnaryPlus::class, '+', $node->expr);
     }
 
     protected function pExpr_PreInc(Expr\PreInc $node) {
-        return $this->pPrefixOp('Expr_PreInc', '++', $node->var);
+        return $this->pPrefixOp(Expr\PreInc::class, '++', $node->var);
     }
 
     protected function pExpr_PreDec(Expr\PreDec $node) {
-        return $this->pPrefixOp('Expr_PreDec', '--', $node->var);
+        return $this->pPrefixOp(Expr\PreDec::class, '--', $node->var);
     }
 
     protected function pExpr_PostInc(Expr\PostInc $node) {
-        return $this->pPostfixOp('Expr_PostInc', $node->var, '++');
+        return $this->pPostfixOp(Expr\PostInc::class, $node->var, '++');
     }
 
     protected function pExpr_PostDec(Expr\PostDec $node) {
-        return $this->pPostfixOp('Expr_PostDec', $node->var, '--');
+        return $this->pPostfixOp(Expr\PostDec::class, $node->var, '--');
     }
 
     protected function pExpr_ErrorSuppress(Expr\ErrorSuppress $node) {
-        return $this->pPrefixOp('Expr_ErrorSuppress', '@', $node->expr);
+        return $this->pPrefixOp(Expr\ErrorSuppress::class, '@', $node->expr);
     }
 
     protected function pExpr_YieldFrom(Expr\YieldFrom $node) {
-        return $this->pPrefixOp('Expr_YieldFrom', 'yield from ', $node->expr);
+        return $this->pPrefixOp(Expr\YieldFrom::class, 'yield from ', $node->expr);
     }
 
     protected function pExpr_Print(Expr\Print_ $node) {
-        return $this->pPrefixOp('Expr_Print', 'print ', $node->expr);
+        return $this->pPrefixOp(Expr\Print_::class, 'print ', $node->expr);
     }
 
     // Casts
 
     protected function pExpr_Cast_Int(Cast\Int_ $node) {
-        return $this->pPrefixOp('Expr_Cast_Int', '(int) ', $node->expr);
+        return $this->pPrefixOp(Cast\Int_::class, '(int) ', $node->expr);
     }
 
     protected function pExpr_Cast_Double(Cast\Double $node) {
-        return $this->pPrefixOp('Expr_Cast_Double', '(double) ', $node->expr);
+        $kind = $node->getAttribute('kind', Cast\Double::KIND_DOUBLE);
+        if ($kind === Cast\Double::KIND_DOUBLE) {
+            $cast = '(double)';
+        } elseif ($kind === Cast\Double::KIND_FLOAT) {
+            $cast = '(float)';
+        } elseif ($kind === Cast\Double::KIND_REAL) {
+            $cast = '(real)';
+        }
+        return $this->pPrefixOp(Cast\Double::class, $cast . ' ', $node->expr);
     }
 
     protected function pExpr_Cast_String(Cast\String_ $node) {
-        return $this->pPrefixOp('Expr_Cast_String', '(string) ', $node->expr);
+        return $this->pPrefixOp(Cast\String_::class, '(string) ', $node->expr);
     }
 
     protected function pExpr_Cast_Array(Cast\Array_ $node) {
-        return $this->pPrefixOp('Expr_Cast_Array', '(array) ', $node->expr);
+        return $this->pPrefixOp(Cast\Array_::class, '(array) ', $node->expr);
     }
 
     protected function pExpr_Cast_Object(Cast\Object_ $node) {
-        return $this->pPrefixOp('Expr_Cast_Object', '(object) ', $node->expr);
+        return $this->pPrefixOp(Cast\Object_::class, '(object) ', $node->expr);
     }
 
     protected function pExpr_Cast_Bool(Cast\Bool_ $node) {
-        return $this->pPrefixOp('Expr_Cast_Bool', '(bool) ', $node->expr);
+        return $this->pPrefixOp(Cast\Bool_::class, '(bool) ', $node->expr);
     }
 
     protected function pExpr_Cast_Unset(Cast\Unset_ $node) {
-        return $this->pPrefixOp('Expr_Cast_Unset', '(unset) ', $node->expr);
+        return $this->pPrefixOp(Cast\Unset_::class, '(unset) ', $node->expr);
     }
 
     // Function calls and similar constructs
@@ -459,6 +515,11 @@ class Standard extends PrettyPrinterAbstract
              . '(' . $this->pMaybeMultiline($node->args) . ')';
     }
 
+    protected function pExpr_NullsafeMethodCall(Expr\NullsafeMethodCall $node) {
+        return $this->pDereferenceLhs($node->var) . '?->' . $this->pObjectProperty($node->name)
+            . '(' . $this->pMaybeMultiline($node->args) . ')';
+    }
+
     protected function pExpr_StaticCall(Expr\StaticCall $node) {
         return $this->pDereferenceLhs($node->class) . '::'
              . ($node->name instanceof Expr
@@ -482,12 +543,12 @@ class Standard extends PrettyPrinterAbstract
     }
 
     protected function pExpr_Include(Expr\Include_ $node) {
-        static $map = array(
+        static $map = [
             Expr\Include_::TYPE_INCLUDE      => 'include',
             Expr\Include_::TYPE_INCLUDE_ONCE => 'include_once',
             Expr\Include_::TYPE_REQUIRE      => 'require',
             Expr\Include_::TYPE_REQUIRE_ONCE => 'require_once',
-        );
+        ];
 
         return $map[$node->type] . ' ' . $this->p($node->expr);
     }
@@ -522,7 +583,9 @@ class Standard extends PrettyPrinterAbstract
 
     protected function pExpr_ArrayItem(Expr\ArrayItem $node) {
         return (null !== $node->key ? $this->p($node->key) . ' => ' : '')
-             . ($node->byRef ? '&' : '') . $this->p($node->value);
+             . ($node->byRef ? '&' : '')
+             . ($node->unpack ? '...' : '')
+             . $this->p($node->value);
     }
 
     protected function pExpr_ArrayDimFetch(Expr\ArrayDimFetch $node) {
@@ -535,14 +598,17 @@ class Standard extends PrettyPrinterAbstract
     }
 
     protected function pExpr_ClassConstFetch(Expr\ClassConstFetch $node) {
-        return $this->p($node->class) . '::'
-             . (is_string($node->name) ? $node->name : $this->p($node->name));
+        return $this->pDereferenceLhs($node->class) . '::' . $this->p($node->name);
     }
 
     protected function pExpr_PropertyFetch(Expr\PropertyFetch $node) {
         return $this->pDereferenceLhs($node->var) . '->' . $this->pObjectProperty($node->name);
     }
 
+    protected function pExpr_NullsafePropertyFetch(Expr\NullsafePropertyFetch $node) {
+        return $this->pDereferenceLhs($node->var) . '?->' . $this->pObjectProperty($node->name);
+    }
+
     protected function pExpr_StaticPropertyFetch(Expr\StaticPropertyFetch $node) {
         return $this->pDereferenceLhs($node->class) . '::$' . $this->pObjectProperty($node->name);
     }
@@ -552,16 +618,39 @@ class Standard extends PrettyPrinterAbstract
     }
 
     protected function pExpr_Closure(Expr\Closure $node) {
-        return ($node->static ? 'static ' : '')
+        return $this->pAttrGroups($node->attrGroups, true)
+             . ($node->static ? 'static ' : '')
              . 'function ' . ($node->byRef ? '&' : '')
              . '(' . $this->pCommaSeparated($node->params) . ')'
-             . (!empty($node->uses) ? ' use(' . $this->pCommaSeparated($node->uses) . ')': '')
-             . (null !== $node->returnType ? ' : ' . $this->pType($node->returnType) : '')
-             . ' {' . $this->pStmts($node->stmts) . "\n" . '}';
+             . (!empty($node->uses) ? ' use(' . $this->pCommaSeparated($node->uses) . ')' : '')
+             . (null !== $node->returnType ? ' : ' . $this->p($node->returnType) : '')
+             . ' {' . $this->pStmts($node->stmts) . $this->nl . '}';
+    }
+
+    protected function pExpr_Match(Expr\Match_ $node) {
+        return 'match (' . $this->p($node->cond) . ') {'
+            . $this->pCommaSeparatedMultiline($node->arms, true)
+            . $this->nl
+            . '}';
+    }
+
+    protected function pMatchArm(Node\MatchArm $node) {
+        return ($node->conds ? $this->pCommaSeparated($node->conds) : 'default')
+            . ' => ' . $this->p($node->body);
+    }
+
+    protected function pExpr_ArrowFunction(Expr\ArrowFunction $node) {
+        return $this->pAttrGroups($node->attrGroups, true)
+            . ($node->static ? 'static ' : '')
+            . 'fn' . ($node->byRef ? '&' : '')
+            . '(' . $this->pCommaSeparated($node->params) . ')'
+            . (null !== $node->returnType ? ': ' . $this->p($node->returnType) : '')
+            . ' => '
+            . $this->p($node->expr);
     }
 
     protected function pExpr_ClosureUse(Expr\ClosureUse $node) {
-        return ($node->byRef ? '&' : '') . '$' . $node->var;
+        return ($node->byRef ? '&' : '') . $this->p($node->var);
     }
 
     protected function pExpr_New(Expr\New_ $node) {
@@ -569,7 +658,8 @@ class Standard extends PrettyPrinterAbstract
             $args = $node->args ? '(' . $this->pMaybeMultiline($node->args) . ')' : '';
             return 'new ' . $this->pClassCommon($node->class, $args);
         }
-        return 'new ' . $this->p($node->class) . '(' . $this->pMaybeMultiline($node->args) . ')';
+        return 'new ' . $this->pNewVariable($node->class)
+            . '(' . $this->pMaybeMultiline($node->args) . ')';
     }
 
     protected function pExpr_Clone(Expr\Clone_ $node) {
@@ -579,7 +669,7 @@ class Standard extends PrettyPrinterAbstract
     protected function pExpr_Ternary(Expr\Ternary $node) {
         // a bit of cheating: we treat the ternary as a binary op where the ?...: part is the operator.
         // this is okay because the part between ? and : never needs parentheses.
-        return $this->pInfixOp('Expr_Ternary',
+        return $this->pInfixOp(Expr\Ternary::class,
             $node->cond, ' ?' . (null !== $node->if ? ' ' . $this->p($node->if) . ' ' : '') . ': ', $node->else
         );
     }
@@ -590,6 +680,10 @@ class Standard extends PrettyPrinterAbstract
              . (null !== $node->expr ? '(' . $this->p($node->expr) . ')' : '');
     }
 
+    protected function pExpr_Throw(Expr\Throw_ $node) {
+        return 'throw ' . $this->p($node->expr);
+    }
+
     protected function pExpr_Yield(Expr\Yield_ $node) {
         if ($node->value === null) {
             return 'yield';
@@ -606,10 +700,11 @@ class Standard extends PrettyPrinterAbstract
 
     protected function pStmt_Namespace(Stmt\Namespace_ $node) {
         if ($this->canUseSemicolonNamespaces) {
-            return 'namespace ' . $this->p($node->name) . ';' . "\n" . $this->pStmts($node->stmts, false);
+            return 'namespace ' . $this->p($node->name) . ';'
+                 . $this->nl . $this->pStmts($node->stmts, false);
         } else {
             return 'namespace' . (null !== $node->name ? ' ' . $this->p($node->name) : '')
-                 . ' {' . $this->pStmts($node->stmts) . "\n" . '}';
+                 . ' {' . $this->pStmts($node->stmts) . $this->nl . '}';
         }
     }
 
@@ -625,7 +720,7 @@ class Standard extends PrettyPrinterAbstract
 
     protected function pStmt_UseUse(Stmt\UseUse $node) {
         return $this->pUseType($node->type) . $this->p($node->name)
-             . ($node->name->getLast() !== $node->alias ? ' as ' . $node->alias : '');
+             . (null !== $node->alias ? ' as ' . $node->alias : '');
     }
 
     protected function pUseType($type) {
@@ -634,9 +729,18 @@ class Standard extends PrettyPrinterAbstract
     }
 
     protected function pStmt_Interface(Stmt\Interface_ $node) {
-        return 'interface ' . $node->name
+        return $this->pAttrGroups($node->attrGroups)
+             . 'interface ' . $node->name
              . (!empty($node->extends) ? ' extends ' . $this->pCommaSeparated($node->extends) : '')
-             . "\n" . '{' . $this->pStmts($node->stmts) . "\n" . '}';
+             . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}';
+    }
+
+    protected function pStmt_Enum(Stmt\Enum_ $node) {
+        return $this->pAttrGroups($node->attrGroups)
+             . 'enum ' . $node->name
+             . ($node->scalarType ? " : $node->scalarType" : '')
+             . (!empty($node->implements) ? ' implements ' . $this->pCommaSeparated($node->implements) : '')
+             . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}';
     }
 
     protected function pStmt_Class(Stmt\Class_ $node) {
@@ -644,15 +748,23 @@ class Standard extends PrettyPrinterAbstract
     }
 
     protected function pStmt_Trait(Stmt\Trait_ $node) {
-        return 'trait ' . $node->name
-             . "\n" . '{' . $this->pStmts($node->stmts) . "\n" . '}';
+        return $this->pAttrGroups($node->attrGroups)
+             . 'trait ' . $node->name
+             . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}';
+    }
+
+    protected function pStmt_EnumCase(Stmt\EnumCase $node) {
+        return $this->pAttrGroups($node->attrGroups)
+             . 'case ' . $node->name
+             . ($node->expr ? ' = ' . $this->p($node->expr) : '')
+             . ';';
     }
 
     protected function pStmt_TraitUse(Stmt\TraitUse $node) {
         return 'use ' . $this->pCommaSeparated($node->traits)
              . (empty($node->adaptations)
                 ? ';'
-                : ' {' . $this->pStmts($node->adaptations) . "\n" . '}');
+                : ' {' . $this->pStmts($node->adaptations) . $this->nl . '}');
     }
 
     protected function pStmt_TraitUseAdaptation_Precedence(Stmt\TraitUseAdaptation\Precedence $node) {
@@ -669,7 +781,10 @@ class Standard extends PrettyPrinterAbstract
     }
 
     protected function pStmt_Property(Stmt\Property $node) {
-        return (0 === $node->flags ? 'var ' : $this->pModifiers($node->flags)) . $this->pCommaSeparated($node->props) . ';';
+        return $this->pAttrGroups($node->attrGroups)
+            . (0 === $node->flags ? 'var ' : $this->pModifiers($node->flags))
+            . ($node->type ? $this->p($node->type) . ' ' : '')
+            . $this->pCommaSeparated($node->props) . ';';
     }
 
     protected function pStmt_PropertyProperty(Stmt\PropertyProperty $node) {
@@ -678,25 +793,28 @@ class Standard extends PrettyPrinterAbstract
     }
 
     protected function pStmt_ClassMethod(Stmt\ClassMethod $node) {
-        return $this->pModifiers($node->flags)
+        return $this->pAttrGroups($node->attrGroups)
+             . $this->pModifiers($node->flags)
              . 'function ' . ($node->byRef ? '&' : '') . $node->name
-             . '(' . $this->pCommaSeparated($node->params) . ')'
-             . (null !== $node->returnType ? ' : ' . $this->pType($node->returnType) : '')
+             . '(' . $this->pMaybeMultiline($node->params) . ')'
+             . (null !== $node->returnType ? ' : ' . $this->p($node->returnType) : '')
              . (null !== $node->stmts
-                ? "\n" . '{' . $this->pStmts($node->stmts) . "\n" . '}'
+                ? $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}'
                 : ';');
     }
 
     protected function pStmt_ClassConst(Stmt\ClassConst $node) {
-        return $this->pModifiers($node->flags)
+        return $this->pAttrGroups($node->attrGroups)
+             . $this->pModifiers($node->flags)
              . 'const ' . $this->pCommaSeparated($node->consts) . ';';
     }
 
     protected function pStmt_Function(Stmt\Function_ $node) {
-        return 'function ' . ($node->byRef ? '&' : '') . $node->name
+        return $this->pAttrGroups($node->attrGroups)
+             . 'function ' . ($node->byRef ? '&' : '') . $node->name
              . '(' . $this->pCommaSeparated($node->params) . ')'
-             . (null !== $node->returnType ? ' : ' . $this->pType($node->returnType) : '')
-             . "\n" . '{' . $this->pStmts($node->stmts) . "\n" . '}';
+             . (null !== $node->returnType ? ' : ' . $this->p($node->returnType) : '')
+             . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}';
     }
 
     protected function pStmt_Const(Stmt\Const_ $node) {
@@ -705,7 +823,7 @@ class Standard extends PrettyPrinterAbstract
 
     protected function pStmt_Declare(Stmt\Declare_ $node) {
         return 'declare (' . $this->pCommaSeparated($node->declares) . ')'
-             . (null !== $node->stmts ? ' {' . $this->pStmts($node->stmts) . "\n" . '}' : ';');
+             . (null !== $node->stmts ? ' {' . $this->pStmts($node->stmts) . $this->nl . '}' : ';');
     }
 
     protected function pStmt_DeclareDeclare(Stmt\DeclareDeclare $node) {
@@ -716,18 +834,18 @@ class Standard extends PrettyPrinterAbstract
 
     protected function pStmt_If(Stmt\If_ $node) {
         return 'if (' . $this->p($node->cond) . ') {'
-             . $this->pStmts($node->stmts) . "\n" . '}'
-             . $this->pImplode($node->elseifs)
-             . (null !== $node->else ? $this->p($node->else) : '');
+             . $this->pStmts($node->stmts) . $this->nl . '}'
+             . ($node->elseifs ? ' ' . $this->pImplode($node->elseifs, ' ') : '')
+             . (null !== $node->else ? ' ' . $this->p($node->else) : '');
     }
 
     protected function pStmt_ElseIf(Stmt\ElseIf_ $node) {
-        return ' elseif (' . $this->p($node->cond) . ') {'
-             . $this->pStmts($node->stmts) . "\n" . '}';
+        return 'elseif (' . $this->p($node->cond) . ') {'
+             . $this->pStmts($node->stmts) . $this->nl . '}';
     }
 
     protected function pStmt_Else(Stmt\Else_ $node) {
-        return ' else {' . $this->pStmts($node->stmts) . "\n" . '}';
+        return 'else {' . $this->pStmts($node->stmts) . $this->nl . '}';
     }
 
     protected function pStmt_For(Stmt\For_ $node) {
@@ -735,29 +853,29 @@ class Standard extends PrettyPrinterAbstract
              . $this->pCommaSeparated($node->init) . ';' . (!empty($node->cond) ? ' ' : '')
              . $this->pCommaSeparated($node->cond) . ';' . (!empty($node->loop) ? ' ' : '')
              . $this->pCommaSeparated($node->loop)
-             . ') {' . $this->pStmts($node->stmts) . "\n" . '}';
+             . ') {' . $this->pStmts($node->stmts) . $this->nl . '}';
     }
 
     protected function pStmt_Foreach(Stmt\Foreach_ $node) {
         return 'foreach (' . $this->p($node->expr) . ' as '
              . (null !== $node->keyVar ? $this->p($node->keyVar) . ' => ' : '')
              . ($node->byRef ? '&' : '') . $this->p($node->valueVar) . ') {'
-             . $this->pStmts($node->stmts) . "\n" . '}';
+             . $this->pStmts($node->stmts) . $this->nl . '}';
     }
 
     protected function pStmt_While(Stmt\While_ $node) {
         return 'while (' . $this->p($node->cond) . ') {'
-             . $this->pStmts($node->stmts) . "\n" . '}';
+             . $this->pStmts($node->stmts) . $this->nl . '}';
     }
 
     protected function pStmt_Do(Stmt\Do_ $node) {
-        return 'do {' . $this->pStmts($node->stmts) . "\n"
+        return 'do {' . $this->pStmts($node->stmts) . $this->nl
              . '} while (' . $this->p($node->cond) . ');';
     }
 
     protected function pStmt_Switch(Stmt\Switch_ $node) {
         return 'switch (' . $this->p($node->cond) . ') {'
-             . $this->pStmts($node->cases) . "\n" . '}';
+             . $this->pStmts($node->cases) . $this->nl . '}';
     }
 
     protected function pStmt_Case(Stmt\Case_ $node) {
@@ -766,18 +884,19 @@ class Standard extends PrettyPrinterAbstract
     }
 
     protected function pStmt_TryCatch(Stmt\TryCatch $node) {
-        return 'try {' . $this->pStmts($node->stmts) . "\n" . '}'
-             . $this->pImplode($node->catches)
-             . ($node->finally !== null ? $this->p($node->finally) : '');
+        return 'try {' . $this->pStmts($node->stmts) . $this->nl . '}'
+             . ($node->catches ? ' ' . $this->pImplode($node->catches, ' ') : '')
+             . ($node->finally !== null ? ' ' . $this->p($node->finally) : '');
     }
 
     protected function pStmt_Catch(Stmt\Catch_ $node) {
-        return ' catch (' . $this->pImplode($node->types, '|') . ' $' . $node->var . ') {'
-             . $this->pStmts($node->stmts) . "\n" . '}';
+        return 'catch (' . $this->pImplode($node->types, '|')
+             . ($node->var !== null ? ' ' . $this->p($node->var) : '')
+             . ') {' . $this->pStmts($node->stmts) . $this->nl . '}';
     }
 
     protected function pStmt_Finally(Stmt\Finally_ $node) {
-        return ' finally {' . $this->pStmts($node->stmts) . "\n" . '}';
+        return 'finally {' . $this->pStmts($node->stmts) . $this->nl . '}';
     }
 
     protected function pStmt_Break(Stmt\Break_ $node) {
@@ -806,6 +925,10 @@ class Standard extends PrettyPrinterAbstract
 
     // Other
 
+    protected function pStmt_Expression(Stmt\Expression $node) {
+        return $this->p($node->expr) . ';';
+    }
+
     protected function pStmt_Echo(Stmt\Echo_ $node) {
         return 'echo ' . $this->pCommaSeparated($node->exprs) . ';';
     }
@@ -819,7 +942,7 @@ class Standard extends PrettyPrinterAbstract
     }
 
     protected function pStmt_StaticVar(Stmt\StaticVar $node) {
-        return '$' . $node->name
+        return $this->p($node->var)
              . (null !== $node->default ? ' = ' . $this->p($node->default) : '');
     }
 
@@ -829,7 +952,7 @@ class Standard extends PrettyPrinterAbstract
 
     protected function pStmt_InlineHTML(Stmt\InlineHTML $node) {
         $newline = $node->getAttribute('hasLeadingNewline', true) ? "\n" : '';
-        return '?>' . $this->pNoIndent($newline . $node->value) . '<?php ';
+        return '?>' . $newline . $node->value . '<?php ';
     }
 
     protected function pStmt_HaltCompiler(Stmt\HaltCompiler $node) {
@@ -842,16 +965,13 @@ class Standard extends PrettyPrinterAbstract
 
     // Helpers
 
-    protected function pType($node) {
-        return is_string($node) ? $node : $this->p($node);
-    }
-
     protected function pClassCommon(Stmt\Class_ $node, $afterClassToken) {
-        return $this->pModifiers($node->flags)
-        . 'class' . $afterClassToken
-        . (null !== $node->extends ? ' extends ' . $this->p($node->extends) : '')
-        . (!empty($node->implements) ? ' implements ' . $this->pCommaSeparated($node->implements) : '')
-        . "\n" . '{' . $this->pStmts($node->stmts) . "\n" . '}';
+        return $this->pAttrGroups($node->attrGroups, $node->name === null)
+            . $this->pModifiers($node->flags)
+            . 'class' . $afterClassToken
+            . (null !== $node->extends ? ' extends ' . $this->p($node->extends) : '')
+            . (!empty($node->implements) ? ' implements ' . $this->pCommaSeparated($node->implements) : '')
+            . $this->nl . '{' . $this->pStmts($node->stmts) . $this->nl . '}';
     }
 
     protected function pObjectProperty($node) {
@@ -862,15 +982,6 @@ class Standard extends PrettyPrinterAbstract
         }
     }
 
-    protected function pModifiers($modifiers) {
-        return ($modifiers & Stmt\Class_::MODIFIER_PUBLIC    ? 'public '    : '')
-             . ($modifiers & Stmt\Class_::MODIFIER_PROTECTED ? 'protected ' : '')
-             . ($modifiers & Stmt\Class_::MODIFIER_PRIVATE   ? 'private '   : '')
-             . ($modifiers & Stmt\Class_::MODIFIER_STATIC    ? 'static '    : '')
-             . ($modifiers & Stmt\Class_::MODIFIER_ABSTRACT  ? 'abstract '  : '')
-             . ($modifiers & Stmt\Class_::MODIFIER_FINAL     ? 'final '     : '');
-    }
-
     protected function pEncapsList(array $encapsList, $quote) {
         $return = '';
         foreach ($encapsList as $element) {
@@ -884,6 +995,10 @@ class Standard extends PrettyPrinterAbstract
         return $return;
     }
 
+    protected function pSingleQuotedString(string $string) {
+        return '\'' . addcslashes($string, '\'\\') . '\'';
+    }
+
     protected function escapeString($string, $quote) {
         if (null === $quote) {
             // For doc strings, don't escape newlines
@@ -892,14 +1007,27 @@ class Standard extends PrettyPrinterAbstract
             $escaped = addcslashes($string, "\n\r\t\f\v$" . $quote . "\\");
         }
 
-        // Escape other control characters
-        return preg_replace_callback('/([\0-\10\16-\37])(?=([0-7]?))/', function ($matches) {
-            $oct = decoct(ord($matches[1]));
-            if ($matches[2] !== '') {
-                // If there is a trailing digit, use the full three character form
-                return '\\' . str_pad($oct, 3, '0', STR_PAD_LEFT);
-            }
-            return '\\' . $oct;
+        // Escape control characters and non-UTF-8 characters.
+        // Regex based on https://stackoverflow.com/a/11709412/385378.
+        $regex = '/(
+              [\x00-\x08\x0E-\x1F] # Control characters
+            | [\xC0-\xC1] # Invalid UTF-8 Bytes
+            | [\xF5-\xFF] # Invalid UTF-8 Bytes
+            | \xE0(?=[\x80-\x9F]) # Overlong encoding of prior code point
+            | \xF0(?=[\x80-\x8F]) # Overlong encoding of prior code point
+            | [\xC2-\xDF](?![\x80-\xBF]) # Invalid UTF-8 Sequence Start
+            | [\xE0-\xEF](?![\x80-\xBF]{2}) # Invalid UTF-8 Sequence Start
+            | [\xF0-\xF4](?![\x80-\xBF]{3}) # Invalid UTF-8 Sequence Start
+            | (?<=[\x00-\x7F\xF5-\xFF])[\x80-\xBF] # Invalid UTF-8 Sequence Middle
+            | (?<![\xC2-\xDF]|[\xE0-\xEF]|[\xE0-\xEF][\x80-\xBF]|[\xF0-\xF4]|[\xF0-\xF4][\x80-\xBF]|[\xF0-\xF4][\x80-\xBF]{2})[\x80-\xBF] # Overlong Sequence
+            | (?<=[\xE0-\xEF])[\x80-\xBF](?![\x80-\xBF]) # Short 3 byte sequence
+            | (?<=[\xF0-\xF4])[\x80-\xBF](?![\x80-\xBF]{2}) # Short 4 byte sequence
+            | (?<=[\xF0-\xF4][\x80-\xBF])[\x80-\xBF](?![\x80-\xBF]) # Short 4 byte sequence (2)
+        )/x';
+        return preg_replace_callback($regex, function ($matches) {
+            assert(strlen($matches[0]) === 1);
+            $hex = dechex(ord($matches[0]));;
+            return '\\x' . str_pad($hex, 2, '0', \STR_PAD_LEFT);
         }, $escaped);
     }
 
@@ -924,19 +1052,7 @@ class Standard extends PrettyPrinterAbstract
     }
 
     protected function pDereferenceLhs(Node $node) {
-        if ($node instanceof Expr\Variable
-            || $node instanceof Name
-            || $node instanceof Expr\ArrayDimFetch
-            || $node instanceof Expr\PropertyFetch
-            || $node instanceof Expr\StaticPropertyFetch
-            || $node instanceof Expr\FuncCall
-            || $node instanceof Expr\MethodCall
-            || $node instanceof Expr\StaticCall
-            || $node instanceof Expr\Array_
-            || $node instanceof Scalar\String_
-            || $node instanceof Expr\ConstFetch
-            || $node instanceof Expr\ClassConstFetch
-        ) {
+        if (!$this->dereferenceLhsRequiresParens($node)) {
             return $this->p($node);
         } else  {
             return '(' . $this->p($node) . ')';
@@ -944,34 +1060,46 @@ class Standard extends PrettyPrinterAbstract
     }
 
     protected function pCallLhs(Node $node) {
-        if ($node instanceof Name
-            || $node instanceof Expr\Variable
-            || $node instanceof Expr\ArrayDimFetch
-            || $node instanceof Expr\FuncCall
-            || $node instanceof Expr\MethodCall
-            || $node instanceof Expr\StaticCall
-            || $node instanceof Expr\Array_
-        ) {
+        if (!$this->callLhsRequiresParens($node)) {
             return $this->p($node);
         } else  {
             return '(' . $this->p($node) . ')';
         }
     }
 
-    private function hasNodeWithComments(array $nodes) {
+    protected function pNewVariable(Node $node) {
+        // TODO: This is not fully accurate.
+        return $this->pDereferenceLhs($node);
+    }
+
+    /**
+     * @param Node[] $nodes
+     * @return bool
+     */
+    protected function hasNodeWithComments(array $nodes) {
         foreach ($nodes as $node) {
-            if ($node && $node->getAttribute('comments')) {
+            if ($node && $node->getComments()) {
                 return true;
             }
         }
         return false;
     }
 
-    private function pMaybeMultiline(array $nodes, $trailingComma = false) {
+    protected function pMaybeMultiline(array $nodes, bool $trailingComma = false) {
         if (!$this->hasNodeWithComments($nodes)) {
             return $this->pCommaSeparated($nodes);
         } else {
-            return $this->pCommaSeparatedMultiline($nodes, $trailingComma) . "\n";
+            return $this->pCommaSeparatedMultiline($nodes, $trailingComma) . $this->nl;
         }
     }
+
+    protected function pAttrGroups(array $nodes, bool $inline = false): string {
+        $result = '';
+        $sep = $inline ? ' ' : $this->nl;
+        foreach ($nodes as $node) {
+            $result .= $this->p($node) . $sep;
+        }
+
+        return $result;
+    }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php b/lib/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php
index 24bae5936..2c7fc3070 100644
--- a/lib/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php
+++ b/lib/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php
@@ -1,84 +1,140 @@
-<?php
+<?php declare(strict_types=1);
 
 namespace PhpParser;
 
+use PhpParser\Internal\DiffElem;
+use PhpParser\Internal\PrintableNewAnonClassNode;
+use PhpParser\Internal\TokenStream;
 use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\AssignOp;
+use PhpParser\Node\Expr\BinaryOp;
+use PhpParser\Node\Expr\Cast;
+use PhpParser\Node\Scalar;
 use PhpParser\Node\Stmt;
 
 abstract class PrettyPrinterAbstract
 {
-    protected $precedenceMap = array(
-        // [precedence, associativity] where for the latter -1 is %left, 0 is %nonassoc and 1 is %right
-        'Expr_BinaryOp_Pow'            => array(  0,  1),
-        'Expr_BitwiseNot'              => array( 10,  1),
-        'Expr_PreInc'                  => array( 10,  1),
-        'Expr_PreDec'                  => array( 10,  1),
-        'Expr_PostInc'                 => array( 10, -1),
-        'Expr_PostDec'                 => array( 10, -1),
-        'Expr_UnaryPlus'               => array( 10,  1),
-        'Expr_UnaryMinus'              => array( 10,  1),
-        'Expr_Cast_Int'                => array( 10,  1),
-        'Expr_Cast_Double'             => array( 10,  1),
-        'Expr_Cast_String'             => array( 10,  1),
-        'Expr_Cast_Array'              => array( 10,  1),
-        'Expr_Cast_Object'             => array( 10,  1),
-        'Expr_Cast_Bool'               => array( 10,  1),
-        'Expr_Cast_Unset'              => array( 10,  1),
-        'Expr_ErrorSuppress'           => array( 10,  1),
-        'Expr_Instanceof'              => array( 20,  0),
-        'Expr_BooleanNot'              => array( 30,  1),
-        'Expr_BinaryOp_Mul'            => array( 40, -1),
-        'Expr_BinaryOp_Div'            => array( 40, -1),
-        'Expr_BinaryOp_Mod'            => array( 40, -1),
-        'Expr_BinaryOp_Plus'           => array( 50, -1),
-        'Expr_BinaryOp_Minus'          => array( 50, -1),
-        'Expr_BinaryOp_Concat'         => array( 50, -1),
-        'Expr_BinaryOp_ShiftLeft'      => array( 60, -1),
-        'Expr_BinaryOp_ShiftRight'     => array( 60, -1),
-        'Expr_BinaryOp_Smaller'        => array( 70,  0),
-        'Expr_BinaryOp_SmallerOrEqual' => array( 70,  0),
-        'Expr_BinaryOp_Greater'        => array( 70,  0),
-        'Expr_BinaryOp_GreaterOrEqual' => array( 70,  0),
-        'Expr_BinaryOp_Equal'          => array( 80,  0),
-        'Expr_BinaryOp_NotEqual'       => array( 80,  0),
-        'Expr_BinaryOp_Identical'      => array( 80,  0),
-        'Expr_BinaryOp_NotIdentical'   => array( 80,  0),
-        'Expr_BinaryOp_Spaceship'      => array( 80,  0),
-        'Expr_BinaryOp_BitwiseAnd'     => array( 90, -1),
-        'Expr_BinaryOp_BitwiseXor'     => array(100, -1),
-        'Expr_BinaryOp_BitwiseOr'      => array(110, -1),
-        'Expr_BinaryOp_BooleanAnd'     => array(120, -1),
-        'Expr_BinaryOp_BooleanOr'      => array(130, -1),
-        'Expr_BinaryOp_Coalesce'       => array(140,  1),
-        'Expr_Ternary'                 => array(150, -1),
-        // parser uses %left for assignments, but they really behave as %right
-        'Expr_Assign'                  => array(160,  1),
-        'Expr_AssignRef'               => array(160,  1),
-        'Expr_AssignOp_Plus'           => array(160,  1),
-        'Expr_AssignOp_Minus'          => array(160,  1),
-        'Expr_AssignOp_Mul'            => array(160,  1),
-        'Expr_AssignOp_Div'            => array(160,  1),
-        'Expr_AssignOp_Concat'         => array(160,  1),
-        'Expr_AssignOp_Mod'            => array(160,  1),
-        'Expr_AssignOp_BitwiseAnd'     => array(160,  1),
-        'Expr_AssignOp_BitwiseOr'      => array(160,  1),
-        'Expr_AssignOp_BitwiseXor'     => array(160,  1),
-        'Expr_AssignOp_ShiftLeft'      => array(160,  1),
-        'Expr_AssignOp_ShiftRight'     => array(160,  1),
-        'Expr_AssignOp_Pow'            => array(160,  1),
-        'Expr_YieldFrom'               => array(165,  1),
-        'Expr_Print'                   => array(168,  1),
-        'Expr_BinaryOp_LogicalAnd'     => array(170, -1),
-        'Expr_BinaryOp_LogicalXor'     => array(180, -1),
-        'Expr_BinaryOp_LogicalOr'      => array(190, -1),
-        'Expr_Include'                 => array(200, -1),
-    );
+    const FIXUP_PREC_LEFT       = 0; // LHS operand affected by precedence
+    const FIXUP_PREC_RIGHT      = 1; // RHS operand affected by precedence
+    const FIXUP_CALL_LHS        = 2; // LHS of call
+    const FIXUP_DEREF_LHS       = 3; // LHS of dereferencing operation
+    const FIXUP_BRACED_NAME     = 4; // Name operand that may require bracing
+    const FIXUP_VAR_BRACED_NAME = 5; // Name operand that may require ${} bracing
+    const FIXUP_ENCAPSED        = 6; // Encapsed string part
 
-    protected $noIndentToken;
+    protected $precedenceMap = [
+        // [precedence, associativity]
+        // where for precedence -1 is %left, 0 is %nonassoc and 1 is %right
+        BinaryOp\Pow::class            => [  0,  1],
+        Expr\BitwiseNot::class         => [ 10,  1],
+        Expr\PreInc::class             => [ 10,  1],
+        Expr\PreDec::class             => [ 10,  1],
+        Expr\PostInc::class            => [ 10, -1],
+        Expr\PostDec::class            => [ 10, -1],
+        Expr\UnaryPlus::class          => [ 10,  1],
+        Expr\UnaryMinus::class         => [ 10,  1],
+        Cast\Int_::class               => [ 10,  1],
+        Cast\Double::class             => [ 10,  1],
+        Cast\String_::class            => [ 10,  1],
+        Cast\Array_::class             => [ 10,  1],
+        Cast\Object_::class            => [ 10,  1],
+        Cast\Bool_::class              => [ 10,  1],
+        Cast\Unset_::class             => [ 10,  1],
+        Expr\ErrorSuppress::class      => [ 10,  1],
+        Expr\Instanceof_::class        => [ 20,  0],
+        Expr\BooleanNot::class         => [ 30,  1],
+        BinaryOp\Mul::class            => [ 40, -1],
+        BinaryOp\Div::class            => [ 40, -1],
+        BinaryOp\Mod::class            => [ 40, -1],
+        BinaryOp\Plus::class           => [ 50, -1],
+        BinaryOp\Minus::class          => [ 50, -1],
+        BinaryOp\Concat::class         => [ 50, -1],
+        BinaryOp\ShiftLeft::class      => [ 60, -1],
+        BinaryOp\ShiftRight::class     => [ 60, -1],
+        BinaryOp\Smaller::class        => [ 70,  0],
+        BinaryOp\SmallerOrEqual::class => [ 70,  0],
+        BinaryOp\Greater::class        => [ 70,  0],
+        BinaryOp\GreaterOrEqual::class => [ 70,  0],
+        BinaryOp\Equal::class          => [ 80,  0],
+        BinaryOp\NotEqual::class       => [ 80,  0],
+        BinaryOp\Identical::class      => [ 80,  0],
+        BinaryOp\NotIdentical::class   => [ 80,  0],
+        BinaryOp\Spaceship::class      => [ 80,  0],
+        BinaryOp\BitwiseAnd::class     => [ 90, -1],
+        BinaryOp\BitwiseXor::class     => [100, -1],
+        BinaryOp\BitwiseOr::class      => [110, -1],
+        BinaryOp\BooleanAnd::class     => [120, -1],
+        BinaryOp\BooleanOr::class      => [130, -1],
+        BinaryOp\Coalesce::class       => [140,  1],
+        Expr\Ternary::class            => [150,  0],
+        // parser uses %left for assignments, but they really behave as %right
+        Expr\Assign::class             => [160,  1],
+        Expr\AssignRef::class          => [160,  1],
+        AssignOp\Plus::class           => [160,  1],
+        AssignOp\Minus::class          => [160,  1],
+        AssignOp\Mul::class            => [160,  1],
+        AssignOp\Div::class            => [160,  1],
+        AssignOp\Concat::class         => [160,  1],
+        AssignOp\Mod::class            => [160,  1],
+        AssignOp\BitwiseAnd::class     => [160,  1],
+        AssignOp\BitwiseOr::class      => [160,  1],
+        AssignOp\BitwiseXor::class     => [160,  1],
+        AssignOp\ShiftLeft::class      => [160,  1],
+        AssignOp\ShiftRight::class     => [160,  1],
+        AssignOp\Pow::class            => [160,  1],
+        AssignOp\Coalesce::class       => [160,  1],
+        Expr\YieldFrom::class          => [165,  1],
+        Expr\Print_::class             => [168,  1],
+        BinaryOp\LogicalAnd::class     => [170, -1],
+        BinaryOp\LogicalXor::class     => [180, -1],
+        BinaryOp\LogicalOr::class      => [190, -1],
+        Expr\Include_::class           => [200, -1],
+    ];
+
+    /** @var int Current indentation level. */
+    protected $indentLevel;
+    /** @var string Newline including current indentation. */
+    protected $nl;
+    /** @var string Token placed at end of doc string to ensure it is followed by a newline. */
     protected $docStringEndToken;
+    /** @var bool Whether semicolon namespaces can be used (i.e. no global namespace is used) */
     protected $canUseSemicolonNamespaces;
+    /** @var array Pretty printer options */
     protected $options;
 
+    /** @var TokenStream Original tokens for use in format-preserving pretty print */
+    protected $origTokens;
+    /** @var Internal\Differ Differ for node lists */
+    protected $nodeListDiffer;
+    /** @var bool[] Map determining whether a certain character is a label character */
+    protected $labelCharMap;
+    /**
+     * @var int[][] Map from token classes and subnode names to FIXUP_* constants. This is used
+     *              during format-preserving prints to place additional parens/braces if necessary.
+     */
+    protected $fixupMap;
+    /**
+     * @var int[][] Map from "{$node->getType()}->{$subNode}" to ['left' => $l, 'right' => $r],
+     *              where $l and $r specify the token type that needs to be stripped when removing
+     *              this node.
+     */
+    protected $removalMap;
+    /**
+     * @var mixed[] Map from "{$node->getType()}->{$subNode}" to [$find, $beforeToken, $extraLeft, $extraRight].
+     *              $find is an optional token after which the insertion occurs. $extraLeft/Right
+     *              are optionally added before/after the main insertions.
+     */
+    protected $insertionMap;
+    /**
+     * @var string[] Map From "{$node->getType()}->{$subNode}" to string that should be inserted
+     *               between elements of this list subnode.
+     */
+    protected $listInsertionMap;
+    protected $emptyListInsertionMap;
+    /** @var int[] Map from "{$node->getType()}->{$subNode}" to token before which the modifiers
+     *             should be reprinted. */
+    protected $modifierChangeMap;
+
     /**
      * Creates a pretty printer instance using the given options.
      *
@@ -89,13 +145,48 @@ abstract class PrettyPrinterAbstract
      * @param array $options Dictionary of formatting options
      */
     public function __construct(array $options = []) {
-        $this->noIndentToken = '_NO_INDENT_' . mt_rand();
         $this->docStringEndToken = '_DOC_STRING_END_' . mt_rand();
 
         $defaultOptions = ['shortArraySyntax' => false];
         $this->options = $options + $defaultOptions;
     }
 
+    /**
+     * Reset pretty printing state.
+     */
+    protected function resetState() {
+        $this->indentLevel = 0;
+        $this->nl = "\n";
+        $this->origTokens = null;
+    }
+
+    /**
+     * Set indentation level
+     *
+     * @param int $level Level in number of spaces
+     */
+    protected function setIndentLevel(int $level) {
+        $this->indentLevel = $level;
+        $this->nl = "\n" . \str_repeat(' ', $level);
+    }
+
+    /**
+     * Increase indentation level.
+     */
+    protected function indent() {
+        $this->indentLevel += 4;
+        $this->nl .= '    ';
+    }
+
+    /**
+     * Decrease indentation level.
+     */
+    protected function outdent() {
+        assert($this->indentLevel >= 4);
+        $this->indentLevel -= 4;
+        $this->nl = "\n" . str_repeat(' ', $this->indentLevel);
+    }
+
     /**
      * Pretty prints an array of statements.
      *
@@ -103,7 +194,8 @@ abstract class PrettyPrinterAbstract
      *
      * @return string Pretty printed statements
      */
-    public function prettyPrint(array $stmts) {
+    public function prettyPrint(array $stmts) : string {
+        $this->resetState();
         $this->preprocessNodes($stmts);
 
         return ltrim($this->handleMagicTokens($this->pStmts($stmts, false)));
@@ -116,7 +208,8 @@ abstract class PrettyPrinterAbstract
      *
      * @return string Pretty printed node
      */
-    public function prettyPrintExpr(Expr $node) {
+    public function prettyPrintExpr(Expr $node) : string {
+        $this->resetState();
         return $this->handleMagicTokens($this->p($node));
     }
 
@@ -127,7 +220,7 @@ abstract class PrettyPrinterAbstract
      *
      * @return string Pretty printed statements
      */
-    public function prettyPrintFile(array $stmts) {
+    public function prettyPrintFile(array $stmts) : string {
         if (!$stmts) {
             return "<?php\n\n";
         }
@@ -155,14 +248,18 @@ abstract class PrettyPrinterAbstract
         foreach ($nodes as $node) {
             if ($node instanceof Stmt\Namespace_ && null === $node->name) {
                 $this->canUseSemicolonNamespaces = false;
+                break;
             }
         }
     }
 
-    protected function handleMagicTokens($str) {
-        // Drop no-indent tokens
-        $str = str_replace($this->noIndentToken, '', $str);
-
+    /**
+     * Handles (and removes) no-indent and doc-string-end tokens.
+     *
+     * @param string $str
+     * @return string
+     */
+    protected function handleMagicTokens(string $str) : string {
         // Replace doc-string-end tokens with nothing or a newline
         $str = str_replace($this->docStringEndToken . ";\n", ";\n", $str);
         $str = str_replace($this->docStringEndToken, "\n", $str);
@@ -178,53 +275,74 @@ abstract class PrettyPrinterAbstract
      *
      * @return string Pretty printed statements
      */
-    protected function pStmts(array $nodes, $indent = true) {
+    protected function pStmts(array $nodes, bool $indent = true) : string {
+        if ($indent) {
+            $this->indent();
+        }
+
         $result = '';
         foreach ($nodes as $node) {
-            $comments = $node->getAttribute('comments', array());
+            $comments = $node->getComments();
             if ($comments) {
-                $result .= "\n" . $this->pComments($comments);
+                $result .= $this->nl . $this->pComments($comments);
                 if ($node instanceof Stmt\Nop) {
                     continue;
                 }
             }
 
-            $result .= "\n" . $this->p($node) . ($node instanceof Expr ? ';' : '');
+            $result .= $this->nl . $this->p($node);
         }
 
         if ($indent) {
-            return preg_replace('~\n(?!$|' . $this->noIndentToken . ')~', "\n    ", $result);
-        } else {
-            return $result;
+            $this->outdent();
         }
+
+        return $result;
     }
 
     /**
-     * Pretty prints a node.
+     * Pretty-print an infix operation while taking precedence into account.
      *
-     * @param Node $node Node to be pretty printed
+     * @param string $class          Node class of operator
+     * @param Node   $leftNode       Left-hand side node
+     * @param string $operatorString String representation of the operator
+     * @param Node   $rightNode      Right-hand side node
      *
-     * @return string Pretty printed node
+     * @return string Pretty printed infix operation
      */
-    protected function p(Node $node) {
-        return $this->{'p' . $node->getType()}($node);
-    }
-
-    protected function pInfixOp($type, Node $leftNode, $operatorString, Node $rightNode) {
-        list($precedence, $associativity) = $this->precedenceMap[$type];
+    protected function pInfixOp(string $class, Node $leftNode, string $operatorString, Node $rightNode) : string {
+        list($precedence, $associativity) = $this->precedenceMap[$class];
 
         return $this->pPrec($leftNode, $precedence, $associativity, -1)
              . $operatorString
              . $this->pPrec($rightNode, $precedence, $associativity, 1);
     }
 
-    protected function pPrefixOp($type, $operatorString, Node $node) {
-        list($precedence, $associativity) = $this->precedenceMap[$type];
+    /**
+     * Pretty-print a prefix operation while taking precedence into account.
+     *
+     * @param string $class          Node class of operator
+     * @param string $operatorString String representation of the operator
+     * @param Node   $node           Node
+     *
+     * @return string Pretty printed prefix operation
+     */
+    protected function pPrefixOp(string $class, string $operatorString, Node $node) : string {
+        list($precedence, $associativity) = $this->precedenceMap[$class];
         return $operatorString . $this->pPrec($node, $precedence, $associativity, 1);
     }
 
-    protected function pPostfixOp($type, Node $node, $operatorString) {
-        list($precedence, $associativity) = $this->precedenceMap[$type];
+    /**
+     * Pretty-print a postfix operation while taking precedence into account.
+     *
+     * @param string $class          Node class of operator
+     * @param string $operatorString String representation of the operator
+     * @param Node   $node           Node
+     *
+     * @return string Pretty printed postfix operation
+     */
+    protected function pPostfixOp(string $class, Node $node, string $operatorString) : string {
+        list($precedence, $associativity) = $this->precedenceMap[$class];
         return $this->pPrec($node, $precedence, $associativity, -1) . $operatorString;
     }
 
@@ -240,12 +358,12 @@ abstract class PrettyPrinterAbstract
      *
      * @return string The pretty printed node
      */
-    protected function pPrec(Node $node, $parentPrecedence, $parentAssociativity, $childPosition) {
-        $type = $node->getType();
-        if (isset($this->precedenceMap[$type])) {
-            $childPrecedence = $this->precedenceMap[$type][0];
+    protected function pPrec(Node $node, int $parentPrecedence, int $parentAssociativity, int $childPosition) : string {
+        $class = \get_class($node);
+        if (isset($this->precedenceMap[$class])) {
+            $childPrecedence = $this->precedenceMap[$class][0];
             if ($childPrecedence > $parentPrecedence
-                || ($parentPrecedence == $childPrecedence && $parentAssociativity != $childPosition)
+                || ($parentPrecedence === $childPrecedence && $parentAssociativity !== $childPosition)
             ) {
                 return '(' . $this->p($node) . ')';
             }
@@ -262,8 +380,8 @@ abstract class PrettyPrinterAbstract
      *
      * @return string Imploded pretty printed nodes
      */
-    protected function pImplode(array $nodes, $glue = '') {
-        $pNodes = array();
+    protected function pImplode(array $nodes, string $glue = '') : string {
+        $pNodes = [];
         foreach ($nodes as $node) {
             if (null === $node) {
                 $pNodes[] = '';
@@ -282,7 +400,7 @@ abstract class PrettyPrinterAbstract
      *
      * @return string Comma separated pretty printed nodes
      */
-    protected function pCommaSeparated(array $nodes) {
+    protected function pCommaSeparated(array $nodes) : string {
         return $this->pImplode($nodes, ', ');
     }
 
@@ -296,37 +414,29 @@ abstract class PrettyPrinterAbstract
      *
      * @return string Comma separated pretty printed nodes in multiline style
      */
-    protected function pCommaSeparatedMultiline(array $nodes, $trailingComma) {
+    protected function pCommaSeparatedMultiline(array $nodes, bool $trailingComma) : string {
+        $this->indent();
+
         $result = '';
         $lastIdx = count($nodes) - 1;
         foreach ($nodes as $idx => $node) {
             if ($node !== null) {
-                $comments = $node->getAttribute('comments', array());
+                $comments = $node->getComments();
                 if ($comments) {
-                    $result .= "\n" . $this->pComments($comments);
+                    $result .= $this->nl . $this->pComments($comments);
                 }
 
-                $result .= "\n" . $this->p($node);
+                $result .= $this->nl . $this->p($node);
             } else {
-                $result .= "\n";
+                $result .= $this->nl;
             }
             if ($trailingComma || $idx !== $lastIdx) {
                 $result .= ',';
             }
         }
 
-        return preg_replace('~\n(?!$|' . $this->noIndentToken . ')~', "\n    ", $result);
-    }
-
-    /**
-     * Signals the pretty printer that a string shall not be indented.
-     *
-     * @param string $string Not to be indented string
-     *
-     * @return string String marked with $this->noIndentToken's.
-     */
-    protected function pNoIndent($string) {
-        return str_replace("\n", "\n" . $this->noIndentToken, $string);
+        $this->outdent();
+        return $result;
     }
 
     /**
@@ -336,13 +446,1061 @@ abstract class PrettyPrinterAbstract
      *
      * @return string Reformatted text of comments
      */
-    protected function pComments(array $comments) {
+    protected function pComments(array $comments) : string {
         $formattedComments = [];
 
         foreach ($comments as $comment) {
-            $formattedComments[] = $comment->getReformattedText();
+            $formattedComments[] = str_replace("\n", $this->nl, $comment->getReformattedText());
         }
 
-        return implode("\n", $formattedComments);
+        return implode($this->nl, $formattedComments);
+    }
+
+    /**
+     * Perform a format-preserving pretty print of an AST.
+     *
+     * The format preservation is best effort. For some changes to the AST the formatting will not
+     * be preserved (at least not locally).
+     *
+     * In order to use this method a number of prerequisites must be satisfied:
+     *  * The startTokenPos and endTokenPos attributes in the lexer must be enabled.
+     *  * The CloningVisitor must be run on the AST prior to modification.
+     *  * The original tokens must be provided, using the getTokens() method on the lexer.
+     *
+     * @param Node[] $stmts      Modified AST with links to original AST
+     * @param Node[] $origStmts  Original AST with token offset information
+     * @param array  $origTokens Tokens of the original code
+     *
+     * @return string
+     */
+    public function printFormatPreserving(array $stmts, array $origStmts, array $origTokens) : string {
+        $this->initializeNodeListDiffer();
+        $this->initializeLabelCharMap();
+        $this->initializeFixupMap();
+        $this->initializeRemovalMap();
+        $this->initializeInsertionMap();
+        $this->initializeListInsertionMap();
+        $this->initializeEmptyListInsertionMap();
+        $this->initializeModifierChangeMap();
+
+        $this->resetState();
+        $this->origTokens = new TokenStream($origTokens);
+
+        $this->preprocessNodes($stmts);
+
+        $pos = 0;
+        $result = $this->pArray($stmts, $origStmts, $pos, 0, 'File', 'stmts', null);
+        if (null !== $result) {
+            $result .= $this->origTokens->getTokenCode($pos, count($origTokens), 0);
+        } else {
+            // Fallback
+            // TODO Add <?php properly
+            $result = "<?php\n" . $this->pStmts($stmts, false);
+        }
+
+        return ltrim($this->handleMagicTokens($result));
+    }
+
+    protected function pFallback(Node $node) {
+        return $this->{'p' . $node->getType()}($node);
+    }
+
+    /**
+     * Pretty prints a node.
+     *
+     * This method also handles formatting preservation for nodes.
+     *
+     * @param Node $node Node to be pretty printed
+     * @param bool $parentFormatPreserved Whether parent node has preserved formatting
+     *
+     * @return string Pretty printed node
+     */
+    protected function p(Node $node, $parentFormatPreserved = false) : string {
+        // No orig tokens means this is a normal pretty print without preservation of formatting
+        if (!$this->origTokens) {
+            return $this->{'p' . $node->getType()}($node);
+        }
+
+        /** @var Node $origNode */
+        $origNode = $node->getAttribute('origNode');
+        if (null === $origNode) {
+            return $this->pFallback($node);
+        }
+
+        $class = \get_class($node);
+        \assert($class === \get_class($origNode));
+
+        $startPos = $origNode->getStartTokenPos();
+        $endPos = $origNode->getEndTokenPos();
+        \assert($startPos >= 0 && $endPos >= 0);
+
+        $fallbackNode = $node;
+        if ($node instanceof Expr\New_ && $node->class instanceof Stmt\Class_) {
+            // Normalize node structure of anonymous classes
+            $node = PrintableNewAnonClassNode::fromNewNode($node);
+            $origNode = PrintableNewAnonClassNode::fromNewNode($origNode);
+        }
+
+        // InlineHTML node does not contain closing and opening PHP tags. If the parent formatting
+        // is not preserved, then we need to use the fallback code to make sure the tags are
+        // printed.
+        if ($node instanceof Stmt\InlineHTML && !$parentFormatPreserved) {
+            return $this->pFallback($fallbackNode);
+        }
+
+        $indentAdjustment = $this->indentLevel - $this->origTokens->getIndentationBefore($startPos);
+
+        $type = $node->getType();
+        $fixupInfo = $this->fixupMap[$class] ?? null;
+
+        $result = '';
+        $pos = $startPos;
+        foreach ($node->getSubNodeNames() as $subNodeName) {
+            $subNode = $node->$subNodeName;
+            $origSubNode = $origNode->$subNodeName;
+
+            if ((!$subNode instanceof Node && $subNode !== null)
+                || (!$origSubNode instanceof Node && $origSubNode !== null)
+            ) {
+                if ($subNode === $origSubNode) {
+                    // Unchanged, can reuse old code
+                    continue;
+                }
+
+                if (is_array($subNode) && is_array($origSubNode)) {
+                    // Array subnode changed, we might be able to reconstruct it
+                    $listResult = $this->pArray(
+                        $subNode, $origSubNode, $pos, $indentAdjustment, $type, $subNodeName,
+                        $fixupInfo[$subNodeName] ?? null
+                    );
+                    if (null === $listResult) {
+                        return $this->pFallback($fallbackNode);
+                    }
+
+                    $result .= $listResult;
+                    continue;
+                }
+
+                if (is_int($subNode) && is_int($origSubNode)) {
+                    // Check if this is a modifier change
+                    $key = $type . '->' . $subNodeName;
+                    if (!isset($this->modifierChangeMap[$key])) {
+                        return $this->pFallback($fallbackNode);
+                    }
+
+                    $findToken = $this->modifierChangeMap[$key];
+                    $result .= $this->pModifiers($subNode);
+                    $pos = $this->origTokens->findRight($pos, $findToken);
+                    continue;
+                }
+
+                // If a non-node, non-array subnode changed, we don't be able to do a partial
+                // reconstructions, as we don't have enough offset information. Pretty print the
+                // whole node instead.
+                return $this->pFallback($fallbackNode);
+            }
+
+            $extraLeft = '';
+            $extraRight = '';
+            if ($origSubNode !== null) {
+                $subStartPos = $origSubNode->getStartTokenPos();
+                $subEndPos = $origSubNode->getEndTokenPos();
+                \assert($subStartPos >= 0 && $subEndPos >= 0);
+            } else {
+                if ($subNode === null) {
+                    // Both null, nothing to do
+                    continue;
+                }
+
+                // A node has been inserted, check if we have insertion information for it
+                $key = $type . '->' . $subNodeName;
+                if (!isset($this->insertionMap[$key])) {
+                    return $this->pFallback($fallbackNode);
+                }
+
+                list($findToken, $beforeToken, $extraLeft, $extraRight) = $this->insertionMap[$key];
+                if (null !== $findToken) {
+                    $subStartPos = $this->origTokens->findRight($pos, $findToken)
+                        + (int) !$beforeToken;
+                } else {
+                    $subStartPos = $pos;
+                }
+
+                if (null === $extraLeft && null !== $extraRight) {
+                    // If inserting on the right only, skipping whitespace looks better
+                    $subStartPos = $this->origTokens->skipRightWhitespace($subStartPos);
+                }
+                $subEndPos = $subStartPos - 1;
+            }
+
+            if (null === $subNode) {
+                // A node has been removed, check if we have removal information for it
+                $key = $type . '->' . $subNodeName;
+                if (!isset($this->removalMap[$key])) {
+                    return $this->pFallback($fallbackNode);
+                }
+
+                // Adjust positions to account for additional tokens that must be skipped
+                $removalInfo = $this->removalMap[$key];
+                if (isset($removalInfo['left'])) {
+                    $subStartPos = $this->origTokens->skipLeft($subStartPos - 1, $removalInfo['left']) + 1;
+                }
+                if (isset($removalInfo['right'])) {
+                    $subEndPos = $this->origTokens->skipRight($subEndPos + 1, $removalInfo['right']) - 1;
+                }
+            }
+
+            $result .= $this->origTokens->getTokenCode($pos, $subStartPos, $indentAdjustment);
+
+            if (null !== $subNode) {
+                $result .= $extraLeft;
+
+                $origIndentLevel = $this->indentLevel;
+                $this->setIndentLevel($this->origTokens->getIndentationBefore($subStartPos) + $indentAdjustment);
+
+                // If it's the same node that was previously in this position, it certainly doesn't
+                // need fixup. It's important to check this here, because our fixup checks are more
+                // conservative than strictly necessary.
+                if (isset($fixupInfo[$subNodeName])
+                    && $subNode->getAttribute('origNode') !== $origSubNode
+                ) {
+                    $fixup = $fixupInfo[$subNodeName];
+                    $res = $this->pFixup($fixup, $subNode, $class, $subStartPos, $subEndPos);
+                } else {
+                    $res = $this->p($subNode, true);
+                }
+
+                $this->safeAppend($result, $res);
+                $this->setIndentLevel($origIndentLevel);
+
+                $result .= $extraRight;
+            }
+
+            $pos = $subEndPos + 1;
+        }
+
+        $result .= $this->origTokens->getTokenCode($pos, $endPos + 1, $indentAdjustment);
+        return $result;
+    }
+
+    /**
+     * Perform a format-preserving pretty print of an array.
+     *
+     * @param array       $nodes            New nodes
+     * @param array       $origNodes        Original nodes
+     * @param int         $pos              Current token position (updated by reference)
+     * @param int         $indentAdjustment Adjustment for indentation
+     * @param string      $parentNodeType   Type of the containing node.
+     * @param string      $subNodeName      Name of array subnode.
+     * @param null|int    $fixup            Fixup information for array item nodes
+     *
+     * @return null|string Result of pretty print or null if cannot preserve formatting
+     */
+    protected function pArray(
+        array $nodes, array $origNodes, int &$pos, int $indentAdjustment,
+        string $parentNodeType, string $subNodeName, $fixup
+    ) {
+        $diff = $this->nodeListDiffer->diffWithReplacements($origNodes, $nodes);
+
+        $mapKey = $parentNodeType . '->' . $subNodeName;
+        $insertStr = $this->listInsertionMap[$mapKey] ?? null;
+        $isStmtList = $subNodeName === 'stmts';
+
+        $beforeFirstKeepOrReplace = true;
+        $skipRemovedNode = false;
+        $delayedAdd = [];
+        $lastElemIndentLevel = $this->indentLevel;
+
+        $insertNewline = false;
+        if ($insertStr === "\n") {
+            $insertStr = '';
+            $insertNewline = true;
+        }
+
+        if ($isStmtList && \count($origNodes) === 1 && \count($nodes) !== 1) {
+            $startPos = $origNodes[0]->getStartTokenPos();
+            $endPos = $origNodes[0]->getEndTokenPos();
+            \assert($startPos >= 0 && $endPos >= 0);
+            if (!$this->origTokens->haveBraces($startPos, $endPos)) {
+                // This was a single statement without braces, but either additional statements
+                // have been added, or the single statement has been removed. This requires the
+                // addition of braces. For now fall back.
+                // TODO: Try to preserve formatting
+                return null;
+            }
+        }
+
+        $result = '';
+        foreach ($diff as $i => $diffElem) {
+            $diffType = $diffElem->type;
+            /** @var Node|null $arrItem */
+            $arrItem = $diffElem->new;
+            /** @var Node|null $origArrItem */
+            $origArrItem = $diffElem->old;
+
+            if ($diffType === DiffElem::TYPE_KEEP || $diffType === DiffElem::TYPE_REPLACE) {
+                $beforeFirstKeepOrReplace = false;
+
+                if ($origArrItem === null || $arrItem === null) {
+                    // We can only handle the case where both are null
+                    if ($origArrItem === $arrItem) {
+                        continue;
+                    }
+                    return null;
+                }
+
+                if (!$arrItem instanceof Node || !$origArrItem instanceof Node) {
+                    // We can only deal with nodes. This can occur for Names, which use string arrays.
+                    return null;
+                }
+
+                $itemStartPos = $origArrItem->getStartTokenPos();
+                $itemEndPos = $origArrItem->getEndTokenPos();
+                \assert($itemStartPos >= 0 && $itemEndPos >= 0 && $itemStartPos >= $pos);
+
+                $origIndentLevel = $this->indentLevel;
+                $lastElemIndentLevel = $this->origTokens->getIndentationBefore($itemStartPos) + $indentAdjustment;
+                $this->setIndentLevel($lastElemIndentLevel);
+
+                $comments = $arrItem->getComments();
+                $origComments = $origArrItem->getComments();
+                $commentStartPos = $origComments ? $origComments[0]->getStartTokenPos() : $itemStartPos;
+                \assert($commentStartPos >= 0);
+
+                if ($commentStartPos < $pos) {
+                    // Comments may be assigned to multiple nodes if they start at the same position.
+                    // Make sure we don't try to print them multiple times.
+                    $commentStartPos = $itemStartPos;
+                }
+
+                if ($skipRemovedNode) {
+                    if ($isStmtList && $this->origTokens->haveBracesInRange($pos, $itemStartPos)) {
+                        // We'd remove the brace of a code block.
+                        // TODO: Preserve formatting.
+                        $this->setIndentLevel($origIndentLevel);
+                        return null;
+                    }
+                } else {
+                    $result .= $this->origTokens->getTokenCode(
+                        $pos, $commentStartPos, $indentAdjustment);
+                }
+
+                if (!empty($delayedAdd)) {
+                    /** @var Node $delayedAddNode */
+                    foreach ($delayedAdd as $delayedAddNode) {
+                        if ($insertNewline) {
+                            $delayedAddComments = $delayedAddNode->getComments();
+                            if ($delayedAddComments) {
+                                $result .= $this->pComments($delayedAddComments) . $this->nl;
+                            }
+                        }
+
+                        $this->safeAppend($result, $this->p($delayedAddNode, true));
+
+                        if ($insertNewline) {
+                            $result .= $insertStr . $this->nl;
+                        } else {
+                            $result .= $insertStr;
+                        }
+                    }
+
+                    $delayedAdd = [];
+                }
+
+                if ($comments !== $origComments) {
+                    if ($comments) {
+                        $result .= $this->pComments($comments) . $this->nl;
+                    }
+                } else {
+                    $result .= $this->origTokens->getTokenCode(
+                        $commentStartPos, $itemStartPos, $indentAdjustment);
+                }
+
+                // If we had to remove anything, we have done so now.
+                $skipRemovedNode = false;
+            } elseif ($diffType === DiffElem::TYPE_ADD) {
+                if (null === $insertStr) {
+                    // We don't have insertion information for this list type
+                    return null;
+                }
+
+                // We go multiline if the original code was multiline,
+                // or if it's an array item with a comment above it.
+                if ($insertStr === ', ' &&
+                    ($this->isMultiline($origNodes) || $arrItem->getComments())
+                ) {
+                    $insertStr = ',';
+                    $insertNewline = true;
+                }
+
+                if ($beforeFirstKeepOrReplace) {
+                    // Will be inserted at the next "replace" or "keep" element
+                    $delayedAdd[] = $arrItem;
+                    continue;
+                }
+
+                $itemStartPos = $pos;
+                $itemEndPos = $pos - 1;
+
+                $origIndentLevel = $this->indentLevel;
+                $this->setIndentLevel($lastElemIndentLevel);
+
+                if ($insertNewline) {
+                    $result .= $insertStr . $this->nl;
+                    $comments = $arrItem->getComments();
+                    if ($comments) {
+                        $result .= $this->pComments($comments) . $this->nl;
+                    }
+                } else {
+                    $result .= $insertStr;
+                }
+            } elseif ($diffType === DiffElem::TYPE_REMOVE) {
+                if (!$origArrItem instanceof Node) {
+                    // We only support removal for nodes
+                    return null;
+                }
+
+                $itemStartPos = $origArrItem->getStartTokenPos();
+                $itemEndPos = $origArrItem->getEndTokenPos();
+                \assert($itemStartPos >= 0 && $itemEndPos >= 0);
+
+                // Consider comments part of the node.
+                $origComments = $origArrItem->getComments();
+                if ($origComments) {
+                    $itemStartPos = $origComments[0]->getStartTokenPos();
+                }
+
+                if ($i === 0) {
+                    // If we're removing from the start, keep the tokens before the node and drop those after it,
+                    // instead of the other way around.
+                    $result .= $this->origTokens->getTokenCode(
+                        $pos, $itemStartPos, $indentAdjustment);
+                    $skipRemovedNode = true;
+                } else {
+                    if ($isStmtList && $this->origTokens->haveBracesInRange($pos, $itemStartPos)) {
+                        // We'd remove the brace of a code block.
+                        // TODO: Preserve formatting.
+                        return null;
+                    }
+                }
+
+                $pos = $itemEndPos + 1;
+                continue;
+            } else {
+                throw new \Exception("Shouldn't happen");
+            }
+
+            if (null !== $fixup && $arrItem->getAttribute('origNode') !== $origArrItem) {
+                $res = $this->pFixup($fixup, $arrItem, null, $itemStartPos, $itemEndPos);
+            } else {
+                $res = $this->p($arrItem, true);
+            }
+            $this->safeAppend($result, $res);
+
+            $this->setIndentLevel($origIndentLevel);
+            $pos = $itemEndPos + 1;
+        }
+
+        if ($skipRemovedNode) {
+            // TODO: Support removing single node.
+            return null;
+        }
+
+        if (!empty($delayedAdd)) {
+            if (!isset($this->emptyListInsertionMap[$mapKey])) {
+                return null;
+            }
+
+            list($findToken, $extraLeft, $extraRight) = $this->emptyListInsertionMap[$mapKey];
+            if (null !== $findToken) {
+                $insertPos = $this->origTokens->findRight($pos, $findToken) + 1;
+                $result .= $this->origTokens->getTokenCode($pos, $insertPos, $indentAdjustment);
+                $pos = $insertPos;
+            }
+
+            $first = true;
+            $result .= $extraLeft;
+            foreach ($delayedAdd as $delayedAddNode) {
+                if (!$first) {
+                    $result .= $insertStr;
+                }
+                $result .= $this->p($delayedAddNode, true);
+                $first = false;
+            }
+            $result .= $extraRight;
+        }
+
+        return $result;
+    }
+
+    /**
+     * Print node with fixups.
+     *
+     * Fixups here refer to the addition of extra parentheses, braces or other characters, that
+     * are required to preserve program semantics in a certain context (e.g. to maintain precedence
+     * or because only certain expressions are allowed in certain places).
+     *
+     * @param int         $fixup       Fixup type
+     * @param Node        $subNode     Subnode to print
+     * @param string|null $parentClass Class of parent node
+     * @param int         $subStartPos Original start pos of subnode
+     * @param int         $subEndPos   Original end pos of subnode
+     *
+     * @return string Result of fixed-up print of subnode
+     */
+    protected function pFixup(int $fixup, Node $subNode, $parentClass, int $subStartPos, int $subEndPos) : string {
+        switch ($fixup) {
+            case self::FIXUP_PREC_LEFT:
+            case self::FIXUP_PREC_RIGHT:
+                if (!$this->origTokens->haveParens($subStartPos, $subEndPos)) {
+                    list($precedence, $associativity) = $this->precedenceMap[$parentClass];
+                    return $this->pPrec($subNode, $precedence, $associativity,
+                        $fixup === self::FIXUP_PREC_LEFT ? -1 : 1);
+                }
+                break;
+            case self::FIXUP_CALL_LHS:
+                if ($this->callLhsRequiresParens($subNode)
+                    && !$this->origTokens->haveParens($subStartPos, $subEndPos)
+                ) {
+                    return '(' . $this->p($subNode) . ')';
+                }
+                break;
+            case self::FIXUP_DEREF_LHS:
+                if ($this->dereferenceLhsRequiresParens($subNode)
+                    && !$this->origTokens->haveParens($subStartPos, $subEndPos)
+                ) {
+                    return '(' . $this->p($subNode) . ')';
+                }
+                break;
+            case self::FIXUP_BRACED_NAME:
+            case self::FIXUP_VAR_BRACED_NAME:
+                if ($subNode instanceof Expr
+                    && !$this->origTokens->haveBraces($subStartPos, $subEndPos)
+                ) {
+                    return ($fixup === self::FIXUP_VAR_BRACED_NAME ? '$' : '')
+                        . '{' . $this->p($subNode) . '}';
+                }
+                break;
+            case self::FIXUP_ENCAPSED:
+                if (!$subNode instanceof Scalar\EncapsedStringPart
+                    && !$this->origTokens->haveBraces($subStartPos, $subEndPos)
+                ) {
+                    return '{' . $this->p($subNode) . '}';
+                }
+                break;
+            default:
+                throw new \Exception('Cannot happen');
+        }
+
+        // Nothing special to do
+        return $this->p($subNode);
+    }
+
+    /**
+     * Appends to a string, ensuring whitespace between label characters.
+     *
+     * Example: "echo" and "$x" result in "echo$x", but "echo" and "x" result in "echo x".
+     * Without safeAppend the result would be "echox", which does not preserve semantics.
+     *
+     * @param string $str
+     * @param string $append
+     */
+    protected function safeAppend(string &$str, string $append) {
+        if ($str === "") {
+            $str = $append;
+            return;
+        }
+
+        if ($append === "") {
+            return;
+        }
+
+        if (!$this->labelCharMap[$append[0]]
+                || !$this->labelCharMap[$str[\strlen($str) - 1]]) {
+            $str .= $append;
+        } else {
+            $str .= " " . $append;
+        }
+    }
+
+    /**
+     * Determines whether the LHS of a call must be wrapped in parenthesis.
+     *
+     * @param Node $node LHS of a call
+     *
+     * @return bool Whether parentheses are required
+     */
+    protected function callLhsRequiresParens(Node $node) : bool {
+        return !($node instanceof Node\Name
+            || $node instanceof Expr\Variable
+            || $node instanceof Expr\ArrayDimFetch
+            || $node instanceof Expr\FuncCall
+            || $node instanceof Expr\MethodCall
+            || $node instanceof Expr\NullsafeMethodCall
+            || $node instanceof Expr\StaticCall
+            || $node instanceof Expr\Array_);
+    }
+
+    /**
+     * Determines whether the LHS of a dereferencing operation must be wrapped in parenthesis.
+     *
+     * @param Node $node LHS of dereferencing operation
+     *
+     * @return bool Whether parentheses are required
+     */
+    protected function dereferenceLhsRequiresParens(Node $node) : bool {
+        return !($node instanceof Expr\Variable
+            || $node instanceof Node\Name
+            || $node instanceof Expr\ArrayDimFetch
+            || $node instanceof Expr\PropertyFetch
+            || $node instanceof Expr\NullsafePropertyFetch
+            || $node instanceof Expr\StaticPropertyFetch
+            || $node instanceof Expr\FuncCall
+            || $node instanceof Expr\MethodCall
+            || $node instanceof Expr\NullsafeMethodCall
+            || $node instanceof Expr\StaticCall
+            || $node instanceof Expr\Array_
+            || $node instanceof Scalar\String_
+            || $node instanceof Expr\ConstFetch
+            || $node instanceof Expr\ClassConstFetch);
+    }
+
+    /**
+     * Print modifiers, including trailing whitespace.
+     *
+     * @param int $modifiers Modifier mask to print
+     *
+     * @return string Printed modifiers
+     */
+    protected function pModifiers(int $modifiers) {
+        return ($modifiers & Stmt\Class_::MODIFIER_PUBLIC    ? 'public '    : '')
+             . ($modifiers & Stmt\Class_::MODIFIER_PROTECTED ? 'protected ' : '')
+             . ($modifiers & Stmt\Class_::MODIFIER_PRIVATE   ? 'private '   : '')
+             . ($modifiers & Stmt\Class_::MODIFIER_STATIC    ? 'static '    : '')
+             . ($modifiers & Stmt\Class_::MODIFIER_ABSTRACT  ? 'abstract '  : '')
+             . ($modifiers & Stmt\Class_::MODIFIER_FINAL     ? 'final '     : '')
+             . ($modifiers & Stmt\Class_::MODIFIER_READONLY  ? 'readonly '  : '');
+    }
+
+    /**
+     * Determine whether a list of nodes uses multiline formatting.
+     *
+     * @param (Node|null)[] $nodes Node list
+     *
+     * @return bool Whether multiline formatting is used
+     */
+    protected function isMultiline(array $nodes) : bool {
+        if (\count($nodes) < 2) {
+            return false;
+        }
+
+        $pos = -1;
+        foreach ($nodes as $node) {
+            if (null === $node) {
+                continue;
+            }
+
+            $endPos = $node->getEndTokenPos() + 1;
+            if ($pos >= 0) {
+                $text = $this->origTokens->getTokenCode($pos, $endPos, 0);
+                if (false === strpos($text, "\n")) {
+                    // We require that a newline is present between *every* item. If the formatting
+                    // is inconsistent, with only some items having newlines, we don't consider it
+                    // as multiline
+                    return false;
+                }
+            }
+            $pos = $endPos;
+        }
+
+        return true;
+    }
+
+    /**
+     * Lazily initializes label char map.
+     *
+     * The label char map determines whether a certain character may occur in a label.
+     */
+    protected function initializeLabelCharMap() {
+        if ($this->labelCharMap) return;
+
+        $this->labelCharMap = [];
+        for ($i = 0; $i < 256; $i++) {
+            // Since PHP 7.1 The lower range is 0x80. However, we also want to support code for
+            // older versions.
+            $chr = chr($i);
+            $this->labelCharMap[$chr] = $i >= 0x7f || ctype_alnum($chr);
+        }
+    }
+
+    /**
+     * Lazily initializes node list differ.
+     *
+     * The node list differ is used to determine differences between two array subnodes.
+     */
+    protected function initializeNodeListDiffer() {
+        if ($this->nodeListDiffer) return;
+
+        $this->nodeListDiffer = new Internal\Differ(function ($a, $b) {
+            if ($a instanceof Node && $b instanceof Node) {
+                return $a === $b->getAttribute('origNode');
+            }
+            // Can happen for array destructuring
+            return $a === null && $b === null;
+        });
+    }
+
+    /**
+     * Lazily initializes fixup map.
+     *
+     * The fixup map is used to determine whether a certain subnode of a certain node may require
+     * some kind of "fixup" operation, e.g. the addition of parenthesis or braces.
+     */
+    protected function initializeFixupMap() {
+        if ($this->fixupMap) return;
+
+        $this->fixupMap = [
+            Expr\PreInc::class => ['var' => self::FIXUP_PREC_RIGHT],
+            Expr\PreDec::class => ['var' => self::FIXUP_PREC_RIGHT],
+            Expr\PostInc::class => ['var' => self::FIXUP_PREC_LEFT],
+            Expr\PostDec::class => ['var' => self::FIXUP_PREC_LEFT],
+            Expr\Instanceof_::class => [
+                'expr' => self::FIXUP_PREC_LEFT,
+                'class' => self::FIXUP_PREC_RIGHT, // TODO: FIXUP_NEW_VARIABLE
+            ],
+            Expr\Ternary::class => [
+                'cond' => self::FIXUP_PREC_LEFT,
+                'else' => self::FIXUP_PREC_RIGHT,
+            ],
+
+            Expr\FuncCall::class => ['name' => self::FIXUP_CALL_LHS],
+            Expr\StaticCall::class => ['class' => self::FIXUP_DEREF_LHS],
+            Expr\ArrayDimFetch::class => ['var' => self::FIXUP_DEREF_LHS],
+            Expr\ClassConstFetch::class => ['var' => self::FIXUP_DEREF_LHS],
+            Expr\New_::class => ['class' => self::FIXUP_DEREF_LHS], // TODO: FIXUP_NEW_VARIABLE
+            Expr\MethodCall::class => [
+                'var' => self::FIXUP_DEREF_LHS,
+                'name' => self::FIXUP_BRACED_NAME,
+            ],
+            Expr\NullsafeMethodCall::class => [
+                'var' => self::FIXUP_DEREF_LHS,
+                'name' => self::FIXUP_BRACED_NAME,
+            ],
+            Expr\StaticPropertyFetch::class => [
+                'class' => self::FIXUP_DEREF_LHS,
+                'name' => self::FIXUP_VAR_BRACED_NAME,
+            ],
+            Expr\PropertyFetch::class => [
+                'var' => self::FIXUP_DEREF_LHS,
+                'name' => self::FIXUP_BRACED_NAME,
+            ],
+            Expr\NullsafePropertyFetch::class => [
+                'var' => self::FIXUP_DEREF_LHS,
+                'name' => self::FIXUP_BRACED_NAME,
+            ],
+            Scalar\Encapsed::class => [
+                'parts' => self::FIXUP_ENCAPSED,
+            ],
+        ];
+
+        $binaryOps = [
+            BinaryOp\Pow::class, BinaryOp\Mul::class, BinaryOp\Div::class, BinaryOp\Mod::class,
+            BinaryOp\Plus::class, BinaryOp\Minus::class, BinaryOp\Concat::class,
+            BinaryOp\ShiftLeft::class, BinaryOp\ShiftRight::class, BinaryOp\Smaller::class,
+            BinaryOp\SmallerOrEqual::class, BinaryOp\Greater::class, BinaryOp\GreaterOrEqual::class,
+            BinaryOp\Equal::class, BinaryOp\NotEqual::class, BinaryOp\Identical::class,
+            BinaryOp\NotIdentical::class, BinaryOp\Spaceship::class, BinaryOp\BitwiseAnd::class,
+            BinaryOp\BitwiseXor::class, BinaryOp\BitwiseOr::class, BinaryOp\BooleanAnd::class,
+            BinaryOp\BooleanOr::class, BinaryOp\Coalesce::class, BinaryOp\LogicalAnd::class,
+            BinaryOp\LogicalXor::class, BinaryOp\LogicalOr::class,
+        ];
+        foreach ($binaryOps as $binaryOp) {
+            $this->fixupMap[$binaryOp] = [
+                'left' => self::FIXUP_PREC_LEFT,
+                'right' => self::FIXUP_PREC_RIGHT
+            ];
+        }
+
+        $assignOps = [
+            Expr\Assign::class, Expr\AssignRef::class, AssignOp\Plus::class, AssignOp\Minus::class,
+            AssignOp\Mul::class, AssignOp\Div::class, AssignOp\Concat::class, AssignOp\Mod::class,
+            AssignOp\BitwiseAnd::class, AssignOp\BitwiseOr::class, AssignOp\BitwiseXor::class,
+            AssignOp\ShiftLeft::class, AssignOp\ShiftRight::class, AssignOp\Pow::class, AssignOp\Coalesce::class
+        ];
+        foreach ($assignOps as $assignOp) {
+            $this->fixupMap[$assignOp] = [
+                'var' => self::FIXUP_PREC_LEFT,
+                'expr' => self::FIXUP_PREC_RIGHT,
+            ];
+        }
+
+        $prefixOps = [
+            Expr\BitwiseNot::class, Expr\BooleanNot::class, Expr\UnaryPlus::class, Expr\UnaryMinus::class,
+            Cast\Int_::class, Cast\Double::class, Cast\String_::class, Cast\Array_::class,
+            Cast\Object_::class, Cast\Bool_::class, Cast\Unset_::class, Expr\ErrorSuppress::class,
+            Expr\YieldFrom::class, Expr\Print_::class, Expr\Include_::class,
+        ];
+        foreach ($prefixOps as $prefixOp) {
+            $this->fixupMap[$prefixOp] = ['expr' => self::FIXUP_PREC_RIGHT];
+        }
+    }
+
+    /**
+     * Lazily initializes the removal map.
+     *
+     * The removal map is used to determine which additional tokens should be removed when a
+     * certain node is replaced by null.
+     */
+    protected function initializeRemovalMap() {
+        if ($this->removalMap) return;
+
+        $stripBoth = ['left' => \T_WHITESPACE, 'right' => \T_WHITESPACE];
+        $stripLeft = ['left' => \T_WHITESPACE];
+        $stripRight = ['right' => \T_WHITESPACE];
+        $stripDoubleArrow = ['right' => \T_DOUBLE_ARROW];
+        $stripColon = ['left' => ':'];
+        $stripEquals = ['left' => '='];
+        $this->removalMap = [
+            'Expr_ArrayDimFetch->dim' => $stripBoth,
+            'Expr_ArrayItem->key' => $stripDoubleArrow,
+            'Expr_ArrowFunction->returnType' => $stripColon,
+            'Expr_Closure->returnType' => $stripColon,
+            'Expr_Exit->expr' => $stripBoth,
+            'Expr_Ternary->if' => $stripBoth,
+            'Expr_Yield->key' => $stripDoubleArrow,
+            'Expr_Yield->value' => $stripBoth,
+            'Param->type' => $stripRight,
+            'Param->default' => $stripEquals,
+            'Stmt_Break->num' => $stripBoth,
+            'Stmt_Catch->var' => $stripLeft,
+            'Stmt_ClassMethod->returnType' => $stripColon,
+            'Stmt_Class->extends' => ['left' => \T_EXTENDS],
+            'Stmt_Enum->scalarType' => $stripColon,
+            'Stmt_EnumCase->expr' => $stripEquals,
+            'Expr_PrintableNewAnonClass->extends' => ['left' => \T_EXTENDS],
+            'Stmt_Continue->num' => $stripBoth,
+            'Stmt_Foreach->keyVar' => $stripDoubleArrow,
+            'Stmt_Function->returnType' => $stripColon,
+            'Stmt_If->else' => $stripLeft,
+            'Stmt_Namespace->name' => $stripLeft,
+            'Stmt_Property->type' => $stripRight,
+            'Stmt_PropertyProperty->default' => $stripEquals,
+            'Stmt_Return->expr' => $stripBoth,
+            'Stmt_StaticVar->default' => $stripEquals,
+            'Stmt_TraitUseAdaptation_Alias->newName' => $stripLeft,
+            'Stmt_TryCatch->finally' => $stripLeft,
+            // 'Stmt_Case->cond': Replace with "default"
+            // 'Stmt_Class->name': Unclear what to do
+            // 'Stmt_Declare->stmts': Not a plain node
+            // 'Stmt_TraitUseAdaptation_Alias->newModifier': Not a plain node
+        ];
+    }
+
+    protected function initializeInsertionMap() {
+        if ($this->insertionMap) return;
+
+        // TODO: "yield" where both key and value are inserted doesn't work
+        // [$find, $beforeToken, $extraLeft, $extraRight]
+        $this->insertionMap = [
+            'Expr_ArrayDimFetch->dim' => ['[', false, null, null],
+            'Expr_ArrayItem->key' => [null, false, null, ' => '],
+            'Expr_ArrowFunction->returnType' => [')', false, ' : ', null],
+            'Expr_Closure->returnType' => [')', false, ' : ', null],
+            'Expr_Ternary->if' => ['?', false, ' ', ' '],
+            'Expr_Yield->key' => [\T_YIELD, false, null, ' => '],
+            'Expr_Yield->value' => [\T_YIELD, false, ' ', null],
+            'Param->type' => [null, false, null, ' '],
+            'Param->default' => [null, false, ' = ', null],
+            'Stmt_Break->num' => [\T_BREAK, false, ' ', null],
+            'Stmt_Catch->var' => [null, false, ' ', null],
+            'Stmt_ClassMethod->returnType' => [')', false, ' : ', null],
+            'Stmt_Class->extends' => [null, false, ' extends ', null],
+            'Stmt_Enum->scalarType' => [null, false, ' : ', null],
+            'Stmt_EnumCase->expr' => [null, false, ' = ', null],
+            'Expr_PrintableNewAnonClass->extends' => [null, ' extends ', null],
+            'Stmt_Continue->num' => [\T_CONTINUE, false, ' ', null],
+            'Stmt_Foreach->keyVar' => [\T_AS, false, null, ' => '],
+            'Stmt_Function->returnType' => [')', false, ' : ', null],
+            'Stmt_If->else' => [null, false, ' ', null],
+            'Stmt_Namespace->name' => [\T_NAMESPACE, false, ' ', null],
+            'Stmt_Property->type' => [\T_VARIABLE, true, null, ' '],
+            'Stmt_PropertyProperty->default' => [null, false, ' = ', null],
+            'Stmt_Return->expr' => [\T_RETURN, false, ' ', null],
+            'Stmt_StaticVar->default' => [null, false, ' = ', null],
+            //'Stmt_TraitUseAdaptation_Alias->newName' => [T_AS, false, ' ', null], // TODO
+            'Stmt_TryCatch->finally' => [null, false, ' ', null],
+
+            // 'Expr_Exit->expr': Complicated due to optional ()
+            // 'Stmt_Case->cond': Conversion from default to case
+            // 'Stmt_Class->name': Unclear
+            // 'Stmt_Declare->stmts': Not a proper node
+            // 'Stmt_TraitUseAdaptation_Alias->newModifier': Not a proper node
+        ];
+    }
+
+    protected function initializeListInsertionMap() {
+        if ($this->listInsertionMap) return;
+
+        $this->listInsertionMap = [
+            // special
+            //'Expr_ShellExec->parts' => '', // TODO These need to be treated more carefully
+            //'Scalar_Encapsed->parts' => '',
+            'Stmt_Catch->types' => '|',
+            'UnionType->types' => '|',
+            'IntersectionType->types' => '&',
+            'Stmt_If->elseifs' => ' ',
+            'Stmt_TryCatch->catches' => ' ',
+
+            // comma-separated lists
+            'Expr_Array->items' => ', ',
+            'Expr_ArrowFunction->params' => ', ',
+            'Expr_Closure->params' => ', ',
+            'Expr_Closure->uses' => ', ',
+            'Expr_FuncCall->args' => ', ',
+            'Expr_Isset->vars' => ', ',
+            'Expr_List->items' => ', ',
+            'Expr_MethodCall->args' => ', ',
+            'Expr_NullsafeMethodCall->args' => ', ',
+            'Expr_New->args' => ', ',
+            'Expr_PrintableNewAnonClass->args' => ', ',
+            'Expr_StaticCall->args' => ', ',
+            'Stmt_ClassConst->consts' => ', ',
+            'Stmt_ClassMethod->params' => ', ',
+            'Stmt_Class->implements' => ', ',
+            'Stmt_Enum->implements' => ', ',
+            'Expr_PrintableNewAnonClass->implements' => ', ',
+            'Stmt_Const->consts' => ', ',
+            'Stmt_Declare->declares' => ', ',
+            'Stmt_Echo->exprs' => ', ',
+            'Stmt_For->init' => ', ',
+            'Stmt_For->cond' => ', ',
+            'Stmt_For->loop' => ', ',
+            'Stmt_Function->params' => ', ',
+            'Stmt_Global->vars' => ', ',
+            'Stmt_GroupUse->uses' => ', ',
+            'Stmt_Interface->extends' => ', ',
+            'Stmt_Match->arms' => ', ',
+            'Stmt_Property->props' => ', ',
+            'Stmt_StaticVar->vars' => ', ',
+            'Stmt_TraitUse->traits' => ', ',
+            'Stmt_TraitUseAdaptation_Precedence->insteadof' => ', ',
+            'Stmt_Unset->vars' => ', ',
+            'Stmt_Use->uses' => ', ',
+            'MatchArm->conds' => ', ',
+            'AttributeGroup->attrs' => ', ',
+
+            // statement lists
+            'Expr_Closure->stmts' => "\n",
+            'Stmt_Case->stmts' => "\n",
+            'Stmt_Catch->stmts' => "\n",
+            'Stmt_Class->stmts' => "\n",
+            'Stmt_Enum->stmts' => "\n",
+            'Expr_PrintableNewAnonClass->stmts' => "\n",
+            'Stmt_Interface->stmts' => "\n",
+            'Stmt_Trait->stmts' => "\n",
+            'Stmt_ClassMethod->stmts' => "\n",
+            'Stmt_Declare->stmts' => "\n",
+            'Stmt_Do->stmts' => "\n",
+            'Stmt_ElseIf->stmts' => "\n",
+            'Stmt_Else->stmts' => "\n",
+            'Stmt_Finally->stmts' => "\n",
+            'Stmt_Foreach->stmts' => "\n",
+            'Stmt_For->stmts' => "\n",
+            'Stmt_Function->stmts' => "\n",
+            'Stmt_If->stmts' => "\n",
+            'Stmt_Namespace->stmts' => "\n",
+            'Stmt_Class->attrGroups' => "\n",
+            'Stmt_Enum->attrGroups' => "\n",
+            'Stmt_EnumCase->attrGroups' => "\n",
+            'Stmt_Interface->attrGroups' => "\n",
+            'Stmt_Trait->attrGroups' => "\n",
+            'Stmt_Function->attrGroups' => "\n",
+            'Stmt_ClassMethod->attrGroups' => "\n",
+            'Stmt_ClassConst->attrGroups' => "\n",
+            'Stmt_Property->attrGroups' => "\n",
+            'Expr_PrintableNewAnonClass->attrGroups' => ' ',
+            'Expr_Closure->attrGroups' => ' ',
+            'Expr_ArrowFunction->attrGroups' => ' ',
+            'Param->attrGroups' => ' ',
+            'Stmt_Switch->cases' => "\n",
+            'Stmt_TraitUse->adaptations' => "\n",
+            'Stmt_TryCatch->stmts' => "\n",
+            'Stmt_While->stmts' => "\n",
+
+            // dummy for top-level context
+            'File->stmts' => "\n",
+        ];
+    }
+
+    protected function initializeEmptyListInsertionMap() {
+        if ($this->emptyListInsertionMap) return;
+
+        // TODO Insertion into empty statement lists.
+
+        // [$find, $extraLeft, $extraRight]
+        $this->emptyListInsertionMap = [
+            'Expr_ArrowFunction->params' => ['(', '', ''],
+            'Expr_Closure->uses' => [')', ' use(', ')'],
+            'Expr_Closure->params' => ['(', '', ''],
+            'Expr_FuncCall->args' => ['(', '', ''],
+            'Expr_MethodCall->args' => ['(', '', ''],
+            'Expr_NullsafeMethodCall->args' => ['(', '', ''],
+            'Expr_New->args' => ['(', '', ''],
+            'Expr_PrintableNewAnonClass->args' => ['(', '', ''],
+            'Expr_PrintableNewAnonClass->implements' => [null, ' implements ', ''],
+            'Expr_StaticCall->args' => ['(', '', ''],
+            'Stmt_Class->implements' => [null, ' implements ', ''],
+            'Stmt_Enum->implements' => [null, ' implements ', ''],
+            'Stmt_ClassMethod->params' => ['(', '', ''],
+            'Stmt_Interface->extends' => [null, ' extends ', ''],
+            'Stmt_Function->params' => ['(', '', ''],
+
+            /* These cannot be empty to start with:
+             * Expr_Isset->vars
+             * Stmt_Catch->types
+             * Stmt_Const->consts
+             * Stmt_ClassConst->consts
+             * Stmt_Declare->declares
+             * Stmt_Echo->exprs
+             * Stmt_Global->vars
+             * Stmt_GroupUse->uses
+             * Stmt_Property->props
+             * Stmt_StaticVar->vars
+             * Stmt_TraitUse->traits
+             * Stmt_TraitUseAdaptation_Precedence->insteadof
+             * Stmt_Unset->vars
+             * Stmt_Use->uses
+             * UnionType->types
+             */
+
+            /* TODO
+             * Stmt_If->elseifs
+             * Stmt_TryCatch->catches
+             * Expr_Array->items
+             * Expr_List->items
+             * Stmt_For->init
+             * Stmt_For->cond
+             * Stmt_For->loop
+             */
+        ];
+    }
+
+    protected function initializeModifierChangeMap() {
+        if ($this->modifierChangeMap) return;
+
+        $this->modifierChangeMap = [
+            'Stmt_ClassConst->flags' => \T_CONST,
+            'Stmt_ClassMethod->flags' => \T_FUNCTION,
+            'Stmt_Class->flags' => \T_CLASS,
+            'Stmt_Property->flags' => \T_VARIABLE,
+            'Param->flags' => \T_VARIABLE,
+            //'Stmt_TraitUseAdaptation_Alias->newModifier' => 0, // TODO
+        ];
+
+        // List of integer subnodes that are not modifiers:
+        // Expr_Include->type
+        // Stmt_GroupUse->type
+        // Stmt_Use->type
+        // Stmt_UseUse->type
     }
 }
diff --git a/lib/nikic/php-parser/lib/PhpParser/Serializer.php b/lib/nikic/php-parser/lib/PhpParser/Serializer.php
deleted file mode 100644
index 1dd790666..000000000
--- a/lib/nikic/php-parser/lib/PhpParser/Serializer.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace PhpParser;
-
-/**
- * @deprecated
- */
-interface Serializer
-{
-    /**
-     * Serializes statements into some string format.
-     *
-     * @param array $nodes Statements
-     *
-     * @return string Serialized string
-     */
-    public function serialize(array $nodes);
-}
\ No newline at end of file
diff --git a/lib/nikic/php-parser/lib/PhpParser/Serializer/XML.php b/lib/nikic/php-parser/lib/PhpParser/Serializer/XML.php
deleted file mode 100644
index 4b16dd6fc..000000000
--- a/lib/nikic/php-parser/lib/PhpParser/Serializer/XML.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-namespace PhpParser\Serializer;
-
-use PhpParser\Comment;
-use PhpParser\Node;
-use PhpParser\Serializer;
-use XMLWriter;
-
-/**
- * @deprecated
- */
-class XML implements Serializer
-{
-    protected $writer;
-
-    /**
-     * Constructs a XML serializer.
-     */
-    public function __construct() {
-        $this->writer = new XMLWriter;
-        $this->writer->openMemory();
-        $this->writer->setIndent(true);
-    }
-
-    public function serialize(array $nodes) {
-        $this->writer->flush();
-        $this->writer->startDocument('1.0', 'UTF-8');
-
-        $this->writer->startElement('AST');
-        $this->writer->writeAttribute('xmlns:node',      'http://nikic.github.com/PHPParser/XML/node');
-        $this->writer->writeAttribute('xmlns:subNode',   'http://nikic.github.com/PHPParser/XML/subNode');
-        $this->writer->writeAttribute('xmlns:attribute', 'http://nikic.github.com/PHPParser/XML/attribute');
-        $this->writer->writeAttribute('xmlns:scalar',    'http://nikic.github.com/PHPParser/XML/scalar');
-
-        $this->_serialize($nodes);
-
-        $this->writer->endElement();
-
-        return $this->writer->outputMemory();
-    }
-
-    protected function _serialize($node) {
-        if ($node instanceof Node) {
-            $this->writer->startElement('node:' . $node->getType());
-
-            foreach ($node->getAttributes() as $name => $value) {
-                $this->writer->startElement('attribute:' . $name);
-                $this->_serialize($value);
-                $this->writer->endElement();
-            }
-
-            foreach ($node as $name => $subNode) {
-                $this->writer->startElement('subNode:' . $name);
-                $this->_serialize($subNode);
-                $this->writer->endElement();
-            }
-
-            $this->writer->endElement();
-        } elseif ($node instanceof Comment) {
-            $this->writer->startElement('comment');
-            $this->writer->writeAttribute('isDocComment', $node instanceof Comment\Doc ? 'true' : 'false');
-            $this->writer->writeAttribute('line', (string) $node->getLine());
-            $this->writer->text($node->getText());
-            $this->writer->endElement();
-        } elseif (is_array($node)) {
-            $this->writer->startElement('scalar:array');
-            foreach ($node as $subNode) {
-                $this->_serialize($subNode);
-            }
-            $this->writer->endElement();
-        } elseif (is_string($node)) {
-            $this->writer->writeElement('scalar:string', $node);
-        } elseif (is_int($node)) {
-            $this->writer->writeElement('scalar:int', (string) $node);
-        } elseif (is_float($node)) {
-            // TODO Higher precision conversion?
-            $this->writer->writeElement('scalar:float', (string) $node);
-        } elseif (true === $node) {
-            $this->writer->writeElement('scalar:true');
-        } elseif (false === $node) {
-            $this->writer->writeElement('scalar:false');
-        } elseif (null === $node) {
-            $this->writer->writeElement('scalar:null');
-        } else {
-            throw new \InvalidArgumentException('Unexpected node type');
-        }
-    }
-}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Unserializer.php b/lib/nikic/php-parser/lib/PhpParser/Unserializer.php
deleted file mode 100644
index 9c221a141..000000000
--- a/lib/nikic/php-parser/lib/PhpParser/Unserializer.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-namespace PhpParser;
-
-/**
- * @deprecated
- */
-interface Unserializer
-{
-    /**
-     * Unserializes a string in some format into a node tree.
-     *
-     * @param string $string Serialized string
-     *
-     * @return mixed Node tree
-     */
-    public function unserialize($string);
-}
diff --git a/lib/nikic/php-parser/lib/PhpParser/Unserializer/XML.php b/lib/nikic/php-parser/lib/PhpParser/Unserializer/XML.php
deleted file mode 100644
index b33dd097e..000000000
--- a/lib/nikic/php-parser/lib/PhpParser/Unserializer/XML.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-
-namespace PhpParser\Unserializer;
-
-use DomainException;
-use PhpParser\Unserializer;
-use XMLReader;
-
-/**
- * @deprecated
- */
-class XML implements Unserializer
-{
-    protected $reader;
-
-    public function __construct() {
-        $this->reader = new XMLReader;
-    }
-
-    public function unserialize($string) {
-        $this->reader->XML($string);
-
-        $this->reader->read();
-        if ('AST' !== $this->reader->name) {
-            throw new DomainException('AST root element not found');
-        }
-
-        return $this->read($this->reader->depth);
-    }
-
-    protected function read($depthLimit, $throw = true, &$nodeFound = null) {
-        $nodeFound = true;
-        while ($this->reader->read() && $depthLimit < $this->reader->depth) {
-            if (XMLReader::ELEMENT !== $this->reader->nodeType) {
-                continue;
-            }
-
-            if ('node' === $this->reader->prefix) {
-                return $this->readNode();
-            } elseif ('scalar' === $this->reader->prefix) {
-                return $this->readScalar();
-            } elseif ('comment' === $this->reader->name) {
-                return $this->readComment();
-            } else {
-                throw new DomainException(sprintf('Unexpected node of type "%s"', $this->reader->name));
-            }
-        }
-
-        $nodeFound = false;
-        if ($throw) {
-            throw new DomainException('Expected node or scalar');
-        }
-    }
-
-    protected function readNode() {
-        $className = $this->getClassNameFromType($this->reader->localName);
-
-        // create the node without calling it's constructor
-        $node = unserialize(
-            sprintf(
-                "O:%d:\"%s\":1:{s:13:\"\0*\0attributes\";a:0:{}}",
-                strlen($className), $className
-            )
-        );
-
-        $depthLimit = $this->reader->depth;
-        while ($this->reader->read() && $depthLimit < $this->reader->depth) {
-            if (XMLReader::ELEMENT !== $this->reader->nodeType) {
-                continue;
-            }
-
-            $type = $this->reader->prefix;
-            if ('subNode' !== $type && 'attribute' !== $type) {
-                throw new DomainException(
-                    sprintf('Expected sub node or attribute, got node of type "%s"', $this->reader->name)
-                );
-            }
-
-            $name = $this->reader->localName;
-            $value = $this->read($this->reader->depth);
-
-            if ('subNode' === $type) {
-                $node->$name = $value;
-            } else {
-                $node->setAttribute($name, $value);
-            }
-        }
-
-        return $node;
-    }
-
-    protected function readScalar() {
-        switch ($name = $this->reader->localName) {
-            case 'array':
-                $depth = $this->reader->depth;
-                $array = array();
-                while (true) {
-                    $node = $this->read($depth, false, $nodeFound);
-                    if (!$nodeFound) {
-                        break;
-                    }
-                    $array[] = $node;
-                }
-                return $array;
-            case 'string':
-                return $this->reader->readString();
-            case 'int':
-                return $this->parseInt($this->reader->readString());
-            case 'float':
-                $text = $this->reader->readString();
-                if (false === $float = filter_var($text, FILTER_VALIDATE_FLOAT)) {
-                    throw new DomainException(sprintf('"%s" is not a valid float', $text));
-                }
-                return $float;
-            case 'true':
-            case 'false':
-            case 'null':
-                if (!$this->reader->isEmptyElement) {
-                    throw new DomainException(sprintf('"%s" scalar must be empty', $name));
-                }
-                return constant($name);
-            default:
-                throw new DomainException(sprintf('Unknown scalar type "%s"', $name));
-        }
-    }
-
-    private function parseInt($text) {
-        if (false === $int = filter_var($text, FILTER_VALIDATE_INT)) {
-            throw new DomainException(sprintf('"%s" is not a valid integer', $text));
-        }
-        return $int;
-    }
-
-    protected function readComment() {
-        $className = $this->reader->getAttribute('isDocComment') === 'true'
-            ? 'PhpParser\Comment\Doc'
-            : 'PhpParser\Comment'
-        ;
-        return new $className(
-            $this->reader->readString(),
-            $this->parseInt($this->reader->getAttribute('line'))
-        );
-    }
-
-    protected function getClassNameFromType($type) {
-        $className = 'PhpParser\\Node\\' . strtr($type, '_', '\\');
-        if (!class_exists($className)) {
-            $className .= '_';
-        }
-        if (!class_exists($className)) {
-            throw new DomainException(sprintf('Unknown node type "%s"', $type));
-        }
-        return $className;
-    }
-}
diff --git a/lib/nikic/php-parser/lib/bootstrap.php b/lib/nikic/php-parser/lib/bootstrap.php
deleted file mode 100644
index b0f517822..000000000
--- a/lib/nikic/php-parser/lib/bootstrap.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-if (!class_exists('PhpParser\Autoloader')) {
-    require __DIR__ . '/PhpParser/Autoloader.php';
-}
-PhpParser\Autoloader::register();
diff --git a/lib/nikic/php-parser/phpunit.xml.dist b/lib/nikic/php-parser/phpunit.xml.dist
deleted file mode 100644
index 8c2d0f227..000000000
--- a/lib/nikic/php-parser/phpunit.xml.dist
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="false"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="./test/bootstrap.php">
-    <testsuites>
-        <testsuite name="PHPParser Test Suite">
-            <directory>./test/</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory suffix=".php">./lib/PhpParser/</directory>
-        </whitelist>
-    </filter>
-</phpunit>
diff --git a/lib/nikic/php-parser/test_old/run-php-src.sh b/lib/nikic/php-parser/test_old/run-php-src.sh
deleted file mode 100755
index 0d37f851d..000000000
--- a/lib/nikic/php-parser/test_old/run-php-src.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-wget -q https://github.com/php/php-src/archive/php-7.1.0.tar.gz
-mkdir -p ./data/php-src
-tar -xzf ./php-7.1.0.tar.gz -C ./data/php-src --strip-components=1
-php -n test_old/run.php --verbose --no-progress PHP7 ./data/php-src
diff --git a/lib/nikic/php-parser/test_old/run.php b/lib/nikic/php-parser/test_old/run.php
deleted file mode 100644
index bc14d893a..000000000
--- a/lib/nikic/php-parser/test_old/run.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php
-
-error_reporting(E_ALL | E_STRICT);
-ini_set('short_open_tag', false);
-
-if ('cli' !== php_sapi_name()) {
-    die('This script is designed for running on the command line.');
-}
-
-function showHelp($error) {
-    die($error . "\n\n" .
-<<<OUTPUT
-This script has to be called with the following signature:
-
-    php run.php [--no-progress] testType pathToTestFiles
-
-The test type must be one of: PHP5, PHP7 or Symfony.
-
-The following options are available:
-
-    --no-progress    Disables showing which file is currently tested.
-
-OUTPUT
-    );
-}
-
-$options = array();
-$arguments = array();
-
-// remove script name from argv
-array_shift($argv);
-
-foreach ($argv as $arg) {
-    if ('-' === $arg[0]) {
-        $options[] = $arg;
-    } else {
-        $arguments[] = $arg;
-    }
-}
-
-if (count($arguments) !== 2) {
-    showHelp('Too little arguments passed!');
-}
-
-$showProgress = true;
-$verbose = false;
-foreach ($options as $option) {
-    if ($option === '--no-progress') {
-        $showProgress = false;
-    } elseif ($option === '--verbose') {
-        $verbose = true;
-    } else {
-        showHelp('Invalid option passed!');
-    }
-}
-
-$testType = $arguments[0];
-$dir = $arguments[1];
-
-switch ($testType) {
-    case 'Symfony':
-        $version = 'Php5';
-        $fileFilter = function($path) {
-            return preg_match('~\.php(?:\.cache)?$~', $path) && false === strpos($path, 'skeleton');
-        };
-        $codeExtractor = function($file, $code) {
-            return $code;
-        };
-        break;
-    case 'PHP5':
-    case 'PHP7':
-    $version = $testType === 'PHP5' ? 'Php5' : 'Php7';
-        $fileFilter = function($path) {
-            return preg_match('~\.phpt$~', $path);
-        };
-        $codeExtractor = function($file, $code) {
-            if (preg_match('~(?:
-# skeleton files
-  ext.gmp.tests.001
-| ext.skeleton.tests.001
-# multibyte encoded files
-| ext.mbstring.tests.zend_multibyte-01
-| Zend.tests.multibyte.multibyte_encoding_001
-| Zend.tests.multibyte.multibyte_encoding_004
-| Zend.tests.multibyte.multibyte_encoding_005
-# pretty print difference due to INF vs 1e1000
-| ext.standard.tests.general_functions.bug27678
-| tests.lang.bug24640
-# pretty print differences due to negative LNumbers
-| Zend.tests.neg_num_string
-| Zend.tests.bug72918
-# pretty print difference due to nop statements
-| ext.mbstring.tests.htmlent
-| ext.standard.tests.file.fread_basic
-)\.phpt$~x', $file)) {
-                return null;
-            }
-
-            if (!preg_match('~--FILE--\s*(.*?)--[A-Z]+--~s', $code, $matches)) {
-                return null;
-            }
-            if (preg_match('~--EXPECT(?:F|REGEX)?--\s*(?:Parse|Fatal) error~', $code)) {
-                return null;
-            }
-
-            return $matches[1];
-        };
-        break;
-    default:
-        showHelp('Test type must be one of: PHP5, PHP7 or Symfony');
-}
-
-require_once dirname(__FILE__) . '/../lib/PhpParser/Autoloader.php';
-PhpParser\Autoloader::register();
-
-$parserName    = 'PhpParser\Parser\\' . $version;
-$parser        = new $parserName(new PhpParser\Lexer\Emulative);
-$prettyPrinter = new PhpParser\PrettyPrinter\Standard;
-$nodeDumper    = new PhpParser\NodeDumper;
-
-$parseFail = $ppFail = $compareFail = $count = 0;
-
-$readTime = $parseTime = $ppTime = $reparseTime = $compareTime = 0;
-$totalStartTime = microtime(true);
-
-foreach (new RecursiveIteratorIterator(
-             new RecursiveDirectoryIterator($dir),
-             RecursiveIteratorIterator::LEAVES_ONLY)
-         as $file) {
-    if (!$fileFilter($file)) {
-        continue;
-    }
-
-    $startTime = microtime(true);
-    $code = file_get_contents($file);
-    $readTime += microtime(true) - $startTime;
-
-    if (null === $code = $codeExtractor($file, $code)) {
-        continue;
-    }
-
-    set_time_limit(10);
-
-    ++$count;
-
-    if ($showProgress) {
-        echo substr(str_pad('Testing file ' . $count . ': ' . substr($file, strlen($dir)), 79), 0, 79), "\r";
-    }
-
-    try {
-        $startTime = microtime(true);
-        $stmts = $parser->parse($code);
-        $parseTime += microtime(true) - $startTime;
-
-        $startTime = microtime(true);
-        $code = '<?php' . "\n" . $prettyPrinter->prettyPrint($stmts);
-        $ppTime += microtime(true) - $startTime;
-
-        try {
-            $startTime = microtime(true);
-            $ppStmts = $parser->parse($code);
-            $reparseTime += microtime(true) - $startTime;
-
-            $startTime = microtime(true);
-            $same = $nodeDumper->dump($stmts) == $nodeDumper->dump($ppStmts);
-            $compareTime += microtime(true) - $startTime;
-
-            if (!$same) {
-                echo $file, ":\n    Result of initial parse and parse after pretty print differ\n";
-                if ($verbose) {
-                    echo "Pretty printer output:\n=====\n$code\n=====\n\n";
-                }
-
-                ++$compareFail;
-            }
-        } catch (PhpParser\Error $e) {
-            echo $file, ":\n    Parse of pretty print failed with message: {$e->getMessage()}\n";
-            if ($verbose) {
-                echo "Pretty printer output:\n=====\n$code\n=====\n\n";
-            }
-
-            ++$ppFail;
-        }
-    } catch (PhpParser\Error $e) {
-        echo $file, ":\n    Parse failed with message: {$e->getMessage()}\n";
-
-        ++$parseFail;
-    }
-}
-
-if (0 === $parseFail && 0 === $ppFail && 0 === $compareFail) {
-    $exit = 0;
-    echo "\n\n", 'All tests passed.', "\n";
-} else {
-    $exit = 1;
-    echo "\n\n", '==========', "\n\n", 'There were: ', "\n";
-    if (0 !== $parseFail) {
-        echo '    ', $parseFail,   ' parse failures.',        "\n";
-    }
-    if (0 !== $ppFail) {
-        echo '    ', $ppFail,      ' pretty print failures.', "\n";
-    }
-    if (0 !== $compareFail) {
-        echo '    ', $compareFail, ' compare failures.',      "\n";
-    }
-}
-
-echo "\n",
-     'Tested files:         ', $count,        "\n",
-     "\n",
-     'Reading files took:   ', $readTime,    "\n",
-     'Parsing took:         ', $parseTime,   "\n",
-     'Pretty printing took: ', $ppTime,      "\n",
-     'Reparsing took:       ', $reparseTime, "\n",
-     'Comparing took:       ', $compareTime, "\n",
-     "\n",
-     'Total time:           ', microtime(true) - $totalStartTime, "\n",
-     'Maximum memory usage: ', memory_get_peak_usage(true), "\n";
-
-exit($exit);

From f4c7afc14818dd9c6752f6cc9379467da2fb3916 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Fri, 29 Apr 2022 14:31:48 +0200
Subject: [PATCH 06/15] =?UTF-8?q?N=C2=B04824=20Update=20consumers=20&=20te?=
 =?UTF-8?q?sts=20after=20nikic/php-parser=20update=20Was=20done=20in=203.0?=
 =?UTF-8?q?.0=20with=20N=C2=B03867=20(cherry=20picked=20from=20commit=20cd?=
 =?UTF-8?q?1ba097cb9f26c5f23dff8a91a4c378bf7862c6)=20(cherry=20picked=20fr?=
 =?UTF-8?q?om=20commit=205b42f67a998dc76f647d2ab0613f66defe5acb76)=20(cher?=
 =?UTF-8?q?ry=20picked=20from=20commit=202d98ca23180ec30e3e6db002536dd48a2?=
 =?UTF-8?q?1a23f52)=20(cherry=20picked=20from=20commit=20ddc5bbd1bbd197fe8?=
 =?UTF-8?q?3f48b796388c3da488cdca0)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/iTopConfigParser.php                     |  41 +-
 .../src/Validator/ConfigNodesVisitor.php      |   2 +
 .../config-itop_KO_config_plus_code.php       | 392 +++++++++++++++++
 .../config-itop_KO_function.php               |   7 +
 .../ConfigValidator/config-itop_VALID.php     | 390 +++++++++++++++++
 .../config-itop_VALID_log-level-min_const.php | 394 ++++++++++++++++++
 .../iTopConfigAstValidatorTest.php            |  69 +++
 7 files changed, 1281 insertions(+), 14 deletions(-)
 create mode 100644 test/core/ConfigValidator/config-itop_KO_config_plus_code.php
 create mode 100644 test/core/ConfigValidator/config-itop_KO_function.php
 create mode 100644 test/core/ConfigValidator/config-itop_VALID.php
 create mode 100644 test/core/ConfigValidator/config-itop_VALID_log-level-min_const.php
 create mode 100644 test/core/ConfigValidator/iTopConfigAstValidatorTest.php

diff --git a/core/iTopConfigParser.php b/core/iTopConfigParser.php
index 00b30864e..97327bca1 100644
--- a/core/iTopConfigParser.php
+++ b/core/iTopConfigParser.php
@@ -6,6 +6,8 @@
  */
 
 use PhpParser\Node\Expr\Assign;
+use PhpParser\Node\Expr\Variable;
+use PhpParser\Parser;
 use PhpParser\ParserFactory;
 use PhpParser\PrettyPrinter\Standard;
 
@@ -80,38 +82,49 @@ class iTopConfigParser
 	 * @param \PhpParser\Parser $oParser
 	 * @param $sConfig
 	 *
-	 * @return \Combodo\iTop\Config\Validator\ConfigNodesVisitor
+	 * @return void
 	 */
-	private function BrowseFile(\PhpParser\Parser $oParser, $sConfig)
+	private function BrowseFile(Parser $oParser, $sConfig)
 	{
 		$prettyPrinter = new Standard();
 
-		try
-		{
+		try {
 			$aNodes = $oParser->parse($sConfig);
 		}
-		catch (\Error $e)
-		{
+		catch (\Error $e) {
 			$sMessage = Dict::Format('config-parse-error', $e->getMessage(), $e->getLine());
 			$this->oException = new \Exception($sMessage, 0, $e);
 		}
 
-		foreach ($aNodes as $oAssignation)
-		{
-			if (! $oAssignation instanceof Assign)
-			{
+		foreach ($aNodes as $sKey => $oNode) {
+			// With PhpParser 3 we had an Assign node at root
+			// In PhpParser 4 the root node is now an Expression
+
+			if (false === ($oNode instanceof \PhpParser\Node\Stmt\Expression)) {
+				continue;
+			}
+			/** @var \PhpParser\Node\Stmt\Expression $oNode */
+
+			if (false === ($oNode->expr instanceof Assign)) {
+				continue;
+			}
+			/** @var Assign $oAssignation */
+			$oAssignation = $oNode->expr;
+
+			if (false === ($oAssignation->var instanceof Variable)) {
+				continue;
+			}
+			if (false === ($oAssignation->expr instanceof PhpParser\Node\Expr\Array_)) {
 				continue;
 			}
 
 			$sCurrentRootVar = $oAssignation->var->name;
-			if (!array_key_exists($sCurrentRootVar, $this->aVarsMap))
-			{
+			if (!array_key_exists($sCurrentRootVar, $this->aVarsMap)) {
 				continue;
 			}
 			$aCurrentRootVarMap =& $this->aVarsMap[$sCurrentRootVar];
 
-			foreach ($oAssignation->expr->items as $oItem)
-			{
+			foreach ($oAssignation->expr->items as $oItem) {
 				$sValue = $prettyPrinter->prettyPrintExpr($oItem->value);
 				$aCurrentRootVarMap[$oItem->key->value] = $sValue;
 			}
diff --git a/datamodels/2.x/itop-config/src/Validator/ConfigNodesVisitor.php b/datamodels/2.x/itop-config/src/Validator/ConfigNodesVisitor.php
index 04493fac8..295a63ddf 100644
--- a/datamodels/2.x/itop-config/src/Validator/ConfigNodesVisitor.php
+++ b/datamodels/2.x/itop-config/src/Validator/ConfigNodesVisitor.php
@@ -23,6 +23,7 @@ class ConfigNodesVisitor extends NodeVisitorAbstract
 			Node\Name::class,
 
 			Node\Const_::class,
+			Node\Identifier::class,
 
 			Node\Expr\Array_::class,
 			Node\Expr\ArrayDimFetch::class,
@@ -44,6 +45,7 @@ class ConfigNodesVisitor extends NodeVisitorAbstract
 			Node\Expr\PreDec::class,
 			Node\Expr\PreInc::class,
 			Node\Expr\Print_::class,
+			Node\Stmt\Expression::class,
 			Node\Expr\Ternary::class,
 			Node\Expr\UnaryMinus::class,
 			Node\Expr\UnaryPlus::class,
diff --git a/test/core/ConfigValidator/config-itop_KO_config_plus_code.php b/test/core/ConfigValidator/config-itop_KO_config_plus_code.php
new file mode 100644
index 000000000..1db98d9f7
--- /dev/null
+++ b/test/core/ConfigValidator/config-itop_KO_config_plus_code.php
@@ -0,0 +1,392 @@
+<?php
+
+/**
+ *
+ * Configuration file, generated by the iTop configuration wizard
+ *
+ * The file is used in MetaModel::LoadConfig() which does all the necessary initialization job
+ *
+ */
+$MySettings = array(
+
+	// access_message: Message displayed to the users when there is any access restriction
+	//	default: 'iTop is temporarily frozen, please wait... (the admin team)'
+	'access_message'                                => 'iTop is temporarily frozen, please wait... (the admin team)',
+
+	// access_mode: Access mode: ACCESS_READONLY = 0, ACCESS_ADMIN_WRITE = 2, ACCESS_FULL = 3
+	//	default: 3
+	'access_mode'                                   => 3,
+
+	// activity_panel.entry_form_opened_by_default: Whether or not the new entry form will be automatically opened when viewing an object.
+	//	default: false
+	'activity_panel.entry_form_opened_by_default'   => false,
+
+	// activity_panel.show_author_name_below_entries: Whether or not to show the author friendlyname next to the date on the last entry.
+	//	default: false
+	'activity_panel.show_author_name_below_entries' => false,
+
+	'allowed_login_types'      => 'form|external|basic',
+
+	// apc_cache.enabled: If set, the APC cache is allowed (the PHP extension must also be active)
+	//	default: true
+	'apc_cache.enabled'        => true,
+
+	// apc_cache.query_ttl: Time to live set in APC for the prepared queries (seconds - 0 means no timeout)
+	//	default: 3600
+	'apc_cache.query_ttl'      => 3600,
+
+	// app_root_url: Root URL used for navigating within the application, or from an email to the application (you can put $SERVER_NAME$ as a placeholder for the server's name)
+	//	default: ''
+	'app_root_url'             => 'http://localhost/itop-dev/',
+
+	// behind_reverse_proxy: If true, then proxies custom header (X-Forwarded-*) are taken into account. Use only if the webserver is not publicly accessible (reachable only by the reverse proxy)
+	//	default: false
+	'behind_reverse_proxy'     => false,
+
+	// cron_max_execution_time: Duration (seconds) of the page cron.php, must be shorter than php setting max_execution_time and shorter than the web server response timeout
+	//	default: 600
+	'cron_max_execution_time'  => 600,
+
+	// csv_file_default_charset: Character set used by default for downloading and uploading data as a CSV file. Warning: it is case sensitive (uppercase is preferable).
+	//	default: 'ISO-8859-1'
+	'csv_file_default_charset' => 'ISO-8859-1',
+
+	'csv_import_charsets'        => array(),
+
+	// csv_import_history_display: Display the history tab in the import wizard
+	//	default: false
+	'csv_import_history_display' => false,
+
+	// date_and_time_format: Format for date and time display (per language)
+	//	default: array (
+	//		  'default' =>
+	//		  array (
+	//		    'date' => 'Y-m-d',
+	//		    'time' => 'H:i:s',
+	//		    'date_time' => '$date $time',
+	//		  ),
+	//		)
+	'date_and_time_format'       => array(
+		'default' =>
+			array(
+				'date'      => 'Y-m-d',
+				'time'      => 'H:i:s',
+				'date_time' => '$date $time',
+			),
+	),
+
+	'db_host' => 'localhost',
+
+	'db_name' => 'itop_dev',
+
+	'db_pwd' => '',
+
+	'db_subname' => '',
+
+	'db_user'         => 'root',
+
+	// deadline_format: The format used for displaying "deadline" attributes: any string with the following placeholders: $date$, $difference$
+	//	default: '$difference$'
+	'deadline_format' => '$difference$',
+
+	'default_language'             => 'EN US',
+
+	// email_asynchronous: If set, the emails are sent off line, which requires cron.php to be activated. Exception: some features like the email test utility will force the serialized mode
+	//	default: false
+	'email_asynchronous'           => false,
+
+	// email_default_sender_address: Default address provided in the email from header field.
+	//	default: ''
+	'email_default_sender_address' => '',
+
+	// email_default_sender_label: Default label provided in the email from header field.
+	//	default: ''
+	'email_default_sender_label'   => '',
+
+	// email_transport: Mean to send emails: PHPMail (uses the function mail()) or SMTP (implements the client protocol)
+	//	default: 'PHPMail'
+	'email_transport'              => 'PHPMail',
+
+	// email_validation_pattern: Regular expression to validate/detect the format of an eMail address
+	//	default: '[a-zA-Z0-9._&\'-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z0-9-]{2,}'
+	'email_validation_pattern'     => '[a-zA-Z0-9._&\'-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z0-9-]{2,}',
+
+	'encryption_key' => '061c5b88c47ed64664618cf37b91a442b5550704aacecc5f58f96fc98087333b',
+
+	'encryption_library' => 'OpenSSL',
+
+	'ext_auth_variable' => '$_SERVER[\'REMOTE_USER\']',
+
+	'fast_reload_interval'           => 60,
+
+	// graphviz_path: Path to the Graphviz "dot" executable for graphing objects lifecycle
+	//	default: '/usr/bin/dot'
+	'graphviz_path'                  => 'C:\\Program Files (x86)\\Graphviz2.38\\bin\\dot.exe',
+
+	// high_cardinality_classes: List of classes with high cardinality (Force manual submit of search)
+	//	default: array (
+	//		)
+	'high_cardinality_classes'       => array(),
+
+	// inline_image_max_display_width: The maximum width (in pixels) when displaying images inside an HTML formatted attribute. Images will be displayed using this this maximum width.
+	//	default: '250'
+	'inline_image_max_display_width' => '250',
+
+	// inline_image_max_storage_width: The maximum width (in pixels) when uploading images to be used inside an HTML formatted attribute. Images larger than the given size will be downsampled before storing them in the database.
+	//	default: '1600'
+	'inline_image_max_storage_width' => '1600',
+
+	// link_set_attribute_qualifier: Link set from string: attribute qualifier (encloses both the attcode and the value)
+	//	default: '\''
+	'link_set_attribute_qualifier'   => '\'',
+
+	// link_set_attribute_separator: Link set from string: attribute separator
+	//	default: ';'
+	'link_set_attribute_separator'   => ';',
+
+	// link_set_item_separator: Link set from string: line separator
+	//	default: '|'
+	'link_set_item_separator'        => '|',
+
+	// link_set_value_separator: Link set from string: value separator (between the attcode and the value itself
+	//	default: ':'
+	'link_set_value_separator'       => ':',
+
+	'log_global' => true,
+
+	'log_issue' => true,
+
+	'log_kpi_duration' => 0,
+
+	'log_notification' => true,
+
+	'log_web_service' => true,
+
+	'max_display_limit'        => 30,
+
+	// max_linkset_output: Maximum number of items shown when getting a list of related items in an email, using the form $this->some_list$. 0 means no limit.
+	//	default: 100
+	'max_linkset_output'       => 100,
+
+	// mentions.allowed_classes: Classes which can be mentioned through the autocomplete in the caselogs. Key of the array must be a single character that will trigger the autocomplete, value can be either a DM class or a valid OQL (eg. "@" => "Person", "?" => "SELECT FAQ WHERE status = 'published'")
+	//	default: array (
+	//		  '@' => 'SELECT Person WHERE status = \'active\'',
+	//		)
+	'mentions.allowed_classes' => array(
+		'@' => 'SELECT Person WHERE status = \'active\'',
+	),
+
+	'min_display_limit'                => 20,
+
+	// online_help: Hyperlink to the online-help web page
+	//	default: 'http://www.combodo.com/itop-help'
+	'online_help'                      => 'http://www.combodo.com/itop-help',
+
+	// optimize_requests_for_join_count: Optimize request joins to minimize the count (default is true, try to set it to false in case of performance issues)
+	//	default: true
+	'optimize_requests_for_join_count' => true,
+
+	'password_hash_algo'   => '2y',
+
+	// php_path: Path to the php executable in CLI mode
+	//	default: 'php'
+	'php_path'             => 'php',
+
+	// search_manual_submit: Force manual submit of search all requests
+	//	default: false
+	'search_manual_submit' => false,
+
+	'secure_connection_required' => false,
+
+	// session_name: The name of the cookie used to store the PHP session id
+	//	default: 'iTop'
+	'session_name'               => 'iTop',
+
+	// shortcut_actions: Actions that are available as direct buttons next to the "Actions" menu
+	//	default: 'UI:Menu:Modify,UI:Menu:New'
+	'shortcut_actions'           => 'UI:Menu:Modify,UI:Menu:New',
+
+	// source_dir: Source directory for the datamodel files. (which gets compiled to env-production).
+	//	default: ''
+	'source_dir'                 => 'datamodels/2.x/',
+
+	'standard_reload_interval'          => 300,
+
+	// synchro_trace: Synchronization details: none, display, save (includes 'display')
+	//	default: 'none'
+	'synchro_trace'                     => 'none',
+
+	// tag_set_item_separator: Tag set from string: tag label separator
+	//	default: '|'
+	'tag_set_item_separator'            => '|',
+
+	// timezone: Timezone (reference: http://php.net/manual/en/timezones.php). If empty, it will be left unchanged and MUST be explicitly configured in PHP
+	//	default: 'Europe/Paris'
+	'timezone'                          => 'Europe/Paris',
+
+	// tracking_level_linked_set_default: Default tracking level if not explicitly set at the attribute level, for AttributeLinkedSet (defaults to NONE in case of a fresh install, LIST otherwise - this to preserve backward compatibility while upgrading from a version older than 2.0.3 - see TRAC #936)
+	//	default: 1
+	'tracking_level_linked_set_default' => 0,
+
+	// url_validation_pattern: Regular expression to validate/detect the format of an URL (URL attributes and Wiki formatting for Text attributes)
+	//	default: '(https?|ftp)\\://([a-zA-Z0-9+!*(),;?&=\\$_.-]+(\\:[a-zA-Z0-9+!*(),;?&=\\$_.-]+)?@)?([a-zA-Z0-9-.]{3,})(\\:[0-9]{2,5})?(/([a-zA-Z0-9%+\\$_-]\\.?)+)*/?(\\?[a-zA-Z+&\\$_.-][a-zA-Z0-9;:[\\]@&%=+/\\$_.-]*)?(#[a-zA-Z_.-][a-zA-Z0-9+\\$_.-]*)?'
+	'url_validation_pattern'            => '(https?|ftp)\\://([a-zA-Z0-9+!*(),;?&=\\$_.-]+(\\:[a-zA-Z0-9+!*(),;?&=\\$_.-]+)?@)?([a-zA-Z0-9-.]{3,})(\\:[0-9]{2,5})?(/([a-zA-Z0-9%+\\$_-]\\.?)+)*/?(\\?[a-zA-Z+&\\$_.-][a-zA-Z0-9;:[\\]@&%=+/\\$_.-]*)?(#[a-zA-Z_.-][a-zA-Z0-9+\\$_.-]*)?',
+);
+
+/**
+ *
+ * Modules specific settings
+ *
+ */
+$MyModuleSettings = array(
+	'authent-cas'                => array(
+		'cas_debug'   => false,
+		'cas_host'    => '',
+		'cas_port'    => '',
+		'cas_context' => '',
+		'cas_version' => '',
+	),
+	'authent-ldap'               => array(
+		'host'         => 'localhost',
+		'port'         => 389,
+		'default_user' => '',
+		'default_pwd'  => '',
+		'base_dn'      => 'dc=yourcompany,dc=com',
+		'user_query'   => '(&(uid=%1$s)(inetuserstatus=ACTIVE))',
+		'options'      => array(
+			17 => 3,
+			8  => 0,
+		),
+		'start_tls'    => false,
+		'debug'        => false,
+	),
+	'itop-attachments'           => array(
+		'allowed_classes'       => array(
+			0 => 'Ticket',
+		),
+		'position'              => 'relations',
+		'preview_max_width'     => 290,
+		'icon_preview_max_size' => 500000,
+	),
+	'itop-backup'                => array(
+		'mysql_bindir'         => '',
+		'week_days'            => 'monday, tuesday, wednesday, thursday, friday',
+		'time'                 => '23:30',
+		'retention_count'      => 5,
+		'enabled'              => true,
+		'itop_backup_incident' => '',
+	),
+	'molkobain-console-tooltips' => array(
+		'decoration_class' => 'fas fa-question',
+		'enabled'          => true,
+	),
+	'itop-time-tracking'         => array(
+		'allowed_classes'                    => array(
+			'UserRequest'      =>
+				array(
+					'calendar-tab' => 'SELECT UserRequest WHERE status != "closed"',
+					'stopwatch'    => 'SELECT UserRequest WHERE status != "closed"',
+					'report-tab'   => 'SELECT UserRequest WHERE status IN ("resolved", "closed")',
+				),
+			'Incident'         =>
+				array(
+					'calendar-tab' => 'SELECT Incident WHERE status != "closed"',
+					'stopwatch'    => 'SELECT Incident WHERE status != "closed"',
+					'report-tab'   => 'SELECT Incident WHERE status IN ("resolved", "closed")',
+				),
+			'CustomerContract' =>
+				array(
+					'calendar-page' => 'SELECT CustomerContract WHERE status = "production"',
+					'report-tab'    => 'SELECT CustomerContract',
+				),
+		),
+		'colors'                             => array(
+			'default_stopwatch' =>
+				array(
+					'text'       => '#ffffff',
+					'background' => '#a6a6a6',
+				),
+			'default_calendar'  =>
+				array(
+					'text'       => '#ffffff',
+					'background' => '#FFCC80',
+				),
+			'classes'           =>
+				array(
+					'UserRequest'      =>
+						array(
+							'text'       => '#ffffff',
+							'background' => 'shadeof:blue',
+						),
+					'Incident'         =>
+						array(
+							'text'       => '#ffffff',
+							'background' => 'shadeof:green',
+						),
+					'CustomerContract' =>
+						array(
+							'text'       => '#ffffff',
+							'background' => 'shadeof:grey',
+						),
+				),
+		),
+		'clone_events'                       => false,
+		'default_event_duration'             => '00:30:00',
+		'day_start_time'                     => '06:00:00',
+		'day_end_time'                       => '22:00:00',
+		'excluded_days'                      => array(
+			0 => 'Saturday',
+			1 => 'Sunday',
+		),
+		'first_day'                          => 1,
+		'business_hours'                     => array(
+			'days_of_week' =>
+				array(
+					0 => '1',
+					1 => '2',
+					2 => '3',
+					3 => '4',
+					4 => '5',
+				),
+			'start'        => '08:00:00',
+			'end'          => '18:00:00',
+		),
+		'minimum_event_duration_display'     => '00:30:00',
+		'stopwatch_clean_periodicity'        => 1,
+		'stopwatch_max_time'                 => 4,
+		'delete_max_event_age'               => 30,
+		'default_report_query'               => 'SELECT TimeSpent WHERE contact_id = :contact_id AND start_date >= :start_date AND end_date < :end_date',
+		'manager_report_query'               => 'SELECT TimeSpent WHERE start_date >= :start_date AND end_date < :end_date',
+		'manager_report_silo'                => 'SELECT Person',
+		'weekly_report_time_spent_attribute' => '',
+		'weekly_report_time_spent_default'   => '30hrs',
+		'report_charts_definition'           => array(
+			0 =>
+				array(
+					'group_by_attribute' => 'contact_id',
+					'label'              => 'TimeTracking:ReportActivityPerUser',
+				),
+			1 =>
+				array(
+					'group_by_attribute' => 'org_id',
+					'label'              => 'TimeTracking:ReportActivityPerCustomer',
+				),
+		),
+	),
+);
+
+/**
+ *
+ * Data model modules to be loaded. Names are specified as relative paths
+ *
+ */
+$MyModules = array(
+	'addons' => array(
+		'user rights' => 'addons/userrights/userrightsprofile.class.inc.php',
+	),
+);
+
+
+echo 'tutu';
+
+?>
\ No newline at end of file
diff --git a/test/core/ConfigValidator/config-itop_KO_function.php b/test/core/ConfigValidator/config-itop_KO_function.php
new file mode 100644
index 000000000..b6664cc95
--- /dev/null
+++ b/test/core/ConfigValidator/config-itop_KO_function.php
@@ -0,0 +1,7 @@
+<?php
+
+function toto() {
+	echo 'this is my function !';
+}
+
+toto();
\ No newline at end of file
diff --git a/test/core/ConfigValidator/config-itop_VALID.php b/test/core/ConfigValidator/config-itop_VALID.php
new file mode 100644
index 000000000..3e27bb1af
--- /dev/null
+++ b/test/core/ConfigValidator/config-itop_VALID.php
@@ -0,0 +1,390 @@
+<?php
+
+/**
+ *
+ * Configuration file, generated by the iTop configuration wizard
+ *
+ * The file is used in MetaModel::LoadConfig() which does all the necessary initialization job
+ *
+ */
+$MySettings = array(
+
+	// access_message: Message displayed to the users when there is any access restriction
+	//	default: 'iTop is temporarily frozen, please wait... (the admin team)'
+	'access_message' => 'iTop is temporarily frozen, please wait... (the admin team)',
+
+	// access_mode: Access mode: ACCESS_READONLY = 0, ACCESS_ADMIN_WRITE = 2, ACCESS_FULL = 3
+	//	default: 3
+	'access_mode' => 3,
+
+	// activity_panel.entry_form_opened_by_default: Whether or not the new entry form will be automatically opened when viewing an object.
+	//	default: false
+	'activity_panel.entry_form_opened_by_default' => false,
+
+	// activity_panel.show_author_name_below_entries: Whether or not to show the author friendlyname next to the date on the last entry.
+	//	default: false
+	'activity_panel.show_author_name_below_entries' => false,
+
+	'allowed_login_types' => 'form|external|basic',
+
+	// apc_cache.enabled: If set, the APC cache is allowed (the PHP extension must also be active)
+	//	default: true
+	'apc_cache.enabled' => true,
+
+	// apc_cache.query_ttl: Time to live set in APC for the prepared queries (seconds - 0 means no timeout)
+	//	default: 3600
+	'apc_cache.query_ttl' => 3600,
+
+	// app_root_url: Root URL used for navigating within the application, or from an email to the application (you can put $SERVER_NAME$ as a placeholder for the server's name)
+	//	default: ''
+	'app_root_url' => 'http://localhost/itop-dev/',
+
+	// behind_reverse_proxy: If true, then proxies custom header (X-Forwarded-*) are taken into account. Use only if the webserver is not publicly accessible (reachable only by the reverse proxy)
+	//	default: false
+	'behind_reverse_proxy' => false,
+
+	// cron_max_execution_time: Duration (seconds) of the page cron.php, must be shorter than php setting max_execution_time and shorter than the web server response timeout
+	//	default: 600
+	'cron_max_execution_time' => 600,
+
+	// csv_file_default_charset: Character set used by default for downloading and uploading data as a CSV file. Warning: it is case sensitive (uppercase is preferable).
+	//	default: 'ISO-8859-1'
+	'csv_file_default_charset' => 'ISO-8859-1',
+
+	'csv_import_charsets' => array (
+	),
+
+	// csv_import_history_display: Display the history tab in the import wizard
+	//	default: false
+	'csv_import_history_display' => false,
+
+	// date_and_time_format: Format for date and time display (per language)
+	//	default: array (
+	//		  'default' =>
+	//		  array (
+	//		    'date' => 'Y-m-d',
+	//		    'time' => 'H:i:s',
+	//		    'date_time' => '$date $time',
+	//		  ),
+	//		)
+	'date_and_time_format' => array (
+	  'default' =>
+	  array (
+	    'date' => 'Y-m-d',
+	    'time' => 'H:i:s',
+	    'date_time' => '$date $time',
+	  ),
+	),
+
+	'db_host' => 'localhost',
+
+	'db_name' => 'itop_dev',
+
+	'db_pwd' => '',
+
+	'db_subname' => '',
+
+	'db_user' => 'root',
+
+	// deadline_format: The format used for displaying "deadline" attributes: any string with the following placeholders: $date$, $difference$
+	//	default: '$difference$'
+	'deadline_format' => '$difference$',
+
+	'default_language' => 'EN US',
+
+	// email_asynchronous: If set, the emails are sent off line, which requires cron.php to be activated. Exception: some features like the email test utility will force the serialized mode
+	//	default: false
+	'email_asynchronous' => false,
+
+	// email_default_sender_address: Default address provided in the email from header field.
+	//	default: ''
+	'email_default_sender_address' => '',
+
+	// email_default_sender_label: Default label provided in the email from header field.
+	//	default: ''
+	'email_default_sender_label' => '',
+
+	// email_transport: Mean to send emails: PHPMail (uses the function mail()) or SMTP (implements the client protocol)
+	//	default: 'PHPMail'
+	'email_transport' => 'PHPMail',
+
+	// email_validation_pattern: Regular expression to validate/detect the format of an eMail address
+	//	default: '[a-zA-Z0-9._&\'-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z0-9-]{2,}'
+	'email_validation_pattern' => '[a-zA-Z0-9._&\'-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z0-9-]{2,}',
+
+	'encryption_key' => '061c5b88c47ed64664618cf37b91a442b5550704aacecc5f58f96fc98087333b',
+
+	'encryption_library' => 'OpenSSL',
+
+	'ext_auth_variable' => '$_SERVER[\'REMOTE_USER\']',
+
+	'fast_reload_interval' => 60,
+
+	// graphviz_path: Path to the Graphviz "dot" executable for graphing objects lifecycle
+	//	default: '/usr/bin/dot'
+	'graphviz_path' => 'C:\\Program Files (x86)\\Graphviz2.38\\bin\\dot.exe',
+
+	// high_cardinality_classes: List of classes with high cardinality (Force manual submit of search)
+	//	default: array (
+	//		)
+	'high_cardinality_classes' => array (
+	),
+
+	// inline_image_max_display_width: The maximum width (in pixels) when displaying images inside an HTML formatted attribute. Images will be displayed using this this maximum width.
+	//	default: '250'
+	'inline_image_max_display_width' => '250',
+
+	// inline_image_max_storage_width: The maximum width (in pixels) when uploading images to be used inside an HTML formatted attribute. Images larger than the given size will be downsampled before storing them in the database.
+	//	default: '1600'
+	'inline_image_max_storage_width' => '1600',
+
+	// link_set_attribute_qualifier: Link set from string: attribute qualifier (encloses both the attcode and the value)
+	//	default: '\''
+	'link_set_attribute_qualifier' => '\'',
+
+	// link_set_attribute_separator: Link set from string: attribute separator
+	//	default: ';'
+	'link_set_attribute_separator' => ';',
+
+	// link_set_item_separator: Link set from string: line separator
+	//	default: '|'
+	'link_set_item_separator' => '|',
+
+	// link_set_value_separator: Link set from string: value separator (between the attcode and the value itself
+	//	default: ':'
+	'link_set_value_separator' => ':',
+
+	'log_global' => true,
+
+	'log_issue' => true,
+
+    'log_kpi_duration' => 0,
+
+	'log_notification' => true,
+
+	'log_web_service' => true,
+
+	'max_display_limit' => 30,
+
+	// max_linkset_output: Maximum number of items shown when getting a list of related items in an email, using the form $this->some_list$. 0 means no limit.
+	//	default: 100
+	'max_linkset_output' => 100,
+
+	// mentions.allowed_classes: Classes which can be mentioned through the autocomplete in the caselogs. Key of the array must be a single character that will trigger the autocomplete, value can be either a DM class or a valid OQL (eg. "@" => "Person", "?" => "SELECT FAQ WHERE status = 'published'")
+	//	default: array (
+	//		  '@' => 'SELECT Person WHERE status = \'active\'',
+	//		)
+	'mentions.allowed_classes' => array (
+	  '@' => 'SELECT Person WHERE status = \'active\'',
+	),
+
+	'min_display_limit' => 20,
+
+	// online_help: Hyperlink to the online-help web page
+	//	default: 'http://www.combodo.com/itop-help'
+	'online_help' => 'http://www.combodo.com/itop-help',
+
+	// optimize_requests_for_join_count: Optimize request joins to minimize the count (default is true, try to set it to false in case of performance issues)
+	//	default: true
+	'optimize_requests_for_join_count' => true,
+
+	'password_hash_algo' => '2y',
+
+	// php_path: Path to the php executable in CLI mode
+	//	default: 'php'
+	'php_path' => 'php',
+
+	// search_manual_submit: Force manual submit of search all requests
+	//	default: false
+	'search_manual_submit' => false,
+
+	'secure_connection_required' => false,
+
+	// session_name: The name of the cookie used to store the PHP session id
+	//	default: 'iTop'
+	'session_name' => 'iTop',
+
+	// shortcut_actions: Actions that are available as direct buttons next to the "Actions" menu
+	//	default: 'UI:Menu:Modify,UI:Menu:New'
+	'shortcut_actions' => 'UI:Menu:Modify,UI:Menu:New',
+
+	// source_dir: Source directory for the datamodel files. (which gets compiled to env-production).
+	//	default: ''
+	'source_dir' => 'datamodels/2.x/',
+
+	'standard_reload_interval' => 300,
+
+	// synchro_trace: Synchronization details: none, display, save (includes 'display')
+	//	default: 'none'
+	'synchro_trace' => 'none',
+
+	// tag_set_item_separator: Tag set from string: tag label separator
+	//	default: '|'
+	'tag_set_item_separator' => '|',
+
+	// timezone: Timezone (reference: http://php.net/manual/en/timezones.php). If empty, it will be left unchanged and MUST be explicitly configured in PHP
+	//	default: 'Europe/Paris'
+	'timezone' => 'Europe/Paris',
+
+	// tracking_level_linked_set_default: Default tracking level if not explicitly set at the attribute level, for AttributeLinkedSet (defaults to NONE in case of a fresh install, LIST otherwise - this to preserve backward compatibility while upgrading from a version older than 2.0.3 - see TRAC #936)
+	//	default: 1
+	'tracking_level_linked_set_default' => 0,
+
+	// url_validation_pattern: Regular expression to validate/detect the format of an URL (URL attributes and Wiki formatting for Text attributes)
+	//	default: '(https?|ftp)\\://([a-zA-Z0-9+!*(),;?&=\\$_.-]+(\\:[a-zA-Z0-9+!*(),;?&=\\$_.-]+)?@)?([a-zA-Z0-9-.]{3,})(\\:[0-9]{2,5})?(/([a-zA-Z0-9%+\\$_-]\\.?)+)*/?(\\?[a-zA-Z+&\\$_.-][a-zA-Z0-9;:[\\]@&%=+/\\$_.-]*)?(#[a-zA-Z_.-][a-zA-Z0-9+\\$_.-]*)?'
+	'url_validation_pattern' => '(https?|ftp)\\://([a-zA-Z0-9+!*(),;?&=\\$_.-]+(\\:[a-zA-Z0-9+!*(),;?&=\\$_.-]+)?@)?([a-zA-Z0-9-.]{3,})(\\:[0-9]{2,5})?(/([a-zA-Z0-9%+\\$_-]\\.?)+)*/?(\\?[a-zA-Z+&\\$_.-][a-zA-Z0-9;:[\\]@&%=+/\\$_.-]*)?(#[a-zA-Z_.-][a-zA-Z0-9+\\$_.-]*)?',
+);
+
+/**
+ *
+ * Modules specific settings
+ *
+ */
+$MyModuleSettings = array(
+	'authent-cas' => array (
+		'cas_debug' => false,
+		'cas_host' => '',
+		'cas_port' => '',
+		'cas_context' => '',
+		'cas_version' => '',
+	),
+	'authent-ldap' => array (
+		'host' => 'localhost',
+		'port' => 389,
+		'default_user' => '',
+		'default_pwd' => '',
+		'base_dn' => 'dc=yourcompany,dc=com',
+		'user_query' => '(&(uid=%1$s)(inetuserstatus=ACTIVE))',
+		'options' => array (
+		  17 => 3,
+		  8 => 0,
+		),
+		'start_tls' => false,
+		'debug' => false,
+	),
+	'itop-attachments' => array (
+		'allowed_classes' => array (
+		  0 => 'Ticket',
+		),
+		'position' => 'relations',
+		'preview_max_width' => 290,
+		'icon_preview_max_size' => 500000,
+	),
+	'itop-backup' => array (
+		'mysql_bindir' => '',
+		'week_days' => 'monday, tuesday, wednesday, thursday, friday',
+		'time' => '23:30',
+		'retention_count' => 5,
+		'enabled' => true,
+		'itop_backup_incident' => '',
+	),
+	'molkobain-console-tooltips' => array (
+		'decoration_class' => 'fas fa-question',
+		'enabled' => true,
+	),
+	'itop-time-tracking' => array (
+		'allowed_classes' => array (
+		  'UserRequest' =>
+		  array (
+		    'calendar-tab' => 'SELECT UserRequest WHERE status != "closed"',
+		    'stopwatch' => 'SELECT UserRequest WHERE status != "closed"',
+		    'report-tab' => 'SELECT UserRequest WHERE status IN ("resolved", "closed")',
+		  ),
+		  'Incident' =>
+		  array (
+		    'calendar-tab' => 'SELECT Incident WHERE status != "closed"',
+		    'stopwatch' => 'SELECT Incident WHERE status != "closed"',
+		    'report-tab' => 'SELECT Incident WHERE status IN ("resolved", "closed")',
+		  ),
+		  'CustomerContract' =>
+		  array (
+		    'calendar-page' => 'SELECT CustomerContract WHERE status = "production"',
+		    'report-tab' => 'SELECT CustomerContract',
+		  ),
+		),
+		'colors' => array (
+		  'default_stopwatch' =>
+		  array (
+		    'text' => '#ffffff',
+		    'background' => '#a6a6a6',
+		  ),
+		  'default_calendar' =>
+		  array (
+		    'text' => '#ffffff',
+		    'background' => '#FFCC80',
+		  ),
+		  'classes' =>
+		  array (
+		    'UserRequest' =>
+		    array (
+		      'text' => '#ffffff',
+		      'background' => 'shadeof:blue',
+		    ),
+		    'Incident' =>
+		    array (
+		      'text' => '#ffffff',
+		      'background' => 'shadeof:green',
+		    ),
+		    'CustomerContract' =>
+		    array (
+		      'text' => '#ffffff',
+		      'background' => 'shadeof:grey',
+		    ),
+		  ),
+		),
+		'clone_events' => false,
+		'default_event_duration' => '00:30:00',
+		'day_start_time' => '06:00:00',
+		'day_end_time' => '22:00:00',
+		'excluded_days' => array (
+		  0 => 'Saturday',
+		  1 => 'Sunday',
+		),
+		'first_day' => 1,
+		'business_hours' => array (
+		  'days_of_week' =>
+		  array (
+		    0 => '1',
+		    1 => '2',
+		    2 => '3',
+		    3 => '4',
+		    4 => '5',
+		  ),
+		  'start' => '08:00:00',
+		  'end' => '18:00:00',
+		),
+		'minimum_event_duration_display' => '00:30:00',
+		'stopwatch_clean_periodicity' => 1,
+		'stopwatch_max_time' => 4,
+		'delete_max_event_age' => 30,
+		'default_report_query' => 'SELECT TimeSpent WHERE contact_id = :contact_id AND start_date >= :start_date AND end_date < :end_date',
+		'manager_report_query' => 'SELECT TimeSpent WHERE start_date >= :start_date AND end_date < :end_date',
+		'manager_report_silo' => 'SELECT Person',
+		'weekly_report_time_spent_attribute' => '',
+		'weekly_report_time_spent_default' => '30hrs',
+		'report_charts_definition' => array (
+		  0 =>
+		  array (
+		    'group_by_attribute' => 'contact_id',
+		    'label' => 'TimeTracking:ReportActivityPerUser',
+		  ),
+		  1 =>
+		  array (
+		    'group_by_attribute' => 'org_id',
+		    'label' => 'TimeTracking:ReportActivityPerCustomer',
+		  ),
+		),
+	),
+);
+
+/**
+ *
+ * Data model modules to be loaded. Names are specified as relative paths
+ *
+ */
+$MyModules = array(
+	'addons' => array (
+		'user rights' => 'addons/userrights/userrightsprofile.class.inc.php',
+	),
+);
+?>
\ No newline at end of file
diff --git a/test/core/ConfigValidator/config-itop_VALID_log-level-min_const.php b/test/core/ConfigValidator/config-itop_VALID_log-level-min_const.php
new file mode 100644
index 000000000..1d59e53c1
--- /dev/null
+++ b/test/core/ConfigValidator/config-itop_VALID_log-level-min_const.php
@@ -0,0 +1,394 @@
+<?php
+
+/**
+ *
+ * Configuration file, generated by the iTop configuration wizard
+ *
+ * The file is used in MetaModel::LoadConfig() which does all the necessary initialization job
+ *
+ */
+$MySettings = array(
+
+	// access_message: Message displayed to the users when there is any access restriction
+	//	default: 'iTop is temporarily frozen, please wait... (the admin team)'
+	'access_message'                                => 'iTop is temporarily frozen, please wait... (the admin team)',
+
+	// access_mode: Access mode: ACCESS_READONLY = 0, ACCESS_ADMIN_WRITE = 2, ACCESS_FULL = 3
+	//	default: 3
+	'access_mode'                                   => 3,
+
+	// activity_panel.entry_form_opened_by_default: Whether or not the new entry form will be automatically opened when viewing an object.
+	//	default: false
+	'activity_panel.entry_form_opened_by_default'   => false,
+
+	// activity_panel.show_author_name_below_entries: Whether or not to show the author friendlyname next to the date on the last entry.
+	//	default: false
+	'activity_panel.show_author_name_below_entries' => false,
+
+	'allowed_login_types'      => 'form|external|basic',
+
+	// apc_cache.enabled: If set, the APC cache is allowed (the PHP extension must also be active)
+	//	default: true
+	'apc_cache.enabled'        => true,
+
+	// apc_cache.query_ttl: Time to live set in APC for the prepared queries (seconds - 0 means no timeout)
+	//	default: 3600
+	'apc_cache.query_ttl'      => 3600,
+
+	// app_root_url: Root URL used for navigating within the application, or from an email to the application (you can put $SERVER_NAME$ as a placeholder for the server's name)
+	//	default: ''
+	'app_root_url'             => 'http://localhost/itop-dev/',
+
+	// behind_reverse_proxy: If true, then proxies custom header (X-Forwarded-*) are taken into account. Use only if the webserver is not publicly accessible (reachable only by the reverse proxy)
+	//	default: false
+	'behind_reverse_proxy'     => false,
+
+	// cron_max_execution_time: Duration (seconds) of the page cron.php, must be shorter than php setting max_execution_time and shorter than the web server response timeout
+	//	default: 600
+	'cron_max_execution_time'  => 600,
+
+	// csv_file_default_charset: Character set used by default for downloading and uploading data as a CSV file. Warning: it is case sensitive (uppercase is preferable).
+	//	default: 'ISO-8859-1'
+	'csv_file_default_charset' => 'ISO-8859-1',
+
+	'csv_import_charsets'        => array(),
+
+	// csv_import_history_display: Display the history tab in the import wizard
+	//	default: false
+	'csv_import_history_display' => false,
+
+	// date_and_time_format: Format for date and time display (per language)
+	//	default: array (
+	//		  'default' =>
+	//		  array (
+	//		    'date' => 'Y-m-d',
+	//		    'time' => 'H:i:s',
+	//		    'date_time' => '$date $time',
+	//		  ),
+	//		)
+	'date_and_time_format'       => array(
+		'default' =>
+			array(
+				'date'      => 'Y-m-d',
+				'time'      => 'H:i:s',
+				'date_time' => '$date $time',
+			),
+	),
+
+	'db_host' => 'localhost',
+
+	'db_name' => 'itop_dev',
+
+	'db_pwd' => '',
+
+	'db_subname' => '',
+
+	'db_user'         => 'root',
+
+	// deadline_format: The format used for displaying "deadline" attributes: any string with the following placeholders: $date$, $difference$
+	//	default: '$difference$'
+	'deadline_format' => '$difference$',
+
+	'default_language'             => 'EN US',
+
+	// email_asynchronous: If set, the emails are sent off line, which requires cron.php to be activated. Exception: some features like the email test utility will force the serialized mode
+	//	default: false
+	'email_asynchronous'           => false,
+
+	// email_default_sender_address: Default address provided in the email from header field.
+	//	default: ''
+	'email_default_sender_address' => '',
+
+	// email_default_sender_label: Default label provided in the email from header field.
+	//	default: ''
+	'email_default_sender_label'   => '',
+
+	// email_transport: Mean to send emails: PHPMail (uses the function mail()) or SMTP (implements the client protocol)
+	//	default: 'PHPMail'
+	'email_transport'              => 'PHPMail',
+
+	// email_validation_pattern: Regular expression to validate/detect the format of an eMail address
+	//	default: '[a-zA-Z0-9._&\'-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z0-9-]{2,}'
+	'email_validation_pattern'     => '[a-zA-Z0-9._&\'-]+@[a-zA-Z0-9.-]+\\.[a-zA-Z0-9-]{2,}',
+
+	'encryption_key' => '061c5b88c47ed64664618cf37b91a442b5550704aacecc5f58f96fc98087333b',
+
+	'encryption_library' => 'OpenSSL',
+
+	'ext_auth_variable' => '$_SERVER[\'REMOTE_USER\']',
+
+	'fast_reload_interval'           => 60,
+
+	// graphviz_path: Path to the Graphviz "dot" executable for graphing objects lifecycle
+	//	default: '/usr/bin/dot'
+	'graphviz_path'                  => 'C:\\Program Files (x86)\\Graphviz2.38\\bin\\dot.exe',
+
+	// high_cardinality_classes: List of classes with high cardinality (Force manual submit of search)
+	//	default: array (
+	//		)
+	'high_cardinality_classes'       => array(),
+
+	// inline_image_max_display_width: The maximum width (in pixels) when displaying images inside an HTML formatted attribute. Images will be displayed using this this maximum width.
+	//	default: '250'
+	'inline_image_max_display_width' => '250',
+
+	// inline_image_max_storage_width: The maximum width (in pixels) when uploading images to be used inside an HTML formatted attribute. Images larger than the given size will be downsampled before storing them in the database.
+	//	default: '1600'
+	'inline_image_max_storage_width' => '1600',
+
+	// link_set_attribute_qualifier: Link set from string: attribute qualifier (encloses both the attcode and the value)
+	//	default: '\''
+	'link_set_attribute_qualifier'   => '\'',
+
+	// link_set_attribute_separator: Link set from string: attribute separator
+	//	default: ';'
+	'link_set_attribute_separator'   => ';',
+
+	// link_set_item_separator: Link set from string: line separator
+	//	default: '|'
+	'link_set_item_separator'        => '|',
+
+	// link_set_value_separator: Link set from string: value separator (between the attcode and the value itself
+	//	default: ':'
+	'link_set_value_separator'       => ':',
+
+	'log_global' => true,
+
+	'log_issue' => true,
+
+	'log_kpi_duration' => 0,
+
+	'log_level_min' => array(
+		''            => LogAPI::LEVEL_WARNING,
+		'InlineImage' => LogAPI::LEVEL_TRACE,
+		'UserRequest' => LogAPI::LEVEL_TRACE,
+	),
+
+	'log_notification' => true,
+
+	'log_web_service' => true,
+
+	'max_display_limit'        => 30,
+
+	// max_linkset_output: Maximum number of items shown when getting a list of related items in an email, using the form $this->some_list$. 0 means no limit.
+	//	default: 100
+	'max_linkset_output'       => 100,
+
+	// mentions.allowed_classes: Classes which can be mentioned through the autocomplete in the caselogs. Key of the array must be a single character that will trigger the autocomplete, value can be either a DM class or a valid OQL (eg. "@" => "Person", "?" => "SELECT FAQ WHERE status = 'published'")
+	//	default: array (
+	//		  '@' => 'SELECT Person WHERE status = \'active\'',
+	//		)
+	'mentions.allowed_classes' => array(
+		'@' => 'SELECT Person WHERE status = \'active\'',
+	),
+
+	'min_display_limit'                => 20,
+
+	// online_help: Hyperlink to the online-help web page
+	//	default: 'http://www.combodo.com/itop-help'
+	'online_help'                      => 'http://www.combodo.com/itop-help',
+
+	// optimize_requests_for_join_count: Optimize request joins to minimize the count (default is true, try to set it to false in case of performance issues)
+	//	default: true
+	'optimize_requests_for_join_count' => true,
+
+	'password_hash_algo'   => '2y',
+
+	// php_path: Path to the php executable in CLI mode
+	//	default: 'php'
+	'php_path'             => 'php',
+
+	// search_manual_submit: Force manual submit of search all requests
+	//	default: false
+	'search_manual_submit' => false,
+
+	'secure_connection_required' => false,
+
+	// session_name: The name of the cookie used to store the PHP session id
+	//	default: 'iTop'
+	'session_name'               => 'iTop',
+
+	// shortcut_actions: Actions that are available as direct buttons next to the "Actions" menu
+	//	default: 'UI:Menu:Modify,UI:Menu:New'
+	'shortcut_actions'           => 'UI:Menu:Modify,UI:Menu:New',
+
+	// source_dir: Source directory for the datamodel files. (which gets compiled to env-production).
+	//	default: ''
+	'source_dir'                 => 'datamodels/2.x/',
+
+	'standard_reload_interval'          => 300,
+
+	// synchro_trace: Synchronization details: none, display, save (includes 'display')
+	//	default: 'none'
+	'synchro_trace'                     => 'none',
+
+	// tag_set_item_separator: Tag set from string: tag label separator
+	//	default: '|'
+	'tag_set_item_separator'            => '|',
+
+	// timezone: Timezone (reference: http://php.net/manual/en/timezones.php). If empty, it will be left unchanged and MUST be explicitly configured in PHP
+	//	default: 'Europe/Paris'
+	'timezone'                          => 'Europe/Paris',
+
+	// tracking_level_linked_set_default: Default tracking level if not explicitly set at the attribute level, for AttributeLinkedSet (defaults to NONE in case of a fresh install, LIST otherwise - this to preserve backward compatibility while upgrading from a version older than 2.0.3 - see TRAC #936)
+	//	default: 1
+	'tracking_level_linked_set_default' => 0,
+
+	// url_validation_pattern: Regular expression to validate/detect the format of an URL (URL attributes and Wiki formatting for Text attributes)
+	//	default: '(https?|ftp)\\://([a-zA-Z0-9+!*(),;?&=\\$_.-]+(\\:[a-zA-Z0-9+!*(),;?&=\\$_.-]+)?@)?([a-zA-Z0-9-.]{3,})(\\:[0-9]{2,5})?(/([a-zA-Z0-9%+\\$_-]\\.?)+)*/?(\\?[a-zA-Z+&\\$_.-][a-zA-Z0-9;:[\\]@&%=+/\\$_.-]*)?(#[a-zA-Z_.-][a-zA-Z0-9+\\$_.-]*)?'
+	'url_validation_pattern'            => '(https?|ftp)\\://([a-zA-Z0-9+!*(),;?&=\\$_.-]+(\\:[a-zA-Z0-9+!*(),;?&=\\$_.-]+)?@)?([a-zA-Z0-9-.]{3,})(\\:[0-9]{2,5})?(/([a-zA-Z0-9%+\\$_-]\\.?)+)*/?(\\?[a-zA-Z+&\\$_.-][a-zA-Z0-9;:[\\]@&%=+/\\$_.-]*)?(#[a-zA-Z_.-][a-zA-Z0-9+\\$_.-]*)?',
+);
+
+/**
+ *
+ * Modules specific settings
+ *
+ */
+$MyModuleSettings = array(
+	'authent-cas'                => array(
+		'cas_debug'   => false,
+		'cas_host'    => '',
+		'cas_port'    => '',
+		'cas_context' => '',
+		'cas_version' => '',
+	),
+	'authent-ldap'               => array(
+		'host'         => 'localhost',
+		'port'         => 389,
+		'default_user' => '',
+		'default_pwd'  => '',
+		'base_dn'      => 'dc=yourcompany,dc=com',
+		'user_query'   => '(&(uid=%1$s)(inetuserstatus=ACTIVE))',
+		'options'      => array(
+			17 => 3,
+			8  => 0,
+		),
+		'start_tls'    => false,
+		'debug'        => false,
+	),
+	'itop-attachments'           => array(
+		'allowed_classes'       => array(
+			0 => 'Ticket',
+		),
+		'position'              => 'relations',
+		'preview_max_width'     => 290,
+		'icon_preview_max_size' => 500000,
+	),
+	'itop-backup'                => array(
+		'mysql_bindir'         => '',
+		'week_days'            => 'monday, tuesday, wednesday, thursday, friday',
+		'time'                 => '23:30',
+		'retention_count'      => 5,
+		'enabled'              => true,
+		'itop_backup_incident' => '',
+	),
+	'molkobain-console-tooltips' => array(
+		'decoration_class' => 'fas fa-question',
+		'enabled'          => true,
+	),
+	'itop-time-tracking'         => array(
+		'allowed_classes'                    => array(
+			'UserRequest'      =>
+				array(
+					'calendar-tab' => 'SELECT UserRequest WHERE status != "closed"',
+					'stopwatch'    => 'SELECT UserRequest WHERE status != "closed"',
+					'report-tab'   => 'SELECT UserRequest WHERE status IN ("resolved", "closed")',
+				),
+			'Incident'         =>
+				array(
+					'calendar-tab' => 'SELECT Incident WHERE status != "closed"',
+					'stopwatch'    => 'SELECT Incident WHERE status != "closed"',
+					'report-tab'   => 'SELECT Incident WHERE status IN ("resolved", "closed")',
+				),
+			'CustomerContract' =>
+				array(
+					'calendar-page' => 'SELECT CustomerContract WHERE status = "production"',
+					'report-tab'    => 'SELECT CustomerContract',
+				),
+		),
+		'colors'                             => array(
+			'default_stopwatch' =>
+				array(
+					'text'       => '#ffffff',
+					'background' => '#a6a6a6',
+				),
+			'default_calendar'  =>
+				array(
+					'text'       => '#ffffff',
+					'background' => '#FFCC80',
+				),
+			'classes'           =>
+				array(
+					'UserRequest'      =>
+						array(
+							'text'       => '#ffffff',
+							'background' => 'shadeof:blue',
+						),
+					'Incident'         =>
+						array(
+							'text'       => '#ffffff',
+							'background' => 'shadeof:green',
+						),
+					'CustomerContract' =>
+						array(
+							'text'       => '#ffffff',
+							'background' => 'shadeof:grey',
+						),
+				),
+		),
+		'clone_events'                       => false,
+		'default_event_duration'             => '00:30:00',
+		'day_start_time'                     => '06:00:00',
+		'day_end_time'                       => '22:00:00',
+		'excluded_days'                      => array(
+			0 => 'Saturday',
+			1 => 'Sunday',
+		),
+		'first_day'                          => 1,
+		'business_hours'                     => array(
+			'days_of_week' =>
+				array(
+					0 => '1',
+					1 => '2',
+					2 => '3',
+					3 => '4',
+					4 => '5',
+				),
+			'start'        => '08:00:00',
+			'end'          => '18:00:00',
+		),
+		'minimum_event_duration_display'     => '00:30:00',
+		'stopwatch_clean_periodicity'        => 1,
+		'stopwatch_max_time'                 => 4,
+		'delete_max_event_age'               => 30,
+		'default_report_query'               => 'SELECT TimeSpent WHERE contact_id = :contact_id AND start_date >= :start_date AND end_date < :end_date',
+		'manager_report_query'               => 'SELECT TimeSpent WHERE start_date >= :start_date AND end_date < :end_date',
+		'manager_report_silo'                => 'SELECT Person',
+		'weekly_report_time_spent_attribute' => '',
+		'weekly_report_time_spent_default'   => '30hrs',
+		'report_charts_definition'           => array(
+			0 =>
+				array(
+					'group_by_attribute' => 'contact_id',
+					'label'              => 'TimeTracking:ReportActivityPerUser',
+				),
+			1 =>
+				array(
+					'group_by_attribute' => 'org_id',
+					'label'              => 'TimeTracking:ReportActivityPerCustomer',
+				),
+		),
+	),
+);
+
+/**
+ *
+ * Data model modules to be loaded. Names are specified as relative paths
+ *
+ */
+$MyModules = array(
+	'addons' => array(
+		'user rights' => 'addons/userrights/userrightsprofile.class.inc.php',
+	),
+);
+?>
\ No newline at end of file
diff --git a/test/core/ConfigValidator/iTopConfigAstValidatorTest.php b/test/core/ConfigValidator/iTopConfigAstValidatorTest.php
new file mode 100644
index 000000000..b30b67f14
--- /dev/null
+++ b/test/core/ConfigValidator/iTopConfigAstValidatorTest.php
@@ -0,0 +1,69 @@
+<?php
+/*
+ * @copyright   Copyright (C) 2010-2021 Combodo SARL
+ * @license     http://opensource.org/licenses/AGPL-3.0
+ */
+
+namespace ConfigValidator;
+
+use Combodo\iTop\Config\Validator\iTopConfigAstValidator;
+use Combodo\iTop\Test\UnitTest\ItopTestCase;
+use Exception;
+
+class iTopConfigAstValidatorTest extends ItopTestCase
+{
+	protected function setUp(): void
+	{
+		parent::setUp();
+		require_once APPROOT.'env-production/itop-config/src/Validator/iTopConfigAstValidator.php';
+		require_once APPROOT.'env-production/itop-config/src/Validator/ConfigNodesVisitor.php';
+	}
+
+	public function testValidateFileValid()
+	{
+		try {
+			$this->CallValidatorOnFile('config-itop_VALID.php');
+		}
+		catch (Exception $e) {
+			$this->fail('An exception was thrown by the validation method on a valid file: '.$e->getMessage());
+		}
+
+		$this->assertTrue(true, 'The file is valid and interpreted as such');
+	}
+
+	public function testValidateFileValidLogLevelMinConst()
+	{
+		$this->markTestSkipped(' disabled test, is failing for now with error "Invalid configuration: LEVEL_WARNING of type Identifier is forbidden in line 152"');
+		try {
+			$this->CallValidatorOnFile('config-itop_VALID_log-level-min_const.php');
+		}
+		catch (Exception $e) {
+			$this->fail('An exception was thrown by the validation method on a valid file: '.$e->getMessage());
+		}
+
+		$this->assertTrue(true, 'The file is valid and interpreted as such');
+	}
+
+	public function testValidateFileWithCode()
+	{
+		$this->expectExceptionMessage('type Stmt_Function is forbidden');
+		$this->CallValidatorOnFile('config-itop_KO_function.php');
+	}
+
+	public function testValidateFileValidWithCodeAtTheEnd()
+	{
+		$this->expectExceptionMessage('Stmt_Echo is forbidden');
+		$this->CallValidatorOnFile('config-itop_KO_config_plus_code.php');
+	}
+
+	/**
+	 * @throws \Exception
+	 */
+	private function CallValidatorOnFile(string $sConfigFilePath)
+	{
+		$sContents = file_get_contents(__DIR__.DIRECTORY_SEPARATOR.$sConfigFilePath);
+
+		$oiTopConfigValidator = new iTopConfigAstValidator();
+		$oiTopConfigValidator->Validate($sContents);
+	}
+}
\ No newline at end of file

From af8bcdc242bb3a87fce792fa1656b1a80717313b Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Fri, 29 Apr 2022 14:39:02 +0200
Subject: [PATCH 07/15] =?UTF-8?q?:arrow=5Fup:=20N=C2=B04824=20Composer=20l?=
 =?UTF-8?q?ibs=20:=20update=20pear/archive=5Ftar?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.json              | 2 +-
 composer.lock              | 2 +-
 lib/composer/installed.php | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index be32dcb4b..cd4dff996 100644
--- a/composer.json
+++ b/composer.json
@@ -12,7 +12,7 @@
     "ext-soap": "*",
     "combodo/tcpdf": "~6.4.4",
     "nikic/php-parser": "~4.13.2",
-    "pear/archive_tar": "1.4.14",
+    "pear/archive_tar": "~1.4.14",
     "pelago/emogrifier": "2.1.0",
     "scssphp/scssphp": "1.0.6",
     "swiftmailer/swiftmailer": "5.4.12",
diff --git a/composer.lock b/composer.lock
index b36f69a74..4531a89ae 100644
--- a/composer.lock
+++ b/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": "2dff3cf0e45834a895b6f81f1af4016c",
+    "content-hash": "ebd8582859a03bc00f64b6155d36a387",
     "packages": [
         {
             "name": "combodo/tcpdf",
diff --git a/lib/composer/installed.php b/lib/composer/installed.php
index e46a0ff33..53413b733 100644
--- a/lib/composer/installed.php
+++ b/lib/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '1882b696c58d1e8e3d687196b0974e6b9ec64312',
+        'reference' => '14f18371ff806c027100f6a593ec09f93d76ccf7',
         'name' => '__root__',
         'dev' => true,
     ),
@@ -16,7 +16,7 @@
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '1882b696c58d1e8e3d687196b0974e6b9ec64312',
+            'reference' => '14f18371ff806c027100f6a593ec09f93d76ccf7',
             'dev_requirement' => false,
         ),
         'combodo/tcpdf' => array(

From 001e222f67a6963f5fdb3ecdd9f4bb924430b800 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Fri, 29 Apr 2022 14:40:27 +0200
Subject: [PATCH 08/15] =?UTF-8?q?:arrow=5Fup:=20N=C2=B04824=20Composer=20l?=
 =?UTF-8?q?ibs=20:=20update=20pelago/emogrifier?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.json                                 |    2 +-
 composer.lock                                 |   50 +-
 lib/composer/autoload_classmap.php            |    4 +-
 lib/composer/autoload_static.php              |    4 +-
 lib/composer/installed.json                   |   50 +-
 lib/composer/installed.php                    |   10 +-
 lib/pelago/emogrifier/.gitignore              |   25 -
 lib/pelago/emogrifier/.travis.yml             |   65 -
 lib/pelago/emogrifier/CHANGELOG.md            |  225 ++-
 lib/pelago/emogrifier/CODE_OF_CONDUCT.md      |   77 -
 lib/pelago/emogrifier/README.md               |  428 +++--
 lib/pelago/emogrifier/composer.json           |   16 +-
 lib/pelago/emogrifier/config/php-cs-fixer.php |   93 -
 lib/pelago/emogrifier/config/phpmd.xml        |   49 -
 lib/pelago/emogrifier/phpcs.xml.dist          |  140 --
 lib/pelago/emogrifier/src/Emogrifier.php      |  822 ++++-----
 .../emogrifier/src/Emogrifier/CssInliner.php  | 1513 +++++++----------
 .../HtmlProcessor/AbstractHtmlProcessor.php   |  114 +-
 .../HtmlProcessor/CssToAttributeConverter.php |   32 +-
 .../HtmlProcessor/HtmlNormalizer.php          |    2 -
 .../Emogrifier/HtmlProcessor/HtmlPruner.php   |  143 ++
 .../Emogrifier/Utilities/ArrayIntersector.php |   56 +
 .../{ => Utilities}/CssConcatenator.php       |   10 +-
 23 files changed, 1886 insertions(+), 2044 deletions(-)
 delete mode 100644 lib/pelago/emogrifier/.gitignore
 delete mode 100644 lib/pelago/emogrifier/.travis.yml
 delete mode 100644 lib/pelago/emogrifier/CODE_OF_CONDUCT.md
 delete mode 100644 lib/pelago/emogrifier/config/php-cs-fixer.php
 delete mode 100644 lib/pelago/emogrifier/config/phpmd.xml
 delete mode 100644 lib/pelago/emogrifier/phpcs.xml.dist
 create mode 100644 lib/pelago/emogrifier/src/Emogrifier/HtmlProcessor/HtmlPruner.php
 create mode 100644 lib/pelago/emogrifier/src/Emogrifier/Utilities/ArrayIntersector.php
 rename lib/pelago/emogrifier/src/Emogrifier/{ => Utilities}/CssConcatenator.php (94%)

diff --git a/composer.json b/composer.json
index cd4dff996..e43adbe39 100644
--- a/composer.json
+++ b/composer.json
@@ -13,7 +13,7 @@
     "combodo/tcpdf": "~6.4.4",
     "nikic/php-parser": "~4.13.2",
     "pear/archive_tar": "~1.4.14",
-    "pelago/emogrifier": "2.1.0",
+    "pelago/emogrifier": "~3.1.0",
     "scssphp/scssphp": "1.0.6",
     "swiftmailer/swiftmailer": "5.4.12",
     "symfony/console": "~3.4.47",
diff --git a/composer.lock b/composer.lock
index 4531a89ae..3af6a5144 100644
--- a/composer.lock
+++ b/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": "ebd8582859a03bc00f64b6155d36a387",
+    "content-hash": "92ecc4c90eca1b55654c99c1b1f8cc8e",
     "packages": [
         {
             "name": "combodo/tcpdf",
@@ -417,34 +417,34 @@
         },
         {
             "name": "pelago/emogrifier",
-            "version": "v2.1.0",
+            "version": "v3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MyIntervals/emogrifier.git",
-                "reference": "40c3d4f475d44ffc7265a760d1dd0e81f579f96f"
+                "reference": "f6a5c7d44612d86c3901c93f1592f5440e6b2cd8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/40c3d4f475d44ffc7265a760d1dd0e81f579f96f",
-                "reference": "40c3d4f475d44ffc7265a760d1dd0e81f579f96f",
+                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/f6a5c7d44612d86c3901c93f1592f5440e6b2cd8",
+                "reference": "f6a5c7d44612d86c3901c93f1592f5440e6b2cd8",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
-                "php": "^5.5.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0",
-                "symfony/css-selector": "^3.4.0 || ^4.0.0"
+                "php": "^5.6 || ~7.0 || ~7.1 || ~7.2 || ~7.3 || ~7.4",
+                "symfony/css-selector": "^2.8 || ^3.0 || ^4.0 || ^5.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.2.0",
-                "phpmd/phpmd": "^2.6.0",
-                "phpunit/phpunit": "^4.8.0",
-                "squizlabs/php_codesniffer": "^3.3.2"
+                "friendsofphp/php-cs-fixer": "^2.15.3",
+                "phpmd/phpmd": "^2.7.0",
+                "phpunit/phpunit": "^5.7.27",
+                "squizlabs/php_codesniffer": "^3.5.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1.x-dev"
+                    "dev-master": "4.0.x-dev"
                 }
             },
             "autoload": {
@@ -457,16 +457,6 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "John Reeve",
-                    "email": "jreeve@pelagodesign.com"
-                },
-                {
-                    "name": "Cameron Brooks"
-                },
-                {
-                    "name": "Jaime Prado"
-                },
                 {
                     "name": "Oliver Klee",
                     "email": "github@oliverklee.de"
@@ -475,9 +465,19 @@
                     "name": "Zoli Szabó",
                     "email": "zoli.szabo+github@gmail.com"
                 },
+                {
+                    "name": "John Reeve",
+                    "email": "jreeve@pelagodesign.com"
+                },
                 {
                     "name": "Jake Hotson",
                     "email": "jake@qzdesign.co.uk"
+                },
+                {
+                    "name": "Cameron Brooks"
+                },
+                {
+                    "name": "Jaime Prado"
                 }
             ],
             "description": "Converts CSS styles into inline style attributes in your HTML code",
@@ -487,7 +487,11 @@
                 "email",
                 "pre-processing"
             ],
-            "time": "2018-12-08T13:55:46+00:00"
+            "support": {
+                "issues": "https://github.com/MyIntervals/emogrifier/issues",
+                "source": "https://github.com/MyIntervals/emogrifier"
+            },
+            "time": "2019-12-26T19:37:31+00:00"
         },
         {
             "name": "psr/cache",
diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index 6cc6fef1e..0e459993d 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -385,11 +385,13 @@ return array(
     'ParseyyStackEntry' => $baseDir . '/core/oql/build/PHP/Lempar.php',
     'ParseyyToken' => $baseDir . '/core/oql/build/PHP/Lempar.php',
     'Pelago\\Emogrifier' => $vendorDir . '/pelago/emogrifier/src/Emogrifier.php',
-    'Pelago\\Emogrifier\\CssConcatenator' => $vendorDir . '/pelago/emogrifier/src/Emogrifier/CssConcatenator.php',
     'Pelago\\Emogrifier\\CssInliner' => $vendorDir . '/pelago/emogrifier/src/Emogrifier/CssInliner.php',
     'Pelago\\Emogrifier\\HtmlProcessor\\AbstractHtmlProcessor' => $vendorDir . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/AbstractHtmlProcessor.php',
     'Pelago\\Emogrifier\\HtmlProcessor\\CssToAttributeConverter' => $vendorDir . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/CssToAttributeConverter.php',
     'Pelago\\Emogrifier\\HtmlProcessor\\HtmlNormalizer' => $vendorDir . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/HtmlNormalizer.php',
+    'Pelago\\Emogrifier\\HtmlProcessor\\HtmlPruner' => $vendorDir . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/HtmlPruner.php',
+    'Pelago\\Emogrifier\\Utilities\\ArrayIntersector' => $vendorDir . '/pelago/emogrifier/src/Emogrifier/Utilities/ArrayIntersector.php',
+    'Pelago\\Emogrifier\\Utilities\\CssConcatenator' => $vendorDir . '/pelago/emogrifier/src/Emogrifier/Utilities/CssConcatenator.php',
     'PhpParser\\Builder' => $vendorDir . '/nikic/php-parser/lib/PhpParser/Builder.php',
     'PhpParser\\BuilderFactory' => $vendorDir . '/nikic/php-parser/lib/PhpParser/BuilderFactory.php',
     'PhpParser\\BuilderHelpers' => $vendorDir . '/nikic/php-parser/lib/PhpParser/BuilderHelpers.php',
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index 642367c39..b80d41b55 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -615,11 +615,13 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'ParseyyStackEntry' => __DIR__ . '/../..' . '/core/oql/build/PHP/Lempar.php',
         'ParseyyToken' => __DIR__ . '/../..' . '/core/oql/build/PHP/Lempar.php',
         'Pelago\\Emogrifier' => __DIR__ . '/..' . '/pelago/emogrifier/src/Emogrifier.php',
-        'Pelago\\Emogrifier\\CssConcatenator' => __DIR__ . '/..' . '/pelago/emogrifier/src/Emogrifier/CssConcatenator.php',
         'Pelago\\Emogrifier\\CssInliner' => __DIR__ . '/..' . '/pelago/emogrifier/src/Emogrifier/CssInliner.php',
         'Pelago\\Emogrifier\\HtmlProcessor\\AbstractHtmlProcessor' => __DIR__ . '/..' . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/AbstractHtmlProcessor.php',
         'Pelago\\Emogrifier\\HtmlProcessor\\CssToAttributeConverter' => __DIR__ . '/..' . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/CssToAttributeConverter.php',
         'Pelago\\Emogrifier\\HtmlProcessor\\HtmlNormalizer' => __DIR__ . '/..' . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/HtmlNormalizer.php',
+        'Pelago\\Emogrifier\\HtmlProcessor\\HtmlPruner' => __DIR__ . '/..' . '/pelago/emogrifier/src/Emogrifier/HtmlProcessor/HtmlPruner.php',
+        'Pelago\\Emogrifier\\Utilities\\ArrayIntersector' => __DIR__ . '/..' . '/pelago/emogrifier/src/Emogrifier/Utilities/ArrayIntersector.php',
+        'Pelago\\Emogrifier\\Utilities\\CssConcatenator' => __DIR__ . '/..' . '/pelago/emogrifier/src/Emogrifier/Utilities/CssConcatenator.php',
         'PhpParser\\Builder' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/Builder.php',
         'PhpParser\\BuilderFactory' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/BuilderFactory.php',
         'PhpParser\\BuilderHelpers' => __DIR__ . '/..' . '/nikic/php-parser/lib/PhpParser/BuilderHelpers.php',
diff --git a/lib/composer/installed.json b/lib/composer/installed.json
index 4ada053c3..290313c8b 100644
--- a/lib/composer/installed.json
+++ b/lib/composer/installed.json
@@ -432,36 +432,36 @@
         },
         {
             "name": "pelago/emogrifier",
-            "version": "v2.1.0",
-            "version_normalized": "2.1.0.0",
+            "version": "v3.1.0",
+            "version_normalized": "3.1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/MyIntervals/emogrifier.git",
-                "reference": "40c3d4f475d44ffc7265a760d1dd0e81f579f96f"
+                "reference": "f6a5c7d44612d86c3901c93f1592f5440e6b2cd8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/40c3d4f475d44ffc7265a760d1dd0e81f579f96f",
-                "reference": "40c3d4f475d44ffc7265a760d1dd0e81f579f96f",
+                "url": "https://api.github.com/repos/MyIntervals/emogrifier/zipball/f6a5c7d44612d86c3901c93f1592f5440e6b2cd8",
+                "reference": "f6a5c7d44612d86c3901c93f1592f5440e6b2cd8",
                 "shasum": ""
             },
             "require": {
                 "ext-dom": "*",
                 "ext-libxml": "*",
-                "php": "^5.5.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0",
-                "symfony/css-selector": "^3.4.0 || ^4.0.0"
+                "php": "^5.6 || ~7.0 || ~7.1 || ~7.2 || ~7.3 || ~7.4",
+                "symfony/css-selector": "^2.8 || ^3.0 || ^4.0 || ^5.0"
             },
             "require-dev": {
-                "friendsofphp/php-cs-fixer": "^2.2.0",
-                "phpmd/phpmd": "^2.6.0",
-                "phpunit/phpunit": "^4.8.0",
-                "squizlabs/php_codesniffer": "^3.3.2"
+                "friendsofphp/php-cs-fixer": "^2.15.3",
+                "phpmd/phpmd": "^2.7.0",
+                "phpunit/phpunit": "^5.7.27",
+                "squizlabs/php_codesniffer": "^3.5.0"
             },
-            "time": "2018-12-08T13:55:46+00:00",
+            "time": "2019-12-26T19:37:31+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "2.1.x-dev"
+                    "dev-master": "4.0.x-dev"
                 }
             },
             "installation-source": "dist",
@@ -475,16 +475,6 @@
                 "MIT"
             ],
             "authors": [
-                {
-                    "name": "John Reeve",
-                    "email": "jreeve@pelagodesign.com"
-                },
-                {
-                    "name": "Cameron Brooks"
-                },
-                {
-                    "name": "Jaime Prado"
-                },
                 {
                     "name": "Oliver Klee",
                     "email": "github@oliverklee.de"
@@ -493,9 +483,19 @@
                     "name": "Zoli Szabó",
                     "email": "zoli.szabo+github@gmail.com"
                 },
+                {
+                    "name": "John Reeve",
+                    "email": "jreeve@pelagodesign.com"
+                },
                 {
                     "name": "Jake Hotson",
                     "email": "jake@qzdesign.co.uk"
+                },
+                {
+                    "name": "Cameron Brooks"
+                },
+                {
+                    "name": "Jaime Prado"
                 }
             ],
             "description": "Converts CSS styles into inline style attributes in your HTML code",
@@ -505,6 +505,10 @@
                 "email",
                 "pre-processing"
             ],
+            "support": {
+                "issues": "https://github.com/MyIntervals/emogrifier/issues",
+                "source": "https://github.com/MyIntervals/emogrifier"
+            },
             "install-path": "../pelago/emogrifier"
         },
         {
diff --git a/lib/composer/installed.php b/lib/composer/installed.php
index 53413b733..292559691 100644
--- a/lib/composer/installed.php
+++ b/lib/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '14f18371ff806c027100f6a593ec09f93d76ccf7',
+        'reference' => '9ebd884f6e55363b145c271dfc1a9d64cae4d2db',
         'name' => '__root__',
         'dev' => true,
     ),
@@ -16,7 +16,7 @@
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '14f18371ff806c027100f6a593ec09f93d76ccf7',
+            'reference' => '9ebd884f6e55363b145c271dfc1a9d64cae4d2db',
             'dev_requirement' => false,
         ),
         'combodo/tcpdf' => array(
@@ -83,12 +83,12 @@
             'dev_requirement' => false,
         ),
         'pelago/emogrifier' => array(
-            'pretty_version' => 'v2.1.0',
-            'version' => '2.1.0.0',
+            'pretty_version' => 'v3.1.0',
+            'version' => '3.1.0.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../pelago/emogrifier',
             'aliases' => array(),
-            'reference' => '40c3d4f475d44ffc7265a760d1dd0e81f579f96f',
+            'reference' => 'f6a5c7d44612d86c3901c93f1592f5440e6b2cd8',
             'dev_requirement' => false,
         ),
         'psr/cache' => array(
diff --git a/lib/pelago/emogrifier/.gitignore b/lib/pelago/emogrifier/.gitignore
deleted file mode 100644
index 8bfbb851e..000000000
--- a/lib/pelago/emogrifier/.gitignore
+++ /dev/null
@@ -1,25 +0,0 @@
-#########################
-# global ignore file
-########################
-# ignoring temporary files (left by e.g. vim)
-# ignoring by common IDE's used directories/files
-# dont ignore .rej and .orig as we want to see/clean files after conflict resolution
-#
-# for local exclude patterns please edit .git/info/exclude
-#
-*~
-*.bak
-*.idea
-*.project
-*.swp
-.buildpath
-.cache
-.project
-.session
-.settings
-.TemporaryItems
-.webprj
-nbproject
-/.php_cs.cache
-/vendor/
-composer.lock
diff --git a/lib/pelago/emogrifier/.travis.yml b/lib/pelago/emogrifier/.travis.yml
deleted file mode 100644
index f3a6c22ea..000000000
--- a/lib/pelago/emogrifier/.travis.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-sudo: false
-
-language: php
-
-php:
-- 5.5
-- 5.6
-- 7.0
-- 7.1
-- 7.2
-- 7.3
-
-cache:
-  directories:
-  - vendor
-  - $HOME/.composer/cache
-
-env:
-  matrix:
-  - DEPENDENCIES_PREFERENCE="--prefer-lowest"
-  - DEPENDENCIES_PREFERENCE=""
-
-before_install:
-- phpenv config-rm xdebug.ini || echo "xdebug not available"
-
-install:
-- >
-  export IGNORE_PLATFORM_REQS="$(composer php:version |grep -q '^7.3' && printf -- --ignore-platform-reqs)";
-  echo;
-  echo "Updating the dependencies";
-  composer update $IGNORE_PLATFORM_REQS --with-dependencies $DEPENDENCIES_PREFERENCE;
-  composer show;
-
-script:
-- >
-  echo;
-  echo "Validating the composer.json";
-  composer validate --no-check-all --no-check-lock --strict;
-
-- >
-  echo;
-  echo "Linting all PHP files";
-  composer ci:php:lint;
-
-- >
-  echo;
-  echo "Running the unit tests";
-  composer ci:tests:unit;
-
-- >
-  echo;
-  echo "Running PHPMD";
-  composer ci:php:md;
-
-- >
-  echo;
-  function version_gte() { test "$(printf '%s\n' "$@" | sort -n -t. -r | head -n 1)" = "$1"; };
-  if version_gte $(composer php:version) 7; then
-    echo "Installing slevomat/coding-standard only for PHP 7.x";
-    composer require $IGNORE_PLATFORM_REQS --dev slevomat/coding-standard:^4.0 $DEPENDENCIES_PREFERENCE;
-    echo "Running PHP_CodeSniffer";
-    composer ci:php:sniff;
-  else
-    echo "Skipped PHP_CodeSniffer due to insufficient PHP version: $(composer php:version)";
-  fi;
diff --git a/lib/pelago/emogrifier/CHANGELOG.md b/lib/pelago/emogrifier/CHANGELOG.md
index 938e2b511..6ee477312 100644
--- a/lib/pelago/emogrifier/CHANGELOG.md
+++ b/lib/pelago/emogrifier/CHANGELOG.md
@@ -15,6 +15,200 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ### Fixed
 
+## 3.1.0
+
+### Added
+- Add support for PHP 7.4
+  ([#821](https://github.com/MyIntervals/emogrifier/pull/821),
+  [#829](https://github.com/MyIntervals/emogrifier/pull/829))
+
+### Changed
+- Upgrade to Symfony 5.0
+  ([#822](https://github.com/MyIntervals/emogrifier/pull/820)
+
+## 3.0.0
+
+### Added
+- Test and document excluding entire subtree with `addExcludedSelector()`
+  ([#347](https://github.com/MyIntervals/emogrifier/issues/347),
+  [#768](https://github.com/MyIntervals/emogrifier/pull/768))
+- Test that rules with `:optional` or `:required` are copied to the `<style>`
+  element ([#748](https://github.com/MyIntervals/emogrifier/issues/748),
+  [#765](https://github.com/MyIntervals/emogrifier/pull/765))
+- Test that rules with `:only-of-type` are copied to the `<style>` element
+  ([#748](https://github.com/MyIntervals/emogrifier/issues/748),
+  [#760](https://github.com/MyIntervals/emogrifier/pull/760))
+- Support `:last-of-type`
+  ([#748](https://github.com/MyIntervals/emogrifier/issues/748),
+  [#758](https://github.com/MyIntervals/emogrifier/pull/758))
+- Support `:first-of-type`
+  ([#748](https://github.com/MyIntervals/emogrifier/issues/748),
+  [#757](https://github.com/MyIntervals/emogrifier/pull/757))
+- Support `:empty`
+  ([#748](https://github.com/MyIntervals/emogrifier/issues/748),
+  [#756](https://github.com/MyIntervals/emogrifier/pull/756))
+- Test that rules with `:any-link` are copied to the `<style>` element
+  ([#748](https://github.com/MyIntervals/emogrifier/issues/748),
+  [#755](https://github.com/MyIntervals/emogrifier/pull/755))
+- Support and test `:only-child`
+  ([#747](https://github.com/MyIntervals/emogrifier/issues/747),
+  [#754](https://github.com/MyIntervals/emogrifier/pull/754))
+- Support and test `:nth-last-of-type`
+  ([#747](https://github.com/MyIntervals/emogrifier/issues/747),
+  [#751](https://github.com/MyIntervals/emogrifier/pull/751))
+- Support and test `:nth-last-child`
+  ([#747](https://github.com/MyIntervals/emogrifier/issues/747),
+  [#750](https://github.com/MyIntervals/emogrifier/pull/750))
+- Support and test general sibling combinator
+  ([#723](https://github.com/MyIntervals/emogrifier/issues/723),
+  [#745](https://github.com/MyIntervals/emogrifier/pull/745))
+- Test universal selector with combinators
+  ([#723](https://github.com/MyIntervals/emogrifier/issues/723),
+  [#743](https://github.com/MyIntervals/emogrifier/pull/743))
+- Preserve `display: none` elements with `-emogrifier-keep` class
+  ([#252](https://github.com/MyIntervals/emogrifier/issues/252),
+  [#737](https://github.com/MyIntervals/emogrifier/pull/737))
+- Preserve valid `@import` rules
+  ([#338](https://github.com/MyIntervals/emogrifier/issues/338),
+  [#334](https://github.com/MyIntervals/emogrifier/pull/334),
+  [#732](https://github.com/MyIntervals/emogrifier/pull/732),
+  [#735](https://github.com/MyIntervals/emogrifier/pull/735))
+- Add `HtmlPruner::removeRedundantClassesAfterCssInlined`
+  ([#380](https://github.com/MyIntervals/emogrifier/issues/380),
+  [#724](https://github.com/MyIntervals/emogrifier/pull/724))
+- Check on Travis that PHP-CS-Fixer will not change anything
+  [#727](https://github.com/MyIntervals/emogrifier/pull/727))
+- Support `:not(…)` as an entire selector
+  ([#469](https://github.com/MyIntervals/emogrifier/issues/469),
+  [#725](https://github.com/MyIntervals/emogrifier/pull/725))
+- Add `HtmlPruner::removeRedundantClasses`
+  ([#380](https://github.com/MyIntervals/emogrifier/issues/380),
+  [#708](https://github.com/MyIntervals/emogrifier/pull/708))
+- Support multiple attributes selectors
+  ([#385](https://github.com/MyIntervals/emogrifier/issues/385),
+  [#721](https://github.com/MyIntervals/emogrifier/pull/721))
+- Support `> :first-child` and `> :last-child` in selectors
+  ([#384](https://github.com/MyIntervals/emogrifier/issues/384),
+  [#720](https://github.com/MyIntervals/emogrifier/pull/720))
+- Add an `ArrayIntersector` class
+  ([#708](https://github.com/MyIntervals/emogrifier/pull/708),
+  [#710](https://github.com/MyIntervals/emogrifier/pull/710))
+- Add `CssInliner::getMatchingUninlinableSelectors`
+  ([#380](https://github.com/MyIntervals/emogrifier/issues/380),
+  [#707](https://github.com/MyIntervals/emogrifier/pull/707))
+- Add tests for `:nth-child` and `:nth-of-type`
+  ([#71](https://github.com/MyIntervals/emogrifier/issues/71),
+  [#698](https://github.com/MyIntervals/emogrifier/pull/698))
+
+### Changed
+- Relax the dependency on `symfony/css-selector`
+  ([#762](https://github.com/MyIntervals/emogrifier/pull/762))
+- Rename `HtmlPruner::removeInvisibleNodes` to
+  `HtmlPruner::removeElementsWithDisplayNone`
+  ([#717](https://github.com/MyIntervals/emogrifier/issues/717),
+  [#718](https://github.com/MyIntervals/emogrifier/pull/718))
+- Mark the utility classes as internal
+  ([#715](https://github.com/MyIntervals/emogrifier/pull/715))
+- Move utility classes to the `Pelago\Emogrifier\Utilities` namespace
+  ([#712](https://github.com/MyIntervals/emogrifier/pull/712))
+- Make the `$css` parameter of the `inlineCss` method optional
+  ([#700](https://github.com/MyIntervals/emogrifier/pull/700))
+- Update the development dependencies
+  ([#691](https://github.com/MyIntervals/emogrifier/pull/691))
+
+### Deprecated
+- Support for PHP 5.6 will be removed in Emogrifier 4.0.
+- Deprecate the `Emogrifier` class
+  ([#701](https://github.com/MyIntervals/emogrifier/pull/701))
+
+### Removed
+- Drop `enableCssToHtmlMapping` and `disableInvisibleNodeRemoval`
+  ([#692](https://github.com/MyIntervals/emogrifier/pull/692))
+- Drop support for PHP 5.5
+  ([#690](https://github.com/MyIntervals/emogrifier/pull/690))
+
+### Fixed
+- Fix PhpStorm code inspection warnings
+  ([#729](https://github.com/MyIntervals/emogrifier/issues/729),
+  [#770](https://github.com/MyIntervals/emogrifier/pull/770))
+- Uppercase type combined with class or ID in selector
+  ([#590](https://github.com/MyIntervals/emogrifier/issues/590),
+  [#769](https://github.com/MyIntervals/emogrifier/pull/769))
+- Dynamic pseudo-class combined with static one (rules copied to `<style>`
+  element, [#746](https://github.com/MyIntervals/emogrifier/pull/746))
+- Descendant attribute selectors (such as `html input[disabled]`)
+  ([#375](https://github.com/MyIntervals/emogrifier/pull/375),
+  [#709](https://github.com/MyIntervals/emogrifier/pull/709))
+- Attribute selectors with hyphen in attribute name
+  ([#284](https://github.com/MyIntervals/emogrifier/issues/284),
+  [#540](https://github.com/MyIntervals/emogrifier/pull/540),
+  [#704](https://github.com/MyIntervals/emogrifier/pull/702))
+- Attribute selectors with space, hyphen, colon, semicolon or (most) other
+  non-alphanumeric characters in attribute value
+  ([#284](https://github.com/MyIntervals/emogrifier/issues/284),
+  [#333](https://github.com/MyIntervals/emogrifier/issues/333),
+  [#550](https://github.com/MyIntervals/emogrifier/issues/550),
+  [#540](https://github.com/MyIntervals/emogrifier/pull/540),
+  [#704](https://github.com/MyIntervals/emogrifier/pull/702))
+- Don’t create empty `style` attributes for unparsable declarations
+  ([#259](https://github.com/MyIntervals/emogrifier/issues/259),
+  [#702](https://github.com/MyIntervals/emogrifier/pull/702))
+- Allow `:not(:behavioural-pseudo-class)` in selectors
+  ([#697](https://github.com/MyIntervals/emogrifier/pull/697),
+  [#703](https://github.com/MyIntervals/emogrifier/pull/703))
+
+## 2.2.0
+
+### Added
+- Add a `HtmlPruner` class
+  ([#679](https://github.com/MyIntervals/emogrifier/pull/679))
+- Add `AbstractHtmlProcessor::fromDomDocument`
+  ([#676](https://github.com/MyIntervals/emogrifier/pull/676))
+- Add `AbstractHtmlProcessor::fromHtml`
+  ([#675](https://github.com/MyIntervals/emogrifier/pull/675))
+
+### Changed
+- Make the closures static
+  ([#674](https://github.com/MyIntervals/emogrifier/pull/674))
+- Keep `<wbr>` elements by default with `CssInliner`
+  ([#665](https://github.com/MyIntervals/emogrifier/pull/665))
+- Make the `CssInliner` inherit `AbstractHtmlProcessor`
+  ([#660](https://github.com/MyIntervals/emogrifier/pull/660))
+- Separate `CssInliner::inlineCss` and the rendering
+  ([#654](https://github.com/MyIntervals/emogrifier/pull/654))
+
+### Removed
+- Drop the removal of unprocessable tags from `CssInliner`
+  ([#685](https://github.com/MyIntervals/emogrifier/pull/685))
+- Drop the removal of invisible nodes from `CssInliner`
+  ([#684](https://github.com/MyIntervals/emogrifier/pull/684))
+
+### Fixed
+- Remove opening `<body>` tag from `body` content when element has attribute(s)
+  ([#677](https://github.com/MyIntervals/emogrifier/issues/677),
+  [#683](https://github.com/MyIntervals/emogrifier/pull/683))
+- Keep development files out of the Composer packages
+  ([#678](https://github.com/MyIntervals/emogrifier/pull/678))
+- Call all static methods statically in `CssConcatenator`
+  ([#670](https://github.com/MyIntervals/emogrifier/pull/670))
+- Support all HTML5 self-closing tags, including `<embed>`, `<source>`,
+  `<track>` and `<wbr>`
+  ([#653](https://github.com/MyIntervals/emogrifier/pull/653))
+- Remove all "unprocessable" (e.g. `<wbr>`) tags
+  ([#650](https://github.com/MyIntervals/emogrifier/pull/650))
+- Correct translated xpath of `:nth-child` selector
+  ([#648](https://github.com/MyIntervals/emogrifier/pull/648))
+
+## 2.1.1
+
+### Changed
+- Add a test that a missing document type gets added
+  ([#641](https://github.com/MyIntervals/emogrifier/pull/641))
+
+### Fixed
+- Keep the `style` element the `head`
+  ([#642](https://github.com/MyIntervals/emogrifier/pull/642))
+
 ## 2.1.0
 
 ### Added
@@ -26,7 +220,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
   ([#633](https://github.com/MyIntervals/emogrifier/pull/633))
 - Add a `getDomDocument()` method
   ([#630](https://github.com/MyIntervals/emogrifier/pull/630))
-- Add a Composer script for PHP CS Fixer 
+- Add a Composer script for PHP CS Fixer
   ([#607](https://github.com/MyIntervals/emogrifier/pull/607))
 - Copy matching rules with dynamic pseudo-classes or pseudo-elements in
   selectors to the style element
@@ -34,18 +228,18 @@ This project adheres to [Semantic Versioning](https://semver.org/).
   [#562](https://github.com/MyIntervals/emogrifier/pull/562),
   [#567](https://github.com/MyIntervals/emogrifier/pull/567))
 - Add a CssToAttributeConverter
-  ([#546](https://github.com/jjriv/emogrifier/pull/546))
+  ([#546](https://github.com/MyIntervals/emogrifier/pull/546))
 - Expose the DOMDocument in AbstractHtmlProcessor
-  ([#520](https://github.com/jjriv/emogrifier/pull/520))
+  ([#520](https://github.com/MyIntervals/emogrifier/pull/520))
 - Add an HtmlNormalizer class
-  ([#513](https://github.com/jjriv/emogrifier/pull/513),
-  [#516](https://github.com/jjriv/emogrifier/pull/516))
+  ([#513](https://github.com/MyIntervals/emogrifier/pull/513),
+  [#516](https://github.com/MyIntervals/emogrifier/pull/516))
 - Add a CssInliner class
-  ([#514](https://github.com/jjriv/emogrifier/pull/514),
-  [#522](https://github.com/jjriv/emogrifier/pull/522))
+  ([#514](https://github.com/MyIntervals/emogrifier/pull/514),
+  [#522](https://github.com/MyIntervals/emogrifier/pull/522))
 - Composer scripts for the various CI build steps
 - Validate the composer.json on Travis
-  ([#476](https://github.com/jjriv/emogrifier/pull/476))
+  ([#476](https://github.com/MyIntervals/emogrifier/pull/476))
 
 ### Changed
 - Mark the work-in-progress classes as `@internal`
@@ -62,20 +256,20 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - Add type hint checking to the code sniffs
   ([#566](https://github.com/MyIntervals/emogrifier/pull/566))
 - Check the code with PHPMD
-  ([#561](https://github.com/jjriv/emogrifier/pull/561))
+  ([#561](https://github.com/MyIntervals/emogrifier/pull/561))
 - Add the cyclomatic complexity to the checked code sniffs
-  ([#558](https://github.com/jjriv/emogrifier/pull/558))
+  ([#558](https://github.com/MyIntervals/emogrifier/pull/558))
 - Use the Symfony CSS selector component
-  ([#540](https://github.com/jjriv/emogrifier/pull/540))
+  ([#540](https://github.com/MyIntervals/emogrifier/pull/540))
 
 ### Deprecated
 - Support for PHP 5.5 will be removed in Emogrifier 3.0.
 - Support for PHP 5.6 will be removed in Emogrifier 4.0.
 - The removal of invisible nodes will be removed in Emogrifier 3.0.
-  ([#473](https://github.com/jjriv/emogrifier/pull/473))
+  ([#473](https://github.com/MyIntervals/emogrifier/pull/473))
 - Converting CSS styles to (non-CSS) HTML attributes will be removed
   in Emogrifier 3.0. Please use the new CssToAttributeConverter instead.
-  ([#474](https://github.com/jjriv/emogrifier/pull/474))
+  ([#474](https://github.com/MyIntervals/emogrifier/pull/474))
 - Emogrifier 3.x.y will be the last release that supports usage without
   Composer (i.e., you can still require the class file).
   Starting with version 4.0, Emogrifier will only work with Composer.
@@ -114,7 +308,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
   ignored, [#507](https://github.com/MyIntervals/emogrifier/pull/507))
 - Allow attribute selectors in descendants
   ([#506](https://github.com/MyIntervals/emogrifier/pull/506),
-  [#381](https://github.com/MyIntervals/emogrifier/issues/381))
+  [#381](https://github.com/MyIntervals/emogrifier/issues/381),
+  [#443](https://github.com/MyIntervals/emogrifier/issues/443))
 - Allow adjacent sibling CSS selector combinator in minified CSS
   ([#505](https://github.com/MyIntervals/emogrifier/pull/505))
 - Allow CSS property values containing newlines
@@ -124,7 +319,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 
 ### Added
 - Support for CSS :not() selector
-  ([#431](https://github.com/jjriv/emogrifier/pull/431))
+  ([#431](https://github.com/MyIntervals/emogrifier/pull/431))
 - Automatically remove !important annotations from final inline style declarations
   ([#420](https://github.com/MyIntervals/emogrifier/pull/420))
 - Automatically move `<style>` block from `<head>` to `<body>`
diff --git a/lib/pelago/emogrifier/CODE_OF_CONDUCT.md b/lib/pelago/emogrifier/CODE_OF_CONDUCT.md
deleted file mode 100644
index c7bc5d9e3..000000000
--- a/lib/pelago/emogrifier/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# Contributor Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age,
-body size, disability, ethnicity, gender identity and expression, level of
-experience, nationality, personal appearance, race, religion, or sexual
-identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an
-appointed representative at an online or offline event. Representation of a
-project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at (emogrifier at myintervals dot com).
-All complaints will be reviewed and investigated and will result in a response
-that is deemed necessary and appropriate to the circumstances. The project team
-is obligated to maintain confidentiality with regard to the reporter of an
-incident. Further details of specific enforcement policies may be posted
-separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.4, available at
-[http://contributor-covenant.org/version/1/4/][version].
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
diff --git a/lib/pelago/emogrifier/README.md b/lib/pelago/emogrifier/README.md
index eee5b79c4..0abe18b6e 100644
--- a/lib/pelago/emogrifier/README.md
+++ b/lib/pelago/emogrifier/README.md
@@ -30,11 +30,9 @@ into inline style attributes in your HTML code.
 - [How it works](#how-it-works)
 - [Installation](#installation)
 - [Usage](#usage)
-- [Options](#options)
-- [Installing with Composer](#installing-with-composer)
 - [Supported CSS selectors](#supported-css-selectors)
 - [Caveats](#caveats)
-- [Processing HTML](#processing-html)
+- [Steps to release a new version](#steps-to-release-a-new-version)
 - [Maintainers](#maintainers)
 
 ## How it Works
@@ -45,15 +43,212 @@ selectors.
 
 ## Installation
 
-For installing emogrifier, either add pelago/emogrifier to your
-project's composer.json, or you can use composer as below:
+For installing emogrifier, either add `pelago/emogrifier` to the `require`
+section in your project's `composer.json`, or you can use composer as below:
 
 ```bash
 composer require pelago/emogrifier
 ```
 
+See https://getcomposer.org/ for more information and documentation.
+
 ## Usage
 
+### Inlining Css
+
+The most basic way to use the `CssInliner` class is to create an instance with
+the original HTML, inline the external CSS, and then get back the resulting
+HTML:
+
+```php
+use Pelago\Emogrifier\CssInliner;
+
+…
+
+$visualHtml = CssInliner::fromHtml($html)->inlineCss($css)->render();
+```
+
+If there is no external CSS file and all CSS is located within `<style>`
+elements in the HTML, you can omit the `$css` parameter:
+
+```php
+$visualHtml = CssInliner::fromHtml($html)->inlineCss()->render();
+```
+
+If you would like to get back only the content of the `<body>` element instead of
+the complete HTML document, you can use the `renderBodyContent` method instead:
+
+```php
+$bodyContent = $visualHtml = CssInliner::fromHtml($html)->inlineCss()
+  ->renderBodyContent();
+```
+
+If you would like to modify the inlining process with any of the available
+[options](#options), you will need to call the corresponding methods
+before inlining the CSS. The code then would look like this:
+
+```php
+$visualHtml = CssInliner::fromHtml($html)->disableStyleBlocksParsing()
+  ->inlineCss($css)->render();
+```
+
+There are also some other HTML-processing classes available
+(all of which are subclasses of `AbstractHtmlProcessor`) which you can use
+to further change the HTML after inlining the CSS.
+(For more details on the classes, please have a look at the sections below.)
+`CssInliner` and all HTML-processing classes can share the same `DOMDocument`
+instance to work on:
+
+```php
+use Pelago\Emogrifier\CssInliner;
+use Pelago\Emogrifier\HtmlProcessor\CssToAttributeConverter;
+use Pelago\Emogrifier\HtmlProcessor\HtmlPruner;
+
+…
+
+$cssInliner = CssInliner::fromHtml($html)->inlineCss($css);
+$domDocument = $cssInliner->getDomDocument();
+HtmlPruner::fromDomDocument($domDocument)->removeElementsWithDisplayNone()
+  ->removeRedundantClassesAfterCssInlined($cssInliner);
+$finalHtml = CssToAttributeConverter::fromDomDocument($domDocument)
+  ->convertCssToVisualAttributes()->render();
+```
+
+### Normalizing and cleaning up HTML
+
+The `HtmlNormalizer` class normalizes the given HTML in the following ways:
+
+- add a document type (HTML5) if missing
+- disentangle incorrectly nested tags
+- add HEAD and BODY elements (if they are missing)
+- reformat the HTML
+
+The class can be used like this:
+
+```php
+use Pelago\Emogrifier\HtmlProcessor\HtmlNormalizer;
+
+…
+
+$cleanHtml = HtmlNormalizer::fromHtml($rawHtml)->render();
+```
+
+### Converting CSS styles to visual HTML attributes
+
+The `CssToAttributeConverter` converts a few style attributes values to visual
+HTML attributes. This allows to get at least a bit of visual styling for email
+clients that do not support CSS well. For example, `style="width: 100px"`
+will be converted to `width="100"`.
+
+The class can be used like this:
+
+```php
+use Pelago\Emogrifier\HtmlProcessor\CssToAttributeConverter;
+
+…
+
+$visualHtml = CssToAttributeConverter::fromHtml($rawHtml)
+  ->convertCssToVisualAttributes()->render();
+```
+
+You can also have the `CssToAttributeConverter` work on a `DOMDocument`:
+
+```php
+$visualHtml = CssToAttributeConverter::fromDomDocument($domDocument)
+  ->convertCssToVisualAttributes()->render();
+```
+
+### Removing redundant content and attributes from the HTML
+
+The `HtmlPruner` class can reduce the size of the HTML by removing elements with
+a `display: none` style declaration, and/or removing classes from `class`
+attributes that are not required.
+
+It can be used like this:
+
+```php
+use Pelago\Emogrifier\HtmlProcessor\HtmlPruner;
+
+…
+
+$prunedHtml = HtmlPruner::fromHtml($html)->removeElementsWithDisplayNone()
+  ->removeRedundantClasses($classesToKeep)->render();
+```
+
+The `removeRedundantClasses` method accepts a whitelist of names of classes that
+should be retained.  If this is a post-processing step after inlining CSS, you
+can alternatively use `removeRedundantClassesAfterCssInlined`, passing it the
+`CssInliner` instance that has inlined the CSS (and having the `HtmlPruner` work
+on the `DOMDocument`).  This will use information from the `CssInliner` to
+determine which classes are still required (namely, those used in uninlinable
+rules that have been copied to a `<style>` element):
+
+```php
+$prunedHtml = HtmlPruner::fromDomDocument($cssInliner->getDomDocument())
+  ->removeElementsWithDisplayNone()
+  ->removeRedundantClassesAfterCssInlined($cssInliner)->render();
+```
+
+The `removeElementsWithDisplayNone` method will not remove any elements which
+have the class `-emogrifier-keep`.  So if, for example, there are elements which
+by default have `display: none` but are revealed by an `@media` rule, or which
+are intended as a preheader, you can add that class to those elements.  The
+paragraph in this HTML snippet will not be removed even though it has
+`display: none` (which has presumably been applied by `CssInliner::inlineCss()`
+from a CSS rule `.preheader { display: none; }`):
+
+```html
+<p class="preheader -emogrifier-keep" style="display: none;">
+  Hello World!
+</p>
+```
+
+The `removeRedundantClassesAfterCssInlined` (or `removeRedundantClasses`)
+method, if invoked after `removeElementsWithDisplayNone`, will remove the
+`-emogrifier-keep` class.
+
+### Options
+
+There are several options that you can set on the `CssInliner` instance before
+calling the `inlineCss` method (or on the `Emogrifier` instance before calling
+the `emogrify` method):
+
+* `->disableStyleBlocksParsing()` - By default, `CssInliner` will grab
+  all `<style>` blocks in the HTML and will apply the CSS styles as inline
+  "style" attributes to the HTML. The `<style>` blocks will then be removed
+  from the HTML. If you want to disable this functionality so that `CssInliner`
+  leaves these `<style>` blocks in the HTML and does not parse them, you should
+  use this option. If you use this option, the contents of the `<style>` blocks
+  will _not_ be applied as inline styles and any CSS you want `CssInliner` to
+  use must be passed in as described in the [Usage section](#usage) above.
+* `->disableInlineStylesParsing()` - By default, `CssInliner`
+  preserves all of the "style" attributes on tags in the HTML you pass to it.
+  However if you want to discard all existing inline styles in the HTML before
+  the CSS is applied, you should use this option.
+* `->addAllowedMediaType(string $mediaName)` - By default, `CssInliner`
+  will keep only media types `all`, `screen` and `print`. If you want to keep
+  some others, you can use this method to define them.
+* `->removeAllowedMediaType(string $mediaName)` - You can use this
+  method to remove media types that Emogrifier keeps.
+* `->addExcludedSelector(string $selector)` - Keeps elements from
+  being affected by CSS inlining.  Note that only elements matching the supplied
+  selector(s) will be excluded from CSS inlining, not necessarily their
+  descendants.  If you wish to exclude an entire subtree, you should provide
+  selector(s) which will match all elements in the subtree, for example by using
+  the universal selector:
+  ```php
+  $cssInliner->addExcludedSelector('.message-preview');
+  $cssInliner->addExcludedSelector('.message-preview *');
+  ```
+
+### Using the legacy Emogrifier class
+
+In version 3.0.0, the `Emogrifier` class has been deprecated, and it will be
+removed for version 4.0.0. Please update your code to use the new
+`CssInliner` class instead.
+
+If you are still using the deprecated class, here is how to use it:
+
 First, you provide Emogrifier with the HTML and CSS you would like to merge.
 This can happen directly during instantiation:
 
@@ -92,74 +287,48 @@ the complete HTML document, you can use the `emogrifyBodyContent` instead:
 $bodyContent = $emogrifier->emogrifyBodyContent();
 ```
 
-## Options
+### Migrating from `Emogrifier` to `CssInliner`
 
-There are several options that you can set on the Emogrifier object before
-calling the `emogrify` method:
+#### Minimal example
 
-* `$emogrifier->disableStyleBlocksParsing()` - By default, Emogrifier will grab
-  all `<style>` blocks in the HTML and will apply the CSS styles as inline
-  "style" attributes to the HTML. The `<style>` blocks will then be removed
-  from the HTML. If you want to disable this functionality so that Emogrifier
-  leaves these `<style>` blocks in the HTML and does not parse them, you should
-  use this option. If you use this option, the contents of the `<style>` blocks
-  will _not_ be applied as inline styles and any CSS you want Emogrifier to
-  use must be passed in as described in the [Usage section](#usage) above.
-* `$emogrifier->disableInlineStylesParsing()` - By default, Emogrifier
-  preserves all of the "style" attributes on tags in the HTML you pass to it.
-  However if you want to discard all existing inline styles in the HTML before
-  the CSS is applied, you should use this option.
-* `$emogrifier->disableInvisibleNodeRemoval()` - By default, Emogrifier removes
-  elements from the DOM that have the style attribute `display: none;`.  If
-  you would like to keep invisible elements in the DOM, use this option.
-  Note: This option will be removed in Emogrifier 3.0. HTML tags with
-  `display: none;` then will always be retained.
-* `$emogrifier->addAllowedMediaType(string $mediaName)` - By default, Emogrifier
-  will keep only media types `all`, `screen` and `print`. If you want to keep
-  some others, you can use this method to define them.
-* `$emogrifier->removeAllowedMediaType(string $mediaName)` - You can use this
-  method to remove media types that Emogrifier keeps.
-* `$emogrifier->addExcludedSelector(string $selector)` - Keeps elements from
-  being affected by emogrification.
-* `$emogrifier->enableCssToHtmlMapping()` - Some email clients don't support CSS
-  well, even if inline and prefer HTML attributes. This function allows you to
-  put properties such as height, width, background color and font color in your
-  CSS while the transformed content will have all the available HTML
-  attributes set. This option will be removed in Emogrifier 3.0. Please use the
-  `CssToAttributeConverter` class instead.
+Old code using `Emogrifier`:
 
-## Installing with Composer
-
-Download the [`composer.phar`](https://getcomposer.org/composer.phar) locally
-or install [Composer](https://getcomposer.org/) globally:
-
-```bash
-curl -s https://getcomposer.org/installer | php
+```php
+$emogrifier = new Emogrifier($html);
+$html = $emogrifier->emogrify();
 ```
 
-Run the following command for a local installation:
+New code using `CssInliner`:
 
-```bash
-php composer.phar require pelago/emogrifier:^2.1.0
+```php
+$html = CssInliner::fromHtml($html)->inlineCss()->render();
 ```
 
-Or for a global installation, run the following command:
+NB: In this example, the old code removes elements with `display: none;`
+while the new code does not, as the default behaviors of the old and
+the new class differ in this regard.
 
-```bash
-composer require pelago/emogrifier:^2.1.0
+#### More complex example
+
+Old code using `Emogrifier`:
+
+```php
+$emogrifier = new Emogrifier($html, $css);
+$emogrifier->enableCssToHtmlMapping();
+
+$html = $emogrifier->emogrify();
 ```
 
-You can also add follow lines to your `composer.json` and run the
-`composer update` command:
+New code using `CssInliner` and family:
 
-```json
-"require": {
-  "pelago/emogrifier": "^2.1.0"
-}
+```php
+$domDocument = CssInliner::fromHtml($html)->inlineCss($css)->getDomDocument();
+
+HtmlPruner::fromDomDocument($domDocument)->removeElementsWithDisplayNone(),
+$html = CssToAttributeConverter::fromDomDocument($domDocument)
+  ->convertCssToVisualAttributes()->render();
 ```
 
-See https://getcomposer.org/ for more information and documentation.
-
 ## Supported CSS selectors
 
 Emogrifier currently supports the following
@@ -168,7 +337,8 @@ Emogrifier currently supports the following
  * [type](https://developer.mozilla.org/en-US/docs/Web/CSS/Type_selectors)
  * [class](https://developer.mozilla.org/en-US/docs/Web/CSS/Class_selectors)
  * [ID](https://developer.mozilla.org/en-US/docs/Web/CSS/ID_selectors)
- * [universal](https://developer.mozilla.org/en-US/docs/Web/CSS/Universal_selectors):
+ * [universal](https://developer.mozilla.org/en-US/docs/Web/CSS/Universal_selectors)
+   (partial support)
  * [attribute](https://developer.mozilla.org/en-US/docs/Web/CSS/Attribute_selectors):
     * presence
     * exact value match
@@ -178,42 +348,103 @@ Emogrifier currently supports the following
     * value with `$` (suffix match)
     * value with `*` (substring match)
  * [adjacent](https://developer.mozilla.org/en-US/docs/Web/CSS/Adjacent_sibling_selectors)
+ * [general sibling](https://developer.mozilla.org/en-US/docs/Web/CSS/General_sibling_combinator)
  * [child](https://developer.mozilla.org/en-US/docs/Web/CSS/Child_selectors)
  * [descendant](https://developer.mozilla.org/en-US/docs/Web/CSS/Descendant_selectors)
  * [pseudo-classes](https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-classes):
+   * [empty](https://developer.mozilla.org/en-US/docs/Web/CSS/:empty)
    * [first-child](https://developer.mozilla.org/en-US/docs/Web/CSS/:first-child)
+   * [first-of-type](https://developer.mozilla.org/en-US/docs/Web/CSS/:first-of-type)
+     (with a type, e.g. `p:first-of-type` but not `*:first-of-type` which will
+     behave as `*:first-child`)
    * [last-child](https://developer.mozilla.org/en-US/docs/Web/CSS/:last-child)
+   * [last-of-type](https://developer.mozilla.org/en-US/docs/Web/CSS/:last-of-type)
+     (with a type)
    * [not()](https://developer.mozilla.org/en-US/docs/Web/CSS/:not)
+   * [nth-child()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-child)
+   * [nth-last-child()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-last-child)
+   * [nth-last-of-type()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-last-of-type)
+     (with a type)
+   * [nth-of-type()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-of-type)
+     (with a type)
+   * [only-child](https://developer.mozilla.org/en-US/docs/Web/CSS/:only-child)
 
 The following selectors are not implemented yet:
 
- * [universal](https://developer.mozilla.org/en-US/docs/Web/CSS/Universal_selectors)
+ * [universal](https://developer.mozilla.org/en-US/docs/Web/CSS/Universal_selectors):
+   * with
+     [child combinator](https://developer.mozilla.org/en-US/docs/Web/CSS/Child_combinator)
+   * as ancestor with 
+     [descendant combinator](https://developer.mozilla.org/en-US/docs/Web/CSS/Descendant_combinator)
+     (e.g. `p *` is supported but `* p` is not)
  * [case-insensitive attribute value](https://developer.mozilla.org/en-US/docs/Web/CSS/Attribute_selectors#case-insensitive)
- * [general sibling](https://developer.mozilla.org/en-US/docs/Web/CSS/General_sibling_selectors)
- * [pseudo-classes](https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-classes)
-   (some of them will never be supported)
+ * static [pseudo-classes](https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-classes):
+   * [first-of-type](https://developer.mozilla.org/en-US/docs/Web/CSS/:first-of-type)
+     without a type (will behave as `:first-child`)
+   * [last-of-type](https://developer.mozilla.org/en-US/docs/Web/CSS/:last-of-type)
+     without a type (will behave as `:last-child`)
+   * [nth-last-of-type()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-last-of-type)
+     without a type (will behave as `:nth-last-child()`)
+   * [nth-of-type()](https://developer.mozilla.org/en-US/docs/Web/CSS/:nth-of-type)
+     without a type (will behave as `:nth-child()`)
+   * any pseudo-classes not listed above as supported – rules involving them
+     will nonetheless be preserved and copied to a `<style>` element in the 
+     HTML – including (but not necessarily limited to) the following:
+     * [any-link](https://developer.mozilla.org/en-US/docs/Web/CSS/:any-link)
+     * [only-of-type](https://developer.mozilla.org/en-US/docs/Web/CSS/:only-of-type)
+     * [optional](https://developer.mozilla.org/en-US/docs/Web/CSS/:optional)
+     * [required](https://developer.mozilla.org/en-US/docs/Web/CSS/:required)
+     
+Rules involving the following selectors cannot be applied as inline styles.
+They will, however, be preserved and copied to a `<style>` element in the HTML:
+     
+ * dynamic [pseudo-classes](https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-classes)
+   (such as `:hover`)
  * [pseudo-elements](https://developer.mozilla.org/en-US/docs/Web/CSS/Pseudo-elements)
+   (such as `::after`)
 
 ## Caveats
 
 * Emogrifier requires the HTML and the CSS to be UTF-8. Encodings like
   ISO8859-1 or ISO8859-15 are not supported.
-* Emogrifier now preserves all valuable @media queries. Media queries
-  can be very useful in responsive email design. See
+* Emogrifier preserves all valuable `@media` rules.  Media queries can be very
+  useful in responsive email design.  See
   [media query support](https://litmus.com/help/email-clients/media-query-support/).
+  However, in order for them to be effective, you may need to add `!important`
+  to some of the declarations within them so that they will override CSS styles
+  that have been inlined.  For example, with the following CSS, the `font-size`
+  declaration in the `@media` rule would not override the font size for `p`
+  elements from the preceding rule after that has been inlined as 
+  `<p style="font-size: 16px;">` in the HTML, without the `!important` directive
+  (even though `!important` would not be necessary if the CSS were not inlined):
+  ```css
+  p {
+    font-size: 16px;
+  }
+  @media (max-width: 640px) {
+    p {
+      font-size: 14px !important;
+    }
+  } 
+  ```
+* Emogrifier cannot inline CSS rules involving selectors with pseudo-elements
+  (such as `::after`) or dynamic pseudo-classes (such as `:hover`) – it is
+  impossible.  However, such rules will be preserved and copied to a `<style>`
+  element, as for `@media` rules.  The same caveat about the possible need for
+  the `!important` directive also applies with pseudo-classes.
 * Emogrifier will grab existing inline style attributes _and_ will
   grab `<style>` blocks from your HTML, but it will not grab CSS files
-  referenced in <link> elements. (The problem email clients are going to ignore
-  these tags anyway, so why leave them in your HTML?)
+  referenced in `<link>` elements or `@import` rules (though it will leave them
+  intact for email clients that support them).
 * Even with styles inline, certain CSS properties are ignored by certain email
   clients. For more information, refer to these resources:
     * [http://www.email-standards.org/](http://www.email-standards.org/)
     * [https://www.campaignmonitor.com/css/](https://www.campaignmonitor.com/css/)
     * [http://templates.mailchimp.com/resources/email-client-css-support/](http://templates.mailchimp.com/resources/email-client-css-support/)
-* All CSS attributes that apply to a node will be applied, even if they are
+* All CSS attributes that apply to an element will be applied, even if they are
   redundant. For example, if you define a font attribute _and_ a font-size
-  attribute, both attributes will be applied to that node (in other words, the
-  more specific attribute will not be combined into the more general
+  attribute, both attributes will be applied to that element (in other words,
+  the more specific attribute will not be combined into the more general
   attribute).
 * There's a good chance you might encounter problems if your HTML is not
   well-formed and valid (DOMDocument might complain). If you get problems like
@@ -223,53 +454,6 @@ The following selectors are not implemented yet:
 * Emogrifier automatically converts the provided (X)HTML into HTML5, i.e.,
   self-closing tags will lose their slash. To keep your HTML valid, it is
   recommended to use HTML5 instead of one of the XHTML variants.
-* Emogrifier only supports CSS1 level selectors and a few CSS2 level selectors
-  (but not all of them). It does not support pseudo selectors. (Emogrifier
-  works by converting CSS selectors to XPath selectors, and pseudo selectors
-  cannot be converted accurately).
-
-## Processing HTML
-
-The Emogrifier package also provides classes for (post-)processing the HTML
-generated by `emogrify` (and it also works on any other HTML).
-
-### Normalizing and cleaning up HTML
-
-The `HtmlNormalizer` class normalizes the given HTML in the following ways:
-
-- add a document type (HTML5) if missing
-- disentangle incorrectly nested tags
-- add HEAD and BODY elements (if they are missing)
-- reformat the HTML
-
-The class can be used like this:
-
-```php
-$normalizer = new \Pelago\Emogrifier\HtmlProcessor\HtmlNormalizer($rawHtml);
-$cleanHtml = $normalizer->render();
-```
-
-### Converting CSS styles to visual HTML attributes
-
-The `CssToAttributeConverter` converts a few style attributes values to visual
-HTML attributes. This allows to get at least a bit of visual styling for email
-clients that do not support CSS well. For example, `style="width: 100px"`
-will be converted to `width="100"`.
-
-The class can be used like this:
-
-```php
-$converter = new \Pelago\Emogrifier\HtmlProcessor\CssToAttributeConverter($rawHtml);
-$visualHtml = $converter->convertCssToVisualAttributes()->render();
-```
-
-### Technology preview of new classes
-
-Currently, a refactoring effort is underway, aiming towards replacing the
-grown-over-time `Emogrifier` class with the new `CssInliner` class and moving
-additional HTML processing into separate `CssProcessor` classes (which will
-inherit from `AbstractHtmlProcessor`). You can try the new classes, but be
-aware that the APIs of the new classes still are subject to change. 
 
 ## Steps to release a new version
 
@@ -277,11 +461,11 @@ aware that the APIs of the new classes still are subject to change.
    changes.
 1. In the [composer.json](composer.json), update the `branch-alias` entry to
    point to the release _after_ the upcoming release.
-1. In the [README.md](README.md), update the version numbers in the section
-   [Installing with Composer](#installing-with-composer).
-1. In the [CHANGELOG.md](CHANGELOG.md), set the version number and remove any
-   empty sections.
+1. In the [CHANGELOG.md](CHANGELOG.md), create a new section with subheadings
+   for changes _after_ the upcoming release, set the version number for the
+   upcoming release, and remove any empty sections.
 1. Have the pull request reviewed and merged.
+1. Tag the new release.
 1. In the [Releases tab](https://github.com/MyIntervals/emogrifier/releases),
    create a new release and copy the change log entries to the new release.
 1. Post about the new release on social media.
diff --git a/lib/pelago/emogrifier/composer.json b/lib/pelago/emogrifier/composer.json
index b2949f9bb..0ba7072b9 100644
--- a/lib/pelago/emogrifier/composer.json
+++ b/lib/pelago/emogrifier/composer.json
@@ -37,16 +37,16 @@
         "source": "https://github.com/MyIntervals/emogrifier"
     },
     "require": {
-        "php": "^5.5.0 || ~7.0.0 || ~7.1.0 || ~7.2.0 || ~7.3.0",
+        "php": "^5.6 || ~7.0 || ~7.1 || ~7.2 || ~7.3 || ~7.4",
         "ext-dom": "*",
         "ext-libxml": "*",
-        "symfony/css-selector": "^3.4.0 || ^4.0.0"
+        "symfony/css-selector": "^2.8 || ^3.0 || ^4.0 || ^5.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "^2.2.0",
-        "squizlabs/php_codesniffer": "^3.3.2",
-        "phpmd/phpmd": "^2.6.0",
-        "phpunit/phpunit": "^4.8.0"
+        "friendsofphp/php-cs-fixer": "^2.15.3",
+        "squizlabs/php_codesniffer": "^3.5.0",
+        "phpmd/phpmd": "^2.7.0",
+        "phpunit/phpunit": "^5.7.27"
     },
     "autoload": {
         "psr-4": {
@@ -69,6 +69,7 @@
         "php:fix": "php-cs-fixer --config=config/php-cs-fixer.php fix config/ src/ tests/",
         "ci:php:lint": "find config src tests -name '*.php' -print0 | xargs -0 -n 1 -P 4 php -l",
         "ci:php:sniff": "phpcs config src tests",
+        "ci:php:fixer": "php-cs-fixer --config=config/php-cs-fixer.php fix --dry-run -v --show-progress=dots --diff-format=udiff config/ src/ tests/",
         "ci:php:md": "phpmd src text config/phpmd.xml",
         "ci:tests:unit": "phpunit tests/",
         "ci:tests": [
@@ -80,6 +81,7 @@
         "ci:static": [
             "@ci:php:lint",
             "@ci:php:sniff",
+            "@ci:php:fixer",
             "@ci:php:md"
         ],
         "ci": [
@@ -89,7 +91,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.1.x-dev"
+            "dev-master": "4.0.x-dev"
         }
     }
 }
diff --git a/lib/pelago/emogrifier/config/php-cs-fixer.php b/lib/pelago/emogrifier/config/php-cs-fixer.php
deleted file mode 100644
index 4e379ee7a..000000000
--- a/lib/pelago/emogrifier/config/php-cs-fixer.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php
-
-if (PHP_SAPI !== 'cli') {
-    die('This script supports command line usage only. Please check your command.');
-}
-
-return \PhpCsFixer\Config::create()
-    ->setRiskyAllowed(true)
-    ->setRules(
-        [
-            // copied from the TYPO3 Core
-            '@PSR2' => true,
-            '@DoctrineAnnotation' => true,
-            'no_leading_import_slash' => true,
-            'no_trailing_comma_in_singleline_array' => true,
-            'no_singleline_whitespace_before_semicolons' => true,
-            'no_unused_imports' => true,
-            'concat_space' => ['spacing' => 'one'],
-            'no_whitespace_in_blank_line' => true,
-            'ordered_imports' => true,
-            'single_quote' => true,
-            'no_empty_statement' => true,
-            'no_extra_consecutive_blank_lines' => true,
-            'phpdoc_no_package' => true,
-            'phpdoc_scalar' => true,
-            'no_blank_lines_after_phpdoc' => true,
-            'array_syntax' => ['syntax' => 'short'],
-            'whitespace_after_comma_in_array' => true,
-            'function_typehint_space' => true,
-            'hash_to_slash_comment' => true,
-            'no_alias_functions' => true,
-            'lowercase_cast' => true,
-            'no_leading_namespace_whitespace' => true,
-            'native_function_casing' => true,
-            'no_short_bool_cast' => true,
-            'no_unneeded_control_parentheses' => true,
-            'phpdoc_trim' => true,
-            'no_superfluous_elseif' => true,
-            'no_useless_else' => true,
-            'phpdoc_types' => true,
-            'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
-            'return_type_declaration' => ['space_before' => 'none'],
-            'cast_spaces' => ['space' => 'none'],
-            'declare_equal_normalize' => ['space' => 'single'],
-            'dir_constant' => true,
-
-            // additional rules
-            'combine_consecutive_issets' => true,
-            'combine_consecutive_unsets' => true,
-            'compact_nullable_typehint' => true,
-            // PHP >= 7.0
-            // 'declare_strict_types' => true,
-            'elseif' => true,
-            'encoding' => true,
-            'escape_implicit_backslashes' => ['single_quoted' => true],
-            'is_null' => true,
-            'linebreak_after_opening_tag' => true,
-            'magic_constant_casing' => true,
-            'method_separation' => true,
-            'modernize_types_casting' => true,
-            // not yet, but maybe later to improve performance
-            // 'native_function_invocation' => true,
-            'new_with_braces' => true,
-            'no_blank_lines_after_class_opening' => true,
-            'no_empty_comment' => true,
-            'no_empty_phpdoc' => true,
-            'no_extra_blank_lines' => true,
-            'no_multiline_whitespace_before_semicolons' => true,
-            'no_php4_constructor' => true,
-            'no_short_echo_tag' => true,
-            'no_spaces_after_function_name' => true,
-            'no_spaces_inside_parenthesis' => true,
-            'no_unneeded_curly_braces' => true,
-            'no_useless_return' => true,
-            'no_whitespace_before_comma_in_array' => true,
-            'php_unit_construct' => true,
-            'php_unit_fqcn_annotation' => true,
-            'php_unit_set_up_tear_down_visibility' => true,
-            'phpdoc_add_missing_param_annotation' => true,
-            'phpdoc_indent' => true,
-            'phpdoc_separation' => true,
-            'semicolon_after_instruction' => true,
-            'short_scalar_cast' => true,
-            'space_after_semicolon' => true,
-            'standardize_not_equals' => true,
-            'psr4' => true,
-            'ternary_operator_spaces' => true,
-            // PHP >= 7.0
-            // 'ternary_to_null_coalescing' => true,
-            'trailing_comma_in_multiline_array' => true,
-            'unary_operator_spaces' => true,
-        ]
-    );
diff --git a/lib/pelago/emogrifier/config/phpmd.xml b/lib/pelago/emogrifier/config/phpmd.xml
deleted file mode 100644
index 569409b48..000000000
--- a/lib/pelago/emogrifier/config/phpmd.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0"?>
-<ruleset name="phpList">
-    <description>
-        PHPMD rules for Emogrifier
-    </description>
-
-    <!-- The commented-out rules will be enabled once the code does not generate any warnings anymore. -->
-
-    <rule ref="rulesets/cleancode.xml/BooleanArgumentFlag"/>
-    <rule ref="rulesets/cleancode.xml/StaticAccess"/>
-
-    <rule ref="rulesets/codesize.xml/CyclomaticComplexity"/>
-    <rule ref="rulesets/codesize.xml/NPathComplexity"/>
-    <rule ref="rulesets/codesize.xml/ExcessiveMethodLength"/>
-    <!--<rule ref="rulesets/codesize.xml/ExcessiveClassLength"/>-->
-    <!--<rule ref="rulesets/codesize.xml/ExcessiveParameterList"/>-->
-    <rule ref="rulesets/codesize.xml/ExcessivePublicCount"/>
-    <!--<rule ref="rulesets/codesize.xml/TooManyFields"/>-->
-    <!--<rule ref="rulesets/codesize.xml/TooManyMethods"/>-->
-    <!--<rule ref="rulesets/codesize.xml/TooManyPublicMethods"/>-->
-    <!--<rule ref="rulesets/codesize.xml/ExcessiveClassComplexity"/>-->
-
-    <rule ref="rulesets/controversial.xml/Superglobals"/>
-    <rule ref="rulesets/controversial.xml/CamelCaseClassName"/>
-    <rule ref="rulesets/controversial.xml/CamelCasePropertyName"/>
-    <rule ref="rulesets/controversial.xml/CamelCaseMethodName"/>
-    <rule ref="rulesets/controversial.xml/CamelCaseParameterName"/>
-    <rule ref="rulesets/controversial.xml/CamelCaseVariableName"/>
-
-    <rule ref="rulesets/design.xml/ExitExpression"/>
-    <rule ref="rulesets/design.xml/EvalExpression"/>
-    <rule ref="rulesets/design.xml/GotoStatement"/>
-    <rule ref="rulesets/design.xml/NumberOfChildren"/>
-    <rule ref="rulesets/design.xml/DepthOfInheritance"/>
-    <rule ref="rulesets/design.xml/CouplingBetweenObjects"/>
-    <rule ref="rulesets/design.xml/DevelopmentCodeFragment"/>
-
-    <!--<rule ref="rulesets/naming.xml/ShortVariable"/>-->
-    <!--<rule ref="rulesets/naming.xml/LongVariable"/>-->
-    <rule ref="rulesets/naming.xml/ShortMethodName"/>
-    <rule ref="rulesets/naming.xml/ConstructorWithNameAsEnclosingClass"/>
-    <rule ref="rulesets/naming.xml/ConstantNamingConventions"/>
-    <rule ref="rulesets/naming.xml/BooleanGetMethodName"/>
-
-    <rule ref="rulesets/unusedcode.xml/UnusedPrivateField"/>
-    <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"/>
-    <!--<rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"/>-->
-    <!--<rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"/>-->
-</ruleset>
diff --git a/lib/pelago/emogrifier/phpcs.xml.dist b/lib/pelago/emogrifier/phpcs.xml.dist
deleted file mode 100644
index d87f19c9e..000000000
--- a/lib/pelago/emogrifier/phpcs.xml.dist
+++ /dev/null
@@ -1,140 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ruleset name="Coding Standard">
-    <description>
-        This standard requires PHP_CodeSniffer >= 3.2.0.
-    </description>
-
-    <config name="installed_paths" value="../../slevomat/coding-standard"/>
-
-    <!--The complete PSR-2 ruleset-->
-    <rule ref="PSR2"/>
-
-    <!-- Arrays -->
-    <rule ref="Generic.Arrays.DisallowLongArraySyntax"/>
-    <rule ref="Squiz.Arrays.ArrayBracketSpacing"/>
-    <rule ref="Squiz.Arrays.ArrayDeclaration.NoCommaAfterLast"/>
-
-    <!-- Classes -->
-    <rule ref="Generic.Classes.DuplicateClassName"/>
-    <rule ref="Squiz.Classes.ClassFileName"/>
-    <rule ref="Squiz.Classes.DuplicateProperty"/>
-    <rule ref="Squiz.Classes.LowercaseClassKeywords"/>
-    <rule ref="Squiz.Classes.SelfMemberReference"/>
-
-    <!-- Code analysis -->
-    <rule ref="Generic.CodeAnalysis.EmptyStatement"/>
-    <rule ref="Generic.CodeAnalysis.AssignmentInCondition"/>
-    <rule ref="Generic.CodeAnalysis.ForLoopShouldBeWhileLoop"/>
-    <rule ref="Generic.CodeAnalysis.ForLoopWithTestFunctionCall"/>
-    <rule ref="Generic.CodeAnalysis.JumbledIncrementer"/>
-    <rule ref="Generic.CodeAnalysis.UnconditionalIfStatement"/>
-    <rule ref="Generic.CodeAnalysis.UnnecessaryFinalModifier"/>
-    <rule ref="Generic.CodeAnalysis.UnusedFunctionParameter"/>
-    <rule ref="Generic.CodeAnalysis.UselessOverridingMethod"/>
-
-    <!-- Commenting -->
-    <rule ref="Generic.Commenting.Fixme"/>
-    <rule ref="Generic.Commenting.Todo"/>
-    <rule ref="PEAR.Commenting.InlineComment"/>
-    <rule ref="Squiz.Commenting.DocCommentAlignment"/>
-    <rule ref="Squiz.Commenting.EmptyCatchComment"/>
-    <rule ref="Squiz.Commenting.FunctionComment">
-        <!-- Allow PHP-5-compatible type hinting. -->
-        <exclude name="Squiz.Commenting.FunctionComment.ScalarTypeHintMissing"/>
-        <!-- Allow no comment for self-describing parameter and exception class names. -->
-        <exclude name="Squiz.Commenting.FunctionComment.MissingParamComment"/>
-        <exclude name="Squiz.Commenting.FunctionComment.EmptyThrows"/>
-        <!-- Allow "int" rather than "integer", etc., in PHPDoc. -->
-        <exclude name="Squiz.Commenting.FunctionComment.IncorrectParamVarName"/>
-        <exclude name="Squiz.Commenting.FunctionComment.InvalidReturn"/>
-        <!-- Allow "@return" to be omitted (for methods which do not return a value). -->
-        <exclude name="Squiz.Commenting.FunctionComment.MissingReturn"/>
-        <!-- Allow parameter type, name and comment not all vertically aligned. -->
-        <exclude name="Squiz.Commenting.FunctionComment.SpacingAfterParamType"/>
-        <exclude name="Squiz.Commenting.FunctionComment.SpacingAfterParamName"/>
-        <!-- Allow parameter and exception descriptions which are not full sentences. -->
-        <exclude name="Squiz.Commenting.FunctionComment.ParamCommentNotCapital"/>
-        <exclude name="Squiz.Commenting.FunctionComment.ParamCommentFullStop"/>
-        <exclude name="Squiz.Commenting.FunctionComment.ThrowsNotCapital"/>
-        <exclude name="Squiz.Commenting.FunctionComment.ThrowsNoFullStop"/>
-    </rule>
-    <rule ref="Squiz.Commenting.FunctionCommentThrowTag"/>
-    <rule ref="Squiz.Commenting.PostStatementComment"/>
-
-    <!-- Control structures -->
-    <rule ref="PEAR.ControlStructures.ControlSignature"/>
-
-    <!-- Debug -->
-    <rule ref="Generic.Debug.ClosureLinter"/>
-
-    <!-- Files -->
-    <rule ref="Generic.Files.OneClassPerFile"/>
-    <rule ref="Generic.Files.OneInterfacePerFile"/>
-    <rule ref="Generic.Files.OneObjectStructurePerFile"/>
-    <rule ref="Zend.Files.ClosingTag"/>
-
-    <!-- Formatting -->
-    <rule ref="Generic.Formatting.NoSpaceAfterCast"/>
-    <rule ref="PEAR.Formatting.MultiLineAssignment"/>
-
-    <!-- Functions -->
-    <rule ref="Generic.Functions.CallTimePassByReference"/>
-    <rule ref="SlevomatCodingStandard.Namespaces.FullyQualifiedGlobalFunctions"/>
-    <rule ref="Squiz.Functions.FunctionDuplicateArgument"/>
-    <rule ref="Squiz.Functions.GlobalFunction"/>
-
-    <!-- Metrics -->
-    <rule ref="Generic.Metrics.CyclomaticComplexity"/>
-    <rule ref="Generic.Metrics.NestingLevel"/>
-
-    <!-- Naming conventions -->
-    <rule ref="Generic.NamingConventions.ConstructorName"/>
-    <rule ref="PEAR.NamingConventions.ValidClassName"/>
-
-    <!-- Objects -->
-    <rule ref="Squiz.Objects.ObjectMemberComma"/>
-
-    <!-- Operators -->
-    <rule ref="Squiz.Operators.IncrementDecrementUsage"/>
-    <rule ref="Squiz.Operators.ValidLogicalOperators"/>
-
-    <!-- PHP -->
-    <rule ref="Generic.PHP.BacktickOperator"/>
-    <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag"/>
-    <rule ref="Generic.PHP.DeprecatedFunctions"/>
-    <rule ref="Generic.PHP.DisallowAlternativePHPTags"/>
-    <rule ref="Generic.PHP.DisallowShortOpenTag"/>
-    <rule ref="Generic.PHP.DiscourageGoto"/>
-    <rule ref="Generic.PHP.ForbiddenFunctions"/>
-    <rule ref="Generic.PHP.NoSilencedErrors"/>
-    <rule ref="Squiz.PHP.CommentedOutCode">
-        <properties>
-            <property name="maxPercentage" value="70"/>
-        </properties>
-    </rule>
-    <rule ref="Squiz.PHP.DisallowMultipleAssignments"/>
-    <rule ref="Squiz.PHP.DisallowSizeFunctionsInLoops"/>
-    <rule ref="Squiz.PHP.DiscouragedFunctions"/>
-    <rule ref="Squiz.PHP.Eval"/>
-    <rule ref="Squiz.PHP.GlobalKeyword"/>
-    <rule ref="Squiz.PHP.Heredoc"/>
-    <rule ref="Squiz.PHP.InnerFunctions"/>
-    <rule ref="Squiz.PHP.LowercasePHPFunctions"/>
-    <rule ref="Squiz.PHP.NonExecutableCode"/>
-
-    <!-- Scope -->
-    <rule ref="Squiz.Scope.MemberVarScope"/>
-    <rule ref="Squiz.Scope.StaticThisUsage"/>
-
-    <!--Strings-->
-    <rule ref="Squiz.Strings.DoubleQuoteUsage"/>
-
-    <!-- Whitespace -->
-    <rule ref="PEAR.WhiteSpace.ObjectOperatorIndent"/>
-    <rule ref="PEAR.WhiteSpace.ScopeClosingBrace"/>
-    <rule ref="Squiz.WhiteSpace.CastSpacing"/>
-    <rule ref="Squiz.WhiteSpace.LogicalOperatorSpacing"/>
-    <rule ref="Squiz.WhiteSpace.OperatorSpacing"/>
-    <rule ref="Squiz.WhiteSpace.PropertyLabelSpacing"/>
-    <rule ref="Squiz.WhiteSpace.SemicolonSpacing"/>
-</ruleset>
\ No newline at end of file
diff --git a/lib/pelago/emogrifier/src/Emogrifier.php b/lib/pelago/emogrifier/src/Emogrifier.php
index 9f1c1a218..5f6c6c55c 100644
--- a/lib/pelago/emogrifier/src/Emogrifier.php
+++ b/lib/pelago/emogrifier/src/Emogrifier.php
@@ -2,11 +2,15 @@
 
 namespace Pelago;
 
+use Pelago\Emogrifier\Utilities\CssConcatenator;
+
 /**
  * This class provides functions for converting CSS styles into inline style attributes in your HTML code.
  *
  * For more information, please see the README.md file.
  *
+ * @deprecated Will be removed for version 4.0.0. Please use the CssInliner class instead.
+ *
  * @author Cameron Brooks
  * @author Jaime Prado
  * @author Oliver Klee <github@oliverklee.de>
@@ -73,7 +77,7 @@ class Emogrifier
      *
      * @var string
      */
-    const PSEUDO_CLASS_MATCHER = '\\S+\\-(?:child|type\\()|not\\([[:ascii:]]*\\)';
+    const PSEUDO_CLASS_MATCHER = '(?:first|last|nth)-child|nth-of-type|not\\([[:ascii:]]*\\)';
 
     /**
      * @var string
@@ -85,11 +89,25 @@ class Emogrifier
      */
     const DEFAULT_DOCUMENT_TYPE = '<!DOCTYPE html>';
 
+    /**
+     * @var string Regular expression part to match tag names that PHP's DOMDocument implementation is not aware are
+     *      self-closing. These are mostly HTML5 elements, but for completeness <command> (obsolete) and <keygen>
+     *      (deprecated) are also included.
+     *
+     * @see https://bugs.php.net/bug.php?id=73175
+     */
+    const PHP_UNRECOGNIZED_VOID_TAGNAME_MATCHER = '(?:command|embed|keygen|source|track|wbr)';
+
     /**
      * @var \DOMDocument
      */
     protected $domDocument = null;
 
+    /**
+     * @var \DOMXPath
+     */
+    protected $xPath = null;
+
     /**
      * @var string
      */
@@ -156,14 +174,6 @@ class Emogrifier
      */
     private $isStyleBlocksParsingEnabled = true;
 
-    /**
-     * Determines whether elements with the `display: none` property are
-     * removed from the DOM.
-     *
-     * @var bool
-     */
-    private $shouldRemoveInvisibleNodes = true;
-
     /**
      * For calculating selector precedence order.
      * Keys are a regular expression part to match before a CSS name.
@@ -216,42 +226,6 @@ class Emogrifier
         => '\\1[substring(@\\2, string-length(@\\2) - string-length("\\3") + 1) = "\\3"]',
     ];
 
-    /**
-     * Determines whether CSS styles that have an equivalent HTML attribute
-     * should be mapped and attached to those elements.
-     *
-     * @var bool
-     */
-    private $shouldMapCssToHtml = false;
-
-    /**
-     * This multi-level array contains simple mappings of CSS properties to
-     * HTML attributes. If a mapping only applies to certain HTML nodes or
-     * only for certain values, the mapping is an object with a whitelist
-     * of nodes and values.
-     *
-     * @var mixed[][]
-     */
-    private $cssToHtmlMap = [
-        'background-color' => [
-            'attribute' => 'bgcolor',
-        ],
-        'text-align' => [
-            'attribute' => 'align',
-            'nodes' => ['p', 'div', 'td'],
-            'values' => ['left', 'right', 'center', 'justify'],
-        ],
-        'float' => [
-            'attribute' => 'align',
-            'nodes' => ['table', 'img'],
-            'values' => ['left', 'right'],
-        ],
-        'border-spacing' => [
-            'attribute' => 'cellspacing',
-            'nodes' => ['table'],
-        ],
-    ];
-
     /**
      * Emogrifier will throw Exceptions when it encounters an error instead of silently ignoring them.
      *
@@ -321,7 +295,9 @@ class Emogrifier
      */
     protected function render()
     {
-        return $this->domDocument->saveHTML();
+        $htmlWithPossibleErroneousClosingTags = $this->domDocument->saveHTML();
+
+        return $this->removeSelfClosingTagsClosingTags($htmlWithPossibleErroneousClosingTags);
     }
 
     /**
@@ -331,9 +307,22 @@ class Emogrifier
      */
     protected function renderBodyContent()
     {
-        $bodyNodeHtml = $this->domDocument->saveHTML($this->getBodyElement());
+        $htmlWithPossibleErroneousClosingTags = $this->domDocument->saveHTML($this->getBodyElement());
+        $bodyNodeHtml = $this->removeSelfClosingTagsClosingTags($htmlWithPossibleErroneousClosingTags);
 
-        return \str_replace(['<body>', '</body>'], '', $bodyNodeHtml);
+        return \preg_replace('%</?+body(?:\\s[^>]*+)?+>%', '', $bodyNodeHtml);
+    }
+
+    /**
+     * Eliminates any invalid closing tags for void elements from the given HTML.
+     *
+     * @param string $html
+     *
+     * @return string
+     */
+    private function removeSelfClosingTagsClosingTags($html)
+    {
+        return \preg_replace('%</' . self::PHP_UNRECOGNIZED_VOID_TAGNAME_MATCHER . '>%', '', $html);
     }
 
     /**
@@ -348,6 +337,18 @@ class Emogrifier
         return $this->domDocument->getElementsByTagName('body')->item(0);
     }
 
+    /**
+     * Returns the HEAD element.
+     *
+     * This method assumes that there always is a HEAD element.
+     *
+     * @return \DOMElement
+     */
+    private function getHeadElement()
+    {
+        return $this->domDocument->getElementsByTagName('head')->item(0);
+    }
+
     /**
      * Applies $this->css to the given HTML and returns the HTML with the CSS
      * applied.
@@ -425,20 +426,19 @@ class Emogrifier
     private function createRawDomDocument($html)
     {
         $domDocument = new \DOMDocument();
-        $domDocument->encoding = 'UTF-8';
         $domDocument->strictErrorChecking = false;
         $domDocument->formatOutput = true;
         $libXmlState = \libxml_use_internal_errors(true);
         $domDocument->loadHTML($this->prepareHtmlForDomConversion($html));
         \libxml_clear_errors();
         \libxml_use_internal_errors($libXmlState);
-        $domDocument->normalizeDocument();
 
         $this->domDocument = $domDocument;
+        $this->xPath = new \DOMXPath($this->domDocument);
     }
 
     /**
-     * Returns the HTML with added document type and Content-Type meta tag if needed,
+     * Returns the HTML with added document type, Content-Type meta tag, and self-closing slashes, if needed,
      * ensuring that the HTML will be good for creating a DOM document from it.
      *
      * @param string $html
@@ -447,7 +447,8 @@ class Emogrifier
      */
     private function prepareHtmlForDomConversion($html)
     {
-        $htmlWithDocumentType = $this->ensureDocumentType($html);
+        $htmlWithSelfClosingSlashes = $this->ensurePhpUnrecognizedSelfClosingTagsAreXml($html);
+        $htmlWithDocumentType = $this->ensureDocumentType($htmlWithSelfClosingSlashes);
 
         return $this->addContentTypeMetaTag($htmlWithDocumentType);
     }
@@ -466,28 +467,31 @@ class Emogrifier
         $this->clearAllCaches();
         $this->purgeVisitedNodes();
 
-        $xPath = new \DOMXPath($this->domDocument);
         \set_error_handler([$this, 'handleXpathQueryWarnings'], E_WARNING);
         $this->removeUnprocessableTags();
-        $this->normalizeStyleAttributesOfAllNodes($xPath);
+        $this->normalizeStyleAttributesOfAllNodes();
 
         // grab any existing style blocks from the html and append them to the existing CSS
         // (these blocks should be appended so as to have precedence over conflicting styles in the existing CSS)
         $allCss = $this->css;
         if ($this->isStyleBlocksParsingEnabled) {
-            $allCss .= $this->getCssFromAllStyleNodes($xPath);
+            $allCss .= $this->getCssFromAllStyleNodes();
         }
 
-        $excludedNodes = $this->getNodesToExclude($xPath);
-        $cssRules = $this->parseCssRules($allCss);
-        foreach ($cssRules['inlineable'] as $cssRule) {
+        $cssWithoutComments = $this->removeCssComments($allCss);
+        list($cssWithoutCommentsCharsetOrImport, $cssImportRules)
+            = $this->extractImportAndCharsetRules($cssWithoutComments);
+
+        $excludedNodes = $this->getNodesToExclude();
+        $cssRules = $this->parseCssRules($cssWithoutCommentsCharsetOrImport);
+        foreach ($cssRules['inlinable'] as $cssRule) {
             // There's no real way to test "PHP Warning" output generated by the following XPath query unless PHPUnit
             // converts it to an exception. Unfortunately, this would only apply to tests and not work for production
             // executions, which can still flood logs/output unnecessarily. Instead, Emogrifier's error handler should
             // always throw an exception and it must be caught here and only rethrown if in debug mode.
             try {
                 // \DOMXPath::query will always return a DOMNodeList or throw an exception when errors are caught.
-                $nodesMatchingCssSelectors = $xPath->query($this->translateCssToXpath($cssRule['selector']));
+                $nodesMatchingCssSelectors = $this->xPath->query($this->translateCssToXpath($cssRule['selector']));
             } catch (\InvalidArgumentException $e) {
                 if ($this->debug) {
                     throw $e;
@@ -500,67 +504,30 @@ class Emogrifier
                 if (\in_array($node, $excludedNodes, true)) {
                     continue;
                 }
-                $this->copyInlineableCssToStyleAttribute($node, $cssRule);
+                $this->copyInlinableCssToStyleAttribute($node, $cssRule);
             }
         }
 
         if ($this->isInlineStyleAttributesParsingEnabled) {
             $this->fillStyleAttributesWithMergedStyles();
         }
-        $this->postProcess($xPath);
 
-        $this->removeImportantAnnotationFromAllInlineStyles($xPath);
+        $this->removeImportantAnnotationFromAllInlineStyles();
 
-        $this->copyUninlineableCssToStyleNode($xPath, $cssRules['uninlineable']);
+        $this->copyUninlinableCssToStyleNode($cssRules['uninlinable'], $cssImportRules);
 
         \restore_error_handler();
     }
 
-    /**
-     * Applies some optional post-processing to the HTML in the DOM document.
-     *
-     * @param \DOMXPath $xPath
-     *
-     * @return void
-     */
-    private function postProcess(\DOMXPath $xPath)
-    {
-        if ($this->shouldMapCssToHtml) {
-            $this->mapAllInlineStylesToHtmlAttributes($xPath);
-        }
-        if ($this->shouldRemoveInvisibleNodes) {
-            $this->removeInvisibleNodes($xPath);
-        }
-    }
-
-    /**
-     * Searches for all nodes with a style attribute, transforms the CSS found
-     * to HTML attributes and adds those attributes to each node.
-     *
-     * @param \DOMXPath $xPath
-     *
-     * @return void
-     */
-    private function mapAllInlineStylesToHtmlAttributes(\DOMXPath $xPath)
-    {
-        /** @var \DOMElement $node */
-        foreach ($this->getAllNodesWithStyleAttribute($xPath) as $node) {
-            $inlineStyleDeclarations = $this->parseCssDeclarationsBlock($node->getAttribute('style'));
-            $this->mapCssToHtmlAttributes($inlineStyleDeclarations, $node);
-        }
-    }
-
     /**
      * Searches for all nodes with a style attribute and removes the "!important" annotations out of
      * the inline style declarations, eventually by rearranging declarations.
      *
-     * @param \DOMXPath $xPath
-     *
      * @return void
      */
-    private function removeImportantAnnotationFromAllInlineStyles(\DOMXPath $xPath)
+    private function removeImportantAnnotationFromAllInlineStyles()
     {
-        foreach ($this->getAllNodesWithStyleAttribute($xPath) as $node) {
+        foreach ($this->getAllNodesWithStyleAttribute() as $node) {
             $this->removeImportantAnnotationFromNodeInlineStyle($node);
         }
     }
@@ -602,234 +569,25 @@ class Emogrifier
     /**
      * Returns a list with all DOM nodes that have a style attribute.
      *
-     * @param \DOMXPath $xPath
-     *
      * @return \DOMNodeList
      */
-    private function getAllNodesWithStyleAttribute(\DOMXPath $xPath)
+    private function getAllNodesWithStyleAttribute()
     {
-        return $xPath->query('//*[@style]');
-    }
-
-    /**
-     * Applies $styles to $node.
-     *
-     * This method maps CSS styles to HTML attributes and adds those to the
-     * node.
-     *
-     * @param string[] $styles the new CSS styles taken from the global styles to be applied to this node
-     * @param \DOMElement $node node to apply styles to
-     *
-     * @return void
-     */
-    private function mapCssToHtmlAttributes(array $styles, \DOMElement $node)
-    {
-        foreach ($styles as $property => $value) {
-            // Strip !important indicator
-            $value = \trim(\str_replace('!important', '', $value));
-            $this->mapCssToHtmlAttribute($property, $value, $node);
-        }
-    }
-
-    /**
-     * Tries to apply the CSS style to $node as an attribute.
-     *
-     * This method maps a CSS rule to HTML attributes and adds those to the node.
-     *
-     * @param string $property the name of the CSS property to map
-     * @param string $value the value of the style rule to map
-     * @param \DOMElement $node node to apply styles to
-     *
-     * @return void
-     */
-    private function mapCssToHtmlAttribute($property, $value, \DOMElement $node)
-    {
-        if (!$this->mapSimpleCssProperty($property, $value, $node)) {
-            $this->mapComplexCssProperty($property, $value, $node);
-        }
-    }
-
-    /**
-     * Looks up the CSS property in the mapping table and maps it if it matches the conditions.
-     *
-     * @param string $property the name of the CSS property to map
-     * @param string $value the value of the style rule to map
-     * @param \DOMElement $node node to apply styles to
-     *
-     * @return bool true if the property can be mapped using the simple mapping table
-     */
-    private function mapSimpleCssProperty($property, $value, \DOMElement $node)
-    {
-        if (!isset($this->cssToHtmlMap[$property])) {
-            return false;
-        }
-
-        $mapping = $this->cssToHtmlMap[$property];
-        $nodesMatch = !isset($mapping['nodes']) || \in_array($node->nodeName, $mapping['nodes'], true);
-        $valuesMatch = !isset($mapping['values']) || \in_array($value, $mapping['values'], true);
-        if (!$nodesMatch || !$valuesMatch) {
-            return false;
-        }
-
-        $node->setAttribute($mapping['attribute'], $value);
-
-        return true;
-    }
-
-    /**
-     * Maps CSS properties that need special transformation to an HTML attribute.
-     *
-     * @param string $property the name of the CSS property to map
-     * @param string $value the value of the style rule to map
-     * @param \DOMElement $node node to apply styles to
-     *
-     * @return void
-     */
-    private function mapComplexCssProperty($property, $value, \DOMElement $node)
-    {
-        switch ($property) {
-            case 'background':
-                $this->mapBackgroundProperty($node, $value);
-                break;
-            case 'width':
-                // intentional fall-through
-            case 'height':
-                $this->mapWidthOrHeightProperty($node, $value, $property);
-                break;
-            case 'margin':
-                $this->mapMarginProperty($node, $value);
-                break;
-            case 'border':
-                $this->mapBorderProperty($node, $value);
-                break;
-            default:
-        }
-    }
-
-    /**
-     * Maps the "background" CSS property to visual HTML attributes.
-     *
-     * @param \DOMElement $node node to apply styles to
-     * @param string $value the value of the style rule to map
-     *
-     * @return void
-     */
-    private function mapBackgroundProperty(\DOMElement $node, $value)
-    {
-        // parse out the color, if any
-        $styles = \explode(' ', $value);
-        $first = $styles[0];
-        if (!\is_numeric($first[0]) && \strpos($first, 'url') !== 0) {
-            // as this is not a position or image, assume it's a color
-            $node->setAttribute('bgcolor', $first);
-        }
-    }
-
-    /**
-     * Maps the "width" or "height" CSS properties to visual HTML attributes.
-     *
-     * @param \DOMElement $node node to apply styles to
-     * @param string $value the value of the style rule to map
-     * @param string $property the name of the CSS property to map
-     *
-     * @return void
-     */
-    private function mapWidthOrHeightProperty(\DOMElement $node, $value, $property)
-    {
-        // only parse values in px and %, but not values like "auto"
-        if (\preg_match('/^\\d+(px|%)$/', $value)) {
-            // Remove 'px'. This regex only conserves numbers and %.
-            $number = \preg_replace('/[^0-9.%]/', '', $value);
-            $node->setAttribute($property, $number);
-        }
-    }
-
-    /**
-     * Maps the "margin" CSS property to visual HTML attributes.
-     *
-     * @param \DOMElement $node node to apply styles to
-     * @param string $value the value of the style rule to map
-     *
-     * @return void
-     */
-    private function mapMarginProperty(\DOMElement $node, $value)
-    {
-        if (!$this->isTableOrImageNode($node)) {
-            return;
-        }
-
-        $margins = $this->parseCssShorthandValue($value);
-        if ($margins['left'] === 'auto' && $margins['right'] === 'auto') {
-            $node->setAttribute('align', 'center');
-        }
-    }
-
-    /**
-     * Maps the "border" CSS property to visual HTML attributes.
-     *
-     * @param \DOMElement $node node to apply styles to
-     * @param string $value the value of the style rule to map
-     *
-     * @return void
-     */
-    private function mapBorderProperty(\DOMElement $node, $value)
-    {
-        if (!$this->isTableOrImageNode($node)) {
-            return;
-        }
-
-        if ($value === 'none' || $value === '0') {
-            $node->setAttribute('border', '0');
-        }
-    }
-
-    /**
-     * Checks whether $node is a table or img element.
-     *
-     * @param \DOMElement $node
-     *
-     * @return bool
-     */
-    private function isTableOrImageNode(\DOMElement $node)
-    {
-        return $node->nodeName === 'table' || $node->nodeName === 'img';
-    }
-
-    /**
-     * Parses a shorthand CSS value and splits it into individual values
-     *
-     * @param string $value a string of CSS value with 1, 2, 3 or 4 sizes
-     *                      For example: padding: 0 auto;
-     *                      '0 auto' is split into top: 0, left: auto, bottom: 0,
-     *                      right: auto.
-     *
-     * @return string[] an array of values for top, right, bottom and left (using these as associative array keys)
-     */
-    private function parseCssShorthandValue($value)
-    {
-        $values = \preg_split('/\\s+/', $value);
-
-        $css = [];
-        $css['top'] = $values[0];
-        $css['right'] = (\count($values) > 1) ? $values[1] : $css['top'];
-        $css['bottom'] = (\count($values) > 2) ? $values[2] : $css['top'];
-        $css['left'] = (\count($values) > 3) ? $values[3] : $css['right'];
-
-        return $css;
+        return $this->xPath->query('//*[@style]');
     }
 
     /**
      * Extracts and parses the individual rules from a CSS string.
      *
-     * @param string $css a string of raw CSS code
+     * @param string $css a string of raw CSS code with comments removed
      *
-     * @return string[][][] A 2-entry array with the key "inlineable" containing rules which can be inlined as `style`
-     *         attributes and the key "uninlineable" containing rules which cannot.  Each value is an array of string
+     * @return string[][][] A 2-entry array with the key "inlinable" containing rules which can be inlined as `style`
+     *         attributes and the key "uninlinable" containing rules which cannot.  Each value is an array of string
      *         sub-arrays with the keys
      *         "media" (the media query string, e.g. "@media screen and (max-width: 480px)",
      *         or an empty string if not from a `@media` rule),
      *         "selector" (the CSS selector, e.g., "*" or "header h1"),
-     *         "hasUnmatchablePseudo" (true if that selector contains psuedo-elements or dynamic pseudo-classes
+     *         "hasUnmatchablePseudo" (true if that selector contains pseudo-elements or dynamic pseudo-classes
      *         such that the declarations cannot be applied inline),
      *         "declarationsBlock" (the semicolon-separated CSS declarations for that selector,
      *         e.g., "color: red; height: 4px;"),
@@ -838,12 +596,12 @@ class Emogrifier
     private function parseCssRules($css)
     {
         $cssKey = \md5($css);
-        if (!isset($this->caches[static::CACHE_KEY_CSS][$cssKey])) {
+        if (!isset($this->caches[self::CACHE_KEY_CSS][$cssKey])) {
             $matches = $this->getCssRuleMatches($css);
 
             $cssRules = [
-                'inlineable' => [],
-                'uninlineable' => [],
+                'inlinable' => [],
+                'uninlinable' => [],
             ];
             /** @var string[][] $matches */
             /** @var string[] $cssRule */
@@ -853,13 +611,12 @@ class Emogrifier
                     continue;
                 }
 
-                $selectors = \explode(',', $cssRule['selectors']);
-                foreach ($selectors as $selector) {
+                foreach (\explode(',', $cssRule['selectors']) as $selector) {
                     // don't process pseudo-elements and behavioral (dynamic) pseudo-classes;
                     // only allow structural pseudo-classes
                     $hasPseudoElement = \strpos($selector, '::') !== false;
                     $hasUnsupportedPseudoClass = (bool)\preg_match(
-                        '/:(?!' . static::PSEUDO_CLASS_MATCHER . ')[\\w\\-]/i',
+                        '/:(?!' . self::PSEUDO_CLASS_MATCHER . ')[\\w\\-]/i',
                         $selector
                     );
                     $hasUnmatchablePseudo = $hasPseudoElement || $hasUnsupportedPseudoClass;
@@ -872,23 +629,23 @@ class Emogrifier
                         // keep track of where it appears in the file, since order is important
                         'line' => $key,
                     ];
-                    $ruleType = ($cssRule['media'] === '' && !$hasUnmatchablePseudo) ? 'inlineable' : 'uninlineable';
+                    $ruleType = ($cssRule['media'] === '' && !$hasUnmatchablePseudo) ? 'inlinable' : 'uninlinable';
                     $cssRules[$ruleType][] = $parsedCssRule;
                 }
             }
 
-            \usort($cssRules['inlineable'], [$this, 'sortBySelectorPrecedence']);
+            \usort($cssRules['inlinable'], [$this, 'sortBySelectorPrecedence']);
 
-            $this->caches[static::CACHE_KEY_CSS][$cssKey] = $cssRules;
+            $this->caches[self::CACHE_KEY_CSS][$cssKey] = $cssRules;
         }
 
-        return $this->caches[static::CACHE_KEY_CSS][$cssKey];
+        return $this->caches[self::CACHE_KEY_CSS][$cssKey];
     }
 
     /**
      * Parses a string of CSS into the media query, selectors and declarations for each ruleset in order.
      *
-     * @param string $css
+     * @param string $css CSS with comments removed
      *
      * @return string[][] Array of string sub-arrays with the keys
      *         "media" (the media query string, e.g. "@media screen and (max-width: 480px)",
@@ -899,9 +656,9 @@ class Emogrifier
      */
     private function getCssRuleMatches($css)
     {
-        $ruleMatches = [];
-
         $splitCss = $this->splitCssAndMediaQuery($css);
+
+        $ruleMatches = [];
         foreach ($splitCss as $cssPart) {
             // process each part for selectors and definitions
             \preg_match_all('/(?:^|[\\s^{}]*)([^{]+){([^}]*)}/mi', $cssPart['css'], $matches, PREG_SET_ORDER);
@@ -939,31 +696,6 @@ class Emogrifier
         $this->isStyleBlocksParsingEnabled = false;
     }
 
-    /**
-     * Disables the removal of elements with `display: none` properties.
-     *
-     * @deprecated will be removed in Emogrifier 3.0
-     *
-     * @return void
-     */
-    public function disableInvisibleNodeRemoval()
-    {
-        $this->shouldRemoveInvisibleNodes = false;
-    }
-
-    /**
-     * Enables the attachment/override of HTML attributes for which a
-     * corresponding CSS property has been set.
-     *
-     * @deprecated will be removed in Emogrifier 3.0, use the CssToAttributeConverter instead
-     *
-     * @return void
-     */
-    public function enableCssToHtmlMapping()
-    {
-        $this->shouldMapCssToHtml = true;
-    }
-
     /**
      * Clears all caches.
      *
@@ -972,11 +704,11 @@ class Emogrifier
     private function clearAllCaches()
     {
         $this->caches = [
-            static::CACHE_KEY_CSS => [],
-            static::CACHE_KEY_SELECTOR => [],
-            static::CACHE_KEY_XPATH => [],
-            static::CACHE_KEY_CSS_DECLARATIONS_BLOCK => [],
-            static::CACHE_KEY_COMBINED_STYLES => [],
+            self::CACHE_KEY_CSS => [],
+            self::CACHE_KEY_SELECTOR => [],
+            self::CACHE_KEY_XPATH => [],
+            self::CACHE_KEY_CSS_DECLARATIONS_BLOCK => [],
+            self::CACHE_KEY_COMBINED_STYLES => [],
         ];
     }
 
@@ -1019,6 +751,7 @@ class Emogrifier
     {
         $key = \array_search($tagName, $this->unprocessableHtmlTags, true);
         if ($key !== false) {
+            /** @var int|string $key */
             unset($this->unprocessableHtmlTags[$key]);
         }
     }
@@ -1077,50 +810,18 @@ class Emogrifier
         }
     }
 
-    /**
-     * This removes styles from your email that contain display:none.
-     * We need to look for display:none, but we need to do a case-insensitive search. Since DOMDocument only
-     * supports XPath 1.0, lower-case() isn't available to us. We've thus far only set attributes to lowercase,
-     * not attribute values. Consequently, we need to translate() the letters that would be in 'NONE' ("NOE")
-     * to lowercase.
-     *
-     * @param \DOMXPath $xPath
-     *
-     * @return void
-     */
-    private function removeInvisibleNodes(\DOMXPath $xPath)
-    {
-        $nodesWithStyleDisplayNone = $xPath->query(
-            '//*[contains(translate(translate(@style," ",""),"NOE","noe"),"display:none")]'
-        );
-        if ($nodesWithStyleDisplayNone->length === 0) {
-            return;
-        }
-
-        // The checks on parentNode and is_callable below ensure that if we've deleted the parent node,
-        // we don't try to call removeChild on a nonexistent child node
-        /** @var \DOMNode $node */
-        foreach ($nodesWithStyleDisplayNone as $node) {
-            if ($node->parentNode && \is_callable([$node->parentNode, 'removeChild'])) {
-                $node->parentNode->removeChild($node);
-            }
-        }
-    }
-
     /**
      * Parses the document and normalizes all existing CSS attributes.
      * This changes 'DISPLAY: none' to 'display: none'.
      * We wouldn't have to do this if DOMXPath supported XPath 2.0.
      * Also stores a reference of nodes with existing inline styles so we don't overwrite them.
      *
-     * @param \DOMXPath $xPath
-     *
      * @return void
      */
-    private function normalizeStyleAttributesOfAllNodes(\DOMXPath $xPath)
+    private function normalizeStyleAttributesOfAllNodes()
     {
         /** @var \DOMElement $node */
-        foreach ($this->getAllNodesWithStyleAttribute($xPath) as $node) {
+        foreach ($this->getAllNodesWithStyleAttribute() as $node) {
             if ($this->isInlineStyleAttributesParsingEnabled) {
                 $this->normalizeStyleAttributes($node);
             }
@@ -1142,8 +843,8 @@ class Emogrifier
     private function normalizeStyleAttributes(\DOMElement $node)
     {
         $normalizedOriginalStyle = \preg_replace_callback(
-            '/[A-z\\-]+(?=\\:)/S',
-            function (array $m) {
+            '/-?+[_a-zA-Z][\\w\\-]*+(?=:)/S',
+            static function (array $m) {
                 return \strtolower($m[0]);
             },
             $node->getAttribute('style')
@@ -1194,8 +895,8 @@ class Emogrifier
     private function generateStyleStringFromDeclarationsArrays(array $oldStyles, array $newStyles)
     {
         $cacheKey = \serialize([$oldStyles, $newStyles]);
-        if (isset($this->caches[static::CACHE_KEY_COMBINED_STYLES][$cacheKey])) {
-            return $this->caches[static::CACHE_KEY_COMBINED_STYLES][$cacheKey];
+        if (isset($this->caches[self::CACHE_KEY_COMBINED_STYLES][$cacheKey])) {
+            return $this->caches[self::CACHE_KEY_COMBINED_STYLES][$cacheKey];
         }
 
         // Unset the overridden styles to preserve order, important if shorthand and individual properties are mixed
@@ -1205,7 +906,8 @@ class Emogrifier
             }
 
             $newAttributeValue = $newStyles[$attributeName];
-            if ($this->attributeValueIsImportant($attributeValue)
+            if (
+                $this->attributeValueIsImportant($attributeValue)
                 && !$this->attributeValueIsImportant($newAttributeValue)
             ) {
                 unset($newStyles[$attributeName]);
@@ -1222,7 +924,7 @@ class Emogrifier
         }
         $trimmedStyle = \rtrim($style);
 
-        $this->caches[static::CACHE_KEY_COMBINED_STYLES][$cacheKey] = $trimmedStyle;
+        $this->caches[self::CACHE_KEY_COMBINED_STYLES][$cacheKey] = $trimmedStyle;
 
         return $trimmedStyle;
     }
@@ -1261,8 +963,13 @@ class Emogrifier
      *
      * @return void
      */
-    private function copyInlineableCssToStyleAttribute(\DOMElement $node, array $cssRule)
+    private function copyInlinableCssToStyleAttribute(\DOMElement $node, array $cssRule)
     {
+        $newStyleDeclarations = $this->parseCssDeclarationsBlock($cssRule['declarationsBlock']);
+        if ($newStyleDeclarations === []) {
+            return;
+        }
+
         // if it has a style attribute, get it, process it, and append (overwrite) new stuff
         if ($node->hasAttribute('style')) {
             // break it up into an associative array
@@ -1270,7 +977,6 @@ class Emogrifier
         } else {
             $oldStyleDeclarations = [];
         }
-        $newStyleDeclarations = $this->parseCssDeclarationsBlock($cssRule['declarationsBlock']);
         $node->setAttribute(
             'style',
             $this->generateStyleStringFromDeclarationsArrays($oldStyleDeclarations, $newStyleDeclarations)
@@ -1278,46 +984,69 @@ class Emogrifier
     }
 
     /**
-     * Applies $cssRules to $this->domDocument, limited to the rules that actually apply to the document.
+     * Applies $cssRules to $this->domDocument, limited to the rules that actually apply to the document, by placing
+     * them as CSS in a `<style>` element.
      *
-     * @param \DOMXPath $xPath
-     * @param string[][] $cssRules The "uninlineable" array of CSS rules returned by `parseCssRules`
+     * @param string[][] $cssRules the "uninlinable" array of CSS rules returned by `parseCssRules`
+     * @param string $cssImportRules This may contain any `@import` rules that should precede the CSS placed in the
+     *        `<style>` element.  If there are no unlinlinable CSS rules to copy there, a `<style>` element will be
+     *        created containing just `$cssImportRules`.  `$cssImportRules` may be an empty string; if it is, and there
+     *        are no unlinlinable CSS rules, an empty `<style>` element will not be created.
      *
      * @return void
      */
-    private function copyUninlineableCssToStyleNode(\DOMXPath $xPath, array $cssRules)
+    private function copyUninlinableCssToStyleNode(array $cssRules, $cssImportRules)
     {
-        $cssRulesRelevantForDocument = \array_filter(
-            $cssRules,
-            function (array $cssRule) use ($xPath) {
-                $selector = $cssRule['selector'];
-                if ($cssRule['hasUnmatchablePseudo']) {
-                    $selector = $this->removeUnmatchablePseudoComponents($selector);
-                }
-                return $this->existsMatchForCssSelector($xPath, $selector);
+        $css = $cssImportRules;
+
+        $cssRulesRelevantForDocument = \array_filter($cssRules, [$this, 'existsMatchForSelectorInCssRule']);
+
+        // avoid including unneeded class dependency if there are no rules
+        if ($cssRulesRelevantForDocument !== []) {
+            // support use without autoload
+            if (!\class_exists(CssConcatenator::class)) {
+                require_once __DIR__ . '/Emogrifier/Utilities/CssConcatenator.php';
             }
-        );
 
-        if ($cssRulesRelevantForDocument === []) {
-            // avoid adding empty style element (or including unneeded class dependency)
-            return;
+            $cssConcatenator = new CssConcatenator();
+            foreach ($cssRulesRelevantForDocument as $cssRule) {
+                $cssConcatenator->append([$cssRule['selector']], $cssRule['declarationsBlock'], $cssRule['media']);
+            }
+
+            $css .= $cssConcatenator->getCss();
         }
 
-        // support use without autoload
-        if (!\class_exists('Pelago\\Emogrifier\\CssConcatenator')) {
-            require_once __DIR__ . '/Emogrifier/CssConcatenator.php';
+        // avoid adding empty style element
+        if ($css !== '') {
+            $this->addStyleElementToDocument($css);
         }
+    }
 
-        $cssConcatenator = new Emogrifier\CssConcatenator();
-        foreach ($cssRulesRelevantForDocument as $cssRule) {
-            $cssConcatenator->append([$cssRule['selector']], $cssRule['declarationsBlock'], $cssRule['media']);
+    /**
+     * Checks whether there is at least one matching element for the CSS selector contained in the `selector` element
+     * of the provided CSS rule.
+     *
+     * Any dynamic pseudo-classes will be assumed to apply. If the selector matches a pseudo-element,
+     * it will test for a match with its originating element.
+     *
+     * @param string[] $cssRule
+     *
+     * @return bool
+     *
+     * @throws \InvalidArgumentException
+     */
+    private function existsMatchForSelectorInCssRule(array $cssRule)
+    {
+        $selector = $cssRule['selector'];
+        if ($cssRule['hasUnmatchablePseudo']) {
+            $selector = $this->removeUnmatchablePseudoComponents($selector);
         }
-
-        $this->addStyleElementToDocument($cssConcatenator->getCss());
+        return $this->existsMatchForCssSelector($selector);
     }
 
     /**
      * Removes pseudo-elements and dynamic pseudo-classes from a CSS selector, replacing them with "*" if necessary.
+     * If such a pseudo-component is within the argument of `:not`, the entire `:not` component is removed or replaced.
      *
      * @param string $selector
      *
@@ -1326,30 +1055,61 @@ class Emogrifier
      */
     private function removeUnmatchablePseudoComponents($selector)
     {
-        $pseudoComponentMatcher = ':(?!' . static::PSEUDO_CLASS_MATCHER . '):?+[\\w\\-]++(?:\\([^\\)]*+\\))?+';
+        // The regex allows nested brackets via `(?2)`.
+        // A space is temporarily prepended because the callback can't determine if the match was at the very start.
+        $selectorWithoutNots = \ltrim(\preg_replace_callback(
+            '/(\\s?+):not(\\([^()]*+(?:(?2)[^()]*+)*+\\))/i',
+            [$this, 'replaceUnmatchableNotComponent'],
+            ' ' . $selector
+        ));
+
+        $pseudoComponentMatcher = ':(?!' . self::PSEUDO_CLASS_MATCHER . '):?+[\\w\\-]++(?:\\([^\\)]*+\\))?+';
         return \preg_replace(
             ['/(\\s|^)' . $pseudoComponentMatcher . '/i', '/' . $pseudoComponentMatcher . '/i'],
             ['$1*', ''],
-            $selector
+            $selectorWithoutNots
         );
     }
 
+    /**
+     * Helps `removeUnmatchablePseudoComponents()` replace or remove a selector `:not(...)` component if its argument
+     * contains pseudo-elements or dynamic pseudo-classes.
+     *
+     * @param string[] $matches array of elements matched by the regular expression
+     *
+     * @return string the full match if there were no unmatchable pseudo components within; otherwise, any preceding
+     *         whitespace followed by "*", or an empty string if there was no preceding whitespace
+     */
+    private function replaceUnmatchableNotComponent(array $matches)
+    {
+        list($notComponentWithAnyPrecedingWhitespace, $anyPrecedingWhitespace, $notArgumentInBrackets) = $matches;
+
+        $hasUnmatchablePseudo = \preg_match(
+            '/:(?!' . self::PSEUDO_CLASS_MATCHER . ')[\\w\\-:]/i',
+            $notArgumentInBrackets
+        );
+
+        if ($hasUnmatchablePseudo) {
+            return $anyPrecedingWhitespace !== '' ? $anyPrecedingWhitespace . '*' : '';
+        }
+        return $notComponentWithAnyPrecedingWhitespace;
+    }
+
     /**
      * Checks whether there is at least one matching element for $cssSelector.
      * When not in debug mode, it returns true also for invalid selectors (because they may be valid,
      * just not implemented/recognized yet by Emogrifier).
      *
-     * @param \DOMXPath $xPath
      * @param string $cssSelector
      *
      * @return bool
      *
      * @throws \InvalidArgumentException
      */
-    private function existsMatchForCssSelector(\DOMXPath $xPath, $cssSelector)
+    private function existsMatchForCssSelector($cssSelector)
     {
         try {
-            $nodesMatchingSelector = $xPath->query($this->translateCssToXpath($cssSelector));
+            $nodesMatchingSelector = $this->xPath->query($this->translateCssToXpath($cssSelector));
         } catch (\InvalidArgumentException $e) {
             if ($this->debug) {
                 throw $e;
@@ -1363,13 +1123,11 @@ class Emogrifier
     /**
      * Returns CSS content.
      *
-     * @param \DOMXPath $xPath
-     *
      * @return string
      */
-    private function getCssFromAllStyleNodes(\DOMXPath $xPath)
+    private function getCssFromAllStyleNodes()
     {
-        $styleNodes = $xPath->query('//style');
+        $styleNodes = $this->xPath->query('//style');
 
         if ($styleNodes === false) {
             return '';
@@ -1390,7 +1148,7 @@ class Emogrifier
      *
      * This method is protected to allow overriding.
      *
-     * @see https://github.com/jjriv/emogrifier/issues/103
+     * @see https://github.com/MyIntervals/emogrifier/issues/103
      *
      * @param string $css
      *
@@ -1403,14 +1161,16 @@ class Emogrifier
         $styleAttribute->value = 'text/css';
         $styleElement->appendChild($styleAttribute);
 
-        $bodyElement = $this->getBodyElement();
-        $bodyElement->appendChild($styleElement);
+        $headElement = $this->getHeadElement();
+        $headElement->appendChild($styleElement);
     }
 
     /**
      * Checks that $this->domDocument has a BODY element and adds it if it is missing.
      *
      * @return void
+     *
+     * @throws \UnexpectedValueException
      */
     private function ensureExistenceOfBodyElement()
     {
@@ -1419,11 +1179,63 @@ class Emogrifier
         }
 
         $htmlElement = $this->domDocument->getElementsByTagName('html')->item(0);
+        if ($htmlElement === null) {
+            throw new \UnexpectedValueException('There is no HTML element although there should be one.', 1569930874);
+        }
         $htmlElement->appendChild($this->domDocument->createElement('body'));
     }
 
     /**
-     * Splits input CSS code into an array of parts for different media querues, in order.
+     * Removes comments from the supplied CSS.
+     *
+     * @param string $css
+     *
+     * @return string CSS with the comments removed
+     */
+    private function removeCssComments($css)
+    {
+        return \preg_replace('%/\\*[^*]*+(?:\\*(?!/)[^*]*+)*+\\*/%', '', $css);
+    }
+
+    /**
+     * Extracts `@import` and `@charset` rules from the supplied CSS.  These rules must not be preceded by any other
+     * rules, or they will be ignored.  (From the CSS 2.1 specification: "CSS 2.1 user agents must ignore any '@import'
+     * rule that occurs inside a block or after any non-ignored statement other than an @charset or an @import rule."
+     * Note also that `@charset` is case sensitive whereas `@import` is not.)
+     *
+     * @param string $css CSS with comments removed
+     *
+     * @return string[] The first element is the CSS with the valid `@import` and `@charset` rules removed.  The second
+     * element contains a concatenation of the valid `@import` rules, each followed by whatever whitespace followed it
+     * in the original CSS (so that either unminified or minified formatting is preserved); if there were no `@import`
+     * rules, it will be an empty string.  The (valid) `@charset` rules are discarded.
+     */
+    private function extractImportAndCharsetRules($css)
+    {
+        $possiblyModifiedCss = $css;
+        $importRules = '';
+
+        while (
+            \preg_match(
+                '/^\\s*+(@((?i)import(?-i)|charset)\\s[^;]++;\\s*+)/',
+                $possiblyModifiedCss,
+                $matches
+            )
+        ) {
+            list($fullMatch, $atRuleAndFollowingWhitespace, $atRuleName) = $matches;
+
+            if (\strtolower($atRuleName) === 'import') {
+                $importRules .= $atRuleAndFollowingWhitespace;
+            }
+
+            $possiblyModifiedCss = \substr($possiblyModifiedCss, \strlen($fullMatch));
+        }
+
+        return [$possiblyModifiedCss, $importRules];
+    }
+
+    /**
+     * Splits input CSS code into an array of parts for different media queries, in order.
      * Each part is an array where:
      *
      * - key "css" will contain clean CSS code (for @media rules this will be the group rule body within "{...}")
@@ -1453,8 +1265,6 @@ class Emogrifier
      */
     private function splitCssAndMediaQuery($css)
     {
-        $cssWithoutComments = \preg_replace('/\\/\\*.*\\*\\//sU', '', $css);
-
         $mediaTypesExpression = '';
         if (!empty($this->allowedMediaTypes)) {
             $mediaTypesExpression = '|' . \implode('|', \array_keys($this->allowedMediaTypes));
@@ -1463,9 +1273,9 @@ class Emogrifier
         $mediaRuleBodyMatcher = '[^{]*+{(?:[^{}]*+{.*})?\\s*+}\\s*+';
 
         $cssSplitForAllowedMediaTypes = \preg_split(
-            '#(@media\\s++(?:only\\s++)?+(?:(?=[{\\(])' . $mediaTypesExpression . ')' . $mediaRuleBodyMatcher
+            '#(@media\\s++(?:only\\s++)?+(?:(?=[{(])' . $mediaTypesExpression . ')' . $mediaRuleBodyMatcher
             . ')#misU',
-            $cssWithoutComments,
+            $css,
             -1,
             PREG_SPLIT_DELIM_CAPTURE
         );
@@ -1506,11 +1316,14 @@ class Emogrifier
     private function removeUnprocessableTags()
     {
         foreach ($this->unprocessableHtmlTags as $tagName) {
-            $nodes = $this->domDocument->getElementsByTagName($tagName);
+            // Deleting nodes from a 'live' NodeList invalidates iteration on it, so a copy must be made to iterate.
+            $nodes = [];
+            foreach ($this->domDocument->getElementsByTagName($tagName) as $node) {
+                $nodes[] = $node;
+            }
             /** @var \DOMNode $node */
             foreach ($nodes as $node) {
-                $hasContent = $node->hasChildNodes() || $node->hasChildNodes();
-                if (!$hasContent) {
+                if (!$node->hasChildNodes()) {
                     $node->parentNode->removeChild($node);
                 }
             }
@@ -1531,12 +1344,14 @@ class Emogrifier
             return $html;
         }
 
-        return static::DEFAULT_DOCUMENT_TYPE . $html;
+        return self::DEFAULT_DOCUMENT_TYPE . $html;
     }
 
     /**
      * Adds a Content-Type meta tag for the charset.
      *
+     * This method also ensures that there is a HEAD element.
+     *
      * @param string $html
      *
      * @return string the HTML with the meta tag added
@@ -1554,20 +1369,37 @@ class Emogrifier
         $hasHtmlTag = \stripos($html, '<html') !== false;
 
         if ($hasHeadTag) {
-            $reworkedHtml = \preg_replace('/<head(.*?)>/i', '<head$1>' . static::CONTENT_TYPE_META_TAG, $html);
+            $reworkedHtml = \preg_replace('/<head(.*?)>/i', '<head$1>' . self::CONTENT_TYPE_META_TAG, $html);
         } elseif ($hasHtmlTag) {
             $reworkedHtml = \preg_replace(
                 '/<html(.*?)>/i',
-                '<html$1><head>' . static::CONTENT_TYPE_META_TAG . '</head>',
+                '<html$1><head>' . self::CONTENT_TYPE_META_TAG . '</head>',
                 $html
             );
         } else {
-            $reworkedHtml = static::CONTENT_TYPE_META_TAG . $html;
+            $reworkedHtml = self::CONTENT_TYPE_META_TAG . $html;
         }
 
         return $reworkedHtml;
     }
 
+    /**
+     * Makes sure that any self-closing tags not recognized as such by PHP's DOMDocument implementation have a
+     * self-closing slash.
+     *
+     * @param string $html
+     *
+     * @return string HTML with problematic tags converted.
+     */
+    private function ensurePhpUnrecognizedSelfClosingTagsAreXml($html)
+    {
+        return \preg_replace(
+            '%<' . self::PHP_UNRECOGNIZED_VOID_TAGNAME_MATCHER . '\\b[^>]*+(?<!/)(?=>)%',
+            '$0/',
+            $html
+        );
+    }
+
     /**
      * @param string[] $a
      * @param string[] $b
@@ -1594,7 +1426,7 @@ class Emogrifier
     private function getCssSelectorPrecedence($selector)
     {
         $selectorKey = \md5($selector);
-        if (!isset($this->caches[static::CACHE_KEY_SELECTOR][$selectorKey])) {
+        if (!isset($this->caches[self::CACHE_KEY_SELECTOR][$selectorKey])) {
             $precedence = 0;
             foreach ($this->selectorPrecedenceMatchers as $matcher => $value) {
                 if (\trim($selector) === '') {
@@ -1604,10 +1436,10 @@ class Emogrifier
                 $selector = \preg_replace('/' . $matcher . '\\w+/', '', $selector, -1, $number);
                 $precedence += ($value * $number);
             }
-            $this->caches[static::CACHE_KEY_SELECTOR][$selectorKey] = $precedence;
+            $this->caches[self::CACHE_KEY_SELECTOR][$selectorKey] = $precedence;
         }
 
-        return $this->caches[static::CACHE_KEY_SELECTOR][$selectorKey];
+        return $this->caches[self::CACHE_KEY_SELECTOR][$selectorKey];
     }
 
     /**
@@ -1624,15 +1456,15 @@ class Emogrifier
         $paddedSelector = ' ' . $cssSelector . ' ';
         $lowercasePaddedSelector = \preg_replace_callback(
             '/\\s+\\w+\\s+/',
-            function (array $matches) {
+            static function (array $matches) {
                 return \strtolower($matches[0]);
             },
             $paddedSelector
         );
         $trimmedLowercaseSelector = \trim($lowercasePaddedSelector);
         $xPathKey = \md5($trimmedLowercaseSelector);
-        if (isset($this->caches[static::CACHE_KEY_XPATH][$xPathKey])) {
-            return $this->caches[static::CACHE_KEY_SELECTOR][$xPathKey];
+        if (isset($this->caches[self::CACHE_KEY_XPATH][$xPathKey])) {
+            return $this->caches[self::CACHE_KEY_SELECTOR][$xPathKey];
         }
 
         $hasNotSelector = (bool)\preg_match(
@@ -1640,17 +1472,17 @@ class Emogrifier
             $trimmedLowercaseSelector,
             $matches
         );
-        if (!$hasNotSelector) {
-            $xPath = '//' . $this->translateCssToXpathPass($trimmedLowercaseSelector);
-        } else {
+        if ($hasNotSelector) {
             /** @var string[] $matches */
             list(, $partBeforeNot, $notContents) = $matches;
             $xPath = '//' . $this->translateCssToXpathPass($partBeforeNot) .
                 '[not(' . $this->translateCssToXpathPassInline($notContents) . ')]';
+        } else {
+            $xPath = '//' . $this->translateCssToXpathPass($trimmedLowercaseSelector);
         }
-        $this->caches[static::CACHE_KEY_SELECTOR][$xPathKey] = $xPath;
+        $this->caches[self::CACHE_KEY_SELECTOR][$xPathKey] = $xPath;
 
-        return $this->caches[static::CACHE_KEY_SELECTOR][$xPathKey];
+        return $this->caches[self::CACHE_KEY_SELECTOR][$xPathKey];
     }
 
     /**
@@ -1698,12 +1530,12 @@ class Emogrifier
     ) {
         $roughXpath = \preg_replace(\array_keys($this->xPathRules), $this->xPathRules, $trimmedLowercaseSelector);
         $xPathWithIdAttributeMatchers = \preg_replace_callback(
-            static::ID_ATTRIBUTE_MATCHER,
+            self::ID_ATTRIBUTE_MATCHER,
             [$this, 'matchIdAttributes'],
             $roughXpath
         );
         $xPathWithIdAttributeAndClassMatchers = \preg_replace_callback(
-            static::CLASS_ATTRIBUTE_MATCHER,
+            self::CLASS_ATTRIBUTE_MATCHER,
             $matchClassAttributesCallback,
             $xPathWithIdAttributeMatchers
         );
@@ -1751,10 +1583,8 @@ class Emogrifier
     private function matchClassAttributesInline(array $match)
     {
         return 'contains(concat(" ",@class," "),concat(" ","' .
-            \implode(
-                '"," "))][contains(concat(" ",@class," "),concat(" ","',
-                \explode('.', \substr($match[2], 1))
-            ) . '"," "))';
+            \str_replace('.', '"," "))][contains(concat(" ",@class," "),concat(" ","', \substr($match[2], 1)) .
+            '"," "))';
     }
 
     /**
@@ -1766,25 +1596,25 @@ class Emogrifier
     {
         $parseResult = $this->parseNth($match);
 
-        if (isset($parseResult[static::MULTIPLIER])) {
-            if ($parseResult[static::MULTIPLIER] < 0) {
-                $parseResult[static::MULTIPLIER] = \abs($parseResult[static::MULTIPLIER]);
+        if (isset($parseResult[self::MULTIPLIER])) {
+            if ($parseResult[self::MULTIPLIER] < 0) {
+                $parseResult[self::MULTIPLIER] = \abs($parseResult[self::MULTIPLIER]);
                 $xPathExpression = \sprintf(
-                    '*[(last() - position()) mod %1%u = %2$u]/static::%3$s',
-                    $parseResult[static::MULTIPLIER],
-                    $parseResult[static::INDEX],
+                    '*[(last() - position()) mod %1%u = %2$u]/self::%3$s',
+                    $parseResult[self::MULTIPLIER],
+                    $parseResult[self::INDEX],
                     $match[1]
                 );
             } else {
                 $xPathExpression = \sprintf(
-                    '*[position() mod %1$u = %2$u]/static::%3$s',
-                    $parseResult[static::MULTIPLIER],
-                    $parseResult[static::INDEX],
+                    '*[position() mod %1$u = %2$u]/self::%3$s',
+                    $parseResult[self::MULTIPLIER],
+                    $parseResult[self::INDEX],
                     $match[1]
                 );
             }
         } else {
-            $xPathExpression = \sprintf('*[%1$u]/static::%2$s', $parseResult[static::INDEX], $match[1]);
+            $xPathExpression = \sprintf('*[%1$u]/self::%2$s', $parseResult[self::INDEX], $match[1]);
         }
 
         return $xPathExpression;
@@ -1799,25 +1629,25 @@ class Emogrifier
     {
         $parseResult = $this->parseNth($match);
 
-        if (isset($parseResult[static::MULTIPLIER])) {
-            if ($parseResult[static::MULTIPLIER] < 0) {
-                $parseResult[static::MULTIPLIER] = \abs($parseResult[static::MULTIPLIER]);
+        if (isset($parseResult[self::MULTIPLIER])) {
+            if ($parseResult[self::MULTIPLIER] < 0) {
+                $parseResult[self::MULTIPLIER] = \abs($parseResult[self::MULTIPLIER]);
                 $xPathExpression = \sprintf(
                     '%1$s[(last() - position()) mod %2$u = %3$u]',
                     $match[1],
-                    $parseResult[static::MULTIPLIER],
-                    $parseResult[static::INDEX]
+                    $parseResult[self::MULTIPLIER],
+                    $parseResult[self::INDEX]
                 );
             } else {
                 $xPathExpression = \sprintf(
                     '%1$s[position() mod %2$u = %3$u]',
                     $match[1],
-                    $parseResult[static::MULTIPLIER],
-                    $parseResult[static::INDEX]
+                    $parseResult[self::MULTIPLIER],
+                    $parseResult[self::INDEX]
                 );
             }
         } else {
-            $xPathExpression = \sprintf('%1$s[%2$u]', $match[1], $parseResult[static::INDEX]);
+            $xPathExpression = \sprintf('%1$s[%2$u]', $match[1], $parseResult[self::INDEX]);
         }
 
         return $xPathExpression;
@@ -1833,12 +1663,12 @@ class Emogrifier
         if (\in_array(\strtolower($match[2]), ['even', 'odd'], true)) {
             // we have "even" or "odd"
             $index = \strtolower($match[2]) === 'even' ? 0 : 1;
-            return [static::MULTIPLIER => 2, static::INDEX => $index];
+            return [self::MULTIPLIER => 2, self::INDEX => $index];
         }
         if (\stripos($match[2], 'n') === false) {
             // if there is a multiplier
             $index = (int)\str_replace(' ', '', $match[2]);
-            return [static::INDEX => $index];
+            return [self::INDEX => $index];
         }
 
         if (isset($match[3])) {
@@ -1854,7 +1684,7 @@ class Emogrifier
         if ($multiplier === '') {
             $multiplier = 1;
         } elseif ($multiplier === '0') {
-            return [static::INDEX => $index];
+            return [self::INDEX => $index];
         } else {
             $multiplier = (int)$multiplier;
         }
@@ -1863,7 +1693,7 @@ class Emogrifier
             $index += \abs($multiplier);
         }
 
-        return [static::MULTIPLIER => $multiplier, static::INDEX => $index];
+        return [self::MULTIPLIER => $multiplier, self::INDEX => $index];
     }
 
     /**
@@ -1887,14 +1717,12 @@ class Emogrifier
      */
     private function parseCssDeclarationsBlock($cssDeclarationsBlock)
     {
-        if (isset($this->caches[static::CACHE_KEY_CSS_DECLARATIONS_BLOCK][$cssDeclarationsBlock])) {
-            return $this->caches[static::CACHE_KEY_CSS_DECLARATIONS_BLOCK][$cssDeclarationsBlock];
+        if (isset($this->caches[self::CACHE_KEY_CSS_DECLARATIONS_BLOCK][$cssDeclarationsBlock])) {
+            return $this->caches[self::CACHE_KEY_CSS_DECLARATIONS_BLOCK][$cssDeclarationsBlock];
         }
 
         $properties = [];
-        $declarations = \preg_split('/;(?!base64|charset)/', $cssDeclarationsBlock);
-
-        foreach ($declarations as $declaration) {
+        foreach (\preg_split('/;(?!base64|charset)/', $cssDeclarationsBlock) as $declaration) {
             $matches = [];
             if (!\preg_match('/^([A-Za-z\\-]+)\\s*:\\s*(.+)$/s', \trim($declaration), $matches)) {
                 continue;
@@ -1904,7 +1732,7 @@ class Emogrifier
             $propertyValue = $matches[2];
             $properties[$propertyName] = $propertyValue;
         }
-        $this->caches[static::CACHE_KEY_CSS_DECLARATIONS_BLOCK][$cssDeclarationsBlock] = $properties;
+        $this->caches[self::CACHE_KEY_CSS_DECLARATIONS_BLOCK][$cssDeclarationsBlock] = $properties;
 
         return $properties;
     }
@@ -1912,18 +1740,16 @@ class Emogrifier
     /**
      * Find the nodes that are not to be emogrified.
      *
-     * @param \DOMXPath $xPath
-     *
      * @return \DOMElement[]
      *
      * @throws \InvalidArgumentException
      */
-    private function getNodesToExclude(\DOMXPath $xPath)
+    private function getNodesToExclude()
     {
         $excludedNodes = [];
         foreach (\array_keys($this->excludedSelectors) as $selectorToExclude) {
             try {
-                $matchingNodes = $xPath->query($this->translateCssToXpath($selectorToExclude));
+                $matchingNodes = $this->xPath->query($this->translateCssToXpath($selectorToExclude));
             } catch (\InvalidArgumentException $e) {
                 if ($this->debug) {
                     throw $e;
diff --git a/lib/pelago/emogrifier/src/Emogrifier/CssInliner.php b/lib/pelago/emogrifier/src/Emogrifier/CssInliner.php
index 3ad06c4d8..681785aaf 100644
--- a/lib/pelago/emogrifier/src/Emogrifier/CssInliner.php
+++ b/lib/pelago/emogrifier/src/Emogrifier/CssInliner.php
@@ -2,6 +2,8 @@
 
 namespace Pelago\Emogrifier;
 
+use Pelago\Emogrifier\HtmlProcessor\AbstractHtmlProcessor;
+use Pelago\Emogrifier\Utilities\CssConcatenator;
 use Symfony\Component\CssSelector\CssSelectorConverter;
 use Symfony\Component\CssSelector\Exception\SyntaxErrorException;
 
@@ -12,8 +14,6 @@ use Symfony\Component\CssSelector\Exception\SyntaxErrorException;
  *
  * For more information, please see the README.md file.
  *
- * @internal This class currently is a new technology preview, and its API is still in flux. Don't use it in production.
- *
  * @author Cameron Brooks
  * @author Jaime Prado
  * @author Oliver Klee <github@oliverklee.de>
@@ -21,7 +21,7 @@ use Symfony\Component\CssSelector\Exception\SyntaxErrorException;
  * @author Sander Kruger <s.kruger@invessel.com>
  * @author Zoli Szabó <zoli.szabo+github@gmail.com>
  */
-class CssInliner
+class CssInliner extends AbstractHtmlProcessor
 {
     /**
      * @var int
@@ -51,38 +51,14 @@ class CssInliner
      *
      * @var string
      */
-    const PSEUDO_CLASS_MATCHER = '\\S+\\-(?:child|type\\()|not\\([[:ascii:]]*\\)';
-
-    /**
-     * @var string
-     */
-    const CONTENT_TYPE_META_TAG = '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">';
-
-    /**
-     * @var string
-     */
-    const DEFAULT_DOCUMENT_TYPE = '<!DOCTYPE html>';
-
-    /**
-     * @var \DOMDocument
-     */
-    protected $domDocument = null;
-
-    /**
-     * @var string
-     */
-    private $css = '';
+    const PSEUDO_CLASS_MATCHER
+        = 'empty|(?:first|last|nth(?:-last)?+|only)-child|(?:first|last|nth(?:-last)?+)-of-type|not\\([[:ascii:]]*\\)';
 
     /**
      * @var bool[]
      */
     private $excludedSelectors = [];
 
-    /**
-     * @var string[]
-     */
-    private $unprocessableHtmlTags = ['wbr'];
-
     /**
      * @var bool[]
      */
@@ -138,14 +114,6 @@ class CssInliner
      */
     private $isStyleBlocksParsingEnabled = true;
 
-    /**
-     * Determines whether elements with the `display: none` property are
-     * removed from the DOM.
-     *
-     * @var bool
-     */
-    private $shouldRemoveInvisibleNodes = true;
-
     /**
      * For calculating selector precedence order.
      * Keys are a regular expression part to match before a CSS name.
@@ -162,6 +130,14 @@ class CssInliner
         '(?:(?<![="\':\\w\\-])|::)' => 1,
     ];
 
+    /**
+     * array of data describing CSS rules which apply to the document but cannot be inlined, in the format returned by
+     * `parseCssRules`
+     *
+     * @var string[][]
+     */
+    private $matchingUninlinableCssRules = null;
+
     /**
      * Emogrifier will throw Exceptions when it encounters an error instead of silently ignoring them.
      *
@@ -170,208 +146,38 @@ class CssInliner
     private $debug = false;
 
     /**
-     * @param string $unprocessedHtml raw HTML, must be UTF-encoded, must not be empty
+     * Inlines the given CSS into the existing HTML.
      *
-     * @throws \InvalidArgumentException if $unprocessedHtml is anything other than a non-empty string
-     */
-    public function __construct($unprocessedHtml)
-    {
-        if (!\is_string($unprocessedHtml)) {
-            throw new \InvalidArgumentException('The provided HTML must be a string.', 1540403176);
-        }
-        if ($unprocessedHtml === '') {
-            throw new \InvalidArgumentException('The provided HTML must not be empty.', 1540403181);
-        }
-
-        $this->cssSelectorConverter = new CssSelectorConverter();
-
-        $this->setHtml($unprocessedHtml);
-    }
-
-    /**
-     * Sets the HTML to process.
+     * @param string $css the CSS to inline, must be UTF-8-encoded
      *
-     * @param string $html the HTML to process, must be UTF-8-encoded
-     *
-     * @return void
-     */
-    private function setHtml($html)
-    {
-        $this->createUnifiedDomDocument($html);
-    }
-
-    /**
-     * Provides access to the internal DOMDocument representation of the HTML in its current state.
-     *
-     * @return \DOMDocument
-     */
-    public function getDomDocument()
-    {
-        return $this->domDocument;
-    }
-
-    /**
-     * Sets the CSS to merge with the HTML.
-     *
-     * @param string $css the CSS to merge, must be UTF-8-encoded
-     *
-     * @return void
-     */
-    public function setCss($css)
-    {
-        $this->css = $css;
-    }
-
-    /**
-     * Renders the normalized and processed HTML.
-     *
-     * @return string
-     */
-    public function render()
-    {
-        return $this->domDocument->saveHTML();
-    }
-
-    /**
-     * Renders the content of the BODY element of the normalized and processed HTML.
-     *
-     * @return string
-     */
-    public function renderBodyContent()
-    {
-        $bodyNodeHtml = $this->domDocument->saveHTML($this->getBodyElement());
-
-        return \str_replace(['<body>', '</body>'], '', $bodyNodeHtml);
-    }
-
-    /**
-     * Returns the BODY element.
-     *
-     * This method assumes that there always is a BODY element.
-     *
-     * @return \DOMElement
-     */
-    private function getBodyElement()
-    {
-        return $this->domDocument->getElementsByTagName('body')->item(0);
-    }
-
-    /**
-     * Applies $this->css to the given HTML and returns the HTML with the CSS
-     * applied.
-     *
-     * This method places the CSS inline.
-     *
-     * @return string
+     * @return self fluent interface
      *
      * @throws SyntaxErrorException
      */
-    public function emogrify()
-    {
-        $this->process();
-
-        return $this->render();
-    }
-
-    /**
-     * Applies $this->css to the given HTML and returns only the HTML content
-     * within the <body> tag.
-     *
-     * This method places the CSS inline.
-     *
-     * @return string
-     *
-     * @throws SyntaxErrorException
-     */
-    public function emogrifyBodyContent()
-    {
-        $this->process();
-
-        return $this->renderBodyContent();
-    }
-
-    /**
-     * Creates a DOM document from the given HTML and stores it in $this->domDocument.
-     *
-     * The DOM document will always have a BODY element and a document type.
-     *
-     * @param string $html
-     *
-     * @return void
-     */
-    private function createUnifiedDomDocument($html)
-    {
-        $this->createRawDomDocument($html);
-        $this->ensureExistenceOfBodyElement();
-    }
-
-    /**
-     * Creates a DOMDocument instance from the given HTML and stores it in $this->domDocument.
-     *
-     * @param string $html
-     *
-     * @return void
-     */
-    private function createRawDomDocument($html)
-    {
-        $domDocument = new \DOMDocument();
-        $domDocument->encoding = 'UTF-8';
-        $domDocument->strictErrorChecking = false;
-        $domDocument->formatOutput = true;
-        $libXmlState = \libxml_use_internal_errors(true);
-        $domDocument->loadHTML($this->prepareHtmlForDomConversion($html));
-        \libxml_clear_errors();
-        \libxml_use_internal_errors($libXmlState);
-        $domDocument->normalizeDocument();
-
-        $this->domDocument = $domDocument;
-    }
-
-    /**
-     * Returns the HTML with added document type and Content-Type meta tag if needed,
-     * ensuring that the HTML will be good for creating a DOM document from it.
-     *
-     * @param string $html
-     *
-     * @return string the unified HTML
-     */
-    private function prepareHtmlForDomConversion($html)
-    {
-        $htmlWithDocumentType = $this->ensureDocumentType($html);
-
-        return $this->addContentTypeMetaTag($htmlWithDocumentType);
-    }
-
-    /**
-     * Applies $this->css to $this->domDocument.
-     *
-     * This method places the CSS inline.
-     *
-     * @return void
-     *
-     * @throws SyntaxErrorException
-     */
-    protected function process()
+    public function inlineCss($css = '')
     {
         $this->clearAllCaches();
         $this->purgeVisitedNodes();
 
-        $xPath = new \DOMXPath($this->domDocument);
-        $this->removeUnprocessableTags();
-        $this->normalizeStyleAttributesOfAllNodes($xPath);
+        $this->normalizeStyleAttributesOfAllNodes();
 
-        // grab any existing style blocks from the html and append them to the existing CSS
+        $combinedCss = $css;
+        // grab any existing style blocks from the HTML and append them to the existing CSS
         // (these blocks should be appended so as to have precedence over conflicting styles in the existing CSS)
-        $allCss = $this->css;
         if ($this->isStyleBlocksParsingEnabled) {
-            $allCss .= $this->getCssFromAllStyleNodes($xPath);
+            $combinedCss .= $this->getCssFromAllStyleNodes();
         }
 
-        $excludedNodes = $this->getNodesToExclude($xPath);
-        $cssRules = $this->parseCssRules($allCss);
-        foreach ($cssRules['inlineable'] as $cssRule) {
+        $cssWithoutComments = $this->removeCssComments($combinedCss);
+        list($cssWithoutCommentsCharsetOrImport, $cssImportRules)
+            = $this->extractImportAndCharsetRules($cssWithoutComments);
+
+        $excludedNodes = $this->getNodesToExclude();
+        $cssRules = $this->parseCssRules($cssWithoutCommentsCharsetOrImport);
+        $cssSelectorConverter = $this->getCssSelectorConverter();
+        foreach ($cssRules['inlinable'] as $cssRule) {
             try {
-                $nodesMatchingCssSelectors = $xPath->query($this->cssSelectorConverter->toXPath($cssRule['selector']));
+                $nodesMatchingCssSelectors = $this->xPath->query($cssSelectorConverter->toXPath($cssRule['selector']));
             } catch (SyntaxErrorException $e) {
                 if ($this->debug) {
                     throw $e;
@@ -384,194 +190,20 @@ class CssInliner
                 if (\in_array($node, $excludedNodes, true)) {
                     continue;
                 }
-                $this->copyInlineableCssToStyleAttribute($node, $cssRule);
+                $this->copyInlinableCssToStyleAttribute($node, $cssRule);
             }
         }
 
         if ($this->isInlineStyleAttributesParsingEnabled) {
             $this->fillStyleAttributesWithMergedStyles();
         }
-        $this->postProcess($xPath);
 
-        $this->removeImportantAnnotationFromAllInlineStyles($xPath);
+        $this->removeImportantAnnotationFromAllInlineStyles();
 
-        $this->copyUninlineableCssToStyleNode($xPath, $cssRules['uninlineable']);
-    }
+        $this->determineMatchingUninlinableCssRules($cssRules['uninlinable']);
+        $this->copyUninlinableCssToStyleNode($cssImportRules);
 
-    /**
-     * Applies some optional post-processing to the HTML in the DOM document.
-     *
-     * @param \DOMXPath $xPath
-     *
-     * @return void
-     */
-    private function postProcess(\DOMXPath $xPath)
-    {
-        if ($this->shouldRemoveInvisibleNodes) {
-            $this->removeInvisibleNodes($xPath);
-        }
-    }
-
-    /**
-     * Searches for all nodes with a style attribute and removes the "!important" annotations out of
-     * the inline style declarations, eventually by rearranging declarations.
-     *
-     * @param \DOMXPath $xPath
-     *
-     * @return void
-     */
-    private function removeImportantAnnotationFromAllInlineStyles(\DOMXPath $xPath)
-    {
-        foreach ($this->getAllNodesWithStyleAttribute($xPath) as $node) {
-            $this->removeImportantAnnotationFromNodeInlineStyle($node);
-        }
-    }
-
-    /**
-     * Removes the "!important" annotations out of the inline style declarations,
-     * eventually by rearranging declarations.
-     * Rearranging needed when !important shorthand properties are followed by some of their
-     * not !important expanded-version properties.
-     * For example "font: 12px serif !important; font-size: 13px;" must be reordered
-     * to "font-size: 13px; font: 12px serif;" in order to remain correct.
-     *
-     * @param \DOMElement $node
-     *
-     * @return void
-     */
-    private function removeImportantAnnotationFromNodeInlineStyle(\DOMElement $node)
-    {
-        $inlineStyleDeclarations = $this->parseCssDeclarationsBlock($node->getAttribute('style'));
-        $regularStyleDeclarations = [];
-        $importantStyleDeclarations = [];
-        foreach ($inlineStyleDeclarations as $property => $value) {
-            if ($this->attributeValueIsImportant($value)) {
-                $importantStyleDeclarations[$property] = \trim(\str_replace('!important', '', $value));
-            } else {
-                $regularStyleDeclarations[$property] = $value;
-            }
-        }
-        $inlineStyleDeclarationsInNewOrder = \array_merge(
-            $regularStyleDeclarations,
-            $importantStyleDeclarations
-        );
-        $node->setAttribute(
-            'style',
-            $this->generateStyleStringFromSingleDeclarationsArray($inlineStyleDeclarationsInNewOrder)
-        );
-    }
-
-    /**
-     * Returns a list with all DOM nodes that have a style attribute.
-     *
-     * @param \DOMXPath $xPath
-     *
-     * @return \DOMNodeList
-     */
-    private function getAllNodesWithStyleAttribute(\DOMXPath $xPath)
-    {
-        return $xPath->query('//*[@style]');
-    }
-
-    /**
-     * Extracts and parses the individual rules from a CSS string.
-     *
-     * @param string $css a string of raw CSS code
-     *
-     * @return string[][][] A 2-entry array with the key "inlineable" containing rules which can be inlined as `style`
-     *         attributes and the key "uninlineable" containing rules which cannot.  Each value is an array of string
-     *         sub-arrays with the keys
-     *         "media" (the media query string, e.g. "@media screen and (max-width: 480px)",
-     *         or an empty string if not from a `@media` rule),
-     *         "selector" (the CSS selector, e.g., "*" or "header h1"),
-     *         "hasUnmatchablePseudo" (true if that selector contains psuedo-elements or dynamic pseudo-classes
-     *         such that the declarations cannot be applied inline),
-     *         "declarationsBlock" (the semicolon-separated CSS declarations for that selector,
-     *         e.g., "color: red; height: 4px;"),
-     *         and "line" (the line number e.g. 42)
-     */
-    private function parseCssRules($css)
-    {
-        $cssKey = \md5($css);
-        if (!isset($this->caches[static::CACHE_KEY_CSS][$cssKey])) {
-            $matches = $this->getCssRuleMatches($css);
-
-            $cssRules = [
-                'inlineable' => [],
-                'uninlineable' => [],
-            ];
-            /** @var string[][] $matches */
-            /** @var string[] $cssRule */
-            foreach ($matches as $key => $cssRule) {
-                $cssDeclaration = \trim($cssRule['declarations']);
-                if ($cssDeclaration === '') {
-                    continue;
-                }
-
-                $selectors = \explode(',', $cssRule['selectors']);
-                foreach ($selectors as $selector) {
-                    // don't process pseudo-elements and behavioral (dynamic) pseudo-classes;
-                    // only allow structural pseudo-classes
-                    $hasPseudoElement = \strpos($selector, '::') !== false;
-                    $hasUnsupportedPseudoClass = (bool)\preg_match(
-                        '/:(?!' . static::PSEUDO_CLASS_MATCHER . ')[\\w\\-]/i',
-                        $selector
-                    );
-                    $hasUnmatchablePseudo = $hasPseudoElement || $hasUnsupportedPseudoClass;
-
-                    $parsedCssRule = [
-                        'media' => $cssRule['media'],
-                        'selector' => \trim($selector),
-                        'hasUnmatchablePseudo' => $hasUnmatchablePseudo,
-                        'declarationsBlock' => $cssDeclaration,
-                        // keep track of where it appears in the file, since order is important
-                        'line' => $key,
-                    ];
-                    $ruleType = ($cssRule['media'] === '' && !$hasUnmatchablePseudo) ? 'inlineable' : 'uninlineable';
-                    $cssRules[$ruleType][] = $parsedCssRule;
-                }
-            }
-
-            \usort($cssRules['inlineable'], [$this, 'sortBySelectorPrecedence']);
-
-            $this->caches[static::CACHE_KEY_CSS][$cssKey] = $cssRules;
-        }
-
-        return $this->caches[static::CACHE_KEY_CSS][$cssKey];
-    }
-
-    /**
-     * Parses a string of CSS into the media query, selectors and declarations for each ruleset in order.
-     *
-     * @param string $css
-     *
-     * @return string[][] Array of string sub-arrays with the keys
-     *         "media" (the media query string, e.g. "@media screen and (max-width: 480px)",
-     *         or an empty string if not from an `@media` rule),
-     *         "selectors" (the CSS selector(s), e.g., "*" or "h1, h2"),
-     *         "declarations" (the semicolon-separated CSS declarations for that/those selector(s),
-     *         e.g., "color: red; height: 4px;"),
-     */
-    private function getCssRuleMatches($css)
-    {
-        $ruleMatches = [];
-
-        $splitCss = $this->splitCssAndMediaQuery($css);
-        foreach ($splitCss as $cssPart) {
-            // process each part for selectors and definitions
-            \preg_match_all('/(?:^|[\\s^{}]*)([^{]+){([^}]*)}/mi', $cssPart['css'], $matches, PREG_SET_ORDER);
-
-            /** @var string[][] $matches */
-            foreach ($matches as $cssRule) {
-                $ruleMatches[] = [
-                    'media' => $cssPart['media'],
-                    'selectors' => $cssRule[1],
-                    'declarations' => $cssRule[2],
-                ];
-            }
-        }
-
-        return $ruleMatches;
+        return $this;
     }
 
     /**
@@ -594,76 +226,6 @@ class CssInliner
         $this->isStyleBlocksParsingEnabled = false;
     }
 
-    /**
-     * Disables the removal of elements with `display: none` properties.
-     *
-     * @deprecated will be removed in Emogrifier 3.0
-     *
-     * @return void
-     */
-    public function disableInvisibleNodeRemoval()
-    {
-        $this->shouldRemoveInvisibleNodes = false;
-    }
-
-    /**
-     * Clears all caches.
-     *
-     * @return void
-     */
-    private function clearAllCaches()
-    {
-        $this->caches = [
-            static::CACHE_KEY_CSS => [],
-            static::CACHE_KEY_SELECTOR => [],
-            static::CACHE_KEY_CSS_DECLARATIONS_BLOCK => [],
-            static::CACHE_KEY_COMBINED_STYLES => [],
-        ];
-    }
-
-    /**
-     * Purges the visited nodes.
-     *
-     * @return void
-     */
-    private function purgeVisitedNodes()
-    {
-        $this->visitedNodes = [];
-        $this->styleAttributesForNodes = [];
-    }
-
-    /**
-     * Marks a tag for removal.
-     *
-     * There are some HTML tags that DOMDocument cannot process, and it will throw an error if it encounters them.
-     * In particular, DOMDocument will complain if you try to use HTML5 tags in an XHTML document.
-     *
-     * Note: The tags will not be removed if they have any content.
-     *
-     * @param string $tagName the tag name, e.g., "p"
-     *
-     * @return void
-     */
-    public function addUnprocessableHtmlTag($tagName)
-    {
-        $this->unprocessableHtmlTags[] = $tagName;
-    }
-
-    /**
-     * Drops a tag from the removal list.
-     *
-     * @param string $tagName the tag name, e.g., "p"
-     *
-     * @return void
-     */
-    public function removeUnprocessableHtmlTag($tagName)
-    {
-        $key = \array_search($tagName, $this->unprocessableHtmlTags, true);
-        if ($key !== false) {
-            unset($this->unprocessableHtmlTags[$key]);
-        }
-    }
-
     /**
      * Marks a media query type to keep.
      *
@@ -719,33 +281,60 @@ class CssInliner
     }
 
     /**
-     * This removes styles from your email that contain display:none.
-     * We need to look for display:none, but we need to do a case-insensitive search. Since DOMDocument only
-     * supports XPath 1.0, lower-case() isn't available to us. We've thus far only set attributes to lowercase,
-     * not attribute values. Consequently, we need to translate() the letters that would be in 'NONE' ("NOE")
-     * to lowercase.
+     * Sets the debug mode.
      *
-     * @param \DOMXPath $xPath
+     * @param bool $debug set to true to enable debug mode
      *
      * @return void
      */
-    private function removeInvisibleNodes(\DOMXPath $xPath)
+    public function setDebug($debug)
     {
-        $nodesWithStyleDisplayNone = $xPath->query(
-            '//*[contains(translate(translate(@style," ",""),"NOE","noe"),"display:none")]'
-        );
-        if ($nodesWithStyleDisplayNone->length === 0) {
-            return;
+        $this->debug = $debug;
+    }
+
+    /**
+     * Gets the array of selectors present in the CSS provided to `inlineCss()` for which the declarations could not be
+     * applied as inline styles, but which may affect elements in the HTML.  The relevant CSS will have been placed in a
+     * `<style>` element.  The selectors may include those used within `@media` rules or those involving dynamic
+     * pseudo-classes (such as `:hover`) or pseudo-elements (such as `::after`).
+     *
+     * @return string[]
+     *
+     * @throws \BadMethodCallException if `inlineCss` has not been called first
+     */
+    public function getMatchingUninlinableSelectors()
+    {
+        if ($this->matchingUninlinableCssRules === null) {
+            throw new \BadMethodCallException('inlineCss must be called first', 1568385221);
         }
 
-        // The checks on parentNode and is_callable below ensure that if we've deleted the parent node,
-        // we don't try to call removeChild on a nonexistent child node
-        /** @var \DOMNode $node */
-        foreach ($nodesWithStyleDisplayNone as $node) {
-            if ($node->parentNode && \is_callable([$node->parentNode, 'removeChild'])) {
-                $node->parentNode->removeChild($node);
-            }
-        }
+        return \array_column($this->matchingUninlinableCssRules, 'selector');
+    }
+
+    /**
+     * Clears all caches.
+     *
+     * @return void
+     */
+    private function clearAllCaches()
+    {
+        $this->caches = [
+            self::CACHE_KEY_CSS => [],
+            self::CACHE_KEY_SELECTOR => [],
+            self::CACHE_KEY_CSS_DECLARATIONS_BLOCK => [],
+            self::CACHE_KEY_COMBINED_STYLES => [],
+        ];
+    }
+
+    /**
+     * Purges the visited nodes.
+     *
+     * @return void
+     */
+    private function purgeVisitedNodes()
+    {
+        $this->visitedNodes = [];
+        $this->styleAttributesForNodes = [];
     }
 
     /**
@@ -754,14 +343,12 @@ class CssInliner
      * We wouldn't have to do this if DOMXPath supported XPath 2.0.
      * Also stores a reference of nodes with existing inline styles so we don't overwrite them.
      *
-     * @param \DOMXPath $xPath
-     *
      * @return void
      */
-    private function normalizeStyleAttributesOfAllNodes(\DOMXPath $xPath)
+    private function normalizeStyleAttributesOfAllNodes()
     {
         /** @var \DOMElement $node */
-        foreach ($this->getAllNodesWithStyleAttribute($xPath) as $node) {
+        foreach ($this->getAllNodesWithStyleAttribute() as $node) {
             if ($this->isInlineStyleAttributesParsingEnabled) {
                 $this->normalizeStyleAttributes($node);
             }
@@ -773,6 +360,16 @@ class CssInliner
         }
     }
 
+    /**
+     * Returns a list with all DOM nodes that have a style attribute.
+     *
+     * @return \DOMNodeList
+     */
+    private function getAllNodesWithStyleAttribute()
+    {
+        return $this->xPath->query('//*[@style]');
+    }
+
     /**
      * Normalizes the value of the "style" attribute and saves it.
      *
@@ -783,8 +380,8 @@ class CssInliner
     private function normalizeStyleAttributes(\DOMElement $node)
     {
         $normalizedOriginalStyle = \preg_replace_callback(
-            '/[A-z\\-]+(?=\\:)/S',
-            function (array $m) {
+            '/-?+[_a-zA-Z][\\w\\-]*+(?=:)/S',
+            static function (array $m) {
                 return \strtolower($m[0]);
             },
             $node->getAttribute('style')
@@ -802,211 +399,54 @@ class CssInliner
     }
 
     /**
-     * Merges styles from styles attributes and style nodes and applies them to the attribute nodes
+     * Parses a CSS declaration block into property name/value pairs.
      *
-     * @return void
+     * Example:
+     *
+     * The declaration block
+     *
+     *   "color: #000; font-weight: bold;"
+     *
+     * will be parsed into the following array:
+     *
+     *   "color" => "#000"
+     *   "font-weight" => "bold"
+     *
+     * @param string $cssDeclarationsBlock the CSS declarations block without the curly braces, may be empty
+     *
+     * @return string[]
+     *         the CSS declarations with the property names as array keys and the property values as array values
      */
-    private function fillStyleAttributesWithMergedStyles()
+    private function parseCssDeclarationsBlock($cssDeclarationsBlock)
     {
-        foreach ($this->styleAttributesForNodes as $nodePath => $styleAttributesForNode) {
-            $node = $this->visitedNodes[$nodePath];
-            $currentStyleAttributes = $this->parseCssDeclarationsBlock($node->getAttribute('style'));
-            $node->setAttribute(
-                'style',
-                $this->generateStyleStringFromDeclarationsArrays(
-                    $currentStyleAttributes,
-                    $styleAttributesForNode
-                )
-            );
-        }
-    }
-
-    /**
-     * This method merges old or existing name/value array with new name/value array
-     * and then generates a string of the combined style suitable for placing inline.
-     * This becomes the single point for CSS string generation allowing for consistent
-     * CSS output no matter where the CSS originally came from.
-     *
-     * @param string[] $oldStyles
-     * @param string[] $newStyles
-     *
-     * @return string
-     */
-    private function generateStyleStringFromDeclarationsArrays(array $oldStyles, array $newStyles)
-    {
-        $cacheKey = \serialize([$oldStyles, $newStyles]);
-        if (isset($this->caches[static::CACHE_KEY_COMBINED_STYLES][$cacheKey])) {
-            return $this->caches[static::CACHE_KEY_COMBINED_STYLES][$cacheKey];
+        if (isset($this->caches[self::CACHE_KEY_CSS_DECLARATIONS_BLOCK][$cssDeclarationsBlock])) {
+            return $this->caches[self::CACHE_KEY_CSS_DECLARATIONS_BLOCK][$cssDeclarationsBlock];
         }
 
-        // Unset the overridden styles to preserve order, important if shorthand and individual properties are mixed
-        foreach ($oldStyles as $attributeName => $attributeValue) {
-            if (!isset($newStyles[$attributeName])) {
+        $properties = [];
+        foreach (\preg_split('/;(?!base64|charset)/', $cssDeclarationsBlock) as $declaration) {
+            $matches = [];
+            if (!\preg_match('/^([A-Za-z\\-]+)\\s*:\\s*(.+)$/s', \trim($declaration), $matches)) {
                 continue;
             }
 
-            $newAttributeValue = $newStyles[$attributeName];
-            if ($this->attributeValueIsImportant($attributeValue)
-                && !$this->attributeValueIsImportant($newAttributeValue)
-            ) {
-                unset($newStyles[$attributeName]);
-            } else {
-                unset($oldStyles[$attributeName]);
-            }
+            $propertyName = \strtolower($matches[1]);
+            $propertyValue = $matches[2];
+            $properties[$propertyName] = $propertyValue;
         }
+        $this->caches[self::CACHE_KEY_CSS_DECLARATIONS_BLOCK][$cssDeclarationsBlock] = $properties;
 
-        $combinedStyles = \array_merge($oldStyles, $newStyles);
-
-        $style = '';
-        foreach ($combinedStyles as $attributeName => $attributeValue) {
-            $style .= \strtolower(\trim($attributeName)) . ': ' . \trim($attributeValue) . '; ';
-        }
-        $trimmedStyle = \rtrim($style);
-
-        $this->caches[static::CACHE_KEY_COMBINED_STYLES][$cacheKey] = $trimmedStyle;
-
-        return $trimmedStyle;
-    }
-
-    /**
-     * Generates a CSS style string suitable to be used inline from the $styleDeclarations property => value array.
-     *
-     * @param string[] $styleDeclarations
-     *
-     * @return string
-     */
-    private function generateStyleStringFromSingleDeclarationsArray(array $styleDeclarations)
-    {
-        return $this->generateStyleStringFromDeclarationsArrays([], $styleDeclarations);
-    }
-
-    /**
-     * Checks whether $attributeValue is marked as !important.
-     *
-     * @param string $attributeValue
-     *
-     * @return bool
-     */
-    private function attributeValueIsImportant($attributeValue)
-    {
-        return \strtolower(\substr(\trim($attributeValue), -10)) === '!important';
-    }
-
-    /**
-     * Applies $cssRules to $this->domDocument, limited to the rules that actually apply to the document.
-     *
-     * @param \DOMXPath $xPath
-     * @param string[][] $cssRules The "uninlineable" array of CSS rules returned by `parseCssRules`
-     *
-     * @return void
-     */
-    private function copyUninlineableCssToStyleNode(\DOMXPath $xPath, array $cssRules)
-    {
-        $cssRulesRelevantForDocument = \array_filter(
-            $cssRules,
-            function (array $cssRule) use ($xPath) {
-                $selector = $cssRule['selector'];
-                if ($cssRule['hasUnmatchablePseudo']) {
-                    $selector = $this->removeUnmatchablePseudoComponents($selector);
-                }
-                return $this->existsMatchForCssSelector($xPath, $selector);
-            }
-        );
-
-        if ($cssRulesRelevantForDocument === []) {
-            // avoid adding empty style element (or including unneeded class dependency)
-            return;
-        }
-
-        $cssConcatenator = new CssConcatenator();
-        foreach ($cssRulesRelevantForDocument as $cssRule) {
-            $cssConcatenator->append([$cssRule['selector']], $cssRule['declarationsBlock'], $cssRule['media']);
-        }
-
-        $this->addStyleElementToDocument($cssConcatenator->getCss());
-    }
-
-    /**
-     * Removes pseudo-elements and dynamic pseudo-classes from a CSS selector, replacing them with "*" if necessary.
-     *
-     * @param string $selector
-     *
-     * @return string Selector which will match the relevant DOM elements if the pseudo-classes are assumed to apply,
-     *                or in the case of pseudo-elements will match their originating element.
-     */
-    private function removeUnmatchablePseudoComponents($selector)
-    {
-        $pseudoComponentMatcher = ':(?!' . static::PSEUDO_CLASS_MATCHER . '):?+[\\w\\-]++(?:\\([^\\)]*+\\))?+';
-        return \preg_replace(
-            ['/(\\s|^)' . $pseudoComponentMatcher . '/i', '/' . $pseudoComponentMatcher . '/i'],
-            ['$1*', ''],
-            $selector
-        );
-    }
-
-    /**
-     * Copies $cssRule into the style attribute of $node.
-     *
-     * Note: This method does not check whether $cssRule matches $node.
-     *
-     * @param \DOMElement $node
-     * @param string[][] $cssRule
-     *
-     * @return void
-     */
-    private function copyInlineableCssToStyleAttribute(\DOMElement $node, array $cssRule)
-    {
-        // if it has a style attribute, get it, process it, and append (overwrite) new stuff
-        if ($node->hasAttribute('style')) {
-            // break it up into an associative array
-            $oldStyleDeclarations = $this->parseCssDeclarationsBlock($node->getAttribute('style'));
-        } else {
-            $oldStyleDeclarations = [];
-        }
-        $newStyleDeclarations = $this->parseCssDeclarationsBlock($cssRule['declarationsBlock']);
-        $node->setAttribute(
-            'style',
-            $this->generateStyleStringFromDeclarationsArrays($oldStyleDeclarations, $newStyleDeclarations)
-        );
-    }
-
-    /**
-     * Checks whether there is at least one matching element for $cssSelector.
-     * When not in debug mode, it returns true also for invalid selectors (because they may be valid,
-     * just not implemented/recognized yet by Emogrifier).
-     *
-     * @param \DOMXPath $xPath
-     * @param string $cssSelector
-     *
-     * @return bool
-     *
-     * @throws SyntaxErrorException
-     */
-    private function existsMatchForCssSelector(\DOMXPath $xPath, $cssSelector)
-    {
-        try {
-            $nodesMatchingSelector = $xPath->query($this->cssSelectorConverter->toXPath($cssSelector));
-        } catch (SyntaxErrorException $e) {
-            if ($this->debug) {
-                throw $e;
-            }
-            return true;
-        }
-
-        return $nodesMatchingSelector !== false && $nodesMatchingSelector->length !== 0;
+        return $properties;
     }
 
     /**
      * Returns CSS content.
      *
-     * @param \DOMXPath $xPath
-     *
      * @return string
      */
-    private function getCssFromAllStyleNodes(\DOMXPath $xPath)
+    private function getCssFromAllStyleNodes()
     {
-        $styleNodes = $xPath->query('//style');
-
+        $styleNodes = $this->xPath->query('//style');
         if ($styleNodes === false) {
             return '';
         }
@@ -1022,44 +462,241 @@ class CssInliner
     }
 
     /**
-     * Adds a style element with $css to $this->domDocument.
-     *
-     * This method is protected to allow overriding.
-     *
-     * @see https://github.com/jjriv/emogrifier/issues/103
+     * Removes comments from the supplied CSS.
      *
      * @param string $css
      *
-     * @return void
+     * @return string CSS with the comments removed
      */
-    protected function addStyleElementToDocument($css)
+    private function removeCssComments($css)
     {
-        $styleElement = $this->domDocument->createElement('style', $css);
-        $styleAttribute = $this->domDocument->createAttribute('type');
-        $styleAttribute->value = 'text/css';
-        $styleElement->appendChild($styleAttribute);
-
-        $bodyElement = $this->getBodyElement();
-        $bodyElement->appendChild($styleElement);
+        return \preg_replace('%/\\*[^*]*+(?:\\*(?!/)[^*]*+)*+\\*/%', '', $css);
     }
 
     /**
-     * Checks that $this->domDocument has a BODY element and adds it if it is missing.
+     * Extracts `@import` and `@charset` rules from the supplied CSS.  These rules must not be preceded by any other
+     * rules, or they will be ignored.  (From the CSS 2.1 specification: "CSS 2.1 user agents must ignore any '@import'
+     * rule that occurs inside a block or after any non-ignored statement other than an @charset or an @import rule."
+     * Note also that `@charset` is case sensitive whereas `@import` is not.)
      *
-     * @return void
+     * @param string $css CSS with comments removed
+     *
+     * @return string[] The first element is the CSS with the valid `@import` and `@charset` rules removed.  The second
+     * element contains a concatenation of the valid `@import` rules, each followed by whatever whitespace followed it
+     * in the original CSS (so that either unminified or minified formatting is preserved); if there were no `@import`
+     * rules, it will be an empty string.  The (valid) `@charset` rules are discarded.
      */
-    private function ensureExistenceOfBodyElement()
+    private function extractImportAndCharsetRules($css)
     {
-        if ($this->domDocument->getElementsByTagName('body')->item(0) !== null) {
-            return;
+        $possiblyModifiedCss = $css;
+        $importRules = '';
+
+        while (
+            \preg_match(
+                '/^\\s*+(@((?i)import(?-i)|charset)\\s[^;]++;\\s*+)/',
+                $possiblyModifiedCss,
+                $matches
+            )
+        ) {
+            list($fullMatch, $atRuleAndFollowingWhitespace, $atRuleName) = $matches;
+
+            if (\strtolower($atRuleName) === 'import') {
+                $importRules .= $atRuleAndFollowingWhitespace;
+            }
+
+            $possiblyModifiedCss = \substr($possiblyModifiedCss, \strlen($fullMatch));
         }
 
-        $htmlElement = $this->domDocument->getElementsByTagName('html')->item(0);
-        $htmlElement->appendChild($this->domDocument->createElement('body'));
+        return [$possiblyModifiedCss, $importRules];
     }
 
     /**
-     * Splits input CSS code into an array of parts for different media querues, in order.
+     * Find the nodes that are not to be emogrified.
+     *
+     * @return \DOMElement[]
+     *
+     * @throws SyntaxErrorException
+     */
+    private function getNodesToExclude()
+    {
+        $excludedNodes = [];
+        foreach (\array_keys($this->excludedSelectors) as $selectorToExclude) {
+            try {
+                $matchingNodes = $this->xPath->query($this->getCssSelectorConverter()->toXPath($selectorToExclude));
+            } catch (SyntaxErrorException $e) {
+                if ($this->debug) {
+                    throw $e;
+                }
+                continue;
+            }
+            foreach ($matchingNodes as $node) {
+                $excludedNodes[] = $node;
+            }
+        }
+
+        return $excludedNodes;
+    }
+
+    /**
+     * @return CssSelectorConverter
+     */
+    private function getCssSelectorConverter()
+    {
+        if ($this->cssSelectorConverter === null) {
+            $this->cssSelectorConverter = new CssSelectorConverter();
+        }
+
+        return $this->cssSelectorConverter;
+    }
+
+    /**
+     * Extracts and parses the individual rules from a CSS string.
+     *
+     * @param string $css a string of raw CSS code with comments removed
+     *
+     * @return string[][][] A 2-entry array with the key "inlinable" containing rules which can be inlined as `style`
+     *         attributes and the key "uninlinable" containing rules which cannot.  Each value is an array of string
+     *         sub-arrays with the keys
+     *         "media" (the media query string, e.g. "@media screen and (max-width: 480px)",
+     *         or an empty string if not from a `@media` rule),
+     *         "selector" (the CSS selector, e.g., "*" or "header h1"),
+     *         "hasUnmatchablePseudo" (true if that selector contains pseudo-elements or dynamic pseudo-classes
+     *         such that the declarations cannot be applied inline),
+     *         "declarationsBlock" (the semicolon-separated CSS declarations for that selector,
+     *         e.g., "color: red; height: 4px;"),
+     *         and "line" (the line number e.g. 42)
+     */
+    private function parseCssRules($css)
+    {
+        $cssKey = \md5($css);
+        if (isset($this->caches[self::CACHE_KEY_CSS][$cssKey])) {
+            return $this->caches[self::CACHE_KEY_CSS][$cssKey];
+        }
+
+        $matches = $this->getCssRuleMatches($css);
+
+        $cssRules = [
+            'inlinable' => [],
+            'uninlinable' => [],
+        ];
+        /** @var string[][] $matches */
+        /** @var string[] $cssRule */
+        foreach ($matches as $key => $cssRule) {
+            $cssDeclaration = \trim($cssRule['declarations']);
+            if ($cssDeclaration === '') {
+                continue;
+            }
+
+            foreach (\explode(',', $cssRule['selectors']) as $selector) {
+                // don't process pseudo-elements and behavioral (dynamic) pseudo-classes;
+                // only allow structural pseudo-classes
+                $hasPseudoElement = \strpos($selector, '::') !== false;
+                $hasUnsupportedPseudoClass = (bool)\preg_match(
+                    '/:(?!' . self::PSEUDO_CLASS_MATCHER . ')[\\w\\-]/i',
+                    $selector
+                );
+                $hasUnmatchablePseudo = $hasPseudoElement || $hasUnsupportedPseudoClass;
+
+                $parsedCssRule = [
+                    'media' => $cssRule['media'],
+                    'selector' => \trim($selector),
+                    'hasUnmatchablePseudo' => $hasUnmatchablePseudo,
+                    'declarationsBlock' => $cssDeclaration,
+                    // keep track of where it appears in the file, since order is important
+                    'line' => $key,
+                ];
+                $ruleType = ($cssRule['media'] === '' && !$hasUnmatchablePseudo) ? 'inlinable' : 'uninlinable';
+                $cssRules[$ruleType][] = $parsedCssRule;
+            }
+        }
+
+        \usort($cssRules['inlinable'], [$this, 'sortBySelectorPrecedence']);
+
+        $this->caches[self::CACHE_KEY_CSS][$cssKey] = $cssRules;
+
+        return $cssRules;
+    }
+
+    /**
+     * @param string[] $a
+     * @param string[] $b
+     *
+     * @return int
+     */
+    private function sortBySelectorPrecedence(array $a, array $b)
+    {
+        $precedenceA = $this->getCssSelectorPrecedence($a['selector']);
+        $precedenceB = $this->getCssSelectorPrecedence($b['selector']);
+
+        // We want these sorted in ascending order so selectors with lesser precedence get processed first and
+        // selectors with greater precedence get sorted last.
+        $precedenceForEquals = ($a['line'] < $b['line'] ? -1 : 1);
+        $precedenceForNotEquals = ($precedenceA < $precedenceB ? -1 : 1);
+        return ($precedenceA === $precedenceB) ? $precedenceForEquals : $precedenceForNotEquals;
+    }
+
+    /**
+     * @param string $selector
+     *
+     * @return int
+     */
+    private function getCssSelectorPrecedence($selector)
+    {
+        $selectorKey = \md5($selector);
+        if (isset($this->caches[self::CACHE_KEY_SELECTOR][$selectorKey])) {
+            return $this->caches[self::CACHE_KEY_SELECTOR][$selectorKey];
+        }
+
+        $precedence = 0;
+        foreach ($this->selectorPrecedenceMatchers as $matcher => $value) {
+            if (\trim($selector) === '') {
+                break;
+            }
+            $number = 0;
+            $selector = \preg_replace('/' . $matcher . '\\w+/', '', $selector, -1, $number);
+            $precedence += ($value * $number);
+        }
+        $this->caches[self::CACHE_KEY_SELECTOR][$selectorKey] = $precedence;
+
+        return $precedence;
+    }
+
+    /**
+     * Parses a string of CSS into the media query, selectors and declarations for each ruleset in order.
+     *
+     * @param string $css CSS with comments removed
+     *
+     * @return string[][] Array of string sub-arrays with the keys
+     *         "media" (the media query string, e.g. "@media screen and (max-width: 480px)",
+     *         or an empty string if not from an `@media` rule),
+     *         "selectors" (the CSS selector(s), e.g., "*" or "h1, h2"),
+     *         "declarations" (the semicolon-separated CSS declarations for that/those selector(s),
+     *         e.g., "color: red; height: 4px;"),
+     */
+    private function getCssRuleMatches($css)
+    {
+        $splitCss = $this->splitCssAndMediaQuery($css);
+
+        $ruleMatches = [];
+        foreach ($splitCss as $cssPart) {
+            // process each part for selectors and definitions
+            \preg_match_all('/(?:^|[\\s^{}]*)([^{]+){([^}]*)}/mi', $cssPart['css'], $matches, PREG_SET_ORDER);
+
+            /** @var string[][] $matches */
+            foreach ($matches as $cssRule) {
+                $ruleMatches[] = [
+                    'media' => $cssPart['media'],
+                    'selectors' => $cssRule[1],
+                    'declarations' => $cssRule[2],
+                ];
+            }
+        }
+
+        return $ruleMatches;
+    }
+
+    /**
+     * Splits input CSS code into an array of parts for different media queries, in order.
      * Each part is an array where:
      *
      * - key "css" will contain clean CSS code (for @media rules this will be the group rule body within "{...}")
@@ -1089,8 +726,6 @@ class CssInliner
      */
     private function splitCssAndMediaQuery($css)
     {
-        $cssWithoutComments = \preg_replace('/\\/\\*.*\\*\\//sU', '', $css);
-
         $mediaTypesExpression = '';
         if (!empty($this->allowedMediaTypes)) {
             $mediaTypesExpression = '|' . \implode('|', \array_keys($this->allowedMediaTypes));
@@ -1099,9 +734,9 @@ class CssInliner
         $mediaRuleBodyMatcher = '[^{]*+{(?:[^{}]*+{.*})?\\s*+}\\s*+';
 
         $cssSplitForAllowedMediaTypes = \preg_split(
-            '#(@media\\s++(?:only\\s++)?+(?:(?=[{\\(])' . $mediaTypesExpression . ')' . $mediaRuleBodyMatcher
+            '#(@media\\s++(?:only\\s++)?+(?:(?=[{(])' . $mediaTypesExpression . ')' . $mediaRuleBodyMatcher
             . ')#misU',
-            $cssWithoutComments,
+            $css,
             -1,
             PREG_SPLIT_DELIM_CAPTURE
         );
@@ -1135,198 +770,346 @@ class CssInliner
     }
 
     /**
-     * Removes empty unprocessable tags from the DOM document.
+     * Copies $cssRule into the style attribute of $node.
+     *
+     * Note: This method does not check whether $cssRule matches $node.
+     *
+     * @param \DOMElement $node
+     * @param string[][] $cssRule
      *
      * @return void
      */
-    private function removeUnprocessableTags()
+    private function copyInlinableCssToStyleAttribute(\DOMElement $node, array $cssRule)
     {
-        foreach ($this->unprocessableHtmlTags as $tagName) {
-            $nodes = $this->domDocument->getElementsByTagName($tagName);
-            /** @var \DOMNode $node */
-            foreach ($nodes as $node) {
-                $hasContent = $node->hasChildNodes() || $node->hasChildNodes();
-                if (!$hasContent) {
-                    $node->parentNode->removeChild($node);
-                }
-            }
-        }
-    }
-
-    /**
-     * Makes sure that the passed HTML has a document type.
-     *
-     * @param string $html
-     *
-     * @return string HTML with document type
-     */
-    private function ensureDocumentType($html)
-    {
-        $hasDocumentType = \stripos($html, '<!DOCTYPE') !== false;
-        if ($hasDocumentType) {
-            return $html;
+        $newStyleDeclarations = $this->parseCssDeclarationsBlock($cssRule['declarationsBlock']);
+        if ($newStyleDeclarations === []) {
+            return;
         }
 
-        return static::DEFAULT_DOCUMENT_TYPE . $html;
-    }
-
-    /**
-     * Adds a Content-Type meta tag for the charset.
-     *
-     * @param string $html
-     *
-     * @return string the HTML with the meta tag added
-     */
-    private function addContentTypeMetaTag($html)
-    {
-        $hasContentTypeMetaTag = \stripos($html, 'Content-Type') !== false;
-        if ($hasContentTypeMetaTag) {
-            return $html;
-        }
-
-        // We are trying to insert the meta tag to the right spot in the DOM.
-        // If we just prepended it to the HTML, we would lose attributes set to the HTML tag.
-        $hasHeadTag = \stripos($html, '<head') !== false;
-        $hasHtmlTag = \stripos($html, '<html') !== false;
-
-        if ($hasHeadTag) {
-            $reworkedHtml = \preg_replace('/<head(.*?)>/i', '<head$1>' . static::CONTENT_TYPE_META_TAG, $html);
-        } elseif ($hasHtmlTag) {
-            $reworkedHtml = \preg_replace(
-                '/<html(.*?)>/i',
-                '<html$1><head>' . static::CONTENT_TYPE_META_TAG . '</head>',
-                $html
-            );
+        // if it has a style attribute, get it, process it, and append (overwrite) new stuff
+        if ($node->hasAttribute('style')) {
+            // break it up into an associative array
+            $oldStyleDeclarations = $this->parseCssDeclarationsBlock($node->getAttribute('style'));
         } else {
-            $reworkedHtml = static::CONTENT_TYPE_META_TAG . $html;
+            $oldStyleDeclarations = [];
         }
-
-        return $reworkedHtml;
+        $node->setAttribute(
+            'style',
+            $this->generateStyleStringFromDeclarationsArrays($oldStyleDeclarations, $newStyleDeclarations)
+        );
     }
 
     /**
-     * @param string[] $a
-     * @param string[] $b
+     * This method merges old or existing name/value array with new name/value array
+     * and then generates a string of the combined style suitable for placing inline.
+     * This becomes the single point for CSS string generation allowing for consistent
+     * CSS output no matter where the CSS originally came from.
      *
-     * @return int
-     */
-    private function sortBySelectorPrecedence(array $a, array $b)
-    {
-        $precedenceA = $this->getCssSelectorPrecedence($a['selector']);
-        $precedenceB = $this->getCssSelectorPrecedence($b['selector']);
-
-        // We want these sorted in ascending order so selectors with lesser precedence get processed first and
-        // selectors with greater precedence get sorted last.
-        $precedenceForEquals = ($a['line'] < $b['line'] ? -1 : 1);
-        $precedenceForNotEquals = ($precedenceA < $precedenceB ? -1 : 1);
-        return ($precedenceA === $precedenceB) ? $precedenceForEquals : $precedenceForNotEquals;
-    }
-
-    /**
-     * @param string $selector
+     * @param string[] $oldStyles
+     * @param string[] $newStyles
      *
-     * @return int
+     * @return string
      */
-    private function getCssSelectorPrecedence($selector)
+    private function generateStyleStringFromDeclarationsArrays(array $oldStyles, array $newStyles)
     {
-        $selectorKey = \md5($selector);
-        if (!isset($this->caches[static::CACHE_KEY_SELECTOR][$selectorKey])) {
-            $precedence = 0;
-            foreach ($this->selectorPrecedenceMatchers as $matcher => $value) {
-                if (\trim($selector) === '') {
-                    break;
-                }
-                $number = 0;
-                $selector = \preg_replace('/' . $matcher . '\\w+/', '', $selector, -1, $number);
-                $precedence += ($value * $number);
-            }
-            $this->caches[static::CACHE_KEY_SELECTOR][$selectorKey] = $precedence;
+        $cacheKey = \serialize([$oldStyles, $newStyles]);
+        if (isset($this->caches[self::CACHE_KEY_COMBINED_STYLES][$cacheKey])) {
+            return $this->caches[self::CACHE_KEY_COMBINED_STYLES][$cacheKey];
         }
 
-        return $this->caches[static::CACHE_KEY_SELECTOR][$selectorKey];
-    }
-
-    /**
-     * Parses a CSS declaration block into property name/value pairs.
-     *
-     * Example:
-     *
-     * The declaration block
-     *
-     *   "color: #000; font-weight: bold;"
-     *
-     * will be parsed into the following array:
-     *
-     *   "color" => "#000"
-     *   "font-weight" => "bold"
-     *
-     * @param string $cssDeclarationsBlock the CSS declarations block without the curly braces, may be empty
-     *
-     * @return string[]
-     *         the CSS declarations with the property names as array keys and the property values as array values
-     */
-    private function parseCssDeclarationsBlock($cssDeclarationsBlock)
-    {
-        if (isset($this->caches[static::CACHE_KEY_CSS_DECLARATIONS_BLOCK][$cssDeclarationsBlock])) {
-            return $this->caches[static::CACHE_KEY_CSS_DECLARATIONS_BLOCK][$cssDeclarationsBlock];
-        }
-
-        $properties = [];
-        $declarations = \preg_split('/;(?!base64|charset)/', $cssDeclarationsBlock);
-
-        foreach ($declarations as $declaration) {
-            $matches = [];
-            if (!\preg_match('/^([A-Za-z\\-]+)\\s*:\\s*(.+)$/s', \trim($declaration), $matches)) {
+        // Unset the overridden styles to preserve order, important if shorthand and individual properties are mixed
+        foreach ($oldStyles as $attributeName => $attributeValue) {
+            if (!isset($newStyles[$attributeName])) {
                 continue;
             }
 
-            $propertyName = \strtolower($matches[1]);
-            $propertyValue = $matches[2];
-            $properties[$propertyName] = $propertyValue;
+            $newAttributeValue = $newStyles[$attributeName];
+            if (
+                $this->attributeValueIsImportant($attributeValue)
+                && !$this->attributeValueIsImportant($newAttributeValue)
+            ) {
+                unset($newStyles[$attributeName]);
+            } else {
+                unset($oldStyles[$attributeName]);
+            }
         }
-        $this->caches[static::CACHE_KEY_CSS_DECLARATIONS_BLOCK][$cssDeclarationsBlock] = $properties;
 
-        return $properties;
+        $combinedStyles = \array_merge($oldStyles, $newStyles);
+
+        $style = '';
+        foreach ($combinedStyles as $attributeName => $attributeValue) {
+            $style .= \strtolower(\trim($attributeName)) . ': ' . \trim($attributeValue) . '; ';
+        }
+        $trimmedStyle = \rtrim($style);
+
+        $this->caches[self::CACHE_KEY_COMBINED_STYLES][$cacheKey] = $trimmedStyle;
+
+        return $trimmedStyle;
     }
 
     /**
-     * Find the nodes that are not to be emogrified.
+     * Checks whether $attributeValue is marked as !important.
      *
-     * @param \DOMXPath $xPath
+     * @param string $attributeValue
      *
-     * @return \DOMElement[]
+     * @return bool
+     */
+    private function attributeValueIsImportant($attributeValue)
+    {
+        return \strtolower(\substr(\trim($attributeValue), -10)) === '!important';
+    }
+
+    /**
+     * Merges styles from styles attributes and style nodes and applies them to the attribute nodes
+     *
+     * @return void
+     */
+    private function fillStyleAttributesWithMergedStyles()
+    {
+        foreach ($this->styleAttributesForNodes as $nodePath => $styleAttributesForNode) {
+            $node = $this->visitedNodes[$nodePath];
+            $currentStyleAttributes = $this->parseCssDeclarationsBlock($node->getAttribute('style'));
+            $node->setAttribute(
+                'style',
+                $this->generateStyleStringFromDeclarationsArrays(
+                    $currentStyleAttributes,
+                    $styleAttributesForNode
+                )
+            );
+        }
+    }
+
+    /**
+     * Searches for all nodes with a style attribute and removes the "!important" annotations out of
+     * the inline style declarations, eventually by rearranging declarations.
+     *
+     * @return void
+     */
+    private function removeImportantAnnotationFromAllInlineStyles()
+    {
+        foreach ($this->getAllNodesWithStyleAttribute() as $node) {
+            $this->removeImportantAnnotationFromNodeInlineStyle($node);
+        }
+    }
+
+    /**
+     * Removes the "!important" annotations out of the inline style declarations,
+     * eventually by rearranging declarations.
+     * Rearranging needed when !important shorthand properties are followed by some of their
+     * not !important expanded-version properties.
+     * For example "font: 12px serif !important; font-size: 13px;" must be reordered
+     * to "font-size: 13px; font: 12px serif;" in order to remain correct.
+     *
+     * @param \DOMElement $node
+     *
+     * @return void
+     */
+    private function removeImportantAnnotationFromNodeInlineStyle(\DOMElement $node)
+    {
+        $inlineStyleDeclarations = $this->parseCssDeclarationsBlock($node->getAttribute('style'));
+        $regularStyleDeclarations = [];
+        $importantStyleDeclarations = [];
+        foreach ($inlineStyleDeclarations as $property => $value) {
+            if ($this->attributeValueIsImportant($value)) {
+                $importantStyleDeclarations[$property] = \trim(\str_replace('!important', '', $value));
+            } else {
+                $regularStyleDeclarations[$property] = $value;
+            }
+        }
+        $inlineStyleDeclarationsInNewOrder = \array_merge(
+            $regularStyleDeclarations,
+            $importantStyleDeclarations
+        );
+        $node->setAttribute(
+            'style',
+            $this->generateStyleStringFromSingleDeclarationsArray($inlineStyleDeclarationsInNewOrder)
+        );
+    }
+
+    /**
+     * Generates a CSS style string suitable to be used inline from the $styleDeclarations property => value array.
+     *
+     * @param string[] $styleDeclarations
+     *
+     * @return string
+     */
+    private function generateStyleStringFromSingleDeclarationsArray(array $styleDeclarations)
+    {
+        return $this->generateStyleStringFromDeclarationsArrays([], $styleDeclarations);
+    }
+
+    /**
+     * Determines which of `$cssRules` actually apply to `$this->domDocument`, and sets them in
+     * `$this->matchingUninlinableCssRules`.
+     *
+     * @param string[][] $cssRules the "uninlinable" array of CSS rules returned by `parseCssRules`
+     *
+     * @return void
+     */
+    private function determineMatchingUninlinableCssRules(array $cssRules)
+    {
+        $this->matchingUninlinableCssRules = \array_filter($cssRules, [$this, 'existsMatchForSelectorInCssRule']);
+    }
+
+    /**
+     * Checks whether there is at least one matching element for the CSS selector contained in the `selector` element
+     * of the provided CSS rule.
+     *
+     * Any dynamic pseudo-classes will be assumed to apply. If the selector matches a pseudo-element,
+     * it will test for a match with its originating element.
+     *
+     * @param string[] $cssRule
+     *
+     * @return bool
      *
      * @throws SyntaxErrorException
      */
-    private function getNodesToExclude(\DOMXPath $xPath)
+    private function existsMatchForSelectorInCssRule(array $cssRule)
     {
-        $excludedNodes = [];
-        foreach (\array_keys($this->excludedSelectors) as $selectorToExclude) {
-            try {
-                $matchingNodes = $xPath->query($this->cssSelectorConverter->toXPath($selectorToExclude));
-            } catch (SyntaxErrorException $e) {
-                if ($this->debug) {
-                    throw $e;
-                }
-                continue;
-            }
-            foreach ($matchingNodes as $node) {
-                $excludedNodes[] = $node;
-            }
+        $selector = $cssRule['selector'];
+        if ($cssRule['hasUnmatchablePseudo']) {
+            $selector = $this->removeUnmatchablePseudoComponents($selector);
         }
-
-        return $excludedNodes;
+        return $this->existsMatchForCssSelector($selector);
     }
 
     /**
-     * Sets the debug mode.
+     * Checks whether there is at least one matching element for $cssSelector.
+     * When not in debug mode, it returns true also for invalid selectors (because they may be valid,
+     * just not implemented/recognized yet by Emogrifier).
      *
-     * @param bool $debug set to true to enable debug mode
+     * @param string $cssSelector
+     *
+     * @return bool
+     *
+     * @throws SyntaxErrorException
+     */
+    private function existsMatchForCssSelector($cssSelector)
+    {
+        try {
+            $nodesMatchingSelector = $this->xPath->query($this->getCssSelectorConverter()->toXPath($cssSelector));
+        } catch (SyntaxErrorException $e) {
+            if ($this->debug) {
+                throw $e;
+            }
+            return true;
+        }
+
+        return $nodesMatchingSelector !== false && $nodesMatchingSelector->length !== 0;
+    }
+
+    /**
+     * Removes pseudo-elements and dynamic pseudo-classes from a CSS selector, replacing them with "*" if necessary.
+     * If such a pseudo-component is within the argument of `:not`, the entire `:not` component is removed or replaced.
+     *
+     * @param string $selector
+     *
+     * @return string Selector which will match the relevant DOM elements if the pseudo-classes are assumed to apply,
+     *                or in the case of pseudo-elements will match their originating element.
+     */
+    private function removeUnmatchablePseudoComponents($selector)
+    {
+        // The regex allows nested brackets via `(?2)`.
+        // A space is temporarily prepended because the callback can't determine if the match was at the very start.
+        $selectorWithoutNots = \ltrim(\preg_replace_callback(
+            '/(\\s?+):not(\\([^()]*+(?:(?2)[^()]*+)*+\\))/i',
+            [$this, 'replaceUnmatchableNotComponent'],
+            ' ' . $selector
+        ));
+
+        $pseudoComponentMatcher = ':(?!' . self::PSEUDO_CLASS_MATCHER . '):?+[\\w\\-]++(?:\\([^\\)]*+\\))?+';
+        return \preg_replace(
+            ['/(\\s|^)' . $pseudoComponentMatcher . '/i', '/' . $pseudoComponentMatcher . '/i'],
+            ['$1*', ''],
+            $selectorWithoutNots
+        );
+    }
+
+    /**
+     * Helps `removeUnmatchablePseudoComponents()` replace or remove a selector `:not(...)` component if its argument
+     * contains pseudo-elements or dynamic pseudo-classes.
+     *
+     * @param string[] $matches array of elements matched by the regular expression
+     *
+     * @return string the full match if there were no unmatchable pseudo components within; otherwise, any preceding
+     *         whitespace followed by "*", or an empty string if there was no preceding whitespace
+     */
+    private function replaceUnmatchableNotComponent(array $matches)
+    {
+        list($notComponentWithAnyPrecedingWhitespace, $anyPrecedingWhitespace, $notArgumentInBrackets) = $matches;
+
+        $hasUnmatchablePseudo = \preg_match(
+            '/:(?!' . self::PSEUDO_CLASS_MATCHER . ')[\\w\\-:]/i',
+            $notArgumentInBrackets
+        );
+
+        if ($hasUnmatchablePseudo) {
+            return $anyPrecedingWhitespace !== '' ? $anyPrecedingWhitespace . '*' : '';
+        }
+        return $notComponentWithAnyPrecedingWhitespace;
+    }
+
+    /**
+     * Applies `$this->matchingUninlinableCssRules` to `$this->domDocument` by placing them as CSS in a `<style>`
+     * element.
+     *
+     * @param string $cssImportRules This may contain any `@import` rules that should precede the CSS placed in the
+     *        `<style>` element.  If there are no unlinlinable CSS rules to copy there, a `<style>` element will be
+     *        created containing just `$cssImportRules`.  `$cssImportRules` may be an empty string; if it is, and there
+     *        are no unlinlinable CSS rules, an empty `<style>` element will not be created.
      *
      * @return void
      */
-    public function setDebug($debug)
+    private function copyUninlinableCssToStyleNode($cssImportRules)
     {
-        $this->debug = $debug;
+        $css = $cssImportRules;
+
+        // avoid including unneeded class dependency if there are no rules
+        if ($this->matchingUninlinableCssRules !== []) {
+            $cssConcatenator = new CssConcatenator();
+            foreach ($this->matchingUninlinableCssRules as $cssRule) {
+                $cssConcatenator->append([$cssRule['selector']], $cssRule['declarationsBlock'], $cssRule['media']);
+            }
+            $css .= $cssConcatenator->getCss();
+        }
+
+        // avoid adding empty style element
+        if ($css !== '') {
+            $this->addStyleElementToDocument($css);
+        }
+    }
+
+    /**
+     * Adds a style element with $css to $this->domDocument.
+     *
+     * This method is protected to allow overriding.
+     *
+     * @see https://github.com/MyIntervals/emogrifier/issues/103
+     *
+     * @param string $css
+     *
+     * @return void
+     */
+    protected function addStyleElementToDocument($css)
+    {
+        $styleElement = $this->domDocument->createElement('style', $css);
+        $styleAttribute = $this->domDocument->createAttribute('type');
+        $styleAttribute->value = 'text/css';
+        $styleElement->appendChild($styleAttribute);
+
+        $headElement = $this->getHeadElement();
+        $headElement->appendChild($styleElement);
+    }
+
+    /**
+     * Returns the HEAD element.
+     *
+     * This method assumes that there always is a HEAD element.
+     *
+     * @return \DOMElement
+     */
+    private function getHeadElement()
+    {
+        return $this->domDocument->getElementsByTagName('head')->item(0);
     }
 }
diff --git a/lib/pelago/emogrifier/src/Emogrifier/HtmlProcessor/AbstractHtmlProcessor.php b/lib/pelago/emogrifier/src/Emogrifier/HtmlProcessor/AbstractHtmlProcessor.php
index cf767425c..589898d52 100644
--- a/lib/pelago/emogrifier/src/Emogrifier/HtmlProcessor/AbstractHtmlProcessor.php
+++ b/lib/pelago/emogrifier/src/Emogrifier/HtmlProcessor/AbstractHtmlProcessor.php
@@ -7,8 +7,6 @@ namespace Pelago\Emogrifier\HtmlProcessor;
  *
  * The "vanilla" subclass is the HtmlNormalizer.
  *
- * @internal This class currently is a new technology preview, and its API is still in flux. Don't use it in production.
- *
  * @author Oliver Klee <github@oliverklee.de>
  */
 abstract class AbstractHtmlProcessor
@@ -23,17 +21,44 @@ abstract class AbstractHtmlProcessor
      */
     const CONTENT_TYPE_META_TAG = '<meta http-equiv="Content-Type" content="text/html; charset=utf-8">';
 
+    /**
+     * @var string Regular expression part to match tag names that PHP's DOMDocument implementation is not aware are
+     *      self-closing. These are mostly HTML5 elements, but for completeness <command> (obsolete) and <keygen>
+     *      (deprecated) are also included.
+     *
+     * @see https://bugs.php.net/bug.php?id=73175
+     */
+    const PHP_UNRECOGNIZED_VOID_TAGNAME_MATCHER = '(?:command|embed|keygen|source|track|wbr)';
+
     /**
      * @var \DOMDocument
      */
     protected $domDocument = null;
 
     /**
+     * @var \DOMXPath
+     */
+    protected $xPath = null;
+
+    /**
+     * The constructor.
+     *
+     * Please use ::fromHtml instead.
+     */
+    private function __construct()
+    {
+    }
+
+    /**
+     * Builds a new instance from the given HTML.
+     *
      * @param string $unprocessedHtml raw HTML, must be UTF-encoded, must not be empty
      *
+     * @return static
+     *
      * @throws \InvalidArgumentException if $unprocessedHtml is anything other than a non-empty string
      */
-    public function __construct($unprocessedHtml)
+    public static function fromHtml($unprocessedHtml)
     {
         if (!\is_string($unprocessedHtml)) {
             throw new \InvalidArgumentException('The provided HTML must be a string.', 1515459744);
@@ -42,7 +67,25 @@ abstract class AbstractHtmlProcessor
             throw new \InvalidArgumentException('The provided HTML must not be empty.', 1515763647);
         }
 
-        $this->setHtml($unprocessedHtml);
+        $instance = new static();
+        $instance->setHtml($unprocessedHtml);
+
+        return $instance;
+    }
+
+    /**
+     * Builds a new instance from the given DOM document.
+     *
+     * @param \DOMDocument $document a DOM document returned by getDomDocument() of another instance
+     *
+     * @return static
+     */
+    public static function fromDomDocument(\DOMDocument $document)
+    {
+        $instance = new static();
+        $instance->setDomDocument($document);
+
+        return $instance;
     }
 
     /**
@@ -67,6 +110,17 @@ abstract class AbstractHtmlProcessor
         return $this->domDocument;
     }
 
+    /**
+     * @param \DOMDocument $domDocument
+     *
+     * @return void
+     */
+    private function setDomDocument(\DOMDocument $domDocument)
+    {
+        $this->domDocument = $domDocument;
+        $this->xPath = new \DOMXPath($this->domDocument);
+    }
+
     /**
      * Renders the normalized and processed HTML.
      *
@@ -74,7 +128,9 @@ abstract class AbstractHtmlProcessor
      */
     public function render()
     {
-        return $this->domDocument->saveHTML();
+        $htmlWithPossibleErroneousClosingTags = $this->domDocument->saveHTML();
+
+        return $this->removeSelfClosingTagsClosingTags($htmlWithPossibleErroneousClosingTags);
     }
 
     /**
@@ -84,9 +140,22 @@ abstract class AbstractHtmlProcessor
      */
     public function renderBodyContent()
     {
-        $bodyNodeHtml = $this->domDocument->saveHTML($this->getBodyElement());
+        $htmlWithPossibleErroneousClosingTags = $this->domDocument->saveHTML($this->getBodyElement());
+        $bodyNodeHtml = $this->removeSelfClosingTagsClosingTags($htmlWithPossibleErroneousClosingTags);
 
-        return \str_replace(['<body>', '</body>'], '', $bodyNodeHtml);
+        return \preg_replace('%</?+body(?:\\s[^>]*+)?+>%', '', $bodyNodeHtml);
+    }
+
+    /**
+     * Eliminates any invalid closing tags for void elements from the given HTML.
+     *
+     * @param string $html
+     *
+     * @return string
+     */
+    private function removeSelfClosingTagsClosingTags($html)
+    {
+        return \preg_replace('%</' . static::PHP_UNRECOGNIZED_VOID_TAGNAME_MATCHER . '>%', '', $html);
     }
 
     /**
@@ -133,11 +202,11 @@ abstract class AbstractHtmlProcessor
         \libxml_clear_errors();
         \libxml_use_internal_errors($libXmlState);
 
-        $this->domDocument = $domDocument;
+        $this->setDomDocument($domDocument);
     }
 
     /**
-     * Returns the HTML with added document type and Content-Type meta tag if needed,
+     * Returns the HTML with added document type, Content-Type meta tag, and self-closing slashes, if needed,
      * ensuring that the HTML will be good for creating a DOM document from it.
      *
      * @param string $html
@@ -146,7 +215,8 @@ abstract class AbstractHtmlProcessor
      */
     private function prepareHtmlForDomConversion($html)
     {
-        $htmlWithDocumentType = $this->ensureDocumentType($html);
+        $htmlWithSelfClosingSlashes = $this->ensurePhpUnrecognizedSelfClosingTagsAreXml($html);
+        $htmlWithDocumentType = $this->ensureDocumentType($htmlWithSelfClosingSlashes);
 
         return $this->addContentTypeMetaTag($htmlWithDocumentType);
     }
@@ -171,6 +241,8 @@ abstract class AbstractHtmlProcessor
     /**
      * Adds a Content-Type meta tag for the charset.
      *
+     * This method also ensures that there is a HEAD element.
+     *
      * @param string $html
      *
      * @return string the HTML with the meta tag added
@@ -202,10 +274,29 @@ abstract class AbstractHtmlProcessor
         return $reworkedHtml;
     }
 
+    /**
+     * Makes sure that any self-closing tags not recognized as such by PHP's DOMDocument implementation have a
+     * self-closing slash.
+     *
+     * @param string $html
+     *
+     * @return string HTML with problematic tags converted.
+     */
+    private function ensurePhpUnrecognizedSelfClosingTagsAreXml($html)
+    {
+        return \preg_replace(
+            '%<' . static::PHP_UNRECOGNIZED_VOID_TAGNAME_MATCHER . '\\b[^>]*+(?<!/)(?=>)%',
+            '$0/',
+            $html
+        );
+    }
+
     /**
      * Checks that $this->domDocument has a BODY element and adds it if it is missing.
      *
      * @return void
+     *
+     * @throws \UnexpectedValueException
      */
     private function ensureExistenceOfBodyElement()
     {
@@ -214,6 +305,9 @@ abstract class AbstractHtmlProcessor
         }
 
         $htmlElement = $this->domDocument->getElementsByTagName('html')->item(0);
+        if ($htmlElement === null) {
+            throw new \UnexpectedValueException('There is no HTML element although there should be one.', 1569930853);
+        }
         $htmlElement->appendChild($this->domDocument->createElement('body'));
     }
 }
diff --git a/lib/pelago/emogrifier/src/Emogrifier/HtmlProcessor/CssToAttributeConverter.php b/lib/pelago/emogrifier/src/Emogrifier/HtmlProcessor/CssToAttributeConverter.php
index 97a94b1c9..3ea7937db 100644
--- a/lib/pelago/emogrifier/src/Emogrifier/HtmlProcessor/CssToAttributeConverter.php
+++ b/lib/pelago/emogrifier/src/Emogrifier/HtmlProcessor/CssToAttributeConverter.php
@@ -10,8 +10,6 @@ namespace Pelago\Emogrifier\HtmlProcessor;
  *
  * To trigger the conversion, call the convertCssToVisualAttributes method.
  *
- * @internal This class currently is a new technology preview, and its API is still in flux. Don't use it in production.
- *
  * @author Oliver Klee <github@oliverklee.de>
  */
 class CssToAttributeConverter extends AbstractHtmlProcessor
@@ -52,7 +50,7 @@ class CssToAttributeConverter extends AbstractHtmlProcessor
     /**
      * Maps the CSS from the style nodes to visual HTML attributes.
      *
-     * @return CssToAttributeConverter fluent interface
+     * @return self fluent interface
      */
     public function convertCssToVisualAttributes()
     {
@@ -72,9 +70,7 @@ class CssToAttributeConverter extends AbstractHtmlProcessor
      */
     private function getAllNodesWithStyleAttribute()
     {
-        $xPath = new \DOMXPath($this->domDocument);
-
-        return $xPath->query('//*[@style]');
+        return $this->xPath->query('//*[@style]');
     }
 
     /**
@@ -103,9 +99,7 @@ class CssToAttributeConverter extends AbstractHtmlProcessor
         }
 
         $properties = [];
-        $declarations = \preg_split('/;(?!base64|charset)/', $cssDeclarationsBlock);
-
-        foreach ($declarations as $declaration) {
+        foreach (\preg_split('/;(?!base64|charset)/', $cssDeclarationsBlock) as $declaration) {
             $matches = [];
             if (!\preg_match('/^([A-Za-z\\-]+)\\s*:\\s*(.+)$/s', \trim($declaration), $matches)) {
                 continue;
@@ -176,13 +170,12 @@ class CssToAttributeConverter extends AbstractHtmlProcessor
         $mapping = $this->cssToHtmlMap[$property];
         $nodesMatch = !isset($mapping['nodes']) || \in_array($node->nodeName, $mapping['nodes'], true);
         $valuesMatch = !isset($mapping['values']) || \in_array($value, $mapping['values'], true);
-        if (!$nodesMatch || !$valuesMatch) {
-            return false;
+        $canBeMapped = $nodesMatch && $valuesMatch;
+        if ($canBeMapped) {
+            $node->setAttribute($mapping['attribute'], $value);
         }
 
-        $node->setAttribute($mapping['attribute'], $value);
-
-        return true;
+        return $canBeMapped;
     }
 
     /**
@@ -224,12 +217,14 @@ class CssToAttributeConverter extends AbstractHtmlProcessor
     private function mapBackgroundProperty(\DOMElement $node, $value)
     {
         // parse out the color, if any
-        $styles = \explode(' ', $value);
+        $styles = \explode(' ', $value, 2);
         $first = $styles[0];
-        if (!\is_numeric($first[0]) && \strpos($first, 'url') !== 0) {
-            // as this is not a position or image, assume it's a color
-            $node->setAttribute('bgcolor', $first);
+        if (\is_numeric($first[0]) || \strncmp($first, 'url', 3) === 0) {
+            return;
         }
+
+        // as this is not a position or image, assume it's a color
+        $node->setAttribute('bgcolor', $first);
     }
 
     /**
@@ -307,6 +302,7 @@ class CssToAttributeConverter extends AbstractHtmlProcessor
      */
     private function parseCssShorthandValue($value)
     {
+        /** @var string[] $values */
         $values = \preg_split('/\\s+/', $value);
 
         $css = [];
diff --git a/lib/pelago/emogrifier/src/Emogrifier/HtmlProcessor/HtmlNormalizer.php b/lib/pelago/emogrifier/src/Emogrifier/HtmlProcessor/HtmlNormalizer.php
index ad3abff37..1406a9ff8 100644
--- a/lib/pelago/emogrifier/src/Emogrifier/HtmlProcessor/HtmlNormalizer.php
+++ b/lib/pelago/emogrifier/src/Emogrifier/HtmlProcessor/HtmlNormalizer.php
@@ -9,8 +9,6 @@ namespace Pelago\Emogrifier\HtmlProcessor;
  * - add HEAD and BODY elements (if they are missing)
  * - reformat the HTML
  *
- * @internal This class currently is a new technology preview, and its API is still in flux. Don't use it in production.
- *
  * @author Oliver Klee <github@oliverklee.de>
  */
 class HtmlNormalizer extends AbstractHtmlProcessor
diff --git a/lib/pelago/emogrifier/src/Emogrifier/HtmlProcessor/HtmlPruner.php b/lib/pelago/emogrifier/src/Emogrifier/HtmlProcessor/HtmlPruner.php
new file mode 100644
index 000000000..59b8ef109
--- /dev/null
+++ b/lib/pelago/emogrifier/src/Emogrifier/HtmlProcessor/HtmlPruner.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace Pelago\Emogrifier\HtmlProcessor;
+
+use Pelago\Emogrifier\CssInliner;
+use Pelago\Emogrifier\Utilities\ArrayIntersector;
+
+/**
+ * This class can remove things from HTML.
+ *
+ * @author Oliver Klee <github@oliverklee.de>
+ * @author Jake Hotson <jake.github@qzdesign.co.uk>
+ */
+class HtmlPruner extends AbstractHtmlProcessor
+{
+    /**
+     * We need to look for display:none, but we need to do a case-insensitive search. Since DOMDocument only
+     * supports XPath 1.0, lower-case() isn't available to us. We've thus far only set attributes to lowercase,
+     * not attribute values. Consequently, we need to translate() the letters that would be in 'NONE' ("NOE")
+     * to lowercase.
+     *
+     * @var string
+     */
+    const DISPLAY_NONE_MATCHER
+        = '//*[@style and contains(translate(translate(@style," ",""),"NOE","noe"),"display:none")'
+        . ' and not(@class and contains(concat(" ", normalize-space(@class), " "), " -emogrifier-keep "))]';
+
+    /**
+     * Removes elements that have a "display: none;" style.
+     *
+     * @return self fluent interface
+     */
+    public function removeElementsWithDisplayNone()
+    {
+        $elementsWithStyleDisplayNone = $this->xPath->query(self::DISPLAY_NONE_MATCHER);
+        if ($elementsWithStyleDisplayNone->length === 0) {
+            return $this;
+        }
+
+        /** @var \DOMNode $element */
+        foreach ($elementsWithStyleDisplayNone as $element) {
+            $parentNode = $element->parentNode;
+            if ($parentNode !== null) {
+                $parentNode->removeChild($element);
+            }
+        }
+
+        return $this;
+    }
+
+    /**
+     * Removes classes that are no longer required (e.g. because there are no longer any CSS rules that reference them)
+     * from `class` attributes.
+     *
+     * Note that this does not inspect the CSS, but expects to be provided with a list of classes that are still in use.
+     *
+     * This method also has the (presumably beneficial) side-effect of minifying (removing superfluous whitespace from)
+     * `class` attributes.
+     *
+     * @param string[] $classesToKeep names of classes that should not be removed
+     *
+     * @return self fluent interface
+     */
+    public function removeRedundantClasses(array $classesToKeep = [])
+    {
+        $elementsWithClassAttribute = $this->xPath->query('//*[@class]');
+
+        if ($classesToKeep !== []) {
+            $this->removeClassesFromElements($elementsWithClassAttribute, $classesToKeep);
+        } else {
+            // Avoid unnecessary processing if there are no classes to keep.
+            $this->removeClassAttributeFromElements($elementsWithClassAttribute);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Removes classes from the `class` attribute of each element in `$elements`, except any in `$classesToKeep`,
+     * removing the `class` attribute itself if the resultant list is empty.
+     *
+     * @param \DOMNodeList $elements
+     * @param string[] $classesToKeep
+     *
+     * @return void
+     */
+    private function removeClassesFromElements(\DOMNodeList $elements, array $classesToKeep)
+    {
+        $classesToKeepIntersector = new ArrayIntersector($classesToKeep);
+
+        /** @var \DOMNode $element */
+        foreach ($elements as $element) {
+            $elementClasses = \preg_split('/\\s++/', \trim($element->getAttribute('class')));
+            $elementClassesToKeep = $classesToKeepIntersector->intersectWith($elementClasses);
+            if ($elementClassesToKeep !== []) {
+                $element->setAttribute('class', \implode(' ', $elementClassesToKeep));
+            } else {
+                $element->removeAttribute('class');
+            }
+        }
+    }
+
+    /**
+     * Removes the `class` attribute from each element in `$elements`.
+     *
+     * @param \DOMNodeList $elements
+     *
+     * @return void
+     */
+    private function removeClassAttributeFromElements(\DOMNodeList $elements)
+    {
+        /** @var \DOMNode $element */
+        foreach ($elements as $element) {
+            $element->removeAttribute('class');
+        }
+    }
+
+    /**
+     * After CSS has been inlined, there will likely be some classes in `class` attributes that are no longer referenced
+     * by any remaining (uninlinable) CSS.  This method removes such classes.
+     *
+     * Note that it does not inspect the remaining CSS, but uses information readily available from the `CssInliner`
+     * instance about the CSS rules that could not be inlined.
+     *
+     * @param CssInliner $cssInliner object instance that performed the CSS inlining
+     *
+     * @return self fluent interface
+     *
+     * @throws \BadMethodCallException if `inlineCss` has not first been called on `$cssInliner`
+     */
+    public function removeRedundantClassesAfterCssInlined(CssInliner $cssInliner)
+    {
+        $classesToKeepAsKeys = [];
+        foreach ($cssInliner->getMatchingUninlinableSelectors() as $selector) {
+            \preg_match_all('/\\.(-?+[_a-zA-Z][\\w\\-]*+)/', $selector, $matches);
+            $classesToKeepAsKeys += \array_fill_keys($matches[1], true);
+        }
+
+        $this->removeRedundantClasses(\array_keys($classesToKeepAsKeys));
+
+        return $this;
+    }
+}
diff --git a/lib/pelago/emogrifier/src/Emogrifier/Utilities/ArrayIntersector.php b/lib/pelago/emogrifier/src/Emogrifier/Utilities/ArrayIntersector.php
new file mode 100644
index 000000000..701ceb8df
--- /dev/null
+++ b/lib/pelago/emogrifier/src/Emogrifier/Utilities/ArrayIntersector.php
@@ -0,0 +1,56 @@
+<?php
+
+namespace Pelago\Emogrifier\Utilities;
+
+/**
+ * When computing many array intersections using the same array, it is more efficient to use `array_flip()` first and
+ * then `array_intersect_key()`, than `array_intersect()`.  See the discussion at
+ * {@link https://stackoverflow.com/questions/6329211/php-array-intersect-efficiency Stack Overflow} for more
+ * information.
+ *
+ * Of course, this is only possible if the arrays contain integer or string values, and either don't contain duplicates,
+ * or that fact that duplicates will be removed does not matter.
+ *
+ * This class takes care of the detail.
+ *
+ * @internal
+ *
+ * @author Jake Hotson <jake.github@qzdesign.co.uk>
+ */
+class ArrayIntersector
+{
+    /**
+     * the array with which the object was constructed, with all its keys exchanged with their associated values
+     *
+     * @var (int|string)[]
+     */
+    private $invertedArray;
+
+    /**
+     * Constructs the object with the array that will be reused for many intersection computations.
+     *
+     * @param (int|string)[] $array
+     */
+    public function __construct(array $array)
+    {
+        $this->invertedArray = \array_flip($array);
+    }
+
+    /**
+     * Computes the intersection of `$array` and the array with which this object was constructed.
+     *
+     * @param (int|string)[] $array
+     *
+     * @return (int|string)[] Returns an array containing all of the values in `$array` whose values exist in the array
+     *         with which this object was constructed.  Note that keys are preserved, order is maintained, but
+     *         duplicates are removed.
+     */
+    public function intersectWith(array $array)
+    {
+        $invertedArray = \array_flip($array);
+
+        $invertedIntersection = \array_intersect_key($invertedArray, $this->invertedArray);
+
+        return \array_flip($invertedIntersection);
+    }
+}
diff --git a/lib/pelago/emogrifier/src/Emogrifier/CssConcatenator.php b/lib/pelago/emogrifier/src/Emogrifier/Utilities/CssConcatenator.php
similarity index 94%
rename from lib/pelago/emogrifier/src/Emogrifier/CssConcatenator.php
rename to lib/pelago/emogrifier/src/Emogrifier/Utilities/CssConcatenator.php
index 3ebd33b95..8d75ee233 100644
--- a/lib/pelago/emogrifier/src/Emogrifier/CssConcatenator.php
+++ b/lib/pelago/emogrifier/src/Emogrifier/Utilities/CssConcatenator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Pelago\Emogrifier;
+namespace Pelago\Emogrifier\Utilities;
 
 /**
  * Facilitates building a CSS string by appending rule blocks one at a time, checking whether the media query,
@@ -33,6 +33,8 @@ namespace Pelago\Emogrifier;
  * `   }
  * ` }
  *
+ * @internal
+ *
  * @author Jake Hotson <jake.github@qzdesign.co.uk>
  */
 class CssConcatenator
@@ -72,7 +74,7 @@ class CssConcatenator
             $lastRuleBlock->selectorsAsKeys += $selectorsAsKeys;
         } else {
             $hasSameSelectorsAsLastRule = $lastRuleBlock !== false
-                && static::hasEquivalentSelectors($selectorsAsKeys, $lastRuleBlock->selectorsAsKeys);
+                && self::hasEquivalentSelectors($selectorsAsKeys, $lastRuleBlock->selectorsAsKeys);
             if ($hasSameSelectorsAsLastRule) {
                 $lastDeclarationsBlockWithoutSemicolon = \rtrim(\rtrim($lastRuleBlock->declarationsBlock), ';');
                 $lastRuleBlock->declarationsBlock = $lastDeclarationsBlockWithoutSemicolon . ';' . $declarationsBlock;
@@ -87,7 +89,7 @@ class CssConcatenator
      */
     public function getCss()
     {
-        return \implode('', \array_map([$this, 'getMediaRuleCss'], $this->mediaRules));
+        return \implode('', \array_map([self::class, 'getMediaRuleCss'], $this->mediaRules));
     }
 
     /**
@@ -133,7 +135,7 @@ class CssConcatenator
      */
     private static function getMediaRuleCss(\stdClass $mediaRule)
     {
-        $css = \implode('', \array_map([static::class, 'getRuleBlockCss'], $mediaRule->ruleBlocks));
+        $css = \implode('', \array_map([self::class, 'getRuleBlockCss'], $mediaRule->ruleBlocks));
         if ($mediaRule->media !== '') {
             $css = $mediaRule->media . '{' . $css . '}';
         }

From 88a10dba28a53a3048f9831dfd7b3541f27d03a2 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Thu, 10 Mar 2022 17:22:27 +0100
Subject: [PATCH 09/15] =?UTF-8?q?N=C2=B04824=20Update=20consumers=20after?=
 =?UTF-8?q?=20pelago/emogrifier=20update?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/email.class.inc.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/core/email.class.inc.php b/core/email.class.inc.php
index 732ca37e8..9eb7853af 100644
--- a/core/email.class.inc.php
+++ b/core/email.class.inc.php
@@ -24,6 +24,10 @@
  * @license     http://opensource.org/licenses/AGPL-3.0
  */
 
+use Pelago\Emogrifier\CssInliner;
+use Pelago\Emogrifier\HtmlProcessor\CssToAttributeConverter;
+use Pelago\Emogrifier\HtmlProcessor\HtmlPruner;
+
 Swift_Preferences::getInstance()->setCharset('UTF-8');
 
 
@@ -335,8 +339,9 @@ class EMail
 	{
 		if (($sMimeType === 'text/html') && ($sCustomStyles !== null))
 		{
-			$emogrifier = new \Pelago\Emogrifier($sBody, $sCustomStyles);
-			$sBody = $emogrifier->emogrify(); // Adds html/body tags if not already present
+			$oDomDocument = CssInliner::fromHtml($sBody)->inlineCss($sCustomStyles)->getDomDocument();
+			HtmlPruner::fromDomDocument($oDomDocument)->removeElementsWithDisplayNone();
+			$sBody = CssToAttributeConverter::fromDomDocument($oDomDocument)->convertCssToVisualAttributes()->render(); // Adds html/body tags if not already present
 		}
 		$this->m_aData['body'] = array('body' => $sBody, 'mimeType' => $sMimeType);
 		$this->m_oMessage->setBody($sBody, $sMimeType);

From 73c3c1249fd57a79fb133b77122c9de4c08ec603 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Fri, 29 Apr 2022 14:51:27 +0200
Subject: [PATCH 10/15] =?UTF-8?q?:arrow=5Fup:=20N=C2=B04824=20Composer=20l?=
 =?UTF-8?q?ibs=20:=20update=20scssphp/scssphp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.json                                 |    2 +-
 composer.lock                                 |   31 +-
 lib/bin/pscss                                 |  125 +-
 lib/bin/pscss.bat                             |    3 +-
 lib/composer/autoload_classmap.php            |   23 +
 lib/composer/autoload_static.php              |   23 +
 lib/composer/installed.json                   |   31 +-
 lib/composer/installed.php                    |   10 +-
 lib/scssphp/scssphp/README.md                 |   44 +-
 lib/scssphp/scssphp/bin/pscss                 |  141 +-
 lib/scssphp/scssphp/composer.json             |   86 +-
 lib/scssphp/scssphp/phpcs.xml.dist            |   12 +
 lib/scssphp/scssphp/scss.inc.php              |   43 +-
 lib/scssphp/scssphp/src/Base/Range.php        |   20 +-
 lib/scssphp/scssphp/src/Block.php             |   19 +-
 lib/scssphp/scssphp/src/Block/AtRootBlock.php |   37 +
 .../scssphp/src/Block/CallableBlock.php       |   45 +
 .../scssphp/src/Block/ContentBlock.php        |   38 +
 .../scssphp/src/Block/DirectiveBlock.php      |   37 +
 lib/scssphp/scssphp/src/Block/EachBlock.php   |   37 +
 lib/scssphp/scssphp/src/Block/ElseBlock.php   |   27 +
 lib/scssphp/scssphp/src/Block/ElseifBlock.php |   32 +
 lib/scssphp/scssphp/src/Block/ForBlock.php    |   47 +
 lib/scssphp/scssphp/src/Block/IfBlock.php     |   37 +
 lib/scssphp/scssphp/src/Block/MediaBlock.php  |   37 +
 .../scssphp/src/Block/NestedPropertyBlock.php |   37 +
 lib/scssphp/scssphp/src/Block/WhileBlock.php  |   32 +
 lib/scssphp/scssphp/src/Cache.php             |   69 +-
 lib/scssphp/scssphp/src/Colors.php            |   51 +-
 lib/scssphp/scssphp/src/CompilationResult.php |   69 +
 lib/scssphp/scssphp/src/Compiler.php          | 6096 ++++++++++++-----
 .../scssphp/src/Compiler/CachedResult.php     |   77 +
 .../scssphp/src/Compiler/Environment.php      |   31 +-
 .../src/Exception/CompilerException.php       |    7 +-
 .../scssphp/src/Exception/ParserException.php |   41 +-
 .../scssphp/src/Exception/RangeException.php  |    7 +-
 .../scssphp/src/Exception/SassException.php   |    7 +
 .../src/Exception/SassScriptException.php     |   32 +
 .../scssphp/src/Exception/ServerException.php |    9 +-
 lib/scssphp/scssphp/src/Formatter.php         |  109 +-
 lib/scssphp/scssphp/src/Formatter/Compact.php |    9 +-
 .../scssphp/src/Formatter/Compressed.php      |   10 +-
 .../scssphp/src/Formatter/Crunched.php        |   12 +-
 lib/scssphp/scssphp/src/Formatter/Debug.php   |   10 +-
 .../scssphp/src/Formatter/Expanded.php        |   10 +-
 lib/scssphp/scssphp/src/Formatter/Nested.php  |   28 +-
 .../scssphp/src/Formatter/OutputBlock.php     |   23 +-
 .../scssphp/src/Logger/LoggerInterface.php    |   48 +
 .../scssphp/src/Logger/QuietLogger.php        |   27 +
 .../scssphp/src/Logger/StreamLogger.php       |   60 +
 lib/scssphp/scssphp/src/Node.php              |   11 +-
 lib/scssphp/scssphp/src/Node/Number.php       |  736 +-
 lib/scssphp/scssphp/src/OutputStyle.php       |    9 +
 lib/scssphp/scssphp/src/Parser.php            | 2076 ++++--
 lib/scssphp/scssphp/src/SourceMap/Base64.php  |   13 +-
 .../scssphp/src/SourceMap/Base64VLQ.php       |   29 +-
 .../src/SourceMap/SourceMapGenerator.php      |   93 +-
 lib/scssphp/scssphp/src/Type.php              |  141 +-
 lib/scssphp/scssphp/src/Util.php              |  126 +-
 lib/scssphp/scssphp/src/Util/Path.php         |   77 +
 lib/scssphp/scssphp/src/ValueConverter.php    |   95 +
 lib/scssphp/scssphp/src/Version.php           |    5 +-
 lib/scssphp/scssphp/src/Warn.php              |   84 +
 63 files changed, 8784 insertions(+), 2609 deletions(-)
 create mode 100644 lib/scssphp/scssphp/phpcs.xml.dist
 create mode 100644 lib/scssphp/scssphp/src/Block/AtRootBlock.php
 create mode 100644 lib/scssphp/scssphp/src/Block/CallableBlock.php
 create mode 100644 lib/scssphp/scssphp/src/Block/ContentBlock.php
 create mode 100644 lib/scssphp/scssphp/src/Block/DirectiveBlock.php
 create mode 100644 lib/scssphp/scssphp/src/Block/EachBlock.php
 create mode 100644 lib/scssphp/scssphp/src/Block/ElseBlock.php
 create mode 100644 lib/scssphp/scssphp/src/Block/ElseifBlock.php
 create mode 100644 lib/scssphp/scssphp/src/Block/ForBlock.php
 create mode 100644 lib/scssphp/scssphp/src/Block/IfBlock.php
 create mode 100644 lib/scssphp/scssphp/src/Block/MediaBlock.php
 create mode 100644 lib/scssphp/scssphp/src/Block/NestedPropertyBlock.php
 create mode 100644 lib/scssphp/scssphp/src/Block/WhileBlock.php
 create mode 100644 lib/scssphp/scssphp/src/CompilationResult.php
 create mode 100644 lib/scssphp/scssphp/src/Compiler/CachedResult.php
 create mode 100644 lib/scssphp/scssphp/src/Exception/SassException.php
 create mode 100644 lib/scssphp/scssphp/src/Exception/SassScriptException.php
 create mode 100644 lib/scssphp/scssphp/src/Logger/LoggerInterface.php
 create mode 100644 lib/scssphp/scssphp/src/Logger/QuietLogger.php
 create mode 100644 lib/scssphp/scssphp/src/Logger/StreamLogger.php
 create mode 100644 lib/scssphp/scssphp/src/OutputStyle.php
 create mode 100644 lib/scssphp/scssphp/src/Util/Path.php
 create mode 100644 lib/scssphp/scssphp/src/ValueConverter.php
 create mode 100644 lib/scssphp/scssphp/src/Warn.php

diff --git a/composer.json b/composer.json
index e43adbe39..50fa493a4 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
     "nikic/php-parser": "~4.13.2",
     "pear/archive_tar": "~1.4.14",
     "pelago/emogrifier": "~3.1.0",
-    "scssphp/scssphp": "1.0.6",
+    "scssphp/scssphp": "~1.10.2",
     "swiftmailer/swiftmailer": "5.4.12",
     "symfony/console": "~3.4.47",
     "symfony/dotenv": "~3.4.47",
diff --git a/composer.lock b/composer.lock
index 3af6a5144..28df02e52 100644
--- a/composer.lock
+++ b/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": "92ecc4c90eca1b55654c99c1b1f8cc8e",
+    "content-hash": "8187e0bd608a597a5151a468aa1f4c7a",
     "packages": [
         {
             "name": "combodo/tcpdf",
@@ -685,16 +685,16 @@
         },
         {
             "name": "scssphp/scssphp",
-            "version": "1.0.6",
+            "version": "v1.10.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/scssphp/scssphp.git",
-                "reference": "5b3c9d704950d8f9637f5110c36c281ec47dc13c"
+                "reference": "387f4f4abf5d99f16be16314c5ab856f81c82f46"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/scssphp/scssphp/zipball/5b3c9d704950d8f9637f5110c36c281ec47dc13c",
-                "reference": "5b3c9d704950d8f9637f5110c36c281ec47dc13c",
+                "url": "https://api.github.com/repos/scssphp/scssphp/zipball/387f4f4abf5d99f16be16314c5ab856f81c82f46",
+                "reference": "387f4f4abf5d99f16be16314c5ab856f81c82f46",
                 "shasum": ""
             },
             "require": {
@@ -703,11 +703,20 @@
                 "php": ">=5.6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3",
-                "squizlabs/php_codesniffer": "~2.5",
-                "twbs/bootstrap": "~4.3",
+                "bamarni/composer-bin-plugin": "^1.4",
+                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3 || ^9.4",
+                "sass/sass-spec": "*",
+                "squizlabs/php_codesniffer": "~3.5",
+                "symfony/phpunit-bridge": "^5.1",
+                "thoughtbot/bourbon": "^7.0",
+                "twbs/bootstrap": "~5.0",
+                "twbs/bootstrap4": "4.6.1",
                 "zurb/foundation": "~6.5"
             },
+            "suggest": {
+                "ext-iconv": "Can be used as fallback when ext-mbstring is not available",
+                "ext-mbstring": "For best performance, mbstring should be installed as it is faster than ext-iconv"
+            },
             "bin": [
                 "bin/pscss"
             ],
@@ -742,7 +751,11 @@
                 "scss",
                 "stylesheet"
             ],
-            "time": "2019-12-12T05:00:52+00:00"
+            "support": {
+                "issues": "https://github.com/scssphp/scssphp/issues",
+                "source": "https://github.com/scssphp/scssphp/tree/v1.10.2"
+            },
+            "time": "2022-03-02T21:15:09+00:00"
         },
         {
             "name": "swiftmailer/swiftmailer",
diff --git a/lib/bin/pscss b/lib/bin/pscss
index 2879dcb97..f563d0cae 100644
--- a/lib/bin/pscss
+++ b/lib/bin/pscss
@@ -1,14 +1,117 @@
-#!/usr/bin/env sh
+#!/usr/bin/env php
+<?php
 
-dir=$(cd "${0%[/\\]*}" > /dev/null; cd "../scssphp/scssphp/bin" && pwd)
+/**
+ * Proxy PHP file generated by Composer
+ *
+ * This file includes the referenced bin path (../scssphp/scssphp/bin/pscss)
+ * using a stream wrapper to prevent the shebang from being output on PHP<8
+ *
+ * @generated
+ */
 
-if [ -d /proc/cygdrive ]; then
-    case $(which php) in
-        $(readlink -n /proc/cygdrive)/*)
-            # We are in Cygwin using Windows php, so the path must be translated
-            dir=$(cygpath -m "$dir");
-            ;;
-    esac
-fi
+namespace Composer;
 
-"${dir}/pscss" "$@"
+$GLOBALS['_composer_bin_dir'] = __DIR__;
+$GLOBALS['_composer_autoload_path'] = __DIR__ . '/..'.'/autoload.php';
+
+if (PHP_VERSION_ID < 80000) {
+    if (!class_exists('Composer\BinProxyWrapper')) {
+        /**
+         * @internal
+         */
+        final class BinProxyWrapper
+        {
+            private $handle;
+            private $position;
+            private $realpath;
+
+            public function stream_open($path, $mode, $options, &$opened_path)
+            {
+                // get rid of phpvfscomposer:// prefix for __FILE__ & __DIR__ resolution
+                $opened_path = substr($path, 17);
+                $this->realpath = realpath($opened_path) ?: $opened_path;
+                $opened_path = $this->realpath;
+                $this->handle = fopen($this->realpath, $mode);
+                $this->position = 0;
+
+                return (bool) $this->handle;
+            }
+
+            public function stream_read($count)
+            {
+                $data = fread($this->handle, $count);
+
+                if ($this->position === 0) {
+                    $data = preg_replace('{^#!.*\r?\n}', '', $data);
+                }
+
+                $this->position += strlen($data);
+
+                return $data;
+            }
+
+            public function stream_cast($castAs)
+            {
+                return $this->handle;
+            }
+
+            public function stream_close()
+            {
+                fclose($this->handle);
+            }
+
+            public function stream_lock($operation)
+            {
+                return $operation ? flock($this->handle, $operation) : true;
+            }
+
+            public function stream_seek($offset, $whence)
+            {
+                if (0 === fseek($this->handle, $offset, $whence)) {
+                    $this->position = ftell($this->handle);
+                    return true;
+                }
+
+                return false;
+            }
+
+            public function stream_tell()
+            {
+                return $this->position;
+            }
+
+            public function stream_eof()
+            {
+                return feof($this->handle);
+            }
+
+            public function stream_stat()
+            {
+                return array();
+            }
+
+            public function stream_set_option($option, $arg1, $arg2)
+            {
+                return true;
+            }
+
+            public function url_stat($path, $flags)
+            {
+                $path = substr($path, 17);
+                if (file_exists($path)) {
+                    return stat($path);
+                }
+
+                return false;
+            }
+        }
+    }
+
+    if (function_exists('stream_wrapper_register') && stream_wrapper_register('phpvfscomposer', 'Composer\BinProxyWrapper')) {
+        include("phpvfscomposer://" . __DIR__ . '/..'.'/scssphp/scssphp/bin/pscss');
+        exit(0);
+    }
+}
+
+include __DIR__ . '/..'.'/scssphp/scssphp/bin/pscss';
diff --git a/lib/bin/pscss.bat b/lib/bin/pscss.bat
index 1e368dc92..6b83bf27c 100644
--- a/lib/bin/pscss.bat
+++ b/lib/bin/pscss.bat
@@ -1,4 +1,5 @@
 @ECHO OFF
 setlocal DISABLEDELAYEDEXPANSION
-SET BIN_TARGET=%~dp0/../scssphp/scssphp/bin/pscss
+SET BIN_TARGET=%~dp0/pscss
+SET COMPOSER_RUNTIME_BIN_DIR=%~dp0
 php "%BIN_TARGET%" %*
diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index 0e459993d..6949d28f6 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -699,13 +699,29 @@ return array(
     'ScalarOqlExpression' => $baseDir . '/core/oql/oqlquery.class.inc.php',
     'ScssPhp\\ScssPhp\\Base\\Range' => $vendorDir . '/scssphp/scssphp/src/Base/Range.php',
     'ScssPhp\\ScssPhp\\Block' => $vendorDir . '/scssphp/scssphp/src/Block.php',
+    'ScssPhp\\ScssPhp\\Block\\AtRootBlock' => $vendorDir . '/scssphp/scssphp/src/Block/AtRootBlock.php',
+    'ScssPhp\\ScssPhp\\Block\\CallableBlock' => $vendorDir . '/scssphp/scssphp/src/Block/CallableBlock.php',
+    'ScssPhp\\ScssPhp\\Block\\ContentBlock' => $vendorDir . '/scssphp/scssphp/src/Block/ContentBlock.php',
+    'ScssPhp\\ScssPhp\\Block\\DirectiveBlock' => $vendorDir . '/scssphp/scssphp/src/Block/DirectiveBlock.php',
+    'ScssPhp\\ScssPhp\\Block\\EachBlock' => $vendorDir . '/scssphp/scssphp/src/Block/EachBlock.php',
+    'ScssPhp\\ScssPhp\\Block\\ElseBlock' => $vendorDir . '/scssphp/scssphp/src/Block/ElseBlock.php',
+    'ScssPhp\\ScssPhp\\Block\\ElseifBlock' => $vendorDir . '/scssphp/scssphp/src/Block/ElseifBlock.php',
+    'ScssPhp\\ScssPhp\\Block\\ForBlock' => $vendorDir . '/scssphp/scssphp/src/Block/ForBlock.php',
+    'ScssPhp\\ScssPhp\\Block\\IfBlock' => $vendorDir . '/scssphp/scssphp/src/Block/IfBlock.php',
+    'ScssPhp\\ScssPhp\\Block\\MediaBlock' => $vendorDir . '/scssphp/scssphp/src/Block/MediaBlock.php',
+    'ScssPhp\\ScssPhp\\Block\\NestedPropertyBlock' => $vendorDir . '/scssphp/scssphp/src/Block/NestedPropertyBlock.php',
+    'ScssPhp\\ScssPhp\\Block\\WhileBlock' => $vendorDir . '/scssphp/scssphp/src/Block/WhileBlock.php',
     'ScssPhp\\ScssPhp\\Cache' => $vendorDir . '/scssphp/scssphp/src/Cache.php',
     'ScssPhp\\ScssPhp\\Colors' => $vendorDir . '/scssphp/scssphp/src/Colors.php',
+    'ScssPhp\\ScssPhp\\CompilationResult' => $vendorDir . '/scssphp/scssphp/src/CompilationResult.php',
     'ScssPhp\\ScssPhp\\Compiler' => $vendorDir . '/scssphp/scssphp/src/Compiler.php',
+    'ScssPhp\\ScssPhp\\Compiler\\CachedResult' => $vendorDir . '/scssphp/scssphp/src/Compiler/CachedResult.php',
     'ScssPhp\\ScssPhp\\Compiler\\Environment' => $vendorDir . '/scssphp/scssphp/src/Compiler/Environment.php',
     'ScssPhp\\ScssPhp\\Exception\\CompilerException' => $vendorDir . '/scssphp/scssphp/src/Exception/CompilerException.php',
     'ScssPhp\\ScssPhp\\Exception\\ParserException' => $vendorDir . '/scssphp/scssphp/src/Exception/ParserException.php',
     'ScssPhp\\ScssPhp\\Exception\\RangeException' => $vendorDir . '/scssphp/scssphp/src/Exception/RangeException.php',
+    'ScssPhp\\ScssPhp\\Exception\\SassException' => $vendorDir . '/scssphp/scssphp/src/Exception/SassException.php',
+    'ScssPhp\\ScssPhp\\Exception\\SassScriptException' => $vendorDir . '/scssphp/scssphp/src/Exception/SassScriptException.php',
     'ScssPhp\\ScssPhp\\Exception\\ServerException' => $vendorDir . '/scssphp/scssphp/src/Exception/ServerException.php',
     'ScssPhp\\ScssPhp\\Formatter' => $vendorDir . '/scssphp/scssphp/src/Formatter.php',
     'ScssPhp\\ScssPhp\\Formatter\\Compact' => $vendorDir . '/scssphp/scssphp/src/Formatter/Compact.php',
@@ -715,15 +731,22 @@ return array(
     'ScssPhp\\ScssPhp\\Formatter\\Expanded' => $vendorDir . '/scssphp/scssphp/src/Formatter/Expanded.php',
     'ScssPhp\\ScssPhp\\Formatter\\Nested' => $vendorDir . '/scssphp/scssphp/src/Formatter/Nested.php',
     'ScssPhp\\ScssPhp\\Formatter\\OutputBlock' => $vendorDir . '/scssphp/scssphp/src/Formatter/OutputBlock.php',
+    'ScssPhp\\ScssPhp\\Logger\\LoggerInterface' => $vendorDir . '/scssphp/scssphp/src/Logger/LoggerInterface.php',
+    'ScssPhp\\ScssPhp\\Logger\\QuietLogger' => $vendorDir . '/scssphp/scssphp/src/Logger/QuietLogger.php',
+    'ScssPhp\\ScssPhp\\Logger\\StreamLogger' => $vendorDir . '/scssphp/scssphp/src/Logger/StreamLogger.php',
     'ScssPhp\\ScssPhp\\Node' => $vendorDir . '/scssphp/scssphp/src/Node.php',
     'ScssPhp\\ScssPhp\\Node\\Number' => $vendorDir . '/scssphp/scssphp/src/Node/Number.php',
+    'ScssPhp\\ScssPhp\\OutputStyle' => $vendorDir . '/scssphp/scssphp/src/OutputStyle.php',
     'ScssPhp\\ScssPhp\\Parser' => $vendorDir . '/scssphp/scssphp/src/Parser.php',
     'ScssPhp\\ScssPhp\\SourceMap\\Base64' => $vendorDir . '/scssphp/scssphp/src/SourceMap/Base64.php',
     'ScssPhp\\ScssPhp\\SourceMap\\Base64VLQ' => $vendorDir . '/scssphp/scssphp/src/SourceMap/Base64VLQ.php',
     'ScssPhp\\ScssPhp\\SourceMap\\SourceMapGenerator' => $vendorDir . '/scssphp/scssphp/src/SourceMap/SourceMapGenerator.php',
     'ScssPhp\\ScssPhp\\Type' => $vendorDir . '/scssphp/scssphp/src/Type.php',
     'ScssPhp\\ScssPhp\\Util' => $vendorDir . '/scssphp/scssphp/src/Util.php',
+    'ScssPhp\\ScssPhp\\Util\\Path' => $vendorDir . '/scssphp/scssphp/src/Util/Path.php',
+    'ScssPhp\\ScssPhp\\ValueConverter' => $vendorDir . '/scssphp/scssphp/src/ValueConverter.php',
     'ScssPhp\\ScssPhp\\Version' => $vendorDir . '/scssphp/scssphp/src/Version.php',
+    'ScssPhp\\ScssPhp\\Warn' => $vendorDir . '/scssphp/scssphp/src/Warn.php',
     'SearchMenuNode' => $baseDir . '/application/menunode.class.inc.php',
     'SecurityException' => $baseDir . '/core/coreexception.class.inc.php',
     'SeparatorPopupMenuItem' => $baseDir . '/application/applicationextension.inc.php',
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index b80d41b55..0cdbd54c9 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -929,13 +929,29 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'ScalarOqlExpression' => __DIR__ . '/../..' . '/core/oql/oqlquery.class.inc.php',
         'ScssPhp\\ScssPhp\\Base\\Range' => __DIR__ . '/..' . '/scssphp/scssphp/src/Base/Range.php',
         'ScssPhp\\ScssPhp\\Block' => __DIR__ . '/..' . '/scssphp/scssphp/src/Block.php',
+        'ScssPhp\\ScssPhp\\Block\\AtRootBlock' => __DIR__ . '/..' . '/scssphp/scssphp/src/Block/AtRootBlock.php',
+        'ScssPhp\\ScssPhp\\Block\\CallableBlock' => __DIR__ . '/..' . '/scssphp/scssphp/src/Block/CallableBlock.php',
+        'ScssPhp\\ScssPhp\\Block\\ContentBlock' => __DIR__ . '/..' . '/scssphp/scssphp/src/Block/ContentBlock.php',
+        'ScssPhp\\ScssPhp\\Block\\DirectiveBlock' => __DIR__ . '/..' . '/scssphp/scssphp/src/Block/DirectiveBlock.php',
+        'ScssPhp\\ScssPhp\\Block\\EachBlock' => __DIR__ . '/..' . '/scssphp/scssphp/src/Block/EachBlock.php',
+        'ScssPhp\\ScssPhp\\Block\\ElseBlock' => __DIR__ . '/..' . '/scssphp/scssphp/src/Block/ElseBlock.php',
+        'ScssPhp\\ScssPhp\\Block\\ElseifBlock' => __DIR__ . '/..' . '/scssphp/scssphp/src/Block/ElseifBlock.php',
+        'ScssPhp\\ScssPhp\\Block\\ForBlock' => __DIR__ . '/..' . '/scssphp/scssphp/src/Block/ForBlock.php',
+        'ScssPhp\\ScssPhp\\Block\\IfBlock' => __DIR__ . '/..' . '/scssphp/scssphp/src/Block/IfBlock.php',
+        'ScssPhp\\ScssPhp\\Block\\MediaBlock' => __DIR__ . '/..' . '/scssphp/scssphp/src/Block/MediaBlock.php',
+        'ScssPhp\\ScssPhp\\Block\\NestedPropertyBlock' => __DIR__ . '/..' . '/scssphp/scssphp/src/Block/NestedPropertyBlock.php',
+        'ScssPhp\\ScssPhp\\Block\\WhileBlock' => __DIR__ . '/..' . '/scssphp/scssphp/src/Block/WhileBlock.php',
         'ScssPhp\\ScssPhp\\Cache' => __DIR__ . '/..' . '/scssphp/scssphp/src/Cache.php',
         'ScssPhp\\ScssPhp\\Colors' => __DIR__ . '/..' . '/scssphp/scssphp/src/Colors.php',
+        'ScssPhp\\ScssPhp\\CompilationResult' => __DIR__ . '/..' . '/scssphp/scssphp/src/CompilationResult.php',
         'ScssPhp\\ScssPhp\\Compiler' => __DIR__ . '/..' . '/scssphp/scssphp/src/Compiler.php',
+        'ScssPhp\\ScssPhp\\Compiler\\CachedResult' => __DIR__ . '/..' . '/scssphp/scssphp/src/Compiler/CachedResult.php',
         'ScssPhp\\ScssPhp\\Compiler\\Environment' => __DIR__ . '/..' . '/scssphp/scssphp/src/Compiler/Environment.php',
         'ScssPhp\\ScssPhp\\Exception\\CompilerException' => __DIR__ . '/..' . '/scssphp/scssphp/src/Exception/CompilerException.php',
         'ScssPhp\\ScssPhp\\Exception\\ParserException' => __DIR__ . '/..' . '/scssphp/scssphp/src/Exception/ParserException.php',
         'ScssPhp\\ScssPhp\\Exception\\RangeException' => __DIR__ . '/..' . '/scssphp/scssphp/src/Exception/RangeException.php',
+        'ScssPhp\\ScssPhp\\Exception\\SassException' => __DIR__ . '/..' . '/scssphp/scssphp/src/Exception/SassException.php',
+        'ScssPhp\\ScssPhp\\Exception\\SassScriptException' => __DIR__ . '/..' . '/scssphp/scssphp/src/Exception/SassScriptException.php',
         'ScssPhp\\ScssPhp\\Exception\\ServerException' => __DIR__ . '/..' . '/scssphp/scssphp/src/Exception/ServerException.php',
         'ScssPhp\\ScssPhp\\Formatter' => __DIR__ . '/..' . '/scssphp/scssphp/src/Formatter.php',
         'ScssPhp\\ScssPhp\\Formatter\\Compact' => __DIR__ . '/..' . '/scssphp/scssphp/src/Formatter/Compact.php',
@@ -945,15 +961,22 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'ScssPhp\\ScssPhp\\Formatter\\Expanded' => __DIR__ . '/..' . '/scssphp/scssphp/src/Formatter/Expanded.php',
         'ScssPhp\\ScssPhp\\Formatter\\Nested' => __DIR__ . '/..' . '/scssphp/scssphp/src/Formatter/Nested.php',
         'ScssPhp\\ScssPhp\\Formatter\\OutputBlock' => __DIR__ . '/..' . '/scssphp/scssphp/src/Formatter/OutputBlock.php',
+        'ScssPhp\\ScssPhp\\Logger\\LoggerInterface' => __DIR__ . '/..' . '/scssphp/scssphp/src/Logger/LoggerInterface.php',
+        'ScssPhp\\ScssPhp\\Logger\\QuietLogger' => __DIR__ . '/..' . '/scssphp/scssphp/src/Logger/QuietLogger.php',
+        'ScssPhp\\ScssPhp\\Logger\\StreamLogger' => __DIR__ . '/..' . '/scssphp/scssphp/src/Logger/StreamLogger.php',
         'ScssPhp\\ScssPhp\\Node' => __DIR__ . '/..' . '/scssphp/scssphp/src/Node.php',
         'ScssPhp\\ScssPhp\\Node\\Number' => __DIR__ . '/..' . '/scssphp/scssphp/src/Node/Number.php',
+        'ScssPhp\\ScssPhp\\OutputStyle' => __DIR__ . '/..' . '/scssphp/scssphp/src/OutputStyle.php',
         'ScssPhp\\ScssPhp\\Parser' => __DIR__ . '/..' . '/scssphp/scssphp/src/Parser.php',
         'ScssPhp\\ScssPhp\\SourceMap\\Base64' => __DIR__ . '/..' . '/scssphp/scssphp/src/SourceMap/Base64.php',
         'ScssPhp\\ScssPhp\\SourceMap\\Base64VLQ' => __DIR__ . '/..' . '/scssphp/scssphp/src/SourceMap/Base64VLQ.php',
         'ScssPhp\\ScssPhp\\SourceMap\\SourceMapGenerator' => __DIR__ . '/..' . '/scssphp/scssphp/src/SourceMap/SourceMapGenerator.php',
         'ScssPhp\\ScssPhp\\Type' => __DIR__ . '/..' . '/scssphp/scssphp/src/Type.php',
         'ScssPhp\\ScssPhp\\Util' => __DIR__ . '/..' . '/scssphp/scssphp/src/Util.php',
+        'ScssPhp\\ScssPhp\\Util\\Path' => __DIR__ . '/..' . '/scssphp/scssphp/src/Util/Path.php',
+        'ScssPhp\\ScssPhp\\ValueConverter' => __DIR__ . '/..' . '/scssphp/scssphp/src/ValueConverter.php',
         'ScssPhp\\ScssPhp\\Version' => __DIR__ . '/..' . '/scssphp/scssphp/src/Version.php',
+        'ScssPhp\\ScssPhp\\Warn' => __DIR__ . '/..' . '/scssphp/scssphp/src/Warn.php',
         'SearchMenuNode' => __DIR__ . '/../..' . '/application/menunode.class.inc.php',
         'SecurityException' => __DIR__ . '/../..' . '/core/coreexception.class.inc.php',
         'SeparatorPopupMenuItem' => __DIR__ . '/../..' . '/application/applicationextension.inc.php',
diff --git a/lib/composer/installed.json b/lib/composer/installed.json
index 290313c8b..46bd25c1f 100644
--- a/lib/composer/installed.json
+++ b/lib/composer/installed.json
@@ -715,17 +715,17 @@
         },
         {
             "name": "scssphp/scssphp",
-            "version": "1.0.6",
-            "version_normalized": "1.0.6.0",
+            "version": "v1.10.2",
+            "version_normalized": "1.10.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/scssphp/scssphp.git",
-                "reference": "5b3c9d704950d8f9637f5110c36c281ec47dc13c"
+                "reference": "387f4f4abf5d99f16be16314c5ab856f81c82f46"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/scssphp/scssphp/zipball/5b3c9d704950d8f9637f5110c36c281ec47dc13c",
-                "reference": "5b3c9d704950d8f9637f5110c36c281ec47dc13c",
+                "url": "https://api.github.com/repos/scssphp/scssphp/zipball/387f4f4abf5d99f16be16314c5ab856f81c82f46",
+                "reference": "387f4f4abf5d99f16be16314c5ab856f81c82f46",
                 "shasum": ""
             },
             "require": {
@@ -734,12 +734,21 @@
                 "php": ">=5.6.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3",
-                "squizlabs/php_codesniffer": "~2.5",
-                "twbs/bootstrap": "~4.3",
+                "bamarni/composer-bin-plugin": "^1.4",
+                "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3 || ^9.4",
+                "sass/sass-spec": "*",
+                "squizlabs/php_codesniffer": "~3.5",
+                "symfony/phpunit-bridge": "^5.1",
+                "thoughtbot/bourbon": "^7.0",
+                "twbs/bootstrap": "~5.0",
+                "twbs/bootstrap4": "4.6.1",
                 "zurb/foundation": "~6.5"
             },
-            "time": "2019-12-12T05:00:52+00:00",
+            "suggest": {
+                "ext-iconv": "Can be used as fallback when ext-mbstring is not available",
+                "ext-mbstring": "For best performance, mbstring should be installed as it is faster than ext-iconv"
+            },
+            "time": "2022-03-02T21:15:09+00:00",
             "bin": [
                 "bin/pscss"
             ],
@@ -775,6 +784,10 @@
                 "scss",
                 "stylesheet"
             ],
+            "support": {
+                "issues": "https://github.com/scssphp/scssphp/issues",
+                "source": "https://github.com/scssphp/scssphp/tree/v1.10.2"
+            },
             "install-path": "../scssphp/scssphp"
         },
         {
diff --git a/lib/composer/installed.php b/lib/composer/installed.php
index 292559691..f46000ad9 100644
--- a/lib/composer/installed.php
+++ b/lib/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '9ebd884f6e55363b145c271dfc1a9d64cae4d2db',
+        'reference' => 'a5ce09c4396a111c9c22aeb83fd5eefd1a55fb8f',
         'name' => '__root__',
         'dev' => true,
     ),
@@ -16,7 +16,7 @@
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '9ebd884f6e55363b145c271dfc1a9d64cae4d2db',
+            'reference' => 'a5ce09c4396a111c9c22aeb83fd5eefd1a55fb8f',
             'dev_requirement' => false,
         ),
         'combodo/tcpdf' => array(
@@ -158,12 +158,12 @@
             ),
         ),
         'scssphp/scssphp' => array(
-            'pretty_version' => '1.0.6',
-            'version' => '1.0.6.0',
+            'pretty_version' => 'v1.10.2',
+            'version' => '1.10.2.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../scssphp/scssphp',
             'aliases' => array(),
-            'reference' => '5b3c9d704950d8f9637f5110c36c281ec47dc13c',
+            'reference' => '387f4f4abf5d99f16be16314c5ab856f81c82f46',
             'dev_requirement' => false,
         ),
         'swiftmailer/swiftmailer' => array(
diff --git a/lib/scssphp/scssphp/README.md b/lib/scssphp/scssphp/README.md
index f541e4888..65bb93ea7 100644
--- a/lib/scssphp/scssphp/README.md
+++ b/lib/scssphp/scssphp/README.md
@@ -1,12 +1,12 @@
 # scssphp
-### <http://scssphp.github.io/scssphp>
+### <https://scssphp.github.io/scssphp>
 
-[![Build](https://travis-ci.org/scssphp/scssphp.svg?branch=master)](http://travis-ci.org/scssphp/scssphp)
+![Build](https://github.com/scssphp/scssphp/workflows/CI/badge.svg)
 [![License](https://poser.pugx.org/scssphp/scssphp/license)](https://packagist.org/packages/scssphp/scssphp)
 
 `scssphp` is a compiler for SCSS written in PHP.
 
-Checkout the homepage, <http://scssphp.github.io/scssphp>, for directions on how to use.
+Checkout the homepage, <https://scssphp.github.io/scssphp>, for directions on how to use.
 
 ## Running Tests
 
@@ -23,8 +23,7 @@ There are several tests in the `tests/` directory:
 * `FailingTest.php` contains tests reported in Github issues that demonstrate compatibility bugs.
 * `InputTest.php` compiles every `.scss` file in the `tests/inputs` directory
   then compares to the respective `.css` file in the `tests/outputs` directory.
-* `ScssTest.php` extracts (ruby) `scss` tests from the `tests/scss_test.rb` file.
-* `ServerTest.php` contains functional tests for the `Server` class.
+* `SassSpecTest.php` extracts tests from the `sass/sass-spec` repository.
 
 When changing any of the tests in `tests/inputs`, the tests will most likely
 fail because the output has changed. Once you verify that the output is correct
@@ -32,16 +31,41 @@ you can run the following command to rebuild all the tests:
 
     BUILD=1 vendor/bin/phpunit tests
 
-This will compile all the tests, and save results into `tests/outputs`.
+This will compile all the tests, and save results into `tests/outputs`. It also
+updates the list of excluded specs from sass-spec.
 
-To enable the `scss` compatibility tests:
+To enable the full `sass-spec` compatibility tests:
 
-    TEST_SCSS_COMPAT=1 vendor/bin/phpunit tests
+    TEST_SASS_SPEC=1 vendor/bin/phpunit tests
 
 ## Coding Standard
 
-`scssphp` source conforms to [PSR2](http://www.php-fig.org/psr/psr-2/).
+`scssphp` source conforms to [PSR12](https://www.php-fig.org/psr/psr-12/).
 
 Run the following command from the root directory to check the code for "sniffs".
 
-    vendor/bin/phpcs --standard=PSR2 bin src tests
+    vendor/bin/phpcs --standard=PSR12 --extensions=php bin src tests *.php
+
+## Static Analysis
+
+`scssphp` uses [phpstan](https://phpstan.org/) for static analysis.
+
+Run the following command from the root directory to analyse the codebase:
+
+    make phpstan
+
+As most of the codebase is composed of legacy code which cannot be type-checked
+fully, the setup contains a baseline file with all errors we want to ignore. In
+particular, we ignore all errors related to not specifying the types inside arrays
+when these arrays correspond to the representation of Sass values and Sass AST nodes
+in the parser and compiler.
+When contributing, the proper process to deal with static analysis is the following:
+
+1. Make your change in the codebase
+2. Run `make phpstan`
+3. Fix errors reported by phpstan when possible
+4. Repeat step 2 and 3 until nothing gets fixed anymore at step 3
+5. Run `make phpstan-baseline` to regenerate the phpstan baseline
+
+Additions to the baseline will be reviewed to avoid ignoring errors that should have
+been fixed.
diff --git a/lib/scssphp/scssphp/bin/pscss b/lib/scssphp/scssphp/bin/pscss
index f944b6325..0f009d6bd 100644
--- a/lib/scssphp/scssphp/bin/pscss
+++ b/lib/scssphp/scssphp/bin/pscss
@@ -1,9 +1,10 @@
 #!/usr/bin/env php
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -19,26 +20,26 @@ if (version_compare(PHP_VERSION, '5.6') < 0) {
 include __DIR__ . '/../scss.inc.php';
 
 use ScssPhp\ScssPhp\Compiler;
+use ScssPhp\ScssPhp\Exception\SassException;
+use ScssPhp\ScssPhp\OutputStyle;
 use ScssPhp\ScssPhp\Parser;
 use ScssPhp\ScssPhp\Version;
 
 $style = null;
-$loadPaths = null;
-$precision = null;
+$loadPaths = [];
 $dumpTree = false;
 $inputFile = null;
 $changeDir = false;
-$debugInfo = false;
-$lineNumbers = false;
-$ignoreErrors = false;
 $encoding = false;
 $sourceMap = false;
+$embedSources = false;
+$embedSourceMap = false;
 
 /**
  * Parse argument
  *
- * @param integer $i
- * @param array $options
+ * @param int      $i
+ * @param string[] $options
  *
  * @return string|null
  */
@@ -61,25 +62,29 @@ function parseArgument(&$i, $options) {
     }
 }
 
+$arguments = [];
+
 for ($i = 1; $i < $argc; $i++) {
     if ($argv[$i] === '-?' || $argv[$i] === '-h' || $argv[$i] === '--help') {
         $exe = $argv[0];
 
         $HELP = <<<EOT
-Usage: $exe [options] [input-file]
+Usage: $exe [options] [input-file] [output-file]
 
 Options include:
 
     --help              Show this message [-h, -?]
-    --continue-on-error Continue compilation (as best as possible) when error encountered
-    --debug-info        Annotate selectors with CSS referring to the source file and line number [-g]
-    --dump-tree         Dump formatted parse tree [-T]
+    --continue-on-error [deprecated] Ignored
+    --debug-info        [deprecated] Ignored [-g]
+    --dump-tree         [deprecated] Dump formatted parse tree [-T]
     --iso8859-1         Use iso8859-1 encoding instead of default utf-8
-    --line-numbers      Annotate selectors with comments referring to the source file and line number [--line-comments]
+    --line-numbers      [deprecated] Ignored [--line-comments]
     --load-path=PATH    Set import path [-I]
-    --precision=N       Set decimal number precision (default 10) [-p]
+    --precision=N       [deprecated] Ignored. (default 10) [-p]
     --sourcemap         Create source map file
-    --style=FORMAT      Set the output format (compact, compressed, crunched, expanded, or nested) [-s, -t]
+    --embed-sources     Embed source file contents in source maps
+    --embed-source-map  Embed the source map contents in CSS (default if writing to stdout)
+    --style=FORMAT      Set the output style (compressed or expanded) [-s, -t]
     --version           Print the version [-v]
 
 EOT;
@@ -90,13 +95,15 @@ EOT;
         exit(Version::VERSION . "\n");
     }
 
+    // Keep parsing --continue-on-error to avoid BC breaks for scripts using it
     if ($argv[$i] === '--continue-on-error') {
-        $ignoreErrors = true;
+        // TODO report it as a warning ?
         continue;
     }
 
+    // Keep parsing it to avoid BC breaks for scripts using it
     if ($argv[$i] === '-g' || $argv[$i] === '--debug-info') {
-        $debugInfo = true;
+        // TODO report it as a warning ?
         continue;
     }
 
@@ -105,8 +112,9 @@ EOT;
         continue;
     }
 
+    // Keep parsing it to avoid BC breaks for scripts using it
     if ($argv[$i] === '--line-numbers' || $argv[$i] === '--line-comments') {
-        $lineNumbers = true;
+        // TODO report it as a warning ?
         continue;
     }
 
@@ -115,6 +123,16 @@ EOT;
         continue;
     }
 
+    if ($argv[$i] === '--embed-sources') {
+        $embedSources = true;
+        continue;
+    }
+
+    if ($argv[$i] === '--embed-source-map') {
+        $embedSourceMap = true;
+        continue;
+    }
+
     if ($argv[$i] === '-T' || $argv[$i] === '--dump-tree') {
         $dumpTree = true;
         continue;
@@ -130,34 +148,25 @@ EOT;
     $value = parseArgument($i, array('-I', '--load-path'));
 
     if (isset($value)) {
-        $loadPaths = $value;
+        $loadPaths[] = $value;
         continue;
     }
 
+    // Keep parsing --precision to avoid BC breaks for scripts using it
     $value = parseArgument($i, array('-p', '--precision'));
 
     if (isset($value)) {
-        $precision = $value;
+        // TODO report it as a warning ?
         continue;
     }
 
-    if (file_exists($argv[$i])) {
-        $inputFile = $argv[$i];
-        continue;
-    }
+    $arguments[] = $argv[$i];
 }
 
 
-if ($inputFile) {
+if (isset($arguments[0]) && file_exists($arguments[0])) {
+    $inputFile = $arguments[0];
     $data = file_get_contents($inputFile);
-
-    $newWorkingDir = dirname(realpath($inputFile));
-    $oldWorkingDir = getcwd();
-
-    if ($oldWorkingDir !== $newWorkingDir) {
-        $changeDir = chdir($newWorkingDir);
-        $inputFile = basename($inputFile);
-    }
 } else {
     $data = '';
 
@@ -171,45 +180,65 @@ if ($dumpTree) {
 
     print_r(json_decode(json_encode($parser->parse($data)), true));
 
+    fwrite(STDERR, 'Warning: the --dump-tree option is deprecated. Use proper debugging tools instead.');
+
     exit();
 }
 
 $scss = new Compiler();
 
-if ($debugInfo) {
-    $scss->setLineNumberStyle(Compiler::DEBUG_INFO);
-}
-
-if ($lineNumbers) {
-    $scss->setLineNumberStyle(Compiler::LINE_COMMENTS);
-}
-
-if ($ignoreErrors) {
-    $scss->setIgnoreErrors($ignoreErrors);
-}
-
 if ($loadPaths) {
-    $scss->setImportPaths(explode(PATH_SEPARATOR, $loadPaths));
-}
-
-if ($precision) {
-    $scss->setNumberPrecision($precision);
+    $scss->setImportPaths($loadPaths);
 }
 
 if ($style) {
-    $scss->setFormatter('ScssPhp\\ScssPhp\\Formatter\\' . ucfirst($style));
+    if ($style === OutputStyle::COMPRESSED || $style === OutputStyle::EXPANDED) {
+        $scss->setOutputStyle($style);
+    } else {
+        fwrite(STDERR, "WARNING: the $style style is deprecated.\n");
+        $scss->setFormatter('ScssPhp\\ScssPhp\\Formatter\\' . ucfirst($style));
+    }
 }
 
+$outputFile = isset($arguments[1]) ? $arguments[1] : null;
+$sourceMapFile = null;
+
 if ($sourceMap) {
-    $scss->setSourceMap(Compiler::SOURCE_MAP_INLINE);
+    $sourceMapOptions = array(
+        'outputSourceFiles' => $embedSources,
+    );
+    if ($embedSourceMap || $outputFile === null) {
+        $scss->setSourceMap(Compiler::SOURCE_MAP_INLINE);
+    } else {
+        $sourceMapFile = $outputFile . '.map';
+        $sourceMapOptions['sourceMapWriteTo'] = $sourceMapFile;
+        $sourceMapOptions['sourceMapURL'] = basename($sourceMapFile);
+        $sourceMapOptions['sourceMapBasepath'] = getcwd();
+        $sourceMapOptions['sourceMapFilename'] = basename($outputFile);
+
+        $scss->setSourceMap(Compiler::SOURCE_MAP_FILE);
+    }
+
+    $scss->setSourceMapOptions($sourceMapOptions);
 }
 
 if ($encoding) {
     $scss->setEncoding($encoding);
 }
 
-echo $scss->compile($data, $inputFile);
-
-if ($changeDir) {
-    chdir($oldWorkingDir);
+try {
+    $result = $scss->compileString($data, $inputFile);
+} catch (SassException $e) {
+    fwrite(STDERR, 'Error: '.$e->getMessage()."\n");
+    exit(1);
+}
+
+if ($outputFile) {
+    file_put_contents($outputFile, $result->getCss());
+
+    if ($sourceMapFile !== null && $result->getSourceMap() !== null) {
+        file_put_contents($sourceMapFile, $result->getSourceMap());
+    }
+} else {
+    echo $result->getCss();
 }
diff --git a/lib/scssphp/scssphp/composer.json b/lib/scssphp/scssphp/composer.json
index ff0590fbd..3c60ca897 100644
--- a/lib/scssphp/scssphp/composer.json
+++ b/lib/scssphp/scssphp/composer.json
@@ -30,22 +30,82 @@
         "ext-json": "*",
         "ext-ctype": "*"
     },
+    "suggest": {
+        "ext-mbstring": "For best performance, mbstring should be installed as it is faster than ext-iconv",
+        "ext-iconv": "Can be used as fallback when ext-mbstring is not available"
+    },
     "require-dev": {
-        "squizlabs/php_codesniffer": "~2.5",
-        "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3",
-        "twbs/bootstrap": "~4.3",
+        "bamarni/composer-bin-plugin": "^1.4",
+        "phpunit/phpunit": "^5.7 || ^6.5 || ^7.5 || ^8.3 || ^9.4",
+        "sass/sass-spec": "*",
+        "squizlabs/php_codesniffer": "~3.5",
+        "symfony/phpunit-bridge": "^5.1",
+        "thoughtbot/bourbon": "^7.0",
+        "twbs/bootstrap": "~5.0",
+        "twbs/bootstrap4": "4.6.1",
         "zurb/foundation": "~6.5"
     },
-    "minimum-stability": "dev",
+    "repositories": [
+        {
+            "type": "package",
+            "package": {
+                "name": "sass/sass-spec",
+                "version": "2022.02.24",
+                "source": {
+                    "type": "git",
+                    "url": "https://github.com/sass/sass-spec.git",
+                    "reference": "f41b9bfb9a3013392f2136c79f7f3356f15fb8ba"
+                },
+                "dist": {
+                    "type": "zip",
+                    "url": "https://api.github.com/repos/sass/sass-spec/zipball/f41b9bfb9a3013392f2136c79f7f3356f15fb8ba",
+                    "reference": "f41b9bfb9a3013392f2136c79f7f3356f15fb8ba",
+                    "shasum": ""
+                }
+            }
+        },
+        {
+            "type": "package",
+            "package": {
+                "name": "thoughtbot/bourbon",
+                "version": "v7.0.0",
+                "source": {
+                    "type": "git",
+                    "url": "https://github.com/thoughtbot/bourbon.git",
+                    "reference": "fbe338ee6807e7f7aa996d82c8a16f248bb149b3"
+                },
+                "dist": {
+                    "type": "zip",
+                    "url": "https://api.github.com/repos/thoughtbot/bourbon/zipball/fbe338ee6807e7f7aa996d82c8a16f248bb149b3",
+                    "reference": "fbe338ee6807e7f7aa996d82c8a16f248bb149b3",
+                    "shasum": ""
+                }
+            }
+        },
+        {
+            "type": "package",
+            "package": {
+                "name": "twbs/bootstrap4",
+                "version": "v4.6.1",
+                "source": {
+                    "type": "git",
+                    "url": "https://github.com/twbs/bootstrap.git",
+                    "reference": "043a03c95a2ad6738f85b65e53b9dbdfb03b8d10"
+                },
+                "dist": {
+                    "type": "zip",
+                    "url": "https://api.github.com/repos/twbs/bootstrap/zipball/043a03c95a2ad6738f85b65e53b9dbdfb03b8d10",
+                    "reference": "043a03c95a2ad6738f85b65e53b9dbdfb03b8d10",
+                    "shasum": ""
+                }
+            }
+        }
+    ],
     "bin": ["bin/pscss"],
-    "archive": {
-        "exclude": [
-            "/Makefile",
-            "/.gitattributes",
-            "/.gitignore",
-            "/.travis.yml",
-            "/phpunit.xml.dist",
-            "/tests"
-        ]
+    "config": {
+        "sort-packages": true,
+        "allow-plugins": {
+            "bamarni/composer-bin-plugin": true
+        }
     }
 }
diff --git a/lib/scssphp/scssphp/phpcs.xml.dist b/lib/scssphp/scssphp/phpcs.xml.dist
new file mode 100644
index 000000000..b162dbd6b
--- /dev/null
+++ b/lib/scssphp/scssphp/phpcs.xml.dist
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<ruleset name="PSR12 (adapted for PHP 5.6+)">
+    <rule ref="PSR12">
+        <!-- Ignore this PHP 7.1+ sniff as long as we support PHP 5.6+ -->
+        <exclude name="PSR12.Properties.ConstantVisibility.NotFound"/>
+
+        <!-- This sniff doesn't ignore comment blocks -->
+<!--
+        <exclude name="Generic.Files.LineLength"/>
+-->
+    </rule>
+</ruleset>
diff --git a/lib/scssphp/scssphp/scss.inc.php b/lib/scssphp/scssphp/scss.inc.php
index e4ec7f181..459837805 100644
--- a/lib/scssphp/scssphp/scss.inc.php
+++ b/lib/scssphp/scssphp/scss.inc.php
@@ -1,34 +1,21 @@
 <?php
+
 if (version_compare(PHP_VERSION, '5.6') < 0) {
     throw new \Exception('scssphp requires PHP 5.6 or above');
 }
 
-if (! class_exists('ScssPhp\ScssPhp\Version', false)) {
-    include_once __DIR__ . '/src/Base/Range.php';
-    include_once __DIR__ . '/src/Block.php';
-    include_once __DIR__ . '/src/Cache.php';
-    include_once __DIR__ . '/src/Colors.php';
-    include_once __DIR__ . '/src/Compiler.php';
-    include_once __DIR__ . '/src/Compiler/Environment.php';
-    include_once __DIR__ . '/src/Exception/CompilerException.php';
-    include_once __DIR__ . '/src/Exception/ParserException.php';
-    include_once __DIR__ . '/src/Exception/RangeException.php';
-    include_once __DIR__ . '/src/Exception/ServerException.php';
-    include_once __DIR__ . '/src/Formatter.php';
-    include_once __DIR__ . '/src/Formatter/Compact.php';
-    include_once __DIR__ . '/src/Formatter/Compressed.php';
-    include_once __DIR__ . '/src/Formatter/Crunched.php';
-    include_once __DIR__ . '/src/Formatter/Debug.php';
-    include_once __DIR__ . '/src/Formatter/Expanded.php';
-    include_once __DIR__ . '/src/Formatter/Nested.php';
-    include_once __DIR__ . '/src/Formatter/OutputBlock.php';
-    include_once __DIR__ . '/src/Node.php';
-    include_once __DIR__ . '/src/Node/Number.php';
-    include_once __DIR__ . '/src/Parser.php';
-    include_once __DIR__ . '/src/SourceMap/Base64.php';
-    include_once __DIR__ . '/src/SourceMap/Base64VLQ.php';
-    include_once __DIR__ . '/src/SourceMap/SourceMapGenerator.php';
-    include_once __DIR__ . '/src/Type.php';
-    include_once __DIR__ . '/src/Util.php';
-    include_once __DIR__ . '/src/Version.php';
+if (! class_exists('ScssPhp\ScssPhp\Version')) {
+    spl_autoload_register(function ($class) {
+        if (0 !== strpos($class, 'ScssPhp\ScssPhp\\')) {
+            // Not a ScssPhp class
+            return;
+        }
+
+        $subClass = substr($class, strlen('ScssPhp\ScssPhp\\'));
+        $path = __DIR__ . '/src/' . str_replace('\\', '/', $subClass) . '.php';
+
+        if (file_exists($path)) {
+            require $path;
+        }
+    });
 }
diff --git a/lib/scssphp/scssphp/src/Base/Range.php b/lib/scssphp/scssphp/src/Base/Range.php
index 094e90303..31d5ec565 100644
--- a/lib/scssphp/scssphp/src/Base/Range.php
+++ b/lib/scssphp/scssphp/src/Base/Range.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2015-2019 Leaf Corcoran
+ * @copyright 2015-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -15,17 +16,26 @@ namespace ScssPhp\ScssPhp\Base;
  * Range
  *
  * @author Anthon Pang <anthon.pang@gmail.com>
+ *
+ * @internal
  */
 class Range
 {
+    /**
+     * @var float|int
+     */
     public $first;
+
+    /**
+     * @var float|int
+     */
     public $last;
 
     /**
      * Initialize range
      *
-     * @param integer|float $first
-     * @param integer|float $last
+     * @param int|float $first
+     * @param int|float $last
      */
     public function __construct($first, $last)
     {
@@ -36,9 +46,9 @@ class Range
     /**
      * Test for inclusion in range
      *
-     * @param integer|float $value
+     * @param int|float $value
      *
-     * @return boolean
+     * @return bool
      */
     public function includes($value)
     {
diff --git a/lib/scssphp/scssphp/src/Block.php b/lib/scssphp/scssphp/src/Block.php
index bb1afdd4b..96668dc66 100644
--- a/lib/scssphp/scssphp/src/Block.php
+++ b/lib/scssphp/scssphp/src/Block.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -15,16 +16,18 @@ namespace ScssPhp\ScssPhp;
  * Block
  *
  * @author Anthon Pang <anthon.pang@gmail.com>
+ *
+ * @internal
  */
 class Block
 {
     /**
-     * @var string
+     * @var string|null
      */
     public $type;
 
     /**
-     * @var \ScssPhp\ScssPhp\Block
+     * @var Block|null
      */
     public $parent;
 
@@ -34,22 +37,22 @@ class Block
     public $sourceName;
 
     /**
-     * @var integer
+     * @var int
      */
     public $sourceIndex;
 
     /**
-     * @var integer
+     * @var int
      */
     public $sourceLine;
 
     /**
-     * @var integer
+     * @var int
      */
     public $sourceColumn;
 
     /**
-     * @var array
+     * @var array|null
      */
     public $selectors;
 
@@ -64,7 +67,7 @@ class Block
     public $children;
 
     /**
-     * @var \ScssPhp\ScssPhp\Block
+     * @var Block|null
      */
     public $selfParent;
 }
diff --git a/lib/scssphp/scssphp/src/Block/AtRootBlock.php b/lib/scssphp/scssphp/src/Block/AtRootBlock.php
new file mode 100644
index 000000000..41842c269
--- /dev/null
+++ b/lib/scssphp/scssphp/src/Block/AtRootBlock.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2020 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://scssphp.github.io/scssphp
+ */
+
+namespace ScssPhp\ScssPhp\Block;
+
+use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Type;
+
+/**
+ * @internal
+ */
+class AtRootBlock extends Block
+{
+    /**
+     * @var array|null
+     */
+    public $selector;
+
+    /**
+     * @var array|null
+     */
+    public $with;
+
+    public function __construct()
+    {
+        $this->type = Type::T_AT_ROOT;
+    }
+}
diff --git a/lib/scssphp/scssphp/src/Block/CallableBlock.php b/lib/scssphp/scssphp/src/Block/CallableBlock.php
new file mode 100644
index 000000000..a18a87c2a
--- /dev/null
+++ b/lib/scssphp/scssphp/src/Block/CallableBlock.php
@@ -0,0 +1,45 @@
+<?php
+
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2020 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://scssphp.github.io/scssphp
+ */
+
+namespace ScssPhp\ScssPhp\Block;
+
+use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Compiler\Environment;
+
+/**
+ * @internal
+ */
+class CallableBlock extends Block
+{
+    /**
+     * @var string
+     */
+    public $name;
+
+    /**
+     * @var array|null
+     */
+    public $args;
+
+    /**
+     * @var Environment|null
+     */
+    public $parentEnv;
+
+    /**
+     * @param string $type
+     */
+    public function __construct($type)
+    {
+        $this->type = $type;
+    }
+}
diff --git a/lib/scssphp/scssphp/src/Block/ContentBlock.php b/lib/scssphp/scssphp/src/Block/ContentBlock.php
new file mode 100644
index 000000000..870849800
--- /dev/null
+++ b/lib/scssphp/scssphp/src/Block/ContentBlock.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2020 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://scssphp.github.io/scssphp
+ */
+
+namespace ScssPhp\ScssPhp\Block;
+
+use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Compiler\Environment;
+use ScssPhp\ScssPhp\Type;
+
+/**
+ * @internal
+ */
+class ContentBlock extends Block
+{
+    /**
+     * @var array|null
+     */
+    public $child;
+
+    /**
+     * @var Environment|null
+     */
+    public $scope;
+
+    public function __construct()
+    {
+        $this->type = Type::T_INCLUDE;
+    }
+}
diff --git a/lib/scssphp/scssphp/src/Block/DirectiveBlock.php b/lib/scssphp/scssphp/src/Block/DirectiveBlock.php
new file mode 100644
index 000000000..b1d3d1a81
--- /dev/null
+++ b/lib/scssphp/scssphp/src/Block/DirectiveBlock.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2020 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://scssphp.github.io/scssphp
+ */
+
+namespace ScssPhp\ScssPhp\Block;
+
+use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Type;
+
+/**
+ * @internal
+ */
+class DirectiveBlock extends Block
+{
+    /**
+     * @var string|array
+     */
+    public $name;
+
+    /**
+     * @var string|array|null
+     */
+    public $value;
+
+    public function __construct()
+    {
+        $this->type = Type::T_DIRECTIVE;
+    }
+}
diff --git a/lib/scssphp/scssphp/src/Block/EachBlock.php b/lib/scssphp/scssphp/src/Block/EachBlock.php
new file mode 100644
index 000000000..b3289579d
--- /dev/null
+++ b/lib/scssphp/scssphp/src/Block/EachBlock.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2020 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://scssphp.github.io/scssphp
+ */
+
+namespace ScssPhp\ScssPhp\Block;
+
+use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Type;
+
+/**
+ * @internal
+ */
+class EachBlock extends Block
+{
+    /**
+     * @var string[]
+     */
+    public $vars = [];
+
+    /**
+     * @var array
+     */
+    public $list;
+
+    public function __construct()
+    {
+        $this->type = Type::T_EACH;
+    }
+}
diff --git a/lib/scssphp/scssphp/src/Block/ElseBlock.php b/lib/scssphp/scssphp/src/Block/ElseBlock.php
new file mode 100644
index 000000000..6abb4d775
--- /dev/null
+++ b/lib/scssphp/scssphp/src/Block/ElseBlock.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2020 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://scssphp.github.io/scssphp
+ */
+
+namespace ScssPhp\ScssPhp\Block;
+
+use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Type;
+
+/**
+ * @internal
+ */
+class ElseBlock extends Block
+{
+    public function __construct()
+    {
+        $this->type = Type::T_ELSE;
+    }
+}
diff --git a/lib/scssphp/scssphp/src/Block/ElseifBlock.php b/lib/scssphp/scssphp/src/Block/ElseifBlock.php
new file mode 100644
index 000000000..4622bca79
--- /dev/null
+++ b/lib/scssphp/scssphp/src/Block/ElseifBlock.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2020 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://scssphp.github.io/scssphp
+ */
+
+namespace ScssPhp\ScssPhp\Block;
+
+use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Type;
+
+/**
+ * @internal
+ */
+class ElseifBlock extends Block
+{
+    /**
+     * @var array
+     */
+    public $cond;
+
+    public function __construct()
+    {
+        $this->type = Type::T_ELSEIF;
+    }
+}
diff --git a/lib/scssphp/scssphp/src/Block/ForBlock.php b/lib/scssphp/scssphp/src/Block/ForBlock.php
new file mode 100644
index 000000000..a9cf6733b
--- /dev/null
+++ b/lib/scssphp/scssphp/src/Block/ForBlock.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2020 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://scssphp.github.io/scssphp
+ */
+
+namespace ScssPhp\ScssPhp\Block;
+
+use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Type;
+
+/**
+ * @internal
+ */
+class ForBlock extends Block
+{
+    /**
+     * @var string
+     */
+    public $var;
+
+    /**
+     * @var array
+     */
+    public $start;
+
+    /**
+     * @var array
+     */
+    public $end;
+
+    /**
+     * @var bool
+     */
+    public $until;
+
+    public function __construct()
+    {
+        $this->type = Type::T_FOR;
+    }
+}
diff --git a/lib/scssphp/scssphp/src/Block/IfBlock.php b/lib/scssphp/scssphp/src/Block/IfBlock.php
new file mode 100644
index 000000000..9f21bf88a
--- /dev/null
+++ b/lib/scssphp/scssphp/src/Block/IfBlock.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2020 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://scssphp.github.io/scssphp
+ */
+
+namespace ScssPhp\ScssPhp\Block;
+
+use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Type;
+
+/**
+ * @internal
+ */
+class IfBlock extends Block
+{
+    /**
+     * @var array
+     */
+    public $cond;
+
+    /**
+     * @var array<ElseifBlock|ElseBlock>
+     */
+    public $cases = [];
+
+    public function __construct()
+    {
+        $this->type = Type::T_IF;
+    }
+}
diff --git a/lib/scssphp/scssphp/src/Block/MediaBlock.php b/lib/scssphp/scssphp/src/Block/MediaBlock.php
new file mode 100644
index 000000000..c49ee1b2b
--- /dev/null
+++ b/lib/scssphp/scssphp/src/Block/MediaBlock.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2020 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://scssphp.github.io/scssphp
+ */
+
+namespace ScssPhp\ScssPhp\Block;
+
+use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Type;
+
+/**
+ * @internal
+ */
+class MediaBlock extends Block
+{
+    /**
+     * @var string|array|null
+     */
+    public $value;
+
+    /**
+     * @var array|null
+     */
+    public $queryList;
+
+    public function __construct()
+    {
+        $this->type = Type::T_MEDIA;
+    }
+}
diff --git a/lib/scssphp/scssphp/src/Block/NestedPropertyBlock.php b/lib/scssphp/scssphp/src/Block/NestedPropertyBlock.php
new file mode 100644
index 000000000..1ea4a6c8a
--- /dev/null
+++ b/lib/scssphp/scssphp/src/Block/NestedPropertyBlock.php
@@ -0,0 +1,37 @@
+<?php
+
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2020 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://scssphp.github.io/scssphp
+ */
+
+namespace ScssPhp\ScssPhp\Block;
+
+use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Type;
+
+/**
+ * @internal
+ */
+class NestedPropertyBlock extends Block
+{
+    /**
+     * @var bool
+     */
+    public $hasValue;
+
+    /**
+     * @var array
+     */
+    public $prefix;
+
+    public function __construct()
+    {
+        $this->type = Type::T_NESTED_PROPERTY;
+    }
+}
diff --git a/lib/scssphp/scssphp/src/Block/WhileBlock.php b/lib/scssphp/scssphp/src/Block/WhileBlock.php
new file mode 100644
index 000000000..ac18d4e02
--- /dev/null
+++ b/lib/scssphp/scssphp/src/Block/WhileBlock.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2020 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://scssphp.github.io/scssphp
+ */
+
+namespace ScssPhp\ScssPhp\Block;
+
+use ScssPhp\ScssPhp\Block;
+use ScssPhp\ScssPhp\Type;
+
+/**
+ * @internal
+ */
+class WhileBlock extends Block
+{
+    /**
+     * @var array
+     */
+    public $cond;
+
+    public function __construct()
+    {
+        $this->type = Type::T_WHILE;
+    }
+}
diff --git a/lib/scssphp/scssphp/src/Cache.php b/lib/scssphp/scssphp/src/Cache.php
index 422497f49..9731c60a7 100644
--- a/lib/scssphp/scssphp/src/Cache.php
+++ b/lib/scssphp/scssphp/src/Cache.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -12,6 +13,7 @@
 namespace ScssPhp\ScssPhp;
 
 use Exception;
+use ScssPhp\ScssPhp\Version;
 
 /**
  * The scss cache manager.
@@ -22,37 +24,60 @@ use Exception;
  * taking in account options that affects the result
  *
  * The cache manager is agnostic about data format and only the operation is expected to be described by string
- *
  */
 
 /**
  * SCSS cache
  *
- * @author Cedric Morin
+ * @author Cedric Morin <cedric@yterium.com>
+ *
+ * @internal
  */
 class Cache
 {
     const CACHE_VERSION = 1;
 
-    // directory used for storing data
+    /**
+     * directory used for storing data
+     *
+     * @var string|false
+     */
     public static $cacheDir = false;
 
-    // prefix for the storing data
+    /**
+     * prefix for the storing data
+     *
+     * @var string
+     */
     public static $prefix = 'scssphp_';
 
-    // force a refresh : 'once' for refreshing the first hit on a cache only, true to never use the cache in this hit
+    /**
+     * force a refresh : 'once' for refreshing the first hit on a cache only, true to never use the cache in this hit
+     *
+     * @var bool|string
+     */
     public static $forceRefresh = false;
 
-    // specifies the number of seconds after which data cached will be seen as 'garbage' and potentially cleaned up
+    /**
+     * specifies the number of seconds after which data cached will be seen as 'garbage' and potentially cleaned up
+     *
+     * @var int
+     */
     public static $gcLifetime = 604800;
 
-    // array of already refreshed cache if $forceRefresh==='once'
+    /**
+     * array of already refreshed cache if $forceRefresh==='once'
+     *
+     * @var array<string, bool>
+     */
     protected static $refreshed = [];
 
     /**
      * Constructor
      *
      * @param array $options
+     *
+     * @phpstan-param array{cacheDir?: string, prefix?: string, forceRefresh?: string} $options
      */
     public function __construct($options)
     {
@@ -84,10 +109,10 @@ class Cache
      * Get the cached result of $operation on $what,
      * which is known as dependant from the content of $options
      *
-     * @param string  $operation    parse, compile...
-     * @param mixed   $what         content key (e.g., filename to be treated)
-     * @param array   $options      any option that affect the operation result on the content
-     * @param integer $lastModified last modified timestamp
+     * @param string   $operation    parse, compile...
+     * @param mixed    $what         content key (e.g., filename to be treated)
+     * @param array    $options      any option that affect the operation result on the content
+     * @param int|null $lastModified last modified timestamp
      *
      * @return mixed
      *
@@ -97,18 +122,20 @@ class Cache
     {
         $fileCache = self::$cacheDir . self::cacheName($operation, $what, $options);
 
-        if (((self::$forceRefresh === false) || (self::$forceRefresh === 'once' &&
+        if (
+            ((self::$forceRefresh === false) || (self::$forceRefresh === 'once' &&
             isset(self::$refreshed[$fileCache]))) && file_exists($fileCache)
         ) {
             $cacheTime = filemtime($fileCache);
 
-            if ((is_null($lastModified) || $cacheTime > $lastModified) &&
+            if (
+                (\is_null($lastModified) || $cacheTime > $lastModified) &&
                 $cacheTime + self::$gcLifetime > time()
             ) {
                 $c = file_get_contents($fileCache);
                 $c = unserialize($c);
 
-                if (is_array($c) && isset($c['value'])) {
+                if (\is_array($c) && isset($c['value'])) {
                     return $c['value'];
                 }
             }
@@ -125,6 +152,8 @@ class Cache
      * @param mixed  $what
      * @param mixed  $value
      * @param array  $options
+     *
+     * @return void
      */
     public function setCache($operation, $what, $value, $options = [])
     {
@@ -132,6 +161,7 @@ class Cache
 
         $c = ['value' => $value];
         $c = serialize($c);
+
         file_put_contents($fileCache, $c);
 
         if (self::$forceRefresh === 'once') {
@@ -153,6 +183,7 @@ class Cache
     {
         $t = [
           'version' => self::CACHE_VERSION,
+          'scssphpVersion' => Version::VERSION,
           'operation' => $operation,
           'what' => $what,
           'options' => $options
@@ -169,6 +200,8 @@ class Cache
     /**
      * Check that the cache dir exists and is writeable
      *
+     * @return void
+     *
      * @throws \Exception
      */
     public static function checkCacheDir()
@@ -177,9 +210,7 @@ class Cache
         self::$cacheDir = rtrim(self::$cacheDir, '/') . '/';
 
         if (! is_dir(self::$cacheDir)) {
-            if (! mkdir(self::$cacheDir)) {
-                throw new Exception('Cache directory couldn\'t be created: ' . self::$cacheDir);
-            }
+            throw new Exception('Cache directory doesn\'t exist: ' . self::$cacheDir);
         }
 
         if (! is_writable(self::$cacheDir)) {
@@ -189,6 +220,8 @@ class Cache
 
     /**
      * Delete unused cached files
+     *
+     * @return void
      */
     public static function cleanCache()
     {
diff --git a/lib/scssphp/scssphp/src/Colors.php b/lib/scssphp/scssphp/src/Colors.php
index ef6409aca..2df39992b 100644
--- a/lib/scssphp/scssphp/src/Colors.php
+++ b/lib/scssphp/scssphp/src/Colors.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -15,6 +16,8 @@ namespace ScssPhp\ScssPhp;
  * CSS Colors
  *
  * @author Leaf Corcoran <leafot@gmail.com>
+ *
+ * @internal
  */
 class Colors
 {
@@ -23,12 +26,13 @@ class Colors
      *
      * @see http://www.w3.org/TR/css3-color
      *
-     * @var array
+     * @var array<string, string>
      */
     protected static $cssColors = [
         'aliceblue' => '240,248,255',
         'antiquewhite' => '250,235,215',
         'aqua' => '0,255,255',
+        'cyan' => '0,255,255',
         'aquamarine' => '127,255,212',
         'azure' => '240,255,255',
         'beige' => '245,245,220',
@@ -46,13 +50,12 @@ class Colors
         'cornflowerblue' => '100,149,237',
         'cornsilk' => '255,248,220',
         'crimson' => '220,20,60',
-        'cyan' => '0,255,255',
         'darkblue' => '0,0,139',
         'darkcyan' => '0,139,139',
         'darkgoldenrod' => '184,134,11',
         'darkgray' => '169,169,169',
-        'darkgreen' => '0,100,0',
         'darkgrey' => '169,169,169',
+        'darkgreen' => '0,100,0',
         'darkkhaki' => '189,183,107',
         'darkmagenta' => '139,0,139',
         'darkolivegreen' => '85,107,47',
@@ -75,14 +78,15 @@ class Colors
         'floralwhite' => '255,250,240',
         'forestgreen' => '34,139,34',
         'fuchsia' => '255,0,255',
+        'magenta' => '255,0,255',
         'gainsboro' => '220,220,220',
         'ghostwhite' => '248,248,255',
         'gold' => '255,215,0',
         'goldenrod' => '218,165,32',
         'gray' => '128,128,128',
+        'grey' => '128,128,128',
         'green' => '0,128,0',
         'greenyellow' => '173,255,47',
-        'grey' => '128,128,128',
         'honeydew' => '240,255,240',
         'hotpink' => '255,105,180',
         'indianred' => '205,92,92',
@@ -98,8 +102,8 @@ class Colors
         'lightcyan' => '224,255,255',
         'lightgoldenrodyellow' => '250,250,210',
         'lightgray' => '211,211,211',
-        'lightgreen' => '144,238,144',
         'lightgrey' => '211,211,211',
+        'lightgreen' => '144,238,144',
         'lightpink' => '255,182,193',
         'lightsalmon' => '255,160,122',
         'lightseagreen' => '32,178,170',
@@ -111,7 +115,6 @@ class Colors
         'lime' => '0,255,0',
         'limegreen' => '50,205,50',
         'linen' => '250,240,230',
-        'magenta' => '255,0,255',
         'maroon' => '128,0,0',
         'mediumaquamarine' => '102,205,170',
         'mediumblue' => '0,0,205',
@@ -145,7 +148,6 @@ class Colors
         'plum' => '221,160,221',
         'powderblue' => '176,224,230',
         'purple' => '128,0,128',
-        'rebeccapurple' => '102,51,153',
         'red' => '255,0,0',
         'rosybrown' => '188,143,143',
         'royalblue' => '65,105,225',
@@ -167,7 +169,6 @@ class Colors
         'teal' => '0,128,128',
         'thistle' => '216,191,216',
         'tomato' => '255,99,71',
-        'transparent' => '0,0,0,0',
         'turquoise' => '64,224,208',
         'violet' => '238,130,238',
         'wheat' => '245,222,179',
@@ -175,6 +176,8 @@ class Colors
         'whitesmoke' => '245,245,245',
         'yellow' => '255,255,0',
         'yellowgreen' => '154,205,50',
+        'rebeccapurple' => '102,51,153',
+        'transparent' => '0,0,0,0',
     ];
 
     /**
@@ -182,11 +185,11 @@ class Colors
      *
      * @param string $colorName
      *
-     * @return array|null
+     * @return int[]|null
      */
     public static function colorNameToRGBa($colorName)
     {
-        if (is_string($colorName) && isset(static::$cssColors[$colorName])) {
+        if (\is_string($colorName) && isset(static::$cssColors[$colorName])) {
             $rgba = explode(',', static::$cssColors[$colorName]);
 
             // only case with opacity is transparent, with opacity=0, so we can intval on opacity also
@@ -201,10 +204,10 @@ class Colors
     /**
      * Reverse conversion : from RGBA to a color name if possible
      *
-     * @param integer $r
-     * @param integer $g
-     * @param integer $b
-     * @param integer $a
+     * @param int       $r
+     * @param int       $g
+     * @param int       $b
+     * @param int|float $a
      *
      * @return string|null
      */
@@ -217,28 +220,26 @@ class Colors
         }
 
         if ($a < 1) {
-            # specific case we dont' revert according to spec
-            #if (! $a && ! $r && ! $g && ! $b) {
-            #    return 'transparent';
-            #}
-
             return null;
         }
 
-        if (is_null($reverseColorTable)) {
+        if (\is_null($reverseColorTable)) {
             $reverseColorTable = [];
 
             foreach (static::$cssColors as $name => $rgb_str) {
                 $rgb_str = explode(',', $rgb_str);
 
-                if (count($rgb_str) == 3) {
-                    $reverseColorTable[intval($rgb_str[0])][intval($rgb_str[1])][intval($rgb_str[2])] = $name;
+                if (
+                    \count($rgb_str) == 3 &&
+                    ! isset($reverseColorTable[\intval($rgb_str[0])][\intval($rgb_str[1])][\intval($rgb_str[2])])
+                ) {
+                    $reverseColorTable[\intval($rgb_str[0])][\intval($rgb_str[1])][\intval($rgb_str[2])] = $name;
                 }
             }
         }
 
-        if (isset($reverseColorTable[intval($r)][intval($g)][intval($b)])) {
-            return $reverseColorTable[intval($r)][intval($g)][intval($b)];
+        if (isset($reverseColorTable[\intval($r)][\intval($g)][\intval($b)])) {
+            return $reverseColorTable[\intval($r)][\intval($g)][\intval($b)];
         }
 
         return null;
diff --git a/lib/scssphp/scssphp/src/CompilationResult.php b/lib/scssphp/scssphp/src/CompilationResult.php
new file mode 100644
index 000000000..36adb0da4
--- /dev/null
+++ b/lib/scssphp/scssphp/src/CompilationResult.php
@@ -0,0 +1,69 @@
+<?php
+
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2020 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://scssphp.github.io/scssphp
+ */
+
+namespace ScssPhp\ScssPhp;
+
+class CompilationResult
+{
+    /**
+     * @var string
+     */
+    private $css;
+
+    /**
+     * @var string|null
+     */
+    private $sourceMap;
+
+    /**
+     * @var string[]
+     */
+    private $includedFiles;
+
+    /**
+     * @param string $css
+     * @param string|null $sourceMap
+     * @param string[] $includedFiles
+     */
+    public function __construct($css, $sourceMap, array $includedFiles)
+    {
+        $this->css = $css;
+        $this->sourceMap = $sourceMap;
+        $this->includedFiles = $includedFiles;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCss()
+    {
+        return $this->css;
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getIncludedFiles()
+    {
+        return $this->includedFiles;
+    }
+
+    /**
+     * The sourceMap content, if it was generated
+     *
+     * @return null|string
+     */
+    public function getSourceMap()
+    {
+        return $this->sourceMap;
+    }
+}
diff --git a/lib/scssphp/scssphp/src/Compiler.php b/lib/scssphp/scssphp/src/Compiler.php
index 711d3382f..e414436c8 100644
--- a/lib/scssphp/scssphp/src/Compiler.php
+++ b/lib/scssphp/scssphp/src/Compiler.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -12,17 +13,31 @@
 namespace ScssPhp\ScssPhp;
 
 use ScssPhp\ScssPhp\Base\Range;
-use ScssPhp\ScssPhp\Block;
-use ScssPhp\ScssPhp\Cache;
-use ScssPhp\ScssPhp\Colors;
+use ScssPhp\ScssPhp\Block\AtRootBlock;
+use ScssPhp\ScssPhp\Block\CallableBlock;
+use ScssPhp\ScssPhp\Block\DirectiveBlock;
+use ScssPhp\ScssPhp\Block\EachBlock;
+use ScssPhp\ScssPhp\Block\ElseBlock;
+use ScssPhp\ScssPhp\Block\ElseifBlock;
+use ScssPhp\ScssPhp\Block\ForBlock;
+use ScssPhp\ScssPhp\Block\IfBlock;
+use ScssPhp\ScssPhp\Block\MediaBlock;
+use ScssPhp\ScssPhp\Block\NestedPropertyBlock;
+use ScssPhp\ScssPhp\Block\WhileBlock;
+use ScssPhp\ScssPhp\Compiler\CachedResult;
 use ScssPhp\ScssPhp\Compiler\Environment;
 use ScssPhp\ScssPhp\Exception\CompilerException;
+use ScssPhp\ScssPhp\Exception\ParserException;
+use ScssPhp\ScssPhp\Exception\SassException;
+use ScssPhp\ScssPhp\Exception\SassScriptException;
+use ScssPhp\ScssPhp\Formatter\Compressed;
+use ScssPhp\ScssPhp\Formatter\Expanded;
 use ScssPhp\ScssPhp\Formatter\OutputBlock;
-use ScssPhp\ScssPhp\Node;
+use ScssPhp\ScssPhp\Logger\LoggerInterface;
+use ScssPhp\ScssPhp\Logger\StreamLogger;
+use ScssPhp\ScssPhp\Node\Number;
 use ScssPhp\ScssPhp\SourceMap\SourceMapGenerator;
-use ScssPhp\ScssPhp\Type;
-use ScssPhp\ScssPhp\Parser;
-use ScssPhp\ScssPhp\Util;
+use ScssPhp\ScssPhp\Util\Path;
 
 /**
  * The scss compiler and parser.
@@ -55,15 +70,35 @@ use ScssPhp\ScssPhp\Util;
  * SCSS compiler
  *
  * @author Leaf Corcoran <leafot@gmail.com>
+ *
+ * @final Extending the Compiler is deprecated
  */
 class Compiler
 {
+    /**
+     * @deprecated
+     */
     const LINE_COMMENTS = 1;
+    /**
+     * @deprecated
+     */
     const DEBUG_INFO    = 2;
 
+    /**
+     * @deprecated
+     */
     const WITH_RULE     = 1;
+    /**
+     * @deprecated
+     */
     const WITH_MEDIA    = 2;
+    /**
+     * @deprecated
+     */
     const WITH_SUPPORTS = 4;
+    /**
+     * @deprecated
+     */
     const WITH_ALL      = 7;
 
     const SOURCE_MAP_NONE   = 0;
@@ -71,9 +106,9 @@ class Compiler
     const SOURCE_MAP_FILE   = 2;
 
     /**
-     * @var array
+     * @var array<string, string>
      */
-    static protected $operatorNames = [
+    protected static $operatorNames = [
         '+'   => 'add',
         '-'   => 'sub',
         '*'   => 'mul',
@@ -87,102 +122,261 @@ class Compiler
 
         '<='  => 'lte',
         '>='  => 'gte',
-        '<=>' => 'cmp',
     ];
 
     /**
-     * @var array
+     * @var array<string, string>
      */
-    static protected $namespaces = [
+    protected static $namespaces = [
         'special'  => '%',
         'mixin'    => '@',
         'function' => '^',
     ];
 
-    static public $true         = [Type::T_KEYWORD, 'true'];
-    static public $false        = [Type::T_KEYWORD, 'false'];
-    static public $null         = [Type::T_NULL];
-    static public $nullString   = [Type::T_STRING, '', []];
-    static public $defaultValue = [Type::T_KEYWORD, ''];
-    static public $selfSelector = [Type::T_SELF];
-    static public $emptyList    = [Type::T_LIST, '', []];
-    static public $emptyMap     = [Type::T_MAP, [], []];
-    static public $emptyString  = [Type::T_STRING, '"', []];
-    static public $with         = [Type::T_KEYWORD, 'with'];
-    static public $without      = [Type::T_KEYWORD, 'without'];
+    public static $true         = [Type::T_KEYWORD, 'true'];
+    public static $false        = [Type::T_KEYWORD, 'false'];
+    /** @deprecated */
+    public static $NaN          = [Type::T_KEYWORD, 'NaN'];
+    /** @deprecated */
+    public static $Infinity     = [Type::T_KEYWORD, 'Infinity'];
+    public static $null         = [Type::T_NULL];
+    public static $nullString   = [Type::T_STRING, '', []];
+    public static $defaultValue = [Type::T_KEYWORD, ''];
+    public static $selfSelector = [Type::T_SELF];
+    public static $emptyList    = [Type::T_LIST, '', []];
+    public static $emptyMap     = [Type::T_MAP, [], []];
+    public static $emptyString  = [Type::T_STRING, '"', []];
+    public static $with         = [Type::T_KEYWORD, 'with'];
+    public static $without      = [Type::T_KEYWORD, 'without'];
+    private static $emptyArgumentList = [Type::T_LIST, '', [], []];
 
-    protected $importPaths = [''];
+    /**
+     * @var array<int, string|callable>
+     */
+    protected $importPaths = [];
+    /**
+     * @var array<string, Block>
+     */
     protected $importCache = [];
+
+    /**
+     * @var string[]
+     */
     protected $importedFiles = [];
+
+    /**
+     * @var array
+     * @phpstan-var array<string, array{0: callable, 1: string[]|null}>
+     */
     protected $userFunctions = [];
+    /**
+     * @var array<string, mixed>
+     */
     protected $registeredVars = [];
+    /**
+     * @var array<string, bool>
+     */
     protected $registeredFeatures = [
         'extend-selector-pseudoclass' => false,
         'at-error'                    => true,
-        'units-level-3'               => false,
+        'units-level-3'               => true,
         'global-variable-shadowing'   => false,
     ];
 
+    /**
+     * @var string|null
+     */
     protected $encoding = null;
+    /**
+     * @var null
+     * @deprecated
+     */
     protected $lineNumberStyle = null;
 
+    /**
+     * @var int|SourceMapGenerator
+     * @phpstan-var self::SOURCE_MAP_*|SourceMapGenerator
+     */
     protected $sourceMap = self::SOURCE_MAP_NONE;
+
+    /**
+     * @var array
+     * @phpstan-var array{sourceRoot?: string, sourceMapFilename?: string|null, sourceMapURL?: string|null, sourceMapWriteTo?: string|null, outputSourceFiles?: bool, sourceMapRootpath?: string, sourceMapBasepath?: string}
+     */
     protected $sourceMapOptions = [];
 
     /**
-     * @var string|\ScssPhp\ScssPhp\Formatter
+     * @var bool
      */
-    protected $formatter = 'ScssPhp\ScssPhp\Formatter\Nested';
+    private $charset = true;
 
+    /**
+     * @var Formatter
+     */
+    protected $formatter;
+
+    /**
+     * @var string
+     * @phpstan-var class-string<Formatter>
+     */
+    private $configuredFormatter = Expanded::class;
+
+    /**
+     * @var Environment
+     */
     protected $rootEnv;
+    /**
+     * @var OutputBlock|null
+     */
     protected $rootBlock;
 
     /**
      * @var \ScssPhp\ScssPhp\Compiler\Environment
      */
     protected $env;
+    /**
+     * @var OutputBlock|null
+     */
     protected $scope;
+    /**
+     * @var Environment|null
+     */
     protected $storeEnv;
+    /**
+     * @var bool|null
+     *
+     * @deprecated
+     */
     protected $charsetSeen;
+    /**
+     * @var array<int, string|null>
+     */
     protected $sourceNames;
 
+    /**
+     * @var Cache|null
+     */
     protected $cache;
 
-    protected $indentLevel;
-    protected $extends;
-    protected $extendsMap;
-    protected $parsedFiles;
-    protected $parser;
-    protected $sourceIndex;
-    protected $sourceLine;
-    protected $sourceColumn;
-    protected $stderr;
-    protected $shouldEvaluate;
-    protected $ignoreErrors;
+    /**
+     * @var bool
+     */
+    protected $cacheCheckImportResolutions = false;
 
+    /**
+     * @var int
+     */
+    protected $indentLevel;
+    /**
+     * @var array[]
+     */
+    protected $extends;
+    /**
+     * @var array<string, int[]>
+     */
+    protected $extendsMap;
+
+    /**
+     * @var array<string, int>
+     */
+    protected $parsedFiles = [];
+
+    /**
+     * @var Parser|null
+     */
+    protected $parser;
+    /**
+     * @var int|null
+     */
+    protected $sourceIndex;
+    /**
+     * @var int|null
+     */
+    protected $sourceLine;
+    /**
+     * @var int|null
+     */
+    protected $sourceColumn;
+    /**
+     * @var bool|null
+     */
+    protected $shouldEvaluate;
+    /**
+     * @var null
+     * @deprecated
+     */
+    protected $ignoreErrors;
+    /**
+     * @var bool
+     */
+    protected $ignoreCallStackMessage = false;
+
+    /**
+     * @var array[]
+     */
     protected $callStack = [];
 
+    /**
+     * @var array
+     * @phpstan-var list<array{currentDir: string|null, path: string, filePath: string}>
+     */
+    private $resolvedImports = [];
+
+    /**
+     * The directory of the currently processed file
+     *
+     * @var string|null
+     */
+    private $currentDirectory;
+
+    /**
+     * The directory of the input file
+     *
+     * @var string
+     */
+    private $rootDirectory;
+
+    /**
+     * @var bool
+     */
+    private $legacyCwdImportPath = true;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
+    /**
+     * @var array<string, bool>
+     */
+    private $warnedChildFunctions = [];
+
     /**
      * Constructor
      *
      * @param array|null $cacheOptions
+     * @phpstan-param array{cacheDir?: string, prefix?: string, forceRefresh?: string, checkImportResolutions?: bool}|null $cacheOptions
      */
     public function __construct($cacheOptions = null)
     {
-        $this->parsedFiles = [];
         $this->sourceNames = [];
 
         if ($cacheOptions) {
             $this->cache = new Cache($cacheOptions);
+            if (!empty($cacheOptions['checkImportResolutions'])) {
+                $this->cacheCheckImportResolutions = true;
+            }
         }
 
-        $this->stderr = fopen('php://stderr', 'w');
+        $this->logger = new StreamLogger(fopen('php://stderr', 'w'), true);
     }
 
     /**
      * Get compiler options
      *
-     * @return array
+     * @return array<string, mixed>
+     *
+     * @internal
      */
     public function getCompileOptions()
     {
@@ -193,54 +387,97 @@ class Compiler
             'encoding'           => $this->encoding,
             'sourceMap'          => serialize($this->sourceMap),
             'sourceMapOptions'   => $this->sourceMapOptions,
-            'formatter'          => $this->formatter,
+            'formatter'          => $this->configuredFormatter,
+            'legacyImportPath'   => $this->legacyCwdImportPath,
         ];
 
         return $options;
     }
 
+    /**
+     * Sets an alternative logger.
+     *
+     * Changing the logger in the middle of the compilation is not
+     * supported and will result in an undefined behavior.
+     *
+     * @param LoggerInterface $logger
+     *
+     * @return void
+     */
+    public function setLogger(LoggerInterface $logger)
+    {
+        $this->logger = $logger;
+    }
+
     /**
      * Set an alternative error output stream, for testing purpose only
      *
      * @param resource $handle
+     *
+     * @return void
+     *
+     * @deprecated Use {@see setLogger} instead
      */
     public function setErrorOuput($handle)
     {
-        $this->stderr = $handle;
+        @trigger_error('The method "setErrorOuput" is deprecated. Use "setLogger" instead.', E_USER_DEPRECATED);
+
+        $this->logger = new StreamLogger($handle);
     }
 
     /**
      * Compile scss
      *
-     * @api
-     *
-     * @param string $code
-     * @param string $path
+     * @param string      $code
+     * @param string|null $path
      *
      * @return string
+     *
+     * @throws SassException when the source fails to compile
+     *
+     * @deprecated Use {@see compileString} instead.
      */
     public function compile($code, $path = null)
     {
-        if ($this->cache) {
-            $cacheKey       = ($path ? $path : "(stdin)") . ":" . md5($code);
-            $compileOptions = $this->getCompileOptions();
-            $cache          = $this->cache->getCache("compile", $cacheKey, $compileOptions);
+        @trigger_error(sprintf('The "%s" method is deprecated. Use "compileString" instead.', __METHOD__), E_USER_DEPRECATED);
 
-            if (is_array($cache) && isset($cache['dependencies']) && isset($cache['out'])) {
-                // check if any dependency file changed before accepting the cache
-                foreach ($cache['dependencies'] as $file => $mtime) {
-                    if (! is_file($file) || filemtime($file) !== $mtime) {
-                        unset($cache);
-                        break;
-                    }
-                }
+        $result = $this->compileString($code, $path);
 
-                if (isset($cache)) {
-                    return $cache['out'];
-                }
+        $sourceMap = $result->getSourceMap();
+
+        if ($sourceMap !== null) {
+            if ($this->sourceMap instanceof SourceMapGenerator) {
+                $this->sourceMap->saveMap($sourceMap);
+            } elseif ($this->sourceMap === self::SOURCE_MAP_FILE) {
+                $sourceMapGenerator = new SourceMapGenerator($this->sourceMapOptions);
+                $sourceMapGenerator->saveMap($sourceMap);
             }
         }
 
+        return $result->getCss();
+    }
+
+    /**
+     * Compile scss
+     *
+     * @param string      $source
+     * @param string|null $path
+     *
+     * @return CompilationResult
+     *
+     * @throws SassException when the source fails to compile
+     */
+    public function compileString($source, $path = null)
+    {
+        if ($this->cache) {
+            $cacheKey       = ($path ? $path : '(stdin)') . ':' . md5($source);
+            $compileOptions = $this->getCompileOptions();
+            $cachedResult = $this->cache->getCache('compile', $cacheKey, $compileOptions);
+
+            if ($cachedResult instanceof CachedResult && $this->isFreshCachedResult($cachedResult)) {
+                return $cachedResult->getResult();
+            }
+        }
 
         $this->indentLevel    = -1;
         $this->extends        = [];
@@ -251,73 +488,168 @@ class Compiler
         $this->env            = null;
         $this->scope          = null;
         $this->storeEnv       = null;
-        $this->charsetSeen    = null;
         $this->shouldEvaluate = null;
+        $this->ignoreCallStackMessage = false;
+        $this->parsedFiles = [];
+        $this->importedFiles = [];
+        $this->resolvedImports = [];
 
-        $this->parser = $this->parserFactory($path);
-        $tree         = $this->parser->parse($code);
-        $this->parser = null;
-
-        $this->formatter = new $this->formatter();
-        $this->rootBlock = null;
-        $this->rootEnv   = $this->pushEnv($tree);
-
-        $this->injectVariables($this->registeredVars);
-        $this->compileRoot($tree);
-        $this->popEnv();
-
-        $sourceMapGenerator = null;
-
-        if ($this->sourceMap) {
-            if (is_object($this->sourceMap) && $this->sourceMap instanceof SourceMapGenerator) {
-                $sourceMapGenerator = $this->sourceMap;
-                $this->sourceMap = self::SOURCE_MAP_FILE;
-            } elseif ($this->sourceMap !== self::SOURCE_MAP_NONE) {
-                $sourceMapGenerator = new SourceMapGenerator($this->sourceMapOptions);
-            }
+        if (!\is_null($path) && is_file($path)) {
+            $path = realpath($path) ?: $path;
+            $this->currentDirectory = dirname($path);
+            $this->rootDirectory = $this->currentDirectory;
+        } else {
+            $this->currentDirectory = null;
+            $this->rootDirectory = getcwd();
         }
 
-        $out = $this->formatter->format($this->scope, $sourceMapGenerator);
+        try {
+            $this->parser = $this->parserFactory($path);
+            $tree         = $this->parser->parse($source);
+            $this->parser = null;
 
-        if (! empty($out) && $this->sourceMap && $this->sourceMap !== self::SOURCE_MAP_NONE) {
-            $sourceMap    = $sourceMapGenerator->generateJson();
-            $sourceMapUrl = null;
+            $this->formatter = new $this->configuredFormatter();
+            $this->rootBlock = null;
+            $this->rootEnv   = $this->pushEnv($tree);
 
-            switch ($this->sourceMap) {
-                case self::SOURCE_MAP_INLINE:
-                    $sourceMapUrl = sprintf('data:application/json,%s', Util::encodeURIComponent($sourceMap));
-                    break;
+            $warnCallback = function ($message, $deprecation) {
+                $this->logger->warn($message, $deprecation);
+            };
+            $previousWarnCallback = Warn::setCallback($warnCallback);
 
-                case self::SOURCE_MAP_FILE:
-                    $sourceMapUrl = $sourceMapGenerator->saveMap($sourceMap);
-                    break;
+            try {
+                $this->injectVariables($this->registeredVars);
+                $this->compileRoot($tree);
+                $this->popEnv();
+            } finally {
+                Warn::setCallback($previousWarnCallback);
             }
 
-            $out .= sprintf('/*# sourceMappingURL=%s */', $sourceMapUrl);
+            $sourceMapGenerator = null;
+
+            if ($this->sourceMap) {
+                if (\is_object($this->sourceMap) && $this->sourceMap instanceof SourceMapGenerator) {
+                    $sourceMapGenerator = $this->sourceMap;
+                    $this->sourceMap = self::SOURCE_MAP_FILE;
+                } elseif ($this->sourceMap !== self::SOURCE_MAP_NONE) {
+                    $sourceMapGenerator = new SourceMapGenerator($this->sourceMapOptions);
+                }
+            }
+            assert($this->scope !== null);
+
+            $out = $this->formatter->format($this->scope, $sourceMapGenerator);
+
+            $prefix = '';
+
+            if ($this->charset && strlen($out) !== Util::mbStrlen($out)) {
+                $prefix = '@charset "UTF-8";' . "\n";
+                $out = $prefix . $out;
+            }
+
+            $sourceMap = null;
+
+            if (! empty($out) && $this->sourceMap && $this->sourceMap !== self::SOURCE_MAP_NONE) {
+                assert($sourceMapGenerator !== null);
+                $sourceMap = $sourceMapGenerator->generateJson($prefix);
+                $sourceMapUrl = null;
+
+                switch ($this->sourceMap) {
+                    case self::SOURCE_MAP_INLINE:
+                        $sourceMapUrl = sprintf('data:application/json,%s', Util::encodeURIComponent($sourceMap));
+                        break;
+
+                    case self::SOURCE_MAP_FILE:
+                        if (isset($this->sourceMapOptions['sourceMapURL'])) {
+                            $sourceMapUrl = $this->sourceMapOptions['sourceMapURL'];
+                        }
+                        break;
+                }
+
+                if ($sourceMapUrl !== null) {
+                    $out .= sprintf('/*# sourceMappingURL=%s */', $sourceMapUrl);
+                }
+            }
+        } catch (SassScriptException $e) {
+            throw new CompilerException($this->addLocationToMessage($e->getMessage()), 0, $e);
         }
 
+        $includedFiles = [];
+
+        foreach ($this->resolvedImports as $resolvedImport) {
+            $includedFiles[$resolvedImport['filePath']] = $resolvedImport['filePath'];
+        }
+
+        $result = new CompilationResult($out, $sourceMap, array_values($includedFiles));
+
         if ($this->cache && isset($cacheKey) && isset($compileOptions)) {
-            $v = [
-                'dependencies' => $this->getParsedFiles(),
-                'out' => &$out,
-            ];
-
-            $this->cache->setCache("compile", $cacheKey, $v, $compileOptions);
+            $this->cache->setCache('compile', $cacheKey, new CachedResult($result, $this->parsedFiles, $this->resolvedImports), $compileOptions);
         }
 
-        return $out;
+        // Reset state to free memory
+        // TODO in 2.0, reset parsedFiles as well when the getter is removed.
+        $this->resolvedImports = [];
+        $this->importedFiles = [];
+
+        return $result;
+    }
+
+    /**
+     * @param CachedResult $result
+     *
+     * @return bool
+     */
+    private function isFreshCachedResult(CachedResult $result)
+    {
+        // check if any dependency file changed since the result was compiled
+        foreach ($result->getParsedFiles() as $file => $mtime) {
+            if (! is_file($file) || filemtime($file) !== $mtime) {
+                return false;
+            }
+        }
+
+        if ($this->cacheCheckImportResolutions) {
+            $resolvedImports = [];
+
+            foreach ($result->getResolvedImports() as $import) {
+                $currentDir = $import['currentDir'];
+                $path = $import['path'];
+                // store the check across all the results in memory to avoid multiple findImport() on the same path
+                // with same context.
+                // this is happening in a same hit with multiple compilations (especially with big frameworks)
+                if (empty($resolvedImports[$currentDir][$path])) {
+                    $resolvedImports[$currentDir][$path] = $this->findImport($path, $currentDir);
+                }
+
+                if ($resolvedImports[$currentDir][$path] !== $import['filePath']) {
+                    return false;
+                }
+            }
+        }
+
+        return true;
     }
 
     /**
      * Instantiate parser
      *
-     * @param string $path
+     * @param string|null $path
      *
      * @return \ScssPhp\ScssPhp\Parser
      */
     protected function parserFactory($path)
     {
-        $parser = new Parser($path, count($this->sourceNames), $this->encoding, $this->cache);
+        // https://sass-lang.com/documentation/at-rules/import
+        // CSS files imported by Sass don’t allow any special Sass features.
+        // In order to make sure authors don’t accidentally write Sass in their CSS,
+        // all Sass features that aren’t also valid CSS will produce errors.
+        // Otherwise, the CSS will be rendered as-is. It can even be extended!
+        $cssOnly = false;
+
+        if ($path !== null && substr($path, -4) === '.css') {
+            $cssOnly = true;
+        }
+
+        $parser = new Parser($path, \count($this->sourceNames), $this->encoding, $this->cache, $cssOnly, $this->logger);
 
         $this->sourceNames[] = $path;
         $this->addParsedFile($path);
@@ -331,12 +663,12 @@ class Compiler
      * @param array $target
      * @param array $origin
      *
-     * @return boolean
+     * @return bool
      */
     protected function isSelfExtend($target, $origin)
     {
         foreach ($origin as $sel) {
-            if (in_array($target, $sel)) {
+            if (\in_array($target, $sel)) {
                 return true;
             }
         }
@@ -347,17 +679,15 @@ class Compiler
     /**
      * Push extends
      *
-     * @param array      $target
+     * @param string[]   $target
      * @param array      $origin
      * @param array|null $block
+     *
+     * @return void
      */
     protected function pushExtends($target, $origin, $block)
     {
-        if ($this->isSelfExtend($target, $origin)) {
-            return;
-        }
-
-        $i = count($this->extends);
+        $i = \count($this->extends);
         $this->extends[] = [$target, $origin, $block];
 
         foreach ($target as $part) {
@@ -372,14 +702,14 @@ class Compiler
     /**
      * Make output block
      *
-     * @param string $type
-     * @param array  $selectors
+     * @param string|null   $type
+     * @param string[]|null $selectors
      *
      * @return \ScssPhp\ScssPhp\Formatter\OutputBlock
      */
     protected function makeOutputBlock($type, $selectors = null)
     {
-        $out = new OutputBlock;
+        $out = new OutputBlock();
         $out->type      = $type;
         $out->lines     = [];
         $out->children  = [];
@@ -392,9 +722,9 @@ class Compiler
             $out->sourceLine   = $this->env->block->sourceLine;
             $out->sourceColumn = $this->env->block->sourceColumn;
         } else {
-            $out->sourceName   = null;
-            $out->sourceLine   = null;
-            $out->sourceColumn = null;
+            $out->sourceName = isset($this->sourceNames[$this->sourceIndex]) ? $this->sourceNames[$this->sourceIndex] : '(stdin)';
+            $out->sourceLine = $this->sourceLine;
+            $out->sourceColumn = $this->sourceColumn;
         }
 
         return $out;
@@ -404,18 +734,23 @@ class Compiler
      * Compile root
      *
      * @param \ScssPhp\ScssPhp\Block $rootBlock
+     *
+     * @return void
      */
     protected function compileRoot(Block $rootBlock)
     {
         $this->rootBlock = $this->scope = $this->makeOutputBlock(Type::T_ROOT);
 
         $this->compileChildrenNoReturn($rootBlock->children, $this->scope);
+        assert($this->scope !== null);
         $this->flattenSelectors($this->scope);
         $this->missingSelectors();
     }
 
     /**
      * Report missing selectors
+     *
+     * @return void
      */
     protected function missingSelectors()
     {
@@ -435,7 +770,7 @@ class Compiler
             $origin = $this->collapseSelectors($origin);
 
             $this->sourceLine = $block[Parser::SOURCE_LINE];
-            $this->throwError("\"$origin\" failed to @extend \"$target\". The selector \"$target\" was not found.");
+            throw $this->error("\"$origin\" failed to @extend \"$target\". The selector \"$target\" was not found.");
         }
     }
 
@@ -444,6 +779,8 @@ class Compiler
      *
      * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $block
      * @param string                                 $parentKey
+     *
+     * @return void
      */
     protected function flattenSelectors(OutputBlock $block, $parentKey = null)
     {
@@ -453,7 +790,7 @@ class Compiler
             foreach ($block->selectors as $s) {
                 $selectors[] = $s;
 
-                if (! is_array($s)) {
+                if (! \is_array($s)) {
                     continue;
                 }
 
@@ -486,7 +823,8 @@ class Compiler
                 $block->selectors[] = $this->compileSelector($selector);
             }
 
-            if ($placeholderSelector && 0 === count($block->selectors) && null !== $parentKey) {
+            if ($placeholderSelector && 0 === \count($block->selectors) && null !== $parentKey) {
+                assert($block->parent !== null);
                 unset($block->parent->children[$parentKey]);
 
                 return;
@@ -499,7 +837,7 @@ class Compiler
     }
 
     /**
-     * Glue parts of :not( or :nth-child( ... that are in general splitted in selectors parts
+     * Glue parts of :not( or :nth-child( ... that are in general split in selectors parts
      *
      * @param array $parts
      *
@@ -510,19 +848,20 @@ class Compiler
         $new = [];
 
         foreach ($parts as $part) {
-            if (is_array($part)) {
+            if (\is_array($part)) {
                 $part = $this->glueFunctionSelectors($part);
                 $new[] = $part;
             } else {
                 // a selector part finishing with a ) is the last part of a :not( or :nth-child(
                 // and need to be joined to this
-                if (count($new) && is_string($new[count($new) - 1]) &&
-                    strlen($part) && substr($part, -1) === ')' && strpos($part, '(') === false
+                if (
+                    \count($new) && \is_string($new[\count($new) - 1]) &&
+                    \strlen($part) && substr($part, -1) === ')' && strpos($part, '(') === false
                 ) {
-                    while (count($new)>1 && substr($new[count($new) - 1], -1) !== '(') {
+                    while (\count($new) > 1 && substr($new[\count($new) - 1], -1) !== '(') {
                         $part = array_pop($new) . $part;
                     }
-                    $new[count($new) - 1] .= $part;
+                    $new[\count($new) - 1] .= $part;
                 } else {
                     $new[] = $part;
                 }
@@ -535,21 +874,24 @@ class Compiler
     /**
      * Match extends
      *
-     * @param array   $selector
-     * @param array   $out
-     * @param integer $from
-     * @param boolean $initial
+     * @param array $selector
+     * @param array $out
+     * @param int   $from
+     * @param bool  $initial
+     *
+     * @return void
      */
     protected function matchExtends($selector, &$out, $from = 0, $initial = true)
     {
         static $partsPile = [];
         $selector = $this->glueFunctionSelectors($selector);
 
-        if (count($selector) == 1 && in_array(reset($selector), $partsPile)) {
+        if (\count($selector) == 1 && \in_array(reset($selector), $partsPile)) {
             return;
         }
 
         $outRecurs = [];
+
         foreach ($selector as $i => $part) {
             if ($i < $from) {
                 continue;
@@ -557,41 +899,43 @@ class Compiler
 
             // check that we are not building an infinite loop of extensions
             // if the new part is just including a previous part don't try to extend anymore
-            if (count($part) > 1) {
+            if (\count($part) > 1) {
                 foreach ($partsPile as $previousPart) {
-                    if (! count(array_diff($previousPart, $part))) {
+                    if (! \count(array_diff($previousPart, $part))) {
                         continue 2;
                     }
                 }
             }
 
             $partsPile[] = $part;
+
             if ($this->matchExtendsSingle($part, $origin, $initial)) {
-                $after       = array_slice($selector, $i + 1);
-                $before      = array_slice($selector, 0, $i);
+                $after       = \array_slice($selector, $i + 1);
+                $before      = \array_slice($selector, 0, $i);
                 list($before, $nonBreakableBefore) = $this->extractRelationshipFromFragment($before);
 
                 foreach ($origin as $new) {
                     $k = 0;
 
                     // remove shared parts
-                    if (count($new) > 1) {
+                    if (\count($new) > 1) {
                         while ($k < $i && isset($new[$k]) && $selector[$k] === $new[$k]) {
                             $k++;
                         }
                     }
-                    if (count($nonBreakableBefore) and $k == count($new)) {
+
+                    if (\count($nonBreakableBefore) && $k === \count($new)) {
                         $k--;
                     }
 
                     $replacement = [];
-                    $tempReplacement = $k > 0 ? array_slice($new, $k) : $new;
+                    $tempReplacement = $k > 0 ? \array_slice($new, $k) : $new;
 
-                    for ($l = count($tempReplacement) - 1; $l >= 0; $l--) {
+                    for ($l = \count($tempReplacement) - 1; $l >= 0; $l--) {
                         $slice = [];
 
                         foreach ($tempReplacement[$l] as $chunk) {
-                            if (! in_array($chunk, $slice)) {
+                            if (! \in_array($chunk, $slice)) {
                                 $slice[] = $chunk;
                             }
                         }
@@ -603,7 +947,7 @@ class Compiler
                         }
                     }
 
-                    $afterBefore = $l != 0 ? array_slice($tempReplacement, 0, $l) : [];
+                    $afterBefore = $l != 0 ? \array_slice($tempReplacement, 0, $l) : [];
 
                     // Merge shared direct relationships.
                     $mergedBefore = $this->mergeDirectRelationships($afterBefore, $nonBreakableBefore);
@@ -622,17 +966,18 @@ class Compiler
                     $this->pushOrMergeExtentedSelector($out, $result);
 
                     // recursively check for more matches
-                    $startRecurseFrom = count($before) + min(count($nonBreakableBefore), count($mergedBefore));
-                    if (count($origin) > 1) {
+                    $startRecurseFrom = \count($before) + min(\count($nonBreakableBefore), \count($mergedBefore));
+
+                    if (\count($origin) > 1) {
                         $this->matchExtends($result, $out, $startRecurseFrom, false);
                     } else {
                         $this->matchExtends($result, $outRecurs, $startRecurseFrom, false);
                     }
 
                     // selector sequence merging
-                    if (! empty($before) && count($new) > 1) {
-                        $preSharedParts = $k > 0 ? array_slice($before, 0, $k) : [];
-                        $postSharedParts = $k > 0 ? array_slice($before, $k) : $before;
+                    if (! empty($before) && \count($new) > 1) {
+                        $preSharedParts = $k > 0 ? \array_slice($before, 0, $k) : [];
+                        $postSharedParts = $k > 0 ? \array_slice($before, $k) : $before;
 
                         list($betweenSharedParts, $nonBreakabl2) = $this->extractRelationshipFromFragment($afterBefore);
 
@@ -652,7 +997,8 @@ class Compiler
             }
             array_pop($partsPile);
         }
-        while (count($outRecurs)) {
+
+        while (\count($outRecurs)) {
             $result = array_shift($outRecurs);
             $this->pushOrMergeExtentedSelector($out, $result);
         }
@@ -660,16 +1006,21 @@ class Compiler
 
     /**
      * Test a part for being a pseudo selector
+     *
      * @param string $part
-     * @param array $matches
+     * @param array  $matches
+     *
      * @return bool
      */
     protected function isPseudoSelector($part, &$matches)
     {
-        if (strpos($part, ":") === 0
-            && preg_match(",^::?([\w-]+)\((.+)\)$,", $part, $matches)) {
+        if (
+            strpos($part, ':') === 0 &&
+            preg_match(",^::?([\w-]+)\((.+)\)$,", $part, $matches)
+        ) {
             return true;
         }
+
         return false;
     }
 
@@ -679,25 +1030,35 @@ class Compiler
      *  - same as previous
      *  - in a white list
      * in this case we merge the pseudo selector content
+     *
      * @param array $out
      * @param array $extended
+     *
+     * @return void
      */
     protected function pushOrMergeExtentedSelector(&$out, $extended)
     {
-        if (count($out) && count($extended) === 1 && count(reset($extended)) === 1) {
+        if (\count($out) && \count($extended) === 1 && \count(reset($extended)) === 1) {
             $single = reset($extended);
             $part = reset($single);
-            if ($this->isPseudoSelector($part, $matchesExtended)
-              && in_array($matchesExtended[1], [ 'slotted' ])) {
+
+            if (
+                $this->isPseudoSelector($part, $matchesExtended) &&
+                \in_array($matchesExtended[1], [ 'slotted' ])
+            ) {
                 $prev = end($out);
                 $prev = $this->glueFunctionSelectors($prev);
-                if (count($prev) === 1 && count(reset($prev)) === 1) {
+
+                if (\count($prev) === 1 && \count(reset($prev)) === 1) {
                     $single = reset($prev);
                     $part = reset($single);
-                    if ($this->isPseudoSelector($part, $matchesPrev)
-                      && $matchesPrev[1] === $matchesExtended[1]) {
+
+                    if (
+                        $this->isPseudoSelector($part, $matchesPrev) &&
+                        $matchesPrev[1] === $matchesExtended[1]
+                    ) {
                         $extended = explode($matchesExtended[1] . '(', $matchesExtended[0], 2);
-                        $extended[1] = $matchesPrev[2] . ", " . $extended[1];
+                        $extended[1] = $matchesPrev[2] . ', ' . $extended[1];
                         $extended = implode($matchesExtended[1] . '(', $extended);
                         $extended = [ [ $extended ]];
                         array_pop($out);
@@ -713,9 +1074,9 @@ class Compiler
      *
      * @param array $rawSingle
      * @param array $outOrigin
-     * @param bool $initial
+     * @param bool  $initial
      *
-     * @return boolean
+     * @return bool
      */
     protected function matchExtendsSingle($rawSingle, &$outOrigin, $initial = true)
     {
@@ -723,18 +1084,18 @@ class Compiler
         $single = [];
 
         // simple usual cases, no need to do the whole trick
-        if (in_array($rawSingle, [['>'],['+'],['~']])) {
+        if (\in_array($rawSingle, [['>'],['+'],['~']])) {
             return false;
         }
 
         foreach ($rawSingle as $part) {
             // matches Number
-            if (! is_string($part)) {
+            if (! \is_string($part)) {
                 return false;
             }
 
-            if (! preg_match('/^[\[.:#%]/', $part) && count($single)) {
-                $single[count($single) - 1] .= $part;
+            if (! preg_match('/^[\[.:#%]/', $part) && \count($single)) {
+                $single[\count($single) - 1] .= $part;
             } else {
                 $single[] = $part;
             }
@@ -742,7 +1103,7 @@ class Compiler
 
         $extendingDecoratedTag = false;
 
-        if (count($single) > 1) {
+        if (\count($single) > 1) {
             $matches = null;
             $extendingDecoratedTag = preg_match('/^[a-z0-9]+$/i', $single[0], $matches) ? $matches[0] : false;
         }
@@ -756,24 +1117,31 @@ class Compiler
                     $counts[$idx] = isset($counts[$idx]) ? $counts[$idx] + 1 : 1;
                 }
             }
-            if ($initial
-                && $this->isPseudoSelector($part, $matches)
-                && ! in_array($matches[1], [ 'not' ])) {
+
+            if (
+                $initial &&
+                $this->isPseudoSelector($part, $matches) &&
+                ! \in_array($matches[1], [ 'not' ])
+            ) {
                 $buffer    = $matches[2];
                 $parser    = $this->parserFactory(__METHOD__);
-                if ($parser->parseSelector($buffer, $subSelectors)) {
+
+                if ($parser->parseSelector($buffer, $subSelectors, false)) {
                     foreach ($subSelectors as $ksub => $subSelector) {
                         $subExtended = [];
                         $this->matchExtends($subSelector, $subExtended, 0, false);
+
                         if ($subExtended) {
                             $subSelectorsExtended = $subSelectors;
                             $subSelectorsExtended[$ksub] = $subExtended;
+
                             foreach ($subSelectorsExtended as $ksse => $sse) {
                                 $subSelectorsExtended[$ksse] = $this->collapseSelectors($sse);
                             }
+
                             $subSelectorsExtended = implode(', ', $subSelectorsExtended);
                             $singleExtended = $single;
-                            $singleExtended[$k] = str_replace("(".$buffer.")", "($subSelectorsExtended)", $part);
+                            $singleExtended[$k] = str_replace('(' . $buffer . ')', "($subSelectorsExtended)", $part);
                             $outOrigin[] = [ $singleExtended ];
                             $found = true;
                         }
@@ -788,7 +1156,7 @@ class Compiler
             $origin = $this->glueFunctionSelectors($origin);
 
             // check count
-            if ($count !== count($target)) {
+            if ($count !== \count($target)) {
                 continue;
             }
 
@@ -798,14 +1166,15 @@ class Compiler
 
             foreach ($origin as $j => $new) {
                 // prevent infinite loop when target extends itself
-                if ($this->isSelfExtend($single, $origin)) {
+                if ($this->isSelfExtend($single, $origin) && ! $initial) {
                     return false;
                 }
 
                 $replacement = end($new);
 
                 // Extending a decorated tag with another tag is not possible.
-                if ($extendingDecoratedTag && $replacement[0] != $extendingDecoratedTag &&
+                if (
+                    $extendingDecoratedTag && $replacement[0] != $extendingDecoratedTag &&
                     preg_match('/^[a-z0-9]+$/i', $replacement[0])
                 ) {
                     unset($origin[$j]);
@@ -814,8 +1183,8 @@ class Compiler
 
                 $combined = $this->combineSelectorSingle($replacement, $rem);
 
-                if (count(array_diff($combined, $origin[$j][count($origin[$j]) - 1]))) {
-                    $origin[$j][count($origin[$j]) - 1] = $combined;
+                if (\count(array_diff($combined, $origin[$j][\count($origin[$j]) - 1]))) {
+                    $origin[$j][\count($origin[$j]) - 1] = $combined;
                 }
             }
 
@@ -844,11 +1213,11 @@ class Compiler
         $parents = [];
         $children = [];
 
-        $j = $i = count($fragment);
+        $j = $i = \count($fragment);
 
         for (;;) {
-            $children = $j != $i ? array_slice($fragment, $j, $i - $j) : [];
-            $parents  = array_slice($fragment, 0, $j);
+            $children = $j != $i ? \array_slice($fragment, $j, $i - $j) : [];
+            $parents  = \array_slice($fragment, 0, $j);
             $slice    = end($parents);
 
             if (empty($slice) || ! $this->isImmediateRelationshipCombinator($slice[0])) {
@@ -874,8 +1243,15 @@ class Compiler
         $tag    = [];
         $out    = [];
         $wasTag = false;
+        $pseudo = [];
+
+        while (\count($other) && strpos(end($other), ':') === 0) {
+            array_unshift($pseudo, array_pop($other));
+        }
 
         foreach ([array_reverse($base), array_reverse($other)] as $single) {
+            $rang = count($single);
+
             foreach ($single as $part) {
                 if (preg_match('/^[\[:]/', $part)) {
                     $out[] = $part;
@@ -883,21 +1259,26 @@ class Compiler
                 } elseif (preg_match('/^[\.#]/', $part)) {
                     array_unshift($out, $part);
                     $wasTag = false;
-                } elseif (preg_match('/^[^_-]/', $part)) {
+                } elseif (preg_match('/^[^_-]/', $part) && $rang === 1) {
                     $tag[] = $part;
                     $wasTag = true;
                 } elseif ($wasTag) {
-                    $tag[count($tag) - 1] .= $part;
+                    $tag[\count($tag) - 1] .= $part;
                 } else {
-                    $out[] = $part;
+                    array_unshift($out, $part);
                 }
+                $rang--;
             }
         }
 
-        if (count($tag)) {
+        if (\count($tag)) {
             array_unshift($out, $tag[0]);
         }
 
+        while (\count($pseudo)) {
+            $out[] = array_shift($pseudo);
+        }
+
         return $out;
     }
 
@@ -905,14 +1286,18 @@ class Compiler
      * Compile media
      *
      * @param \ScssPhp\ScssPhp\Block $media
+     *
+     * @return void
      */
     protected function compileMedia(Block $media)
     {
+        assert($media instanceof MediaBlock);
         $this->pushEnv($media);
 
         $mediaQueries = $this->compileMediaQuery($this->multiplyMedia($this->env));
 
-        if (! empty($mediaQueries) && $mediaQueries) {
+        if (! empty($mediaQueries)) {
+            assert($this->scope !== null);
             $previousScope = $this->scope;
             $parentScope = $this->mediaParent($this->scope);
 
@@ -929,7 +1314,8 @@ class Compiler
             foreach ($media->children as $child) {
                 $type = $child[0];
 
-                if ($type !== Type::T_BLOCK &&
+                if (
+                    $type !== Type::T_BLOCK &&
                     $type !== Type::T_MEDIA &&
                     $type !== Type::T_DIRECTIVE &&
                     $type !== Type::T_IMPORT
@@ -940,7 +1326,7 @@ class Compiler
             }
 
             if ($needsWrap) {
-                $wrapped = new Block;
+                $wrapped = new Block();
                 $wrapped->sourceName   = $media->sourceName;
                 $wrapped->sourceIndex  = $media->sourceIndex;
                 $wrapped->sourceLine   = $media->sourceLine;
@@ -951,30 +1337,6 @@ class Compiler
                 $wrapped->children     = $media->children;
 
                 $media->children = [[Type::T_BLOCK, $wrapped]];
-
-                if (isset($this->lineNumberStyle)) {
-                    $annotation = $this->makeOutputBlock(Type::T_COMMENT);
-                    $annotation->depth = 0;
-
-                    $file = $this->sourceNames[$media->sourceIndex];
-                    $line = $media->sourceLine;
-
-                    switch ($this->lineNumberStyle) {
-                        case static::LINE_COMMENTS:
-                            $annotation->lines[] = '/* line ' . $line
-                                                 . ($file ? ', ' . $file : '')
-                                                 . ' */';
-                            break;
-
-                        case static::DEBUG_INFO:
-                            $annotation->lines[] = '@media -sass-debug-info{'
-                                                 . ($file ? 'filename{font-family:"' . $file . '"}' : '')
-                                                 . 'line{font-family:' . $line . '}}';
-                            break;
-                    }
-
-                    $this->scope->children[] = $annotation;
-                }
             }
 
             $this->compileChildrenNoReturn($media->children, $this->scope);
@@ -1008,18 +1370,33 @@ class Compiler
     /**
      * Compile directive
      *
-     * @param \ScssPhp\ScssPhp\Block|array $block
+     * @param DirectiveBlock|array                   $directive
      * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $out
+     *
+     * @return void
      */
     protected function compileDirective($directive, OutputBlock $out)
     {
-        if (is_array($directive)) {
-            $s = '@' . $directive[0];
+        if (\is_array($directive)) {
+            $directiveName = $this->compileDirectiveName($directive[0]);
+            $s = '@' . $directiveName;
+
             if (! empty($directive[1])) {
                 $s .= ' ' . $this->compileValue($directive[1]);
             }
-            $this->appendRootDirective($s . ';', $out);
+            // sass-spec compliance on newline after directives, a bit tricky :/
+            $appendNewLine = (! empty($directive[2]) || strpos($s, "\n")) ? "\n" : "";
+            if (\is_array($directive[0]) && empty($directive[1])) {
+                $appendNewLine = "\n";
+            }
+
+            if (empty($directive[3])) {
+                $this->appendRootDirective($s . ';' . $appendNewLine, $out, [Type::T_COMMENT, Type::T_DIRECTIVE]);
+            } else {
+                $this->appendOutputLine($out, Type::T_DIRECTIVE, $s . ';');
+            }
         } else {
+            $directive->name = $this->compileDirectiveName($directive->name);
             $s = '@' . $directive->name;
 
             if (! empty($directive->value)) {
@@ -1034,20 +1411,39 @@ class Compiler
         }
     }
 
+    /**
+     * directive names can include some interpolation
+     *
+     * @param string|array $directiveName
+     * @return string
+     * @throws CompilerException
+     */
+    protected function compileDirectiveName($directiveName)
+    {
+        if (is_string($directiveName)) {
+            return $directiveName;
+        }
+
+        return $this->compileValue($directiveName);
+    }
+
     /**
      * Compile at-root
      *
      * @param \ScssPhp\ScssPhp\Block $block
+     *
+     * @return void
      */
     protected function compileAtRoot(Block $block)
     {
+        assert($block instanceof AtRootBlock);
         $env     = $this->pushEnv($block);
         $envs    = $this->compactEnv($env);
         list($with, $without) = $this->compileWith(isset($block->with) ? $block->with : null);
 
         // wrap inline selector
         if ($block->selector) {
-            $wrapped = new Block;
+            $wrapped = new Block();
             $wrapped->sourceName   = $block->sourceName;
             $wrapped->sourceIndex  = $block->sourceIndex;
             $wrapped->sourceLine   = $block->sourceLine;
@@ -1063,8 +1459,11 @@ class Compiler
         }
 
         $selfParent = $block->selfParent;
+        assert($selfParent !== null, 'at-root blocks must have a selfParent set.');
 
-        if (! $block->selfParent->selectors && isset($block->parent) && $block->parent &&
+        if (
+            ! $selfParent->selectors &&
+            isset($block->parent) &&
             isset($block->parent->selectors) && $block->parent->selectors
         ) {
             $selfParent = $block->parent;
@@ -1072,13 +1471,15 @@ class Compiler
 
         $this->env = $this->filterWithWithout($envs, $with, $without);
 
+        assert($this->scope !== null);
         $saveScope   = $this->scope;
         $this->scope = $this->filterScopeWithWithout($saveScope, $with, $without);
 
         // propagate selfParent to the children where they still can be useful
         $this->compileChildrenNoReturn($block->children, $this->scope, $selfParent);
 
-        $this->scope = $this->completeScope($this->scope, $saveScope);
+        assert($this->scope !== null);
+        $this->completeScope($this->scope, $saveScope);
         $this->scope = $saveScope;
         $this->env   = $this->extractEnv($envs);
 
@@ -1086,25 +1487,26 @@ class Compiler
     }
 
     /**
-     * Filter at-root scope depending of with/without option
+     * Filter at-root scope depending on with/without option
      *
      * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $scope
      * @param array                                  $with
      * @param array                                  $without
      *
-     * @return mixed
+     * @return OutputBlock
      */
     protected function filterScopeWithWithout($scope, $with, $without)
     {
         $filteredScopes = [];
         $childStash = [];
 
-        if ($scope->type === TYPE::T_ROOT) {
+        if ($scope->type === Type::T_ROOT) {
             return $scope;
         }
+        assert($this->rootBlock !== null);
 
         // start from the root
-        while ($scope->parent && $scope->parent->type !== TYPE::T_ROOT) {
+        while ($scope->parent && $scope->parent->type !== Type::T_ROOT) {
             array_unshift($childStash, $scope);
             $scope = $scope->parent;
         }
@@ -1127,7 +1529,7 @@ class Compiler
                 $filteredScopes[] = $s;
             }
 
-            if (count($childStash)) {
+            if (\count($childStash)) {
                 $scope = array_shift($childStash);
             } elseif ($scope->children) {
                 $scope = end($scope->children);
@@ -1136,7 +1538,7 @@ class Compiler
             }
         }
 
-        if (! count($filteredScopes)) {
+        if (! \count($filteredScopes)) {
             return $this->rootBlock;
         }
 
@@ -1147,7 +1549,7 @@ class Compiler
 
         $p = &$newScope;
 
-        while (count($filteredScopes)) {
+        while (\count($filteredScopes)) {
             $s = array_shift($filteredScopes);
             $s->parent = $p;
             $p->children[] = $s;
@@ -1165,11 +1567,11 @@ class Compiler
      * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $scope
      * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $previousScope
      *
-     * @return mixed
+     * @return OutputBlock
      */
     protected function completeScope($scope, $previousScope)
     {
-        if (! $scope->type && (! $scope->selectors || ! count($scope->selectors)) && count($scope->lines)) {
+        if (! $scope->type && ! $scope->selectors && \count($scope->lines)) {
             $scope->selectors = $this->findScopeSelectors($previousScope, $scope->depth);
         }
 
@@ -1186,7 +1588,7 @@ class Compiler
      * Find a selector by the depth node in the scope
      *
      * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $scope
-     * @param integer                                $depth
+     * @param int                                    $depth
      *
      * @return array
      */
@@ -1210,9 +1612,11 @@ class Compiler
     /**
      * Compile @at-root's with: inclusion / without: exclusion into 2 lists uses to filter scope/env later
      *
-     * @param array $withCondition
+     * @param array|null $withCondition
      *
      * @return array
+     *
+     * @phpstan-return array{array<string, bool>, array<string, bool>}
      */
     protected function compileWith($withCondition)
     {
@@ -1221,9 +1625,21 @@ class Compiler
         $without = ['rule' => true];
 
         if ($withCondition) {
-            if ($this->libMapHasKey([$withCondition, static::$with])) {
+            if ($withCondition[0] === Type::T_INTERPOLATE) {
+                $w = $this->compileValue($withCondition);
+
+                $buffer = "($w)";
+                $parser = $this->parserFactory(__METHOD__);
+
+                if ($parser->parseValue($buffer, $reParsedWith)) {
+                    $withCondition = $reParsedWith;
+                }
+            }
+
+            $withConfig = $this->mapGet($withCondition, static::$with);
+            if ($withConfig !== null) {
                 $without = []; // cancel the default
-                $list = $this->coerceList($this->libMapGet([$withCondition, static::$with]));
+                $list = $this->coerceList($withConfig);
 
                 foreach ($list[2] as $item) {
                     $keyword = $this->compileStringContent($this->coerceString($item));
@@ -1232,9 +1648,10 @@ class Compiler
                 }
             }
 
-            if ($this->libMapHasKey([$withCondition, static::$without])) {
+            $withoutConfig = $this->mapGet($withCondition, static::$without);
+            if ($withoutConfig !== null) {
                 $without = []; // cancel the default
-                $list = $this->coerceList($this->libMapGet([$withCondition, static::$without]));
+                $list = $this->coerceList($withoutConfig);
 
                 foreach ($list[2] as $item) {
                     $keyword = $this->compileStringContent($this->coerceString($item));
@@ -1250,11 +1667,13 @@ class Compiler
     /**
      * Filter env stack
      *
-     * @param array   $envs
+     * @param Environment[] $envs
      * @param array $with
      * @param array $without
      *
-     * @return \ScssPhp\ScssPhp\Compiler\Environment
+     * @return Environment
+     *
+     * @phpstan-param  non-empty-array<Environment> $envs
      */
     protected function filterWithWithout($envs, $with, $without)
     {
@@ -1282,7 +1701,7 @@ class Compiler
      * @param array                                                         $with
      * @param array                                                         $without
      *
-     * @return boolean
+     * @return bool
      */
     protected function isWith($block, $with, $without)
     {
@@ -1292,8 +1711,9 @@ class Compiler
             }
 
             if ($block->type === Type::T_DIRECTIVE) {
+                assert($block instanceof DirectiveBlock || $block instanceof OutputBlock);
                 if (isset($block->name)) {
-                    return $this->testWithWithout($block->name, $with, $without);
+                    return $this->testWithWithout($this->compileDirectiveName($block->name), $with, $without);
                 } elseif (isset($block->selectors) && preg_match(',@(\w+),ims', json_encode($block->selectors), $m)) {
                     return $this->testWithWithout($m[1], $with, $without);
                 } else {
@@ -1302,14 +1722,14 @@ class Compiler
             }
         } elseif (isset($block->selectors)) {
             // a selector starting with number is a keyframe rule
-            if (count($block->selectors)) {
+            if (\count($block->selectors)) {
                 $s = reset($block->selectors);
 
-                while (is_array($s)) {
+                while (\is_array($s)) {
                     $s = reset($s);
                 }
 
-                if (is_object($s) && $s instanceof Node\Number) {
+                if (\is_object($s) && $s instanceof Number) {
                     return $this->testWithWithout('keyframes', $with, $without);
                 }
             }
@@ -1327,14 +1747,13 @@ class Compiler
      * @param array  $with
      * @param array  $without
      *
-     * @return boolean
+     * @return bool
      *   true if the block should be kept, false to reject
      */
     protected function testWithWithout($what, $with, $without)
     {
-
         // if without, reject only if in the list (or 'all' is in the list)
-        if (count($without)) {
+        if (\count($without)) {
             return (isset($without[$what]) || isset($without['all'])) ? false : true;
         }
 
@@ -1347,7 +1766,9 @@ class Compiler
      * Compile keyframe block
      *
      * @param \ScssPhp\ScssPhp\Block $block
-     * @param array                  $selectors
+     * @param string[]               $selectors
+     *
+     * @return void
      */
     protected function compileKeyframeBlock(Block $block, $selectors)
     {
@@ -1361,10 +1782,12 @@ class Compiler
 
         $this->scope = $this->makeOutputBlock($block->type, $selectors);
         $this->scope->depth = 1;
+        assert($this->scope->parent !== null);
         $this->scope->parent->children[] = $this->scope;
 
         $this->compileChildrenNoReturn($block->children, $this->scope);
 
+        assert($this->scope !== null);
         $this->scope = $this->scope->parent;
         $this->env   = $this->extractEnv($envs);
 
@@ -1374,11 +1797,14 @@ class Compiler
     /**
      * Compile nested properties lines
      *
-     * @param \ScssPhp\ScssPhp\Block $block
-     * @param OutputBlock            $out
+     * @param \ScssPhp\ScssPhp\Block                 $block
+     * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $out
+     *
+     * @return void
      */
     protected function compileNestedPropertiesBlock(Block $block, OutputBlock $out)
     {
+        assert($block instanceof NestedPropertyBlock);
         $prefix = $this->compileValue($block->prefix) . '-';
 
         $nested = $this->makeOutputBlock($block->type);
@@ -1397,6 +1823,7 @@ class Compiler
                     break;
 
                 case Type::T_NESTED_PROPERTY:
+                    assert($child[1] instanceof NestedPropertyBlock);
                     array_unshift($child[1]->prefix[2], $prefix);
                     break;
             }
@@ -1409,18 +1836,21 @@ class Compiler
      * Compile nested block
      *
      * @param \ScssPhp\ScssPhp\Block $block
-     * @param array                  $selectors
+     * @param string[]               $selectors
+     *
+     * @return void
      */
     protected function compileNestedBlock(Block $block, $selectors)
     {
         $this->pushEnv($block);
 
         $this->scope = $this->makeOutputBlock($block->type, $selectors);
+        assert($this->scope->parent !== null);
         $this->scope->parent->children[] = $this->scope;
 
         // wrap assign children in a block
         // except for @font-face
-        if ($block->type !== Type::T_DIRECTIVE || $block->name !== "font-face") {
+        if (!$block instanceof DirectiveBlock || $this->compileDirectiveName($block->name) !== 'font-face') {
             // need wrapping?
             $needWrapping = false;
 
@@ -1432,7 +1862,7 @@ class Compiler
             }
 
             if ($needWrapping) {
-                $wrapped = new Block;
+                $wrapped = new Block();
                 $wrapped->sourceName   = $block->sourceName;
                 $wrapped->sourceIndex  = $block->sourceIndex;
                 $wrapped->sourceLine   = $block->sourceLine;
@@ -1449,6 +1879,7 @@ class Compiler
 
         $this->compileChildrenNoReturn($block->children, $this->scope);
 
+        assert($this->scope !== null);
         $this->scope = $this->scope->parent;
 
         $this->popEnv();
@@ -1471,41 +1902,21 @@ class Compiler
      * @see Compiler::compileChild()
      *
      * @param \ScssPhp\ScssPhp\Block $block
+     *
+     * @return void
      */
     protected function compileBlock(Block $block)
     {
         $env = $this->pushEnv($block);
+        assert($block->selectors !== null);
         $env->selectors = $this->evalSelectors($block->selectors);
 
         $out = $this->makeOutputBlock(null);
 
-        if (isset($this->lineNumberStyle) && count($env->selectors) && count($block->children)) {
-            $annotation = $this->makeOutputBlock(Type::T_COMMENT);
-            $annotation->depth = 0;
-
-            $file = $this->sourceNames[$block->sourceIndex];
-            $line = $block->sourceLine;
-
-            switch ($this->lineNumberStyle) {
-                case static::LINE_COMMENTS:
-                    $annotation->lines[] = '/* line ' . $line
-                                         . ($file ? ', ' . $file : '')
-                                         . ' */';
-                    break;
-
-                case static::DEBUG_INFO:
-                    $annotation->lines[] = '@media -sass-debug-info{'
-                                         . ($file ? 'filename{font-family:"' . $file . '"}' : '')
-                                         . 'line{font-family:' . $line . '}}';
-                    break;
-            }
-
-            $this->scope->children[] = $annotation;
-        }
-
+        assert($this->scope !== null);
         $this->scope->children[] = $out;
 
-        if (count($block->children)) {
+        if (\count($block->children)) {
             $out->selectors = $this->multiplySelectors($env, $block->selfParent);
 
             // propagate selfParent to the children where they still can be useful
@@ -1520,6 +1931,7 @@ class Compiler
 
             // and revert for the following children of the same block
             if ($selfParentSelectors) {
+                assert($block->selfParent !== null);
                 $block->selfParent->selectors = $selfParentSelectors;
             }
         }
@@ -1531,10 +1943,10 @@ class Compiler
     /**
      * Compile the value of a comment that can have interpolation
      *
-     * @param array   $value
-     * @param boolean $pushEnv
+     * @param array $value
+     * @param bool  $pushEnv
      *
-     * @return array|mixed|string
+     * @return string
      */
     protected function compileCommentValue($value, $pushEnv = false)
     {
@@ -1543,18 +1955,19 @@ class Compiler
         if (isset($value[2])) {
             if ($pushEnv) {
                 $this->pushEnv();
-                $storeEnv = $this->storeEnv;
-                $this->storeEnv = $this->env;
             }
 
             try {
                 $c = $this->compileValue($value[2]);
-            } catch (\Exception $e) {
+            } catch (SassScriptException $e) {
+                $this->logger->warn('Ignoring interpolation errors in multiline comments is deprecated and will be removed in ScssPhp 2.0. ' . $this->addLocationToMessage($e->getMessage()), true);
+                // ignore error in comment compilation which are only interpolation
+            } catch (SassException $e) {
+                $this->logger->warn('Ignoring interpolation errors in multiline comments is deprecated and will be removed in ScssPhp 2.0. ' . $e->getMessage(), true);
                 // ignore error in comment compilation which are only interpolation
             }
 
             if ($pushEnv) {
-                $this->storeEnv = $storeEnv;
                 $this->popEnv();
             }
         }
@@ -1566,12 +1979,15 @@ class Compiler
      * Compile root level comment
      *
      * @param array $block
+     *
+     * @return void
      */
     protected function compileComment($block)
     {
         $out = $this->makeOutputBlock(Type::T_COMMENT);
         $out->lines[] = $this->compileCommentValue($block, true);
 
+        assert($this->scope !== null);
         $this->scope->children[] = $out;
     }
 
@@ -1586,15 +2002,25 @@ class Compiler
     {
         $this->shouldEvaluate = false;
 
-        $selectors = array_map([$this, 'evalSelector'], $selectors);
+        $evaluatedSelectors = [];
+        foreach ($selectors as $selector) {
+            $evaluatedSelectors[] = $this->evalSelector($selector);
+        }
+        $selectors = $evaluatedSelectors;
 
         // after evaluating interpolates, we might need a second pass
         if ($this->shouldEvaluate) {
-            $selectors = $this->revertSelfSelector($selectors);
+            $selectors = $this->replaceSelfSelector($selectors, '&');
             $buffer    = $this->collapseSelectors($selectors);
             $parser    = $this->parserFactory(__METHOD__);
 
-            if ($parser->parseSelector($buffer, $newSelectors)) {
+            try {
+                $isValid = $parser->parseSelector($buffer, $newSelectors, true);
+            } catch (ParserException $e) {
+                throw $this->error($e->getMessage());
+            }
+
+            if ($isValid) {
                 $selectors = array_map([$this, 'evalSelector'], $newSelectors);
             }
         }
@@ -1608,6 +2034,8 @@ class Compiler
      * @param array $selector
      *
      * @return array
+     *
+     * @phpstan-impure
      */
     protected function evalSelector($selector)
     {
@@ -1620,20 +2048,23 @@ class Compiler
      * @param array $part
      *
      * @return array
+     *
+     * @phpstan-impure
      */
     protected function evalSelectorPart($part)
     {
         foreach ($part as &$p) {
-            if (is_array($p) && ($p[0] === Type::T_INTERPOLATE || $p[0] === Type::T_STRING)) {
+            if (\is_array($p) && ($p[0] === Type::T_INTERPOLATE || $p[0] === Type::T_STRING)) {
                 $p = $this->compileValue($p);
 
-                // force re-evaluation
-                if (strpos($p, '&') !== false || strpos($p, ',') !== false) {
+                // force re-evaluation if self char or non standard char
+                if (preg_match(',[^\w-],', $p)) {
                     $this->shouldEvaluate = true;
                 }
-            } elseif (is_string($p) && strlen($p) >= 2 &&
-                ($first = $p[0]) && ($first === '"' || $first === "'") &&
-                substr($p, -1) === $first
+            } elseif (
+                \is_string($p) && \strlen($p) >= 2 &&
+                ($p[0] === '"' || $p[0] === "'") &&
+                substr($p, -1) === $p[0]
             ) {
                 $p = substr($p, 1, -1);
             }
@@ -1645,14 +2076,44 @@ class Compiler
     /**
      * Collapse selectors
      *
-     * @param array   $selectors
-     * @param boolean $selectorFormat
-     *   if false return a collapsed string
-     *   if true return an array description of a structured selector
+     * @param array $selectors
      *
      * @return string
      */
-    protected function collapseSelectors($selectors, $selectorFormat = false)
+    protected function collapseSelectors($selectors)
+    {
+        $parts = [];
+
+        foreach ($selectors as $selector) {
+            $output = [];
+
+            foreach ($selector as $node) {
+                $compound = '';
+
+                array_walk_recursive(
+                    $node,
+                    function ($value, $key) use (&$compound) {
+                        $compound .= $value;
+                    }
+                );
+
+                $output[] = $compound;
+            }
+
+            $parts[] = implode(' ', $output);
+        }
+
+        return implode(', ', $parts);
+    }
+
+    /**
+     * Collapse selectors
+     *
+     * @param array $selectors
+     *
+     * @return array
+     */
+    private function collapseSelectorsAsList($selectors)
     {
         $parts = [];
 
@@ -1670,59 +2131,52 @@ class Compiler
                     }
                 );
 
-                if ($selectorFormat && $this->isImmediateRelationshipCombinator($compound)) {
-                    if (count($output)) {
-                        $output[count($output) - 1] .= ' ' . $compound;
+                if ($this->isImmediateRelationshipCombinator($compound)) {
+                    if (\count($output)) {
+                        $output[\count($output) - 1] .= ' ' . $compound;
                     } else {
                         $output[] = $compound;
                     }
 
                     $glueNext = true;
                 } elseif ($glueNext) {
-                    $output[count($output) - 1] .= ' ' . $compound;
+                    $output[\count($output) - 1] .= ' ' . $compound;
                     $glueNext = false;
                 } else {
                     $output[] = $compound;
                 }
             }
 
-            if ($selectorFormat) {
-                foreach ($output as &$o) {
-                    $o = [Type::T_STRING, '', [$o]];
-                }
-
-                $output = [Type::T_LIST, ' ', $output];
-            } else {
-                $output = implode(' ', $output);
+            foreach ($output as &$o) {
+                $o = [Type::T_STRING, '', [$o]];
             }
 
-            $parts[] = $output;
+            $parts[] = [Type::T_LIST, ' ', $output];
         }
 
-        if ($selectorFormat) {
-            $parts = [Type::T_LIST, ',', $parts];
-        } else {
-            $parts = implode(', ', $parts);
-        }
-
-        return $parts;
+        return [Type::T_LIST, ',', $parts];
     }
 
     /**
      * Parse down the selector and revert [self] to "&" before a reparsing
      *
-     * @param array $selectors
+     * @param array       $selectors
+     * @param string|null $replace
      *
      * @return array
      */
-    protected function revertSelfSelector($selectors)
+    protected function replaceSelfSelector($selectors, $replace = null)
     {
         foreach ($selectors as &$part) {
-            if (is_array($part)) {
+            if (\is_array($part)) {
                 if ($part === [Type::T_SELF]) {
-                    $part = '&';
+                    if (\is_null($replace)) {
+                        $replace = $this->reduce([Type::T_SELF]);
+                        $replace = $this->compileValue($replace);
+                    }
+                    $part = $replace;
                 } else {
-                    $part = $this->revertSelfSelector($part);
+                    $part = $this->replaceSelfSelector($part, $replace);
                 }
             }
         }
@@ -1742,18 +2196,19 @@ class Compiler
         $joined = [];
 
         foreach ($single as $part) {
-            if (empty($joined) ||
-                ! is_string($part) ||
+            if (
+                empty($joined) ||
+                ! \is_string($part) ||
                 preg_match('/[\[.:#%]/', $part)
             ) {
                 $joined[] = $part;
                 continue;
             }
 
-            if (is_array(end($joined))) {
+            if (\is_array(end($joined))) {
                 $joined[] = $part;
             } else {
-                $joined[count($joined) - 1] .= $part;
+                $joined[\count($joined) - 1] .= $part;
             }
         }
 
@@ -1769,7 +2224,7 @@ class Compiler
      */
     protected function compileSelector($selector)
     {
-        if (! is_array($selector)) {
+        if (! \is_array($selector)) {
             return $selector; // media and the like
         }
 
@@ -1792,7 +2247,7 @@ class Compiler
     protected function compileSelectorPart($piece)
     {
         foreach ($piece as &$p) {
-            if (! is_array($p)) {
+            if (! \is_array($p)) {
                 continue;
             }
 
@@ -1815,17 +2270,17 @@ class Compiler
      *
      * @param array $selector
      *
-     * @return boolean
+     * @return bool
      */
     protected function hasSelectorPlaceholder($selector)
     {
-        if (! is_array($selector)) {
+        if (! \is_array($selector)) {
             return false;
         }
 
         foreach ($selector as $parts) {
             foreach ($parts as $part) {
-                if (strlen($part) && '%' === $part[0]) {
+                if (\strlen($part) && '%' === $part[0]) {
                     return true;
                 }
             }
@@ -1834,6 +2289,11 @@ class Compiler
         return false;
     }
 
+    /**
+     * @param string $name
+     *
+     * @return void
+     */
     protected function pushCallStack($name = '')
     {
         $this->callStack[] = [
@@ -1844,15 +2304,18 @@ class Compiler
         ];
 
         // infinite calling loop
-        if (count($this->callStack) > 25000) {
+        if (\count($this->callStack) > 25000) {
             // not displayed but you can var_dump it to deep debug
             $msg = $this->callStackMessage(true, 100);
-            $msg = "Infinite calling loop";
+            $msg = 'Infinite calling loop';
 
-            $this->throwError($msg);
+            throw $this->error($msg);
         }
     }
 
+    /**
+     * @return void
+     */
     protected function popCallStack()
     {
         array_pop($this->callStack);
@@ -1865,7 +2328,7 @@ class Compiler
      * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $out
      * @param string                                 $traceName
      *
-     * @return array|null
+     * @return array|Number|null
      */
     protected function compileChildren($stms, OutputBlock $out, $traceName = '')
     {
@@ -1875,6 +2338,8 @@ class Compiler
             $ret = $this->compileChild($stm, $out);
 
             if (isset($ret)) {
+                $this->popCallStack();
+
                 return $ret;
             }
         }
@@ -1885,13 +2350,15 @@ class Compiler
     }
 
     /**
-     * Compile children and throw exception if unexpected @return
+     * Compile children and throw exception if unexpected `@return`
      *
      * @param array                                  $stms
      * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $out
      * @param \ScssPhp\ScssPhp\Block                 $selfParent
      * @param string                                 $traceName
      *
+     * @return void
+     *
      * @throws \Exception
      */
     protected function compileChildrenNoReturn($stms, OutputBlock $out, $selfParent = null, $traceName = '')
@@ -1899,11 +2366,11 @@ class Compiler
         $this->pushCallStack($traceName);
 
         foreach ($stms as $stm) {
-            if ($selfParent && isset($stm[1]) && is_object($stm[1]) && $stm[1] instanceof Block) {
+            if ($selfParent && isset($stm[1]) && \is_object($stm[1]) && $stm[1] instanceof Block) {
                 $stm[1]->selfParent = $selfParent;
                 $ret = $this->compileChild($stm, $out);
                 $stm[1]->selfParent = null;
-            } elseif ($selfParent && in_array($stm[0], [TYPE::T_INCLUDE, TYPE::T_EXTEND])) {
+            } elseif ($selfParent && \in_array($stm[0], [Type::T_INCLUDE, Type::T_EXTEND])) {
                 $stm['selfParent'] = $selfParent;
                 $ret = $this->compileChild($stm, $out);
                 unset($stm['selfParent']);
@@ -1912,9 +2379,7 @@ class Compiler
             }
 
             if (isset($ret)) {
-                $this->throwError('@return may only be used within a function');
-
-                return;
+                throw $this->error('@return may only be used within a function');
             }
         }
 
@@ -1923,7 +2388,7 @@ class Compiler
 
 
     /**
-     * evaluate media query : compile internal value keeping the structure inchanged
+     * evaluate media query : compile internal value keeping the structure unchanged
      *
      * @param array $queryList
      *
@@ -1939,12 +2404,13 @@ class Compiler
             $shouldReparse = false;
 
             foreach ($query as $kq => $q) {
-                for ($i = 1; $i < count($q); $i++) {
+                for ($i = 1; $i < \count($q); $i++) {
                     $value = $this->compileValue($q[$i]);
 
                     // the parser had no mean to know if media type or expression if it was an interpolation
                     // so you need to reparse if the T_MEDIA_TYPE looks like anything else a media type
-                    if ($q[0] == Type::T_MEDIA_TYPE &&
+                    if (
+                        $q[0] == Type::T_MEDIA_TYPE &&
                         (strpos($value, '(') !== false ||
                         strpos($value, ')') !== false ||
                         strpos($value, ':') !== false ||
@@ -1958,21 +2424,21 @@ class Compiler
             }
 
             if ($shouldReparse) {
-                if (is_null($parser)) {
+                if (\is_null($parser)) {
                     $parser = $this->parserFactory(__METHOD__);
                 }
 
                 $queryString = $this->compileMediaQuery([$queryList[$kql]]);
                 $queryString = reset($queryString);
 
-                if (strpos($queryString, '@media ') === 0) {
+                if ($queryString !== false && strpos($queryString, '@media ') === 0) {
                     $queryString = substr($queryString, 7);
                     $queries = [];
 
                     if ($parser->parseMediaQueryList($queryString, $queries)) {
                         $queries = $this->evaluateMediaQuery($queries[2]);
 
-                        while (count($queries)) {
+                        while (\count($queries)) {
                             $outQueryList[] = array_shift($queries);
                         }
 
@@ -1992,14 +2458,14 @@ class Compiler
      *
      * @param array $queryList
      *
-     * @return array
+     * @return string[]
      */
     protected function compileMediaQuery($queryList)
     {
         $start   = '@media ';
         $default = trim($start);
         $out     = [];
-        $current = "";
+        $current = '';
 
         foreach ($queryList as $query) {
             $type = null;
@@ -2017,17 +2483,17 @@ class Compiler
             foreach ($query as $q) {
                 switch ($q[0]) {
                     case Type::T_MEDIA_TYPE:
-                        $newType = array_map([$this, 'compileValue'], array_slice($q, 1));
+                        $newType = array_map([$this, 'compileValue'], \array_slice($q, 1));
 
                         // combining not and anything else than media type is too risky and should be avoided
                         if (! $mediaTypeOnly) {
-                            if (in_array(Type::T_NOT, $newType) || ($type && in_array(Type::T_NOT, $type) )) {
+                            if (\in_array(Type::T_NOT, $newType) || ($type && \in_array(Type::T_NOT, $type) )) {
                                 if ($type) {
                                     array_unshift($parts, implode(' ', array_filter($type)));
                                 }
 
                                 if (! empty($parts)) {
-                                    if (strlen($current)) {
+                                    if (\strlen($current)) {
                                         $current .= $this->formatter->tagSeparator;
                                     }
 
@@ -2038,7 +2504,7 @@ class Compiler
                                     $out[] = $start . $current;
                                 }
 
-                                $current = "";
+                                $current = '';
                                 $type    = null;
                                 $parts   = [];
                             }
@@ -2090,7 +2556,7 @@ class Compiler
             }
 
             if (! empty($parts)) {
-                if (strlen($current)) {
+                if (\strlen($current)) {
                     $current .= $this->formatter->tagSeparator;
                 }
 
@@ -2172,7 +2638,7 @@ class Compiler
             return $type1;
         }
 
-        if (count($type1) > 1) {
+        if (\count($type1) > 1) {
             $m1 = strtolower($type1[0]);
             $t1 = strtolower($type1[1]);
         } else {
@@ -2180,7 +2646,7 @@ class Compiler
             $t1 = strtolower($type1[0]);
         }
 
-        if (count($type2) > 1) {
+        if (\count($type2) > 1) {
             $m2 = strtolower($type2[0]);
             $t2 = strtolower($type2[1]);
         } else {
@@ -2213,7 +2679,7 @@ class Compiler
         }
 
         // t1 == t2, neither m1 nor m2 are "not"
-        return [empty($m1)? $m2 : $m1, $t1];
+        return [empty($m1) ? $m2 : $m1, $t1];
     }
 
     /**
@@ -2221,38 +2687,40 @@ class Compiler
      *
      * @param array                                  $rawPath
      * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $out
-     * @param boolean                                $once
+     * @param bool                                   $once
      *
-     * @return boolean
+     * @return bool
      */
     protected function compileImport($rawPath, OutputBlock $out, $once = false)
     {
         if ($rawPath[0] === Type::T_STRING) {
             $path = $this->compileStringContent($rawPath);
 
-            if ($path = $this->findImport($path)) {
-                if (! $once || ! in_array($path, $this->importedFiles)) {
-                    $this->importFile($path, $out);
-                    $this->importedFiles[] = $path;
+            if (strpos($path, 'url(') !== 0 && $filePath = $this->findImport($path, $this->currentDirectory)) {
+                $this->registerImport($this->currentDirectory, $path, $filePath);
+
+                if (! $once || ! \in_array($filePath, $this->importedFiles)) {
+                    $this->importFile($filePath, $out);
+                    $this->importedFiles[] = $filePath;
                 }
 
                 return true;
             }
 
-            $this->appendRootDirective('@import ' . $this->compileValue($rawPath). ';', $out);
+            $this->appendRootDirective('@import ' . $this->compileImportPath($rawPath) . ';', $out);
 
             return false;
         }
 
         if ($rawPath[0] === Type::T_LIST) {
             // handle a list of strings
-            if (count($rawPath[2]) === 0) {
+            if (\count($rawPath[2]) === 0) {
                 return false;
             }
 
             foreach ($rawPath[2] as $path) {
                 if ($path[0] !== Type::T_STRING) {
-                    $this->appendRootDirective('@import ' . $this->compileValue($rawPath) . ';', $out);
+                    $this->appendRootDirective('@import ' . $this->compileImportPath($rawPath) . ';', $out);
 
                     return false;
                 }
@@ -2265,19 +2733,68 @@ class Compiler
             return true;
         }
 
-        $this->appendRootDirective('@import ' . $this->compileValue($rawPath) . ';', $out);
+        $this->appendRootDirective('@import ' . $this->compileImportPath($rawPath) . ';', $out);
 
         return false;
     }
 
+    /**
+     * @param array $rawPath
+     * @return string
+     * @throws CompilerException
+     */
+    protected function compileImportPath($rawPath)
+    {
+        $path = $this->compileValue($rawPath);
+
+        // case url() without quotes : suppress \r \n remaining in the path
+        // if this is a real string there can not be CR or LF char
+        if (strpos($path, 'url(') === 0) {
+            $path = str_replace(array("\r", "\n"), array('', ' '), $path);
+        } else {
+            // if this is a file name in a string, spaces should be escaped
+            $path = $this->reduce($rawPath);
+            $path = $this->escapeImportPathString($path);
+            $path = $this->compileValue($path);
+        }
+
+        return $path;
+    }
+
+    /**
+     * @param array $path
+     * @return array
+     * @throws CompilerException
+     */
+    protected function escapeImportPathString($path)
+    {
+        switch ($path[0]) {
+            case Type::T_LIST:
+                foreach ($path[2] as $k => $v) {
+                    $path[2][$k] = $this->escapeImportPathString($v);
+                }
+                break;
+            case Type::T_STRING:
+                if ($path[1]) {
+                    $path = $this->compileValue($path);
+                    $path = str_replace(' ', '\\ ', $path);
+                    $path = [Type::T_KEYWORD, $path];
+                }
+                break;
+        }
+
+        return $path;
+    }
 
     /**
      * Append a root directive like @import or @charset as near as the possible from the source code
      * (keeping before comments, @import and @charset coming before in the source code)
      *
-     * @param string                                        $line
-     * @param @param \ScssPhp\ScssPhp\Formatter\OutputBlock $out
-     * @param array                                         $allowed
+     * @param string                                 $line
+     * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $out
+     * @param array                                  $allowed
+     *
+     * @return void
      */
     protected function appendRootDirective($line, $out, $allowed = [Type::T_COMMENT])
     {
@@ -2289,8 +2806,8 @@ class Compiler
 
         $i = 0;
 
-        while ($i < count($root->children)) {
-            if (! isset($root->children[$i]->type) || ! in_array($root->children[$i]->type, $allowed)) {
+        while ($i < \count($root->children)) {
+            if (! isset($root->children[$i]->type) || ! \in_array($root->children[$i]->type, $allowed)) {
                 break;
             }
 
@@ -2300,21 +2817,21 @@ class Compiler
         // remove incompatible children from the bottom of the list
         $saveChildren = [];
 
-        while ($i < count($root->children)) {
+        while ($i < \count($root->children)) {
             $saveChildren[] = array_pop($root->children);
         }
 
         // insert the directive as a comment
         $child = $this->makeOutputBlock(Type::T_COMMENT);
         $child->lines[]      = $line;
-        $child->sourceName   = $this->sourceNames[$this->sourceIndex];
+        $child->sourceName   = $this->sourceNames[$this->sourceIndex] ?: '(stdin)';
         $child->sourceLine   = $this->sourceLine;
         $child->sourceColumn = $this->sourceColumn;
 
         $root->children[] = $child;
 
         // repush children
-        while (count($saveChildren)) {
+        while (\count($saveChildren)) {
             $root->children[] = array_pop($saveChildren);
         }
     }
@@ -2325,25 +2842,23 @@ class Compiler
      *
      * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $out
      * @param string                                 $type
-     * @param string|mixed                           $line
+     * @param string                                 $line
+     *
+     * @return void
      */
     protected function appendOutputLine(OutputBlock $out, $type, $line)
     {
         $outWrite = &$out;
 
-        if ($type === Type::T_COMMENT) {
-            $parent = $out->parent;
-
-            if (end($parent->children) !== $out) {
-                $outWrite = &$parent->children[count($parent->children) - 1];
-            }
-        }
-
         // check if it's a flat output or not
-        if (count($out->children)) {
-            $lastChild = &$out->children[count($out->children) - 1];
+        if (\count($out->children)) {
+            $lastChild = &$out->children[\count($out->children) - 1];
 
-            if ($lastChild->depth === $out->depth && is_null($lastChild->selectors) && ! count($lastChild->children)) {
+            if (
+                $lastChild->depth === $out->depth &&
+                \is_null($lastChild->selectors) &&
+                ! \count($lastChild->children)
+            ) {
                 $outWrite = $lastChild;
             } else {
                 $nextLines = $this->makeOutputBlock($type);
@@ -2364,7 +2879,7 @@ class Compiler
      * @param array                                  $child
      * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $out
      *
-     * @return array
+     * @return array|Number|null
      */
     protected function compileChild($child, OutputBlock $out)
     {
@@ -2372,18 +2887,19 @@ class Compiler
             $this->sourceIndex  = isset($child[Parser::SOURCE_INDEX]) ? $child[Parser::SOURCE_INDEX] : null;
             $this->sourceLine   = isset($child[Parser::SOURCE_LINE]) ? $child[Parser::SOURCE_LINE] : -1;
             $this->sourceColumn = isset($child[Parser::SOURCE_COLUMN]) ? $child[Parser::SOURCE_COLUMN] : -1;
-        } elseif (is_array($child) && isset($child[1]->sourceLine)) {
+        } elseif (\is_array($child) && isset($child[1]->sourceLine) && $child[1] instanceof Block) {
             $this->sourceIndex  = $child[1]->sourceIndex;
             $this->sourceLine   = $child[1]->sourceLine;
             $this->sourceColumn = $child[1]->sourceColumn;
         } elseif (! empty($out->sourceLine) && ! empty($out->sourceName)) {
             $this->sourceLine   = $out->sourceLine;
-            $this->sourceIndex  = array_search($out->sourceName, $this->sourceNames);
+            $sourceIndex  = array_search($out->sourceName, $this->sourceNames);
             $this->sourceColumn = $out->sourceColumn;
 
-            if ($this->sourceIndex === false) {
-                $this->sourceIndex = null;
+            if ($sourceIndex === false) {
+                $sourceIndex = null;
             }
+            $this->sourceIndex = $sourceIndex;
         }
 
         switch ($child[0]) {
@@ -2416,10 +2932,30 @@ class Compiler
                 break;
 
             case Type::T_CHARSET:
-                if (! $this->charsetSeen) {
-                    $this->charsetSeen = true;
-                    $this->appendRootDirective('@charset ' . $this->compileValue($child[1]) . ';', $out);
+                break;
+
+            case Type::T_CUSTOM_PROPERTY:
+                list(, $name, $value) = $child;
+                $compiledName = $this->compileValue($name);
+
+                // if the value reduces to null from something else then
+                // the property should be discarded
+                if ($value[0] !== Type::T_NULL) {
+                    $value = $this->reduce($value);
+
+                    if ($value[0] === Type::T_NULL || $value === static::$nullString) {
+                        break;
+                    }
                 }
+
+                $compiledValue = $this->compileValue($value);
+
+                $line = $this->formatter->customProperty(
+                    $compiledName,
+                    $compiledValue
+                );
+
+                $this->appendOutputLine($out, Type::T_ASSIGN, $line);
                 break;
 
             case Type::T_ASSIGN:
@@ -2427,8 +2963,8 @@ class Compiler
 
                 if ($name[0] === Type::T_VARIABLE) {
                     $flags     = isset($child[3]) ? $child[3] : [];
-                    $isDefault = in_array('!default', $flags);
-                    $isGlobal  = in_array('!global', $flags);
+                    $isDefault = \in_array('!default', $flags);
+                    $isGlobal  = \in_array('!global', $flags);
 
                     if ($isGlobal) {
                         $this->set($name[1], $this->reduce($value), false, $this->rootEnv, $value);
@@ -2436,7 +2972,7 @@ class Compiler
                     }
 
                     $shouldSet = $isDefault &&
-                        (is_null($result = $this->get($name[1], false)) ||
+                        (\is_null($result = $this->get($name[1], false)) ||
                         $result === static::$null);
 
                     if (! $isDefault || $shouldSet) {
@@ -2448,7 +2984,7 @@ class Compiler
                 $compiledName = $this->compileValue($name);
 
                 // handle shorthand syntaxes : size / line-height...
-                if (in_array($compiledName, ['font', 'grid-row', 'grid-column', 'border-radius'])) {
+                if (\in_array($compiledName, ['font', 'grid-row', 'grid-column', 'border-radius'])) {
                     if ($value[0] === Type::T_VARIABLE) {
                         // if the font value comes from variable, the content is already reduced
                         // (i.e., formulas were already calculated), so we need the original unreduced value
@@ -2468,7 +3004,7 @@ class Compiler
                             break;
                     }
 
-                    if ($compiledName === 'font' and $value[0] === Type::T_LIST && $value[1]==',') {
+                    if ($compiledName === 'font' && $value[0] === Type::T_LIST && $value[1] === ',') {
                         // this is the case if more than one font is given: example: "font: 400 1em/1.3 arial,helvetica"
                         // we need to handle the first list element
                         $shorthandValue=&$value[2][0];
@@ -2480,11 +3016,11 @@ class Compiler
                         if ($shorthandDividerNeedsUnit) {
                             $divider = $shorthandValue[3];
 
-                            if (is_array($divider)) {
+                            if (\is_array($divider)) {
                                 $divider = $this->reduce($divider, true);
                             }
 
-                            if (intval($divider->dimension) and !count($divider->units)) {
+                            if ($divider instanceof Number && \intval($divider->getDimension()) && $divider->unitless()) {
                                 $revert = false;
                             }
                         }
@@ -2497,17 +3033,18 @@ class Compiler
                             if ($item[0] === Type::T_EXPRESSION && $item[1] === '/') {
                                 if ($maxShorthandDividers > 0) {
                                     $revert = true;
+
                                     // if the list of values is too long, this has to be a shorthand,
                                     // otherwise it could be a real division
-                                    if (is_null($maxListElements) or count($shorthandValue[2]) <= $maxListElements) {
+                                    if (\is_null($maxListElements) || \count($shorthandValue[2]) <= $maxListElements) {
                                         if ($shorthandDividerNeedsUnit) {
                                             $divider = $item[3];
 
-                                            if (is_array($divider)) {
+                                            if (\is_array($divider)) {
                                                 $divider = $this->reduce($divider, true);
                                             }
 
-                                            if (intval($divider->dimension) and !count($divider->units)) {
+                                            if ($divider instanceof Number && \intval($divider->getDimension()) && $divider->unitless()) {
                                                 $revert = false;
                                             }
                                         }
@@ -2535,11 +3072,14 @@ class Compiler
 
                 $compiledValue = $this->compileValue($value);
 
-                $line = $this->formatter->property(
-                    $compiledName,
-                    $compiledValue
-                );
-                $this->appendOutputLine($out, Type::T_ASSIGN, $line);
+                // ignore empty value
+                if (\strlen($compiledValue)) {
+                    $line = $this->formatter->property(
+                        $compiledName,
+                        $compiledValue
+                    );
+                    $this->appendOutputLine($out, Type::T_ASSIGN, $line);
+                }
                 break;
 
             case Type::T_COMMENT:
@@ -2555,6 +3095,7 @@ class Compiler
             case Type::T_MIXIN:
             case Type::T_FUNCTION:
                 list(, $block) = $child;
+                assert($block instanceof CallableBlock);
                 // the block need to be able to go up to it's parent env to resolve vars
                 $block->parentEnv = $this->getStoreEnv();
                 $this->set(static::$namespaces[$block->type] . $block->name, $block, true);
@@ -2562,16 +3103,42 @@ class Compiler
 
             case Type::T_EXTEND:
                 foreach ($child[1] as $sel) {
+                    $replacedSel = $this->replaceSelfSelector($sel);
+
+                    if ($replacedSel !== $sel) {
+                        throw $this->error('Parent selectors aren\'t allowed here.');
+                    }
+
                     $results = $this->evalSelectors([$sel]);
 
                     foreach ($results as $result) {
+                        if (\count($result) !== 1) {
+                            throw $this->error('complex selectors may not be extended.');
+                        }
+
                         // only use the first one
-                        $result = current($result);
+                        $result = $result[0];
                         $selectors = $out->selectors;
 
                         if (! $selectors && isset($child['selfParent'])) {
                             $selectors = $this->multiplySelectors($this->env, $child['selfParent']);
                         }
+                        assert($selectors !== null);
+
+                        if (\count($result) > 1) {
+                            $replacement = implode(', ', $result);
+                            $fname = $this->getPrettyPath($this->sourceNames[$this->sourceIndex]);
+                            $line = $this->sourceLine;
+
+                            $message = <<<EOL
+on line $line of $fname:
+Compound selectors may no longer be extended.
+Consider `@extend $replacement` instead.
+See http://bit.ly/ExtendCompound for details.
+EOL;
+
+                            $this->logger->warn($message);
+                        }
 
                         $this->pushExtends($result, $selectors, $child);
                     }
@@ -2580,14 +3147,16 @@ class Compiler
 
             case Type::T_IF:
                 list(, $if) = $child;
+                assert($if instanceof IfBlock);
 
                 if ($this->isTruthy($this->reduce($if->cond, true))) {
                     return $this->compileChildren($if->children, $out);
                 }
 
                 foreach ($if->cases as $case) {
-                    if ($case->type === Type::T_ELSE ||
-                        $case->type === Type::T_ELSEIF && $this->isTruthy($this->reduce($case->cond))
+                    if (
+                        $case instanceof ElseBlock ||
+                        $case instanceof ElseifBlock && $this->isTruthy($this->reduce($case->cond))
                     ) {
                         return $this->compileChildren($case->children, $out);
                     }
@@ -2596,13 +3165,14 @@ class Compiler
 
             case Type::T_EACH:
                 list(, $each) = $child;
+                assert($each instanceof EachBlock);
 
-                $list = $this->coerceList($this->reduce($each->list));
+                $list = $this->coerceList($this->reduce($each->list), ',', true);
 
                 $this->pushEnv();
 
                 foreach ($list[2] as $item) {
-                    if (count($each->vars) === 1) {
+                    if (\count($each->vars) === 1) {
                         $this->set($each->vars[0], $item, true);
                     } else {
                         list(,, $values) = $this->coerceList($item);
@@ -2615,87 +3185,78 @@ class Compiler
                     $ret = $this->compileChildren($each->children, $out);
 
                     if ($ret) {
-                        if ($ret[0] !== Type::T_CONTROL) {
-                            $this->popEnv();
+                        $store = $this->env->store;
+                        $this->popEnv();
+                        $this->backPropagateEnv($store, $each->vars);
 
-                            return $ret;
-                        }
-
-                        if ($ret[1]) {
-                            break;
-                        }
+                        return $ret;
                     }
                 }
-
+                $store = $this->env->store;
                 $this->popEnv();
+                $this->backPropagateEnv($store, $each->vars);
+
                 break;
 
             case Type::T_WHILE:
                 list(, $while) = $child;
+                assert($while instanceof WhileBlock);
 
                 while ($this->isTruthy($this->reduce($while->cond, true))) {
                     $ret = $this->compileChildren($while->children, $out);
 
                     if ($ret) {
-                        if ($ret[0] !== Type::T_CONTROL) {
-                            return $ret;
-                        }
-
-                        if ($ret[1]) {
-                            break;
-                        }
+                        return $ret;
                     }
                 }
                 break;
 
             case Type::T_FOR:
                 list(, $for) = $child;
+                assert($for instanceof ForBlock);
 
-                $start = $this->reduce($for->start, true);
-                $end   = $this->reduce($for->end, true);
+                $startNumber = $this->assertNumber($this->reduce($for->start, true));
+                $endNumber = $this->assertNumber($this->reduce($for->end, true));
 
-                if (! ($start[2] == $end[2] || $end->unitless())) {
-                    $this->throwError('Incompatible units: "%s" and "%s".', $start->unitStr(), $end->unitStr());
+                $start = $this->assertInteger($startNumber);
 
-                    break;
-                }
+                $numeratorUnits = $startNumber->getNumeratorUnits();
+                $denominatorUnits = $startNumber->getDenominatorUnits();
 
-                $unit  = $start[2];
-                $start = $start[1];
-                $end   = $end[1];
+                $end = $this->assertInteger($endNumber->coerce($numeratorUnits, $denominatorUnits));
 
                 $d = $start < $end ? 1 : -1;
 
+                $this->pushEnv();
+
                 for (;;) {
-                    if ((! $for->until && $start - $d == $end) ||
+                    if (
+                        (! $for->until && $start - $d == $end) ||
                         ($for->until && $start == $end)
                     ) {
                         break;
                     }
 
-                    $this->set($for->var, new Node\Number($start, $unit));
+                    $this->set($for->var, new Number($start, $numeratorUnits, $denominatorUnits));
                     $start += $d;
 
                     $ret = $this->compileChildren($for->children, $out);
 
                     if ($ret) {
-                        if ($ret[0] !== Type::T_CONTROL) {
-                            return $ret;
-                        }
+                        $store = $this->env->store;
+                        $this->popEnv();
+                        $this->backPropagateEnv($store, [$for->var]);
 
-                        if ($ret[1]) {
-                            break;
-                        }
+                        return $ret;
                     }
                 }
+
+                $store = $this->env->store;
+                $this->popEnv();
+                $this->backPropagateEnv($store, [$for->var]);
+
                 break;
 
-            case Type::T_BREAK:
-                return [Type::T_CONTROL, true];
-
-            case Type::T_CONTINUE:
-                return [Type::T_CONTROL, false];
-
             case Type::T_RETURN:
                 return $this->reduce($child[1], true);
 
@@ -2710,24 +3271,22 @@ class Compiler
                 $mixin = $this->get(static::$namespaces['mixin'] . $name, false);
 
                 if (! $mixin) {
-                    $this->throwError("Undefined mixin $name");
-                    break;
+                    throw $this->error("Undefined mixin $name");
                 }
 
+                assert($mixin instanceof CallableBlock);
+
                 $callingScope = $this->getStoreEnv();
 
                 // push scope, apply args
                 $this->pushEnv();
                 $this->env->depth--;
 
-                $storeEnv = $this->storeEnv;
-                $this->storeEnv = $this->env;
-
                 // Find the parent selectors in the env to be able to know what '&' refers to in the mixin
                 // and assign this fake parent to childs
                 $selfParent = null;
 
-                if (isset($child['selfParent']) && isset($child['selfParent']->selectors)) {
+                if (isset($child['selfParent']) && $child['selfParent'] instanceof Block && isset($child['selfParent']->selectors)) {
                     $selfParent = $child['selfParent'];
                 } else {
                     $parentSelectors = $this->multiplySelectors($this->env);
@@ -2737,7 +3296,7 @@ class Compiler
                         $parent->selectors = $parentSelectors;
 
                         foreach ($mixin->children as $k => $child) {
-                            if (isset($child[1]) && is_object($child[1]) && $child[1] instanceof Block) {
+                            if (isset($child[1]) && $child[1] instanceof Block) {
                                 $mixin->children[$k][1]->parent = $parent;
                             }
                         }
@@ -2771,12 +3330,10 @@ class Compiler
                 if (! empty($mixin->parentEnv)) {
                     $this->env->declarationScopeParent = $mixin->parentEnv;
                 } else {
-                    $this->throwError("@mixin $name() without parentEnv");
+                    throw $this->error("@mixin $name() without parentEnv");
                 }
 
-                $this->compileChildrenNoReturn($mixin->children, $out, $selfParent, $this->env->marker . " " . $name);
-
-                $this->storeEnv = $storeEnv;
+                $this->compileChildrenNoReturn($mixin->children, $out, $selfParent, $this->env->marker . ' ' . $name);
 
                 $this->popEnv();
                 break;
@@ -2788,9 +3345,6 @@ class Compiler
                 $argContent = $child[1];
 
                 if (! $content) {
-                    $content = new \stdClass();
-                    $content->scope    = new \stdClass();
-                    $content->children = $env->parent->block->children;
                     break;
                 }
 
@@ -2799,7 +3353,7 @@ class Compiler
 
                 if (isset($argUsing) && isset($argContent)) {
                     // Get the arguments provided for the content with the names provided in the "using" argument list
-                    $this->storeEnv = $this->env;
+                    $this->storeEnv = null;
                     $varsUsing = $this->applyArguments($argUsing, $argContent, false);
                 }
 
@@ -2819,54 +3373,58 @@ class Compiler
             case Type::T_DEBUG:
                 list(, $value) = $child;
 
-                $fname = $this->sourceNames[$this->sourceIndex];
+                $fname = $this->getPrettyPath($this->sourceNames[$this->sourceIndex]);
                 $line  = $this->sourceLine;
-                $value = $this->compileValue($this->reduce($value, true));
+                $value = $this->compileDebugValue($value);
 
-                fwrite($this->stderr, "File $fname on line $line DEBUG: $value\n");
+                $this->logger->debug("$fname:$line DEBUG: $value");
                 break;
 
             case Type::T_WARN:
                 list(, $value) = $child;
 
-                $fname = $this->sourceNames[$this->sourceIndex];
+                $fname = $this->getPrettyPath($this->sourceNames[$this->sourceIndex]);
                 $line  = $this->sourceLine;
-                $value = $this->compileValue($this->reduce($value, true));
+                $value = $this->compileDebugValue($value);
 
-                fwrite($this->stderr, "File $fname on line $line WARN: $value\n");
+                $this->logger->warn("$value\n         on line $line of $fname");
                 break;
 
             case Type::T_ERROR:
                 list(, $value) = $child;
 
-                $fname = $this->sourceNames[$this->sourceIndex];
+                $fname = $this->getPrettyPath($this->sourceNames[$this->sourceIndex]);
                 $line  = $this->sourceLine;
                 $value = $this->compileValue($this->reduce($value, true));
 
-                $this->throwError("File $fname on line $line ERROR: $value\n");
-                break;
-
-            case Type::T_CONTROL:
-                $this->throwError('@break/@continue not permitted in this scope');
-                break;
+                throw $this->error("File $fname on line $line ERROR: $value\n");
 
             default:
-                $this->throwError("unknown child type: $child[0]");
+                throw $this->error("unknown child type: $child[0]");
         }
+
+        return null;
     }
 
     /**
      * Reduce expression to string
      *
      * @param array $exp
+     * @param bool $keepParens
      *
      * @return array
      */
-    protected function expToString($exp)
+    protected function expToString($exp, $keepParens = false)
     {
-        list(, $op, $left, $right, /* $inParens */, $whiteLeft, $whiteRight) = $exp;
+        list(, $op, $left, $right, $inParens, $whiteLeft, $whiteRight) = $exp;
 
-        $content = [$this->reduce($left)];
+        $content = [];
+
+        if ($keepParens && $inParens) {
+            $content[] = '(';
+        }
+
+        $content[] = $this->reduce($left);
 
         if ($whiteLeft) {
             $content[] = ' ';
@@ -2880,17 +3438,21 @@ class Compiler
 
         $content[] = $this->reduce($right);
 
+        if ($keepParens && $inParens) {
+            $content[] = ')';
+        }
+
         return [Type::T_STRING, '', $content];
     }
 
     /**
      * Is truthy?
      *
-     * @param array $value
+     * @param array|Number $value
      *
-     * @return boolean
+     * @return bool
      */
-    protected function isTruthy($value)
+    public function isTruthy($value)
     {
         return $value !== static::$false && $value !== static::$null;
     }
@@ -2900,7 +3462,7 @@ class Compiler
      *
      * @param string $value
      *
-     * @return boolean
+     * @return bool
      */
     protected function isImmediateRelationshipCombinator($value)
     {
@@ -2912,7 +3474,7 @@ class Compiler
      *
      * @param array $value
      *
-     * @return boolean
+     * @return bool
      */
     protected function shouldEval($value)
     {
@@ -2934,15 +3496,15 @@ class Compiler
     /**
      * Reduce value
      *
-     * @param array   $value
-     * @param boolean $inExp
+     * @param array|Number $value
+     * @param bool         $inExp
      *
-     * @return null|string|array|\ScssPhp\ScssPhp\Node\Number
+     * @return array|Number
      */
     protected function reduce($value, $inExp = false)
     {
-        if (is_null($value)) {
-            return null;
+        if ($value instanceof Number) {
+            return $value;
         }
 
         switch ($value[0]) {
@@ -2959,8 +3521,9 @@ class Compiler
                 }
 
                 // special case: looks like css shorthand
-                if ($opName == 'div' && ! $inParens && ! $inExp && isset($right[2]) &&
-                    (($right[0] !== Type::T_NUMBER && $right[2] != '') ||
+                if (
+                    $opName == 'div' && ! $inParens && ! $inExp &&
+                    (($right[0] !== Type::T_NUMBER && isset($right[2]) && $right[2] != '') ||
                     ($right[0] === Type::T_NUMBER && ! $right->unitless()))
                 ) {
                     return $this->expToString($value);
@@ -2975,73 +3538,24 @@ class Compiler
                 $ucLType  = ucfirst($ltype);
                 $ucRType  = ucfirst($rtype);
 
+                $shouldEval = $inParens || $inExp;
+
                 // this tries:
                 // 1. op[op name][left type][right type]
-                // 2. op[left type][right type] (passing the op as first arg
+                // 2. op[left type][right type] (passing the op as first arg)
                 // 3. op[op name]
-                $fn = "op${ucOpName}${ucLType}${ucRType}";
+                if (\is_callable([$this, $fn = "op${ucOpName}${ucLType}${ucRType}"])) {
+                    $out = $this->$fn($left, $right, $shouldEval);
+                } elseif (\is_callable([$this, $fn = "op${ucLType}${ucRType}"])) {
+                    $out = $this->$fn($op, $left, $right, $shouldEval);
+                } elseif (\is_callable([$this, $fn = "op${ucOpName}"])) {
+                    $out = $this->$fn($left, $right, $shouldEval);
+                } else {
+                    $out = null;
+                }
 
-                if (is_callable([$this, $fn]) ||
-                    (($fn = "op${ucLType}${ucRType}") &&
-                        is_callable([$this, $fn]) &&
-                        $passOp = true) ||
-                    (($fn = "op${ucOpName}") &&
-                        is_callable([$this, $fn]) &&
-                        $genOp = true)
-                ) {
-                    $coerceUnit = false;
-
-                    if (! isset($genOp) &&
-                        $left[0] === Type::T_NUMBER && $right[0] === Type::T_NUMBER
-                    ) {
-                        $coerceUnit = true;
-
-                        switch ($opName) {
-                            case 'mul':
-                                $targetUnit = $left[2];
-
-                                foreach ($right[2] as $unit => $exp) {
-                                    $targetUnit[$unit] = (isset($targetUnit[$unit]) ? $targetUnit[$unit] : 0) + $exp;
-                                }
-                                break;
-
-                            case 'div':
-                                $targetUnit = $left[2];
-
-                                foreach ($right[2] as $unit => $exp) {
-                                    $targetUnit[$unit] = (isset($targetUnit[$unit]) ? $targetUnit[$unit] : 0) - $exp;
-                                }
-                                break;
-
-                            case 'mod':
-                                $targetUnit = $left[2];
-                                break;
-
-                            default:
-                                $targetUnit = $left->unitless() ? $right[2] : $left[2];
-                        }
-
-                        if (! $left->unitless() && ! $right->unitless()) {
-                            $left = $left->normalize();
-                            $right = $right->normalize();
-                        }
-                    }
-
-                    $shouldEval = $inParens || $inExp;
-
-                    if (isset($passOp)) {
-                        $out = $this->$fn($op, $left, $right, $shouldEval);
-                    } else {
-                        $out = $this->$fn($left, $right, $shouldEval);
-                    }
-
-                    if (isset($out)) {
-                        if ($coerceUnit && $out[0] === Type::T_NUMBER) {
-                            $out = $out->coerce($targetUnit);
-                        }
-
-                        return $out;
-                    }
+                if (isset($out)) {
+                    return $out;
                 }
 
                 return $this->expToString($value);
@@ -3052,13 +3566,13 @@ class Compiler
                 $inExp = $inExp || $this->shouldEval($exp);
                 $exp = $this->reduce($exp);
 
-                if ($exp[0] === Type::T_NUMBER) {
+                if ($exp instanceof Number) {
                     switch ($op) {
                         case '+':
-                            return new Node\Number($exp[1], $exp[2]);
+                            return $exp;
 
                         case '-':
-                            return new Node\Number(-$exp[1], $exp[2]);
+                            return $exp->unaryMinus();
                     }
                 }
 
@@ -3083,6 +3597,14 @@ class Compiler
                 foreach ($value[2] as &$item) {
                     $item = $this->reduce($item);
                 }
+                unset($item);
+
+                if (isset($value[3]) && \is_array($value[3])) {
+                    foreach ($value[3] as &$item) {
+                        $item = $this->reduce($item);
+                    }
+                    unset($item);
+                }
 
                 return $value;
 
@@ -3099,7 +3621,7 @@ class Compiler
 
             case Type::T_STRING:
                 foreach ($value[2] as &$item) {
-                    if (is_array($item) || $item instanceof \ArrayAccess) {
+                    if (\is_array($item) || $item instanceof Number) {
                         $item = $this->reduce($item);
                     }
                 }
@@ -3110,7 +3632,7 @@ class Compiler
                 $value[1] = $this->reduce($value[1]);
 
                 if ($inExp) {
-                    return $value[1];
+                    return [Type::T_KEYWORD, $this->compileValue($value, false)];
                 }
 
                 return $value;
@@ -3119,8 +3641,9 @@ class Compiler
                 return $this->fncall($value[1], $value[2]);
 
             case Type::T_SELF:
-                $selfSelector = $this->multiplySelectors($this->env);
-                $selfSelector = $this->collapseSelectors($selfSelector, true);
+                $selfParent = ! empty($this->env->block->selfParent) ? $this->env->block->selfParent : null;
+                $selfSelector = $this->multiplySelectors($this->env, $selfParent);
+                $selfSelector = $this->collapseSelectorsAsList($selfSelector);
 
                 return $selfSelector;
 
@@ -3132,35 +3655,301 @@ class Compiler
     /**
      * Function caller
      *
-     * @param string $name
-     * @param array  $argValues
+     * @param string|array $functionReference
+     * @param array        $argValues
      *
-     * @return array|null
+     * @return array|Number
      */
-    protected function fncall($name, $argValues)
+    protected function fncall($functionReference, $argValues)
     {
-        // SCSS @function
-        if ($this->callScssFunction($name, $argValues, $returnValue)) {
-            return $returnValue;
-        }
+        // a string means this is a static hard reference coming from the parsing
+        if (is_string($functionReference)) {
+            $name = $functionReference;
 
-        // native PHP functions
-        if ($this->callNativeFunction($name, $argValues, $returnValue)) {
-            return $returnValue;
-        }
-
-        // for CSS functions, simply flatten the arguments into a list
-        $listArgs = [];
-
-        foreach ((array) $argValues as $arg) {
-            if (empty($arg[0])) {
-                $listArgs[] = $this->reduce($arg[1]);
+            $functionReference = $this->getFunctionReference($name);
+            if ($functionReference === static::$null || $functionReference[0] !== Type::T_FUNCTION_REFERENCE) {
+                $functionReference = [Type::T_FUNCTION, $name, [Type::T_LIST, ',', []]];
             }
         }
 
-        return [Type::T_FUNCTION, $name, [Type::T_LIST, ',', $listArgs]];
+        // a function type means we just want a plain css function call
+        if ($functionReference[0] === Type::T_FUNCTION) {
+            // for CSS functions, simply flatten the arguments into a list
+            $listArgs = [];
+
+            foreach ((array) $argValues as $arg) {
+                if (empty($arg[0]) || count($argValues) === 1) {
+                    $listArgs[] = $this->reduce($this->stringifyFncallArgs($arg[1]));
+                }
+            }
+
+            return [Type::T_FUNCTION, $functionReference[1], [Type::T_LIST, ',', $listArgs]];
+        }
+
+        if ($functionReference === static::$null || $functionReference[0] !== Type::T_FUNCTION_REFERENCE) {
+            return static::$defaultValue;
+        }
+
+
+        switch ($functionReference[1]) {
+            // SCSS @function
+            case 'scss':
+                return $this->callScssFunction($functionReference[3], $argValues);
+
+            // native PHP functions
+            case 'user':
+            case 'native':
+                list(,,$name, $fn, $prototype) = $functionReference;
+
+                // special cases of css valid functions min/max
+                $name = strtolower($name);
+                if (\in_array($name, ['min', 'max']) && count($argValues) >= 1) {
+                    $cssFunction = $this->cssValidArg(
+                        [Type::T_FUNCTION_CALL, $name, $argValues],
+                        ['min', 'max', 'calc', 'env', 'var']
+                    );
+                    if ($cssFunction !== false) {
+                        return $cssFunction;
+                    }
+                }
+                $returnValue = $this->callNativeFunction($name, $fn, $prototype, $argValues);
+
+                if (! isset($returnValue)) {
+                    return $this->fncall([Type::T_FUNCTION, $name, [Type::T_LIST, ',', []]], $argValues);
+                }
+
+                return $returnValue;
+
+            default:
+                return static::$defaultValue;
+        }
     }
 
+    /**
+     * @param array|Number $arg
+     * @param string[]     $allowed_function
+     * @param bool         $inFunction
+     *
+     * @return array|Number|false
+     */
+    protected function cssValidArg($arg, $allowed_function = [], $inFunction = false)
+    {
+        if ($arg instanceof Number) {
+            return $this->stringifyFncallArgs($arg);
+        }
+
+        switch ($arg[0]) {
+            case Type::T_INTERPOLATE:
+                return [Type::T_KEYWORD, $this->CompileValue($arg)];
+
+            case Type::T_FUNCTION:
+                if (! \in_array($arg[1], $allowed_function)) {
+                    return false;
+                }
+                if ($arg[2][0] === Type::T_LIST) {
+                    foreach ($arg[2][2] as $k => $subarg) {
+                        $arg[2][2][$k] = $this->cssValidArg($subarg, $allowed_function, $arg[1]);
+                        if ($arg[2][2][$k] === false) {
+                            return false;
+                        }
+                    }
+                }
+                return $arg;
+
+            case Type::T_FUNCTION_CALL:
+                if (! \in_array($arg[1], $allowed_function)) {
+                    return false;
+                }
+                $cssArgs = [];
+                foreach ($arg[2] as $argValue) {
+                    if ($argValue === static::$null) {
+                        return false;
+                    }
+                    $cssArg = $this->cssValidArg($argValue[1], $allowed_function, $arg[1]);
+                    if (empty($argValue[0]) && $cssArg !== false) {
+                        $cssArgs[] = [$argValue[0], $cssArg];
+                    } else {
+                        return false;
+                    }
+                }
+
+                return $this->fncall([Type::T_FUNCTION, $arg[1], [Type::T_LIST, ',', []]], $cssArgs);
+
+            case Type::T_STRING:
+            case Type::T_KEYWORD:
+                if (!$inFunction or !\in_array($inFunction, ['calc', 'env', 'var'])) {
+                    return false;
+                }
+                return $this->stringifyFncallArgs($arg);
+
+            case Type::T_LIST:
+                if (!$inFunction) {
+                    return false;
+                }
+                if (empty($arg['enclosing']) and $arg[1] === '') {
+                    foreach ($arg[2] as $k => $subarg) {
+                        $arg[2][$k] = $this->cssValidArg($subarg, $allowed_function, $inFunction);
+                        if ($arg[2][$k] === false) {
+                            return false;
+                        }
+                    }
+                    $arg[0] = Type::T_STRING;
+                    return $arg;
+                }
+                return false;
+
+            case Type::T_EXPRESSION:
+                if (! \in_array($arg[1], ['+', '-', '/', '*'])) {
+                    return false;
+                }
+                $arg[2] = $this->cssValidArg($arg[2], $allowed_function, $inFunction);
+                $arg[3] = $this->cssValidArg($arg[3], $allowed_function, $inFunction);
+                if ($arg[2] === false || $arg[3] === false) {
+                    return false;
+                }
+                return $this->expToString($arg, true);
+
+            case Type::T_VARIABLE:
+            case Type::T_SELF:
+            default:
+                return false;
+        }
+    }
+
+
+    /**
+     * Reformat fncall arguments to proper css function output
+     *
+     * @param array|Number $arg
+     *
+     * @return array|Number
+     */
+    protected function stringifyFncallArgs($arg)
+    {
+        if ($arg instanceof Number) {
+            return $arg;
+        }
+
+        switch ($arg[0]) {
+            case Type::T_LIST:
+                foreach ($arg[2] as $k => $v) {
+                    $arg[2][$k] = $this->stringifyFncallArgs($v);
+                }
+                break;
+
+            case Type::T_EXPRESSION:
+                if ($arg[1] === '/') {
+                    $arg[2] = $this->stringifyFncallArgs($arg[2]);
+                    $arg[3] = $this->stringifyFncallArgs($arg[3]);
+                    $arg[5] = $arg[6] = false; // no space around /
+                    $arg = $this->expToString($arg);
+                }
+                break;
+
+            case Type::T_FUNCTION_CALL:
+                $name = strtolower($arg[1]);
+
+                if (in_array($name, ['max', 'min', 'calc'])) {
+                    $args = $arg[2];
+                    $arg = $this->fncall([Type::T_FUNCTION, $name, [Type::T_LIST, ',', []]], $args);
+                }
+                break;
+        }
+
+        return $arg;
+    }
+
+    /**
+     * Find a function reference
+     * @param string $name
+     * @param bool $safeCopy
+     * @return array
+     */
+    protected function getFunctionReference($name, $safeCopy = false)
+    {
+        // SCSS @function
+        if ($func = $this->get(static::$namespaces['function'] . $name, false)) {
+            if ($safeCopy) {
+                $func = clone $func;
+            }
+
+            return [Type::T_FUNCTION_REFERENCE, 'scss', $name, $func];
+        }
+
+        // native PHP functions
+
+        // try to find a native lib function
+        $normalizedName = $this->normalizeName($name);
+
+        if (isset($this->userFunctions[$normalizedName])) {
+            // see if we can find a user function
+            list($f, $prototype) = $this->userFunctions[$normalizedName];
+
+            return [Type::T_FUNCTION_REFERENCE, 'user', $name, $f, $prototype];
+        }
+
+        $lowercasedName = strtolower($normalizedName);
+
+        // Special functions overriding a CSS function are case-insensitive. We normalize them as lowercase
+        // to avoid the deprecation warning about the wrong case being used.
+        if ($lowercasedName === 'min' || $lowercasedName === 'max') {
+            $normalizedName = $lowercasedName;
+        }
+
+        if (($f = $this->getBuiltinFunction($normalizedName)) && \is_callable($f)) {
+            /** @var string $libName */
+            $libName   = $f[1];
+            $prototype = isset(static::$$libName) ? static::$$libName : null;
+
+            // All core functions have a prototype defined. Not finding the
+            // prototype can mean 2 things:
+            // - the function comes from a child class (deprecated just after)
+            // - the function was found with a different case, which relates to calling the
+            //   wrong Sass function due to our camelCase usage (`fade-in()` vs `fadein()`),
+            //   because PHP method names are case-insensitive while property names are
+            //   case-sensitive.
+            if ($prototype === null || strtolower($normalizedName) !== $normalizedName) {
+                $r = new \ReflectionMethod($this, $libName);
+                $actualLibName = $r->name;
+
+                if ($actualLibName !== $libName || strtolower($normalizedName) !== $normalizedName) {
+                    $kebabCaseName = preg_replace('~(?<=\\w)([A-Z])~', '-$1', substr($actualLibName, 3));
+                    assert($kebabCaseName !== null);
+                    $originalName = strtolower($kebabCaseName);
+                    $warning = "Calling built-in functions with a non-standard name is deprecated since Scssphp 1.8.0 and will not work anymore in 2.0 (they will be treated as CSS function calls instead).\nUse \"$originalName\" instead of \"$name\".";
+                    @trigger_error($warning, E_USER_DEPRECATED);
+                    $fname = $this->getPrettyPath($this->sourceNames[$this->sourceIndex]);
+                    $line  = $this->sourceLine;
+                    Warn::deprecation("$warning\n         on line $line of $fname");
+
+                    // Use the actual function definition
+                    $prototype = isset(static::$$actualLibName) ? static::$$actualLibName : null;
+                    $f[1] = $libName = $actualLibName;
+                }
+            }
+
+            if (\get_class($this) !== __CLASS__ && !isset($this->warnedChildFunctions[$libName])) {
+                $r = new \ReflectionMethod($this, $libName);
+                $declaringClass = $r->getDeclaringClass()->name;
+
+                $needsWarning = $this->warnedChildFunctions[$libName] = $declaringClass !== __CLASS__;
+
+                if ($needsWarning) {
+                    if (method_exists(__CLASS__, $libName)) {
+                        @trigger_error(sprintf('Overriding the "%s" core function by extending the Compiler is deprecated and will be unsupported in 2.0. Remove the "%s::%s" method.', $normalizedName, $declaringClass, $libName), E_USER_DEPRECATED);
+                    } else {
+                        @trigger_error(sprintf('Registering custom functions by extending the Compiler and using the lib* discovery mechanism is deprecated and will be removed in 2.0. Replace the "%s::%s" method with registering the "%s" function through "Compiler::registerFunction".', $declaringClass, $libName, $normalizedName), E_USER_DEPRECATED);
+                    }
+                }
+            }
+
+            return [Type::T_FUNCTION_REFERENCE, 'native', $name, $f, $prototype];
+        }
+
+        return static::$null;
+    }
+
+
     /**
      * Normalize name
      *
@@ -3176,14 +3965,20 @@ class Compiler
     /**
      * Normalize value
      *
-     * @param array $value
+     * @internal
      *
-     * @return array
+     * @param array|Number $value
+     *
+     * @return array|Number
      */
     public function normalizeValue($value)
     {
         $value = $this->coerceForExpression($this->reduce($value));
 
+        if ($value instanceof Number) {
+            return $value;
+        }
+
         switch ($value[0]) {
             case Type::T_LIST:
                 $value = $this->extractInterpolation($value);
@@ -3200,14 +3995,15 @@ class Compiler
                     unset($value['enclosing']);
                 }
 
+                if ($value[1] === '' && count($value[2]) > 1) {
+                    $value[1] = ' ';
+                }
+
                 return $value;
 
             case Type::T_STRING:
                 return [$value[0], '"', [$this->compileStringContent($value)]];
 
-            case Type::T_NUMBER:
-                return $value->normalize();
-
             case Type::T_INTERPOLATE:
                 return [Type::T_KEYWORD, $this->compileValue($value)];
 
@@ -3219,70 +4015,66 @@ class Compiler
     /**
      * Add numbers
      *
-     * @param array $left
-     * @param array $right
+     * @param Number $left
+     * @param Number $right
      *
-     * @return \ScssPhp\ScssPhp\Node\Number
+     * @return Number
      */
-    protected function opAddNumberNumber($left, $right)
+    protected function opAddNumberNumber(Number $left, Number $right)
     {
-        return new Node\Number($left[1] + $right[1], $left[2]);
+        return $left->plus($right);
     }
 
     /**
      * Multiply numbers
      *
-     * @param array $left
-     * @param array $right
+     * @param Number $left
+     * @param Number $right
      *
-     * @return \ScssPhp\ScssPhp\Node\Number
+     * @return Number
      */
-    protected function opMulNumberNumber($left, $right)
+    protected function opMulNumberNumber(Number $left, Number $right)
     {
-        return new Node\Number($left[1] * $right[1], $left[2]);
+        return $left->times($right);
     }
 
     /**
      * Subtract numbers
      *
-     * @param array $left
-     * @param array $right
+     * @param Number $left
+     * @param Number $right
      *
-     * @return \ScssPhp\ScssPhp\Node\Number
+     * @return Number
      */
-    protected function opSubNumberNumber($left, $right)
+    protected function opSubNumberNumber(Number $left, Number $right)
     {
-        return new Node\Number($left[1] - $right[1], $left[2]);
+        return $left->minus($right);
     }
 
     /**
      * Divide numbers
      *
-     * @param array $left
-     * @param array $right
+     * @param Number $left
+     * @param Number $right
      *
-     * @return array|\ScssPhp\ScssPhp\Node\Number
+     * @return Number
      */
-    protected function opDivNumberNumber($left, $right)
+    protected function opDivNumberNumber(Number $left, Number $right)
     {
-        if ($right[1] == 0) {
-            return [Type::T_STRING, '', [$left[1] . $left[2] . '/' . $right[1] . $right[2]]];
-        }
-
-        return new Node\Number($left[1] / $right[1], $left[2]);
+        return $left->dividedBy($right);
     }
 
     /**
      * Mod numbers
      *
-     * @param array $left
-     * @param array $right
+     * @param Number $left
+     * @param Number $right
      *
-     * @return \ScssPhp\ScssPhp\Node\Number
+     * @return Number
      */
-    protected function opModNumberNumber($left, $right)
+    protected function opModNumberNumber(Number $left, Number $right)
     {
-        return new Node\Number($left[1] % $right[1], $left[2]);
+        return $left->modulo($right);
     }
 
     /**
@@ -3321,11 +4113,11 @@ class Compiler
     /**
      * Boolean and
      *
-     * @param array   $left
-     * @param array   $right
-     * @param boolean $shouldEval
+     * @param array|Number $left
+     * @param array|Number $right
+     * @param bool         $shouldEval
      *
-     * @return array|null
+     * @return array|Number|null
      */
     protected function opAnd($left, $right, $shouldEval)
     {
@@ -3349,11 +4141,11 @@ class Compiler
     /**
      * Boolean or
      *
-     * @param array   $left
-     * @param array   $right
-     * @param boolean $shouldEval
+     * @param array|Number $left
+     * @param array|Number $right
+     * @param bool         $shouldEval
      *
-     * @return array|null
+     * @return array|Number|null
      */
     protected function opOr($left, $right, $shouldEval)
     {
@@ -3385,6 +4177,15 @@ class Compiler
      */
     protected function opColorColor($op, $left, $right)
     {
+        if ($op !== '==' && $op !== '!=') {
+            $warning = "Color arithmetic is deprecated and will be an error in future versions.\n"
+                . "Consider using Sass's color functions instead.";
+            $fname = $this->getPrettyPath($this->sourceNames[$this->sourceIndex]);
+            $line  = $this->sourceLine;
+
+            Warn::deprecation("$warning\n         on line $line of $fname");
+        }
+
         $out = [Type::T_COLOR];
 
         foreach ([1, 2, 3] as $i) {
@@ -3405,13 +4206,16 @@ class Compiler
                     break;
 
                 case '%':
+                    if ($rval == 0) {
+                        throw $this->error("color: Can't take modulo by zero");
+                    }
+
                     $out[] = $lval % $rval;
                     break;
 
                 case '/':
                     if ($rval == 0) {
-                        $this->throwError("color: Can't divide by zero");
-                        break 2;
+                        throw $this->error("color: Can't divide by zero");
                     }
 
                     $out[] = (int) ($lval / $rval);
@@ -3424,8 +4228,7 @@ class Compiler
                     return $this->opNeq($left, $right);
 
                 default:
-                    $this->throwError("color: unknown op $op");
-                    break 2;
+                    throw $this->error("color: unknown op $op");
             }
         }
 
@@ -3443,13 +4246,21 @@ class Compiler
      *
      * @param string $op
      * @param array  $left
-     * @param array  $right
+     * @param Number  $right
      *
      * @return array
      */
-    protected function opColorNumber($op, $left, $right)
+    protected function opColorNumber($op, $left, Number $right)
     {
-        $value = $right[1];
+        if ($op === '==') {
+            return static::$false;
+        }
+
+        if ($op === '!=') {
+            return static::$true;
+        }
+
+        $value = $right->getDimension();
 
         return $this->opColorColor(
             $op,
@@ -3462,14 +4273,22 @@ class Compiler
      * Compare number and color
      *
      * @param string $op
-     * @param array  $left
+     * @param Number  $left
      * @param array  $right
      *
      * @return array
      */
-    protected function opNumberColor($op, $left, $right)
+    protected function opNumberColor($op, Number $left, $right)
     {
-        $value = $left[1];
+        if ($op === '==') {
+            return static::$false;
+        }
+
+        if ($op === '!=') {
+            return static::$true;
+        }
+
+        $value = $left->getDimension();
 
         return $this->opColorColor(
             $op,
@@ -3481,8 +4300,8 @@ class Compiler
     /**
      * Compare number1 == number2
      *
-     * @param array $left
-     * @param array $right
+     * @param array|Number $left
+     * @param array|Number $right
      *
      * @return array
      */
@@ -3502,8 +4321,8 @@ class Compiler
     /**
      * Compare number1 != number2
      *
-     * @param array $left
-     * @param array $right
+     * @param array|Number $left
+     * @param array|Number $right
      *
      * @return array
      */
@@ -3521,70 +4340,81 @@ class Compiler
     }
 
     /**
-     * Compare number1 >= number2
+     * Compare number1 == number2
      *
-     * @param array $left
-     * @param array $right
+     * @param Number $left
+     * @param Number $right
      *
      * @return array
      */
-    protected function opGteNumberNumber($left, $right)
+    protected function opEqNumberNumber(Number $left, Number $right)
     {
-        return $this->toBool($left[1] >= $right[1]);
+        return $this->toBool($left->equals($right));
+    }
+
+    /**
+     * Compare number1 != number2
+     *
+     * @param Number $left
+     * @param Number $right
+     *
+     * @return array
+     */
+    protected function opNeqNumberNumber(Number $left, Number $right)
+    {
+        return $this->toBool(!$left->equals($right));
+    }
+
+    /**
+     * Compare number1 >= number2
+     *
+     * @param Number $left
+     * @param Number $right
+     *
+     * @return array
+     */
+    protected function opGteNumberNumber(Number $left, Number $right)
+    {
+        return $this->toBool($left->greaterThanOrEqual($right));
     }
 
     /**
      * Compare number1 > number2
      *
-     * @param array $left
-     * @param array $right
+     * @param Number $left
+     * @param Number $right
      *
      * @return array
      */
-    protected function opGtNumberNumber($left, $right)
+    protected function opGtNumberNumber(Number $left, Number $right)
     {
-        return $this->toBool($left[1] > $right[1]);
+        return $this->toBool($left->greaterThan($right));
     }
 
     /**
      * Compare number1 <= number2
      *
-     * @param array $left
-     * @param array $right
+     * @param Number $left
+     * @param Number $right
      *
      * @return array
      */
-    protected function opLteNumberNumber($left, $right)
+    protected function opLteNumberNumber(Number $left, Number $right)
     {
-        return $this->toBool($left[1] <= $right[1]);
+        return $this->toBool($left->lessThanOrEqual($right));
     }
 
     /**
      * Compare number1 < number2
      *
-     * @param array $left
-     * @param array $right
+     * @param Number $left
+     * @param Number $right
      *
      * @return array
      */
-    protected function opLtNumberNumber($left, $right)
+    protected function opLtNumberNumber(Number $left, Number $right)
     {
-        return $this->toBool($left[1] < $right[1]);
-    }
-
-    /**
-     * Three-way comparison, aka spaceship operator
-     *
-     * @param array $left
-     * @param array $right
-     *
-     * @return \ScssPhp\ScssPhp\Node\Number
-     */
-    protected function opCmpNumberNumber($left, $right)
-    {
-        $n = $left[1] - $right[1];
-
-        return new Node\Number($n ? $n / abs($n) : 0, '');
+        return $this->toBool($left->lessThan($right));
     }
 
     /**
@@ -3592,7 +4422,7 @@ class Compiler
      *
      * @api
      *
-     * @param mixed $thing
+     * @param bool $thing
      *
      * @return array
      */
@@ -3601,6 +4431,53 @@ class Compiler
         return $thing ? static::$true : static::$false;
     }
 
+    /**
+     * Escape non printable chars in strings output as in dart-sass
+     *
+     * @internal
+     *
+     * @param string $string
+     * @param bool   $inKeyword
+     *
+     * @return string
+     */
+    public function escapeNonPrintableChars($string, $inKeyword = false)
+    {
+        static $replacement = [];
+        if (empty($replacement[$inKeyword])) {
+            for ($i = 0; $i < 32; $i++) {
+                if ($i !== 9 || $inKeyword) {
+                    $replacement[$inKeyword][chr($i)] = '\\' . dechex($i) . ($inKeyword ? ' ' : chr(0));
+                }
+            }
+        }
+        $string = str_replace(array_keys($replacement[$inKeyword]), array_values($replacement[$inKeyword]), $string);
+        // chr(0) is not a possible char from the input, so any chr(0) comes from our escaping replacement
+        if (strpos($string, chr(0)) !== false) {
+            if (substr($string, -1) === chr(0)) {
+                $string = substr($string, 0, -1);
+            }
+            $string = str_replace(
+                [chr(0) . '\\',chr(0) . ' '],
+                [ '\\', ' '],
+                $string
+            );
+            if (strpos($string, chr(0)) !== false) {
+                $parts = explode(chr(0), $string);
+                $string = array_shift($parts);
+                while (count($parts)) {
+                    $next = array_shift($parts);
+                    if (strpos("0123456789abcdefABCDEF" . chr(9), $next[0]) !== false) {
+                        $string .= " ";
+                    }
+                    $string .= $next;
+                }
+            }
+        }
+
+        return $string;
+    }
+
     /**
      * Compiles a primitive value into a CSS property value.
      *
@@ -3614,17 +4491,22 @@ class Compiler
      *
      * @api
      *
-     * @param array $value
+     * @param array|Number $value
+     * @param bool         $quote
      *
-     * @return string|array
+     * @return string
      */
-    public function compileValue($value)
+    public function compileValue($value, $quote = true)
     {
         $value = $this->reduce($value);
 
+        if ($value instanceof Number) {
+            return $value->output($this);
+        }
+
         switch ($value[0]) {
             case Type::T_KEYWORD:
-                return $value[1];
+                return $this->escapeNonPrintableChars($value[1], true);
 
             case Type::T_COLOR:
                 // [1] - red component (either number for a %)
@@ -3637,18 +4519,18 @@ class Compiler
                 $g = $this->compileRGBAValue($g);
                 $b = $this->compileRGBAValue($b);
 
-                if (count($value) === 5) {
+                if (\count($value) === 5) {
                     $alpha = $this->compileRGBAValue($value[4], true);
 
                     if (! is_numeric($alpha) || $alpha < 1) {
                         $colorName = Colors::RGBaToColorName($r, $g, $b, $alpha);
 
-                        if (! is_null($colorName)) {
+                        if (! \is_null($colorName)) {
                             return $colorName;
                         }
 
                         if (is_numeric($alpha)) {
-                            $a = new Node\Number($alpha, '');
+                            $a = new Number($alpha, '');
                         } else {
                             $a = $alpha;
                         }
@@ -3663,7 +4545,7 @@ class Compiler
 
                 $colorName = Colors::RGBaToColorName($r, $g, $b);
 
-                if (! is_null($colorName)) {
+                if (! \is_null($colorName)) {
                     return $colorName;
                 }
 
@@ -3676,72 +4558,119 @@ class Compiler
 
                 return $h;
 
-            case Type::T_NUMBER:
-                return $value->output($this);
-
             case Type::T_STRING:
-                return $value[1] . $this->compileStringContent($value) . $value[1];
+                $content = $this->compileStringContent($value, $quote);
+
+                if ($value[1] && $quote) {
+                    $content = str_replace('\\', '\\\\', $content);
+
+                    $content = $this->escapeNonPrintableChars($content);
+
+                    // force double quote as string quote for the output in certain cases
+                    if (
+                        $value[1] === "'" &&
+                        (strpos($content, '"') === false or strpos($content, "'") !== false)
+                    ) {
+                        $value[1] = '"';
+                    } elseif (
+                        $value[1] === '"' &&
+                        (strpos($content, '"') !== false and strpos($content, "'") === false)
+                    ) {
+                        $value[1] = "'";
+                    }
+
+                    $content = str_replace($value[1], '\\' . $value[1], $content);
+                }
+
+                return $value[1] . $content . $value[1];
 
             case Type::T_FUNCTION:
-                $args = ! empty($value[2]) ? $this->compileValue($value[2]) : '';
+                $args = ! empty($value[2]) ? $this->compileValue($value[2], $quote) : '';
 
                 return "$value[1]($args)";
 
+            case Type::T_FUNCTION_REFERENCE:
+                $name = ! empty($value[2]) ? $value[2] : '';
+
+                return "get-function(\"$name\")";
+
             case Type::T_LIST:
                 $value = $this->extractInterpolation($value);
 
                 if ($value[0] !== Type::T_LIST) {
-                    return $this->compileValue($value);
+                    return $this->compileValue($value, $quote);
                 }
 
                 list(, $delim, $items) = $value;
-                $pre = $post = "";
+                $pre = $post = '';
+
                 if (! empty($value['enclosing'])) {
                     switch ($value['enclosing']) {
                         case 'parent':
-                            //$pre = "(";
-                            //$post = ")";
+                            //$pre = '(';
+                            //$post = ')';
                             break;
                         case 'forced_parent':
-                            $pre = "(";
-                            $post = ")";
+                            $pre = '(';
+                            $post = ')';
                             break;
                         case 'bracket':
                         case 'forced_bracket':
-                            $pre = "[";
-                            $post = "]";
+                            $pre = '[';
+                            $post = ']';
                             break;
                     }
                 }
 
+                $separator = $delim === '/' ? ' /' : $delim;
+
                 $prefix_value = '';
+
                 if ($delim !== ' ') {
                     $prefix_value = ' ';
                 }
 
                 $filtered = [];
 
+                $same_string_quote = null;
                 foreach ($items as $item) {
+                    if (\is_null($same_string_quote)) {
+                        $same_string_quote = false;
+                        if ($item[0] === Type::T_STRING) {
+                            $same_string_quote = $item[1];
+                            foreach ($items as $ii) {
+                                if ($ii[0] !== Type::T_STRING) {
+                                    $same_string_quote = false;
+                                    break;
+                                }
+                            }
+                        }
+                    }
                     if ($item[0] === Type::T_NULL) {
                         continue;
                     }
+                    if ($same_string_quote === '"' && $item[0] === Type::T_STRING && $item[1]) {
+                        $item[1] = $same_string_quote;
+                    }
 
-                    $compiled = $this->compileValue($item);
-                    if ($prefix_value && strlen($compiled)) {
+                    $compiled = $this->compileValue($item, $quote);
+
+                    if ($prefix_value && \strlen($compiled)) {
                         $compiled = $prefix_value . $compiled;
                     }
+
                     $filtered[] = $compiled;
                 }
 
-                return $pre . substr(implode("$delim", $filtered), strlen($prefix_value)) . $post;
+                return $pre . substr(implode($separator, $filtered), \strlen($prefix_value)) . $post;
 
             case Type::T_MAP:
                 $keys     = $value[1];
                 $values   = $value[2];
                 $filtered = [];
 
-                for ($i = 0, $s = count($keys); $i < $s; $i++) {
-                    $filtered[$this->compileValue($keys[$i])] = $this->compileValue($values[$i]);
+                for ($i = 0, $s = \count($keys); $i < $s; $i++) {
+                    $filtered[$this->compileValue($keys[$i], $quote)] = $this->compileValue($values[$i], $quote);
                 }
 
                 array_walk($filtered, function (&$value, $key) {
@@ -3761,8 +4690,9 @@ class Compiler
                     $delim .= ' ';
                 }
 
-                $left = count($left[2]) > 0 ?
-                    $this->compileValue($left) . $delim . $whiteLeft: '';
+                $left = \count($left[2]) > 0
+                    ?  $this->compileValue($left, $quote) . $delim . $whiteLeft
+                    : '';
 
                 $delim = $right[1];
 
@@ -3770,15 +4700,19 @@ class Compiler
                     $delim .= ' ';
                 }
 
-                $right = count($right[2]) > 0 ?
-                    $whiteRight . $delim . $this->compileValue($right) : '';
+                $right = \count($right[2]) > 0 ?
+                    $whiteRight . $delim . $this->compileValue($right, $quote) : '';
 
-                return $left . $this->compileValue($interpolate) . $right;
+                return $left . $this->compileValue($interpolate, $quote) . $right;
 
             case Type::T_INTERPOLATE:
                 // strip quotes if it's a string
                 $reduced = $this->reduce($value[1]);
 
+                if ($reduced instanceof Number) {
+                    return $this->compileValue($reduced, $quote);
+                }
+
                 switch ($reduced[0]) {
                     case Type::T_LIST:
                         $reduced = $this->extractInterpolation($reduced);
@@ -3800,14 +4734,12 @@ class Compiler
                                 continue;
                             }
 
-                            $temp = $this->compileValue([Type::T_KEYWORD, $item]);
-
-                            if ($temp[0] === Type::T_STRING) {
-                                $filtered[] = $this->compileStringContent($temp);
-                            } elseif ($temp[0] === Type::T_KEYWORD) {
-                                $filtered[] = $temp[1];
+                            if ($item[0] === Type::T_STRING) {
+                                $filtered[] = $this->compileStringContent($item, $quote);
+                            } elseif ($item[0] === Type::T_KEYWORD) {
+                                $filtered[] = $item[1];
                             } else {
-                                $filtered[] = $this->compileValue($temp);
+                                $filtered[] = $this->compileValue($item, $quote);
                             }
                         }
 
@@ -3815,14 +4747,14 @@ class Compiler
                         break;
 
                     case Type::T_STRING:
-                        $reduced = [Type::T_KEYWORD, $this->compileStringContent($reduced)];
+                        $reduced = [Type::T_STRING, '', [$this->compileStringContent($reduced)]];
                         break;
 
                     case Type::T_NULL:
                         $reduced = [Type::T_KEYWORD, ''];
                 }
 
-                return $this->compileValue($reduced);
+                return $this->compileValue($reduced, $quote);
 
             case Type::T_NULL:
                 return 'null';
@@ -3831,7 +4763,29 @@ class Compiler
                 return $this->compileCommentValue($value);
 
             default:
-                $this->throwError("unknown value type: ".json_encode($value));
+                throw $this->error('unknown value type: ' . json_encode($value));
+        }
+    }
+
+    /**
+     * @param array|Number $value
+     *
+     * @return string
+     */
+    protected function compileDebugValue($value)
+    {
+        $value = $this->reduce($value, true);
+
+        if ($value instanceof Number) {
+            return $this->compileValue($value);
+        }
+
+        switch ($value[0]) {
+            case Type::T_STRING:
+                return $this->compileStringContent($value);
+
+            default:
+                return $this->compileValue($value);
         }
     }
 
@@ -3841,26 +4795,50 @@ class Compiler
      * @param array $list
      *
      * @return string
+     *
+     * @deprecated
      */
     protected function flattenList($list)
     {
+        @trigger_error(sprintf('The "%s" method is deprecated.', __METHOD__), E_USER_DEPRECATED);
+
         return $this->compileValue($list);
     }
 
+    /**
+     * Gets the text of a Sass string
+     *
+     * Calling this method on anything else than a SassString is unsupported. Use {@see assertString} first
+     * to ensure that the value is indeed a string.
+     *
+     * @param array $value
+     *
+     * @return string
+     */
+    public function getStringText(array $value)
+    {
+        if ($value[0] !== Type::T_STRING) {
+            throw new \InvalidArgumentException('The argument is not a sass string. Did you forgot to use "assertString"?');
+        }
+
+        return $this->compileStringContent($value);
+    }
+
     /**
      * Compile string content
      *
      * @param array $string
+     * @param bool  $quote
      *
      * @return string
      */
-    protected function compileStringContent($string)
+    protected function compileStringContent($string, $quote = true)
     {
         $parts = [];
 
         foreach ($string[2] as $part) {
-            if (is_array($part) || $part instanceof \ArrayAccess) {
-                $parts[] = $this->compileValue($part);
+            if (\is_array($part) || $part instanceof Number) {
+                $parts[] = $this->compileValue($part, $quote);
             } else {
                 $parts[] = $part;
             }
@@ -3882,8 +4860,8 @@ class Compiler
 
         foreach ($items as $i => $item) {
             if ($item[0] === Type::T_INTERPOLATE) {
-                $before = [Type::T_LIST, $list[1], array_slice($items, 0, $i)];
-                $after  = [Type::T_LIST, $list[1], array_slice($items, $i + 1)];
+                $before = [Type::T_LIST, $list[1], \array_slice($items, 0, $i)];
+                $after  = [Type::T_LIST, $list[1], \array_slice($items, $i + 1)];
 
                 return [Type::T_INTERPOLATED, $item, $before, $after];
             }
@@ -3908,7 +4886,7 @@ class Compiler
 
         $selfParentSelectors = null;
 
-        if (! is_null($selfParent) && $selfParent->selectors) {
+        if (! \is_null($selfParent) && $selfParent->selectors) {
             $selfParentSelectors = $this->evalSelectors($selfParent->selectors);
         }
 
@@ -3924,8 +4902,8 @@ class Compiler
                 $prevSelectors = $selectors;
                 $selectors     = [];
 
-                foreach ($prevSelectors as $selector) {
-                    foreach ($parentSelectors as $parent) {
+                foreach ($parentSelectors as $parent) {
+                    foreach ($prevSelectors as $selector) {
                         if ($selfParentSelectors) {
                             foreach ($selfParentSelectors as $selfParent) {
                                 // if no '&' in the selector, each call will give same result, only add once
@@ -3945,16 +4923,21 @@ class Compiler
 
         $selectors = array_values($selectors);
 
+        // case we are just starting a at-root : nothing to multiply but parentSelectors
+        if (! $selectors && $selfParentSelectors) {
+            $selectors = $selfParentSelectors;
+        }
+
         return $selectors;
     }
 
     /**
      * Join selectors; looks for & to replace, or append parent before child
      *
-     * @param array   $parent
-     * @param array   $child
-     * @param boolean &$stillHasSelf
-     * @param array   $selfParentSelectors
+     * @param array $parent
+     * @param array $child
+     * @param bool  $stillHasSelf
+     * @param array $selfParentSelectors
 
      * @return array
      */
@@ -3975,7 +4958,7 @@ class Compiler
                 if ($p === static::$selfSelector && ! $setSelf) {
                     $setSelf = true;
 
-                    if (is_null($selfParentSelectors)) {
+                    if (\is_null($selfParentSelectors)) {
                         $selfParentSelectors = $parent;
                     }
 
@@ -3986,7 +4969,7 @@ class Compiler
                         }
 
                         foreach ($parentPart as $pp) {
-                            if (is_array($pp)) {
+                            if (\is_array($pp)) {
                                 $flatten = [];
 
                                 array_walk_recursive($pp, function ($a) use (&$flatten) {
@@ -4020,7 +5003,8 @@ class Compiler
      */
     protected function multiplyMedia(Environment $env = null, $childQueries = null)
     {
-        if (! isset($env) ||
+        if (
+            ! isset($env) ||
             ! empty($env->block->type) && $env->block->type !== Type::T_MEDIA
         ) {
             return $childQueries;
@@ -4031,6 +5015,8 @@ class Compiler
             return $this->multiplyMedia($env->parent, $childQueries);
         }
 
+        assert($env->block instanceof MediaBlock);
+
         $parentQueries = isset($env->block->queryList)
             ? $env->block->queryList
             : [[[Type::T_MEDIA_VALUE, $env->block->value]]];
@@ -4043,7 +5029,7 @@ class Compiler
 
         list($this->env, $this->storeEnv) = $store;
 
-        if (is_null($childQueries)) {
+        if (\is_null($childQueries)) {
             $childQueries = $parentQueries;
         } else {
             $originalQueries = $childQueries;
@@ -4066,9 +5052,11 @@ class Compiler
     /**
      * Convert env linked list to stack
      *
-     * @param \ScssPhp\ScssPhp\Compiler\Environment $env
+     * @param Environment $env
      *
-     * @return array
+     * @return Environment[]
+     *
+     * @phpstan-return non-empty-array<Environment>
      */
     protected function compactEnv(Environment $env)
     {
@@ -4082,9 +5070,11 @@ class Compiler
     /**
      * Convert env stack to singly linked list
      *
-     * @param array $envs
+     * @param Environment[] $envs
      *
-     * @return \ScssPhp\ScssPhp\Compiler\Environment
+     * @return Environment
+     *
+     * @phpstan-param  non-empty-array<Environment> $envs
      */
     protected function extractEnv($envs)
     {
@@ -4105,25 +5095,47 @@ class Compiler
      */
     protected function pushEnv(Block $block = null)
     {
-        $env = new Environment;
+        $env = new Environment();
         $env->parent = $this->env;
+        $env->parentStore = $this->storeEnv;
         $env->store  = [];
         $env->block  = $block;
         $env->depth  = isset($this->env->depth) ? $this->env->depth + 1 : 0;
 
         $this->env = $env;
+        $this->storeEnv = null;
 
         return $env;
     }
 
     /**
      * Pop environment
+     *
+     * @return void
      */
     protected function popEnv()
     {
+        $this->storeEnv = $this->env->parentStore;
         $this->env = $this->env->parent;
     }
 
+    /**
+     * Propagate vars from a just poped Env (used in @each and @for)
+     *
+     * @param array         $store
+     * @param null|string[] $excludedVars
+     *
+     * @return void
+     */
+    protected function backPropagateEnv($store, $excludedVars = null)
+    {
+        foreach ($store as $key => $value) {
+            if (empty($excludedVars) || ! \in_array($key, $excludedVars)) {
+                $this->set($key, $value, true);
+            }
+        }
+    }
+
     /**
      * Get store environment
      *
@@ -4139,9 +5151,11 @@ class Compiler
      *
      * @param string                                $name
      * @param mixed                                 $value
-     * @param boolean                               $shadow
+     * @param bool                                  $shadow
      * @param \ScssPhp\ScssPhp\Compiler\Environment $env
      * @param mixed                                 $valueUnreduced
+     *
+     * @return void
      */
     protected function set($name, $value, $shadow = false, Environment $env = null, $valueUnreduced = null)
     {
@@ -4165,29 +5179,50 @@ class Compiler
      * @param mixed                                 $value
      * @param \ScssPhp\ScssPhp\Compiler\Environment $env
      * @param mixed                                 $valueUnreduced
+     *
+     * @return void
      */
     protected function setExisting($name, $value, Environment $env, $valueUnreduced = null)
     {
         $storeEnv = $env;
+        $specialContentKey = static::$namespaces['special'] . 'content';
 
         $hasNamespace = $name[0] === '^' || $name[0] === '@' || $name[0] === '%';
 
+        $maxDepth = 10000;
+
         for (;;) {
-            if (array_key_exists($name, $env->store)) {
+            if ($maxDepth-- <= 0) {
+                break;
+            }
+
+            if (\array_key_exists($name, $env->store)) {
                 break;
             }
 
             if (! $hasNamespace && isset($env->marker)) {
+                if (! empty($env->store[$specialContentKey])) {
+                    $env = $env->store[$specialContentKey]->scope;
+                    continue;
+                }
+
+                if (! empty($env->declarationScopeParent)) {
+                    $env = $env->declarationScopeParent;
+                    continue;
+                } else {
+                    $env = $storeEnv;
+                    break;
+                }
+            }
+
+            if (isset($env->parentStore)) {
+                $env = $env->parentStore;
+            } elseif (isset($env->parent)) {
+                $env = $env->parent;
+            } else {
                 $env = $storeEnv;
                 break;
             }
-
-            if (! isset($env->parent)) {
-                $env = $storeEnv;
-                break;
-            }
-
-            $env = $env->parent;
         }
 
         $env->store[$name] = $value;
@@ -4204,6 +5239,8 @@ class Compiler
      * @param mixed                                 $value
      * @param \ScssPhp\ScssPhp\Compiler\Environment $env
      * @param mixed                                 $valueUnreduced
+     *
+     * @return void
      */
     protected function setRaw($name, $value, Environment $env, $valueUnreduced = null)
     {
@@ -4217,12 +5254,12 @@ class Compiler
     /**
      * Get variable
      *
-     * @api
+     * @internal
      *
      * @param string                                $name
-     * @param boolean                               $shouldThrow
+     * @param bool                                  $shouldThrow
      * @param \ScssPhp\ScssPhp\Compiler\Environment $env
-     * @param boolean                               $unreduced
+     * @param bool                                  $unreduced
      *
      * @return mixed|null
      */
@@ -4244,7 +5281,7 @@ class Compiler
                 break;
             }
 
-            if (array_key_exists($normalizedName, $env->store)) {
+            if (\array_key_exists($normalizedName, $env->store)) {
                 if ($unreduced && isset($env->storeUnreduced[$normalizedName])) {
                     return $env->storeUnreduced[$normalizedName];
                 }
@@ -4266,15 +5303,17 @@ class Compiler
                 continue;
             }
 
-            if (! isset($env->parent)) {
+            if (isset($env->parentStore)) {
+                $env = $env->parentStore;
+            } elseif (isset($env->parent)) {
+                $env = $env->parent;
+            } else {
                 break;
             }
-
-            $env = $env->parent;
         }
 
         if ($shouldThrow) {
-            $this->throwError("Undefined variable \$$name" . ($maxDepth <= 0 ? " (infinite recursion)" : ""));
+            throw $this->error("Undefined variable \$$name" . ($maxDepth <= 0 ? ' (infinite recursion)' : ''));
         }
 
         // found nothing
@@ -4287,17 +5326,19 @@ class Compiler
      * @param string                                $name
      * @param \ScssPhp\ScssPhp\Compiler\Environment $env
      *
-     * @return boolean
+     * @return bool
      */
     protected function has($name, Environment $env = null)
     {
-        return ! is_null($this->get($name, false, $env));
+        return ! \is_null($this->get($name, false, $env));
     }
 
     /**
      * Inject variables
      *
      * @param array $args
+     *
+     * @return void
      */
     protected function injectVariables(array $args)
     {
@@ -4312,7 +5353,7 @@ class Compiler
                 $name = substr($name, 1);
             }
 
-            if (! $parser->parseValue($strValue, $value)) {
+            if (!\is_string($strValue) || ! $parser->parseValue($strValue, $value)) {
                 $value = $this->coerceValue($strValue);
             }
 
@@ -4320,16 +5361,59 @@ class Compiler
         }
     }
 
+    /**
+     * Replaces variables.
+     *
+     * @param array<string, mixed> $variables
+     *
+     * @return void
+     */
+    public function replaceVariables(array $variables)
+    {
+        $this->registeredVars = [];
+        $this->addVariables($variables);
+    }
+
+    /**
+     * Replaces variables.
+     *
+     * @param array<string, mixed> $variables
+     *
+     * @return void
+     */
+    public function addVariables(array $variables)
+    {
+        $triggerWarning = false;
+
+        foreach ($variables as $name => $value) {
+            if (!$value instanceof Number && !\is_array($value)) {
+                $triggerWarning = true;
+            }
+
+            $this->registeredVars[$name] = $value;
+        }
+
+        if ($triggerWarning) {
+            @trigger_error('Passing raw values to as custom variables to the Compiler is deprecated. Use "\ScssPhp\ScssPhp\ValueConverter::parseValue" or "\ScssPhp\ScssPhp\ValueConverter::fromPhp" to convert them instead.', E_USER_DEPRECATED);
+        }
+    }
+
     /**
      * Set variables
      *
      * @api
      *
      * @param array $variables
+     *
+     * @return void
+     *
+     * @deprecated Use "addVariables" or "replaceVariables" instead.
      */
     public function setVariables(array $variables)
     {
-        $this->registeredVars = array_merge($this->registeredVars, $variables);
+        @trigger_error('The method "setVariables" of the Compiler is deprecated. Use the "addVariables" method for the equivalent behavior or "replaceVariables" if merging with previous variables was not desired.');
+
+        $this->addVariables($variables);
     }
 
     /**
@@ -4338,6 +5422,8 @@ class Compiler
      * @api
      *
      * @param string $name
+     *
+     * @return void
      */
     public function unsetVariable($name)
     {
@@ -4359,13 +5445,15 @@ class Compiler
     /**
      * Adds to list of parsed files
      *
-     * @api
+     * @internal
      *
-     * @param string $path
+     * @param string|null $path
+     *
+     * @return void
      */
     public function addParsedFile($path)
     {
-        if (isset($path) && is_file($path)) {
+        if (! \is_null($path) && is_file($path)) {
             $this->parsedFiles[realpath($path)] = filemtime($path);
         }
     }
@@ -4373,12 +5461,12 @@ class Compiler
     /**
      * Returns list of parsed files
      *
-     * @api
-     *
-     * @return array
+     * @deprecated
+     * @return array<string, int>
      */
     public function getParsedFiles()
     {
+        @trigger_error('The method "getParsedFiles" of the Compiler is deprecated. Use the "getIncludedFiles" method on the CompilationResult instance returned by compileString() instead. Be careful that the signature of the method is different.', E_USER_DEPRECATED);
         return $this->parsedFiles;
     }
 
@@ -4388,10 +5476,12 @@ class Compiler
      * @api
      *
      * @param string|callable $path
+     *
+     * @return void
      */
     public function addImportPath($path)
     {
-        if (! in_array($path, $this->importPaths)) {
+        if (! \in_array($path, $this->importPaths)) {
             $this->importPaths[] = $path;
         }
     }
@@ -4401,11 +5491,24 @@ class Compiler
      *
      * @api
      *
-     * @param string|array $path
+     * @param string|array<string|callable> $path
+     *
+     * @return void
      */
     public function setImportPaths($path)
     {
-        $this->importPaths = (array) $path;
+        $paths = (array) $path;
+        $actualImportPaths = array_filter($paths, function ($path) {
+            return $path !== '';
+        });
+
+        $this->legacyCwdImportPath = \count($actualImportPaths) !== \count($paths);
+
+        if ($this->legacyCwdImportPath) {
+            @trigger_error('Passing an empty string in the import paths to refer to the current working directory is deprecated. If that\'s the intended behavior, the value of "getcwd()" should be used directly instead. If this was used for resolving relative imports of the input alongside "chdir" with the source directory, the path of the input file should be passed to "compileString()" instead.', E_USER_DEPRECATED);
+        }
+
+        $this->importPaths = $actualImportPaths;
     }
 
     /**
@@ -4413,11 +5516,43 @@ class Compiler
      *
      * @api
      *
-     * @param integer $numberPrecision
+     * @param int $numberPrecision
+     *
+     * @return void
+     *
+     * @deprecated The number precision is not configurable anymore. The default is enough for all browsers.
      */
     public function setNumberPrecision($numberPrecision)
     {
-        Node\Number::$precision = $numberPrecision;
+        @trigger_error('The number precision is not configurable anymore. '
+            . 'The default is enough for all browsers.', E_USER_DEPRECATED);
+    }
+
+    /**
+     * Sets the output style.
+     *
+     * @api
+     *
+     * @param string $style One of the OutputStyle constants
+     *
+     * @return void
+     *
+     * @phpstan-param OutputStyle::* $style
+     */
+    public function setOutputStyle($style)
+    {
+        switch ($style) {
+            case OutputStyle::EXPANDED:
+                $this->configuredFormatter = Expanded::class;
+                break;
+
+            case OutputStyle::COMPRESSED:
+                $this->configuredFormatter = Compressed::class;
+                break;
+
+            default:
+                throw new \InvalidArgumentException(sprintf('Invalid output style "%s".', $style));
+        }
     }
 
     /**
@@ -4426,10 +5561,21 @@ class Compiler
      * @api
      *
      * @param string $formatterName
+     *
+     * @return void
+     *
+     * @deprecated Use {@see setOutputStyle} instead.
+     *
+     * @phpstan-param class-string<Formatter> $formatterName
      */
     public function setFormatter($formatterName)
     {
-        $this->formatter = $formatterName;
+        if (!\in_array($formatterName, [Expanded::class, Compressed::class], true)) {
+            @trigger_error('Formatters other than Expanded and Compressed are deprecated.', E_USER_DEPRECATED);
+        }
+        @trigger_error('The method "setFormatter" is deprecated. Use "setOutputStyle" instead.', E_USER_DEPRECATED);
+
+        $this->configuredFormatter = $formatterName;
     }
 
     /**
@@ -4438,10 +5584,34 @@ class Compiler
      * @api
      *
      * @param string $lineNumberStyle
+     *
+     * @return void
+     *
+     * @deprecated The line number output is not supported anymore. Use source maps instead.
      */
     public function setLineNumberStyle($lineNumberStyle)
     {
-        $this->lineNumberStyle = $lineNumberStyle;
+        @trigger_error('The line number output is not supported anymore. '
+                       . 'Use source maps instead.', E_USER_DEPRECATED);
+    }
+
+    /**
+     * Configures the handling of non-ASCII outputs.
+     *
+     * If $charset is `true`, this will include a `@charset` declaration or a
+     * UTF-8 [byte-order mark][] if the stylesheet contains any non-ASCII
+     * characters. Otherwise, it will never include a `@charset` declaration or a
+     * byte-order mark.
+     *
+     * [byte-order mark]: https://en.wikipedia.org/wiki/Byte_order_mark#UTF-8
+     *
+     * @param bool $charset
+     *
+     * @return void
+     */
+    public function setCharset($charset)
+    {
+        $this->charset = $charset;
     }
 
     /**
@@ -4449,7 +5619,11 @@ class Compiler
      *
      * @api
      *
-     * @param integer $sourceMap
+     * @param int $sourceMap
+     *
+     * @return void
+     *
+     * @phpstan-param self::SOURCE_MAP_* $sourceMap
      */
     public function setSourceMap($sourceMap)
     {
@@ -4462,6 +5636,10 @@ class Compiler
      * @api
      *
      * @param array $sourceMapOptions
+     *
+     * @phpstan-param  array{sourceRoot?: string, sourceMapFilename?: string|null, sourceMapURL?: string|null, sourceMapWriteTo?: string|null, outputSourceFiles?: bool, sourceMapRootpath?: string, sourceMapBasepath?: string} $sourceMapOptions
+     *
+     * @return void
      */
     public function setSourceMapOptions($sourceMapOptions)
     {
@@ -4473,13 +5651,23 @@ class Compiler
      *
      * @api
      *
-     * @param string   $name
-     * @param callable $func
-     * @param array    $prototype
+     * @param string        $name
+     * @param callable      $callback
+     * @param string[]|null $argumentDeclaration
+     *
+     * @return void
      */
-    public function registerFunction($name, $func, $prototype = null)
+    public function registerFunction($name, $callback, $argumentDeclaration = null)
     {
-        $this->userFunctions[$this->normalizeName($name)] = [$func, $prototype];
+        if (self::isNativeFunction($name)) {
+            @trigger_error(sprintf('The "%s" function is a core sass function. Overriding it with a custom implementation through "%s" is deprecated and won\'t be supported in ScssPhp 2.0 anymore.', $name, __METHOD__), E_USER_DEPRECATED);
+        }
+
+        if ($argumentDeclaration === null) {
+            @trigger_error('Omitting the argument declaration when registering custom function is deprecated and won\'t be supported in ScssPhp 2.0 anymore.', E_USER_DEPRECATED);
+        }
+
+        $this->userFunctions[$this->normalizeName($name)] = [$callback, $argumentDeclaration];
     }
 
     /**
@@ -4488,6 +5676,8 @@ class Compiler
      * @api
      *
      * @param string $name
+     *
+     * @return void
      */
     public function unregisterFunction($name)
     {
@@ -4500,9 +5690,15 @@ class Compiler
      * @api
      *
      * @param string $name
+     *
+     * @return void
+     *
+     * @deprecated Registering additional features is deprecated.
      */
     public function addFeature($name)
     {
+        @trigger_error('Registering additional features is deprecated.', E_USER_DEPRECATED);
+
         $this->registeredFeatures[$name] = true;
     }
 
@@ -4511,12 +5707,28 @@ class Compiler
      *
      * @param string                                 $path
      * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $out
+     *
+     * @return void
      */
     protected function importFile($path, OutputBlock $out)
     {
+        $this->pushCallStack('import ' . $this->getPrettyPath($path));
         // see if tree is cached
         $realPath = realpath($path);
 
+        if ($realPath === false) {
+            $realPath = $path;
+        }
+
+        if (substr($path, -5) === '.sass') {
+            $this->sourceIndex = \count($this->sourceNames);
+            $this->sourceNames[] = $path;
+            $this->sourceLine = 1;
+            $this->sourceColumn = 1;
+
+            throw $this->error('The Sass indented syntax is not implemented.');
+        }
+
         if (isset($this->importCache[$realPath])) {
             $this->handleImportLoop($realPath);
 
@@ -4529,62 +5741,261 @@ class Compiler
             $this->importCache[$realPath] = $tree;
         }
 
-        $pi = pathinfo($path);
+        $currentDirectory = $this->currentDirectory;
+        $this->currentDirectory = dirname($path);
 
-        array_unshift($this->importPaths, $pi['dirname']);
         $this->compileChildrenNoReturn($tree->children, $out);
-        array_shift($this->importPaths);
+        $this->currentDirectory = $currentDirectory;
+        $this->popCallStack();
+    }
+
+    /**
+     * Save the imported files with their resolving path context
+     *
+     * @param string|null $currentDirectory
+     * @param string      $path
+     * @param string      $filePath
+     *
+     * @return void
+     */
+    private function registerImport($currentDirectory, $path, $filePath)
+    {
+        $this->resolvedImports[] = ['currentDir' => $currentDirectory, 'path' => $path, 'filePath' => $filePath];
+    }
+
+    /**
+     * Detects whether the import is a CSS import.
+     *
+     * For legacy reasons, custom importers are called for those, allowing them
+     * to replace them with an actual Sass import. However this behavior is
+     * deprecated. Custom importers are expected to return null when they receive
+     * a CSS import.
+     *
+     * @param string $url
+     *
+     * @return bool
+     */
+    public static function isCssImport($url)
+    {
+        return 1 === preg_match('~\.css$|^https?://|^//~', $url);
     }
 
     /**
      * Return the file path for an import url if it exists
      *
-     * @api
+     * @internal
      *
-     * @param string $url
+     * @param string      $url
+     * @param string|null $currentDir
      *
      * @return string|null
      */
-    public function findImport($url)
+    public function findImport($url, $currentDir = null)
     {
-        $urls = [];
+        // Vanilla css and external requests. These are not meant to be Sass imports.
+        // Callback importers are still called for BC.
+        if (self::isCssImport($url)) {
+            foreach ($this->importPaths as $dir) {
+                if (\is_string($dir)) {
+                    continue;
+                }
 
-        // for "normal" scss imports (ignore vanilla css and external requests)
-        if (! preg_match('~\.css$|^https?://~', $url)) {
-            // try both normal and the _partial filename
-            $urls = [$url, preg_replace('~[^/]+$~', '_\0', $url)];
-        }
+                if (\is_callable($dir)) {
+                    // check custom callback for import path
+                    $file = \call_user_func($dir, $url);
 
-        $hasExtension = preg_match('/[.]s?css$/', $url);
+                    if (! \is_null($file)) {
+                        if (\is_array($dir)) {
+                            $callableDescription = (\is_object($dir[0]) ? \get_class($dir[0]) : $dir[0]).'::'.$dir[1];
+                        } elseif ($dir instanceof \Closure) {
+                            $r = new \ReflectionFunction($dir);
+                            if (false !== strpos($r->name, '{closure}')) {
+                                $callableDescription = sprintf('closure{%s:%s}', $r->getFileName(), $r->getStartLine());
+                            } elseif ($class = $r->getClosureScopeClass()) {
+                                $callableDescription = $class->name.'::'.$r->name;
+                            } else {
+                                $callableDescription = $r->name;
+                            }
+                        } elseif (\is_object($dir)) {
+                            $callableDescription = \get_class($dir) . '::__invoke';
+                        } else {
+                            $callableDescription = 'callable'; // Fallback if we don't have a dedicated description
+                        }
+                        @trigger_error(sprintf('Returning a file to import for CSS or external references in custom importer callables is deprecated and will not be supported anymore in ScssPhp 2.0. This behavior is not compliant with the Sass specification. Update your "%s" importer.', $callableDescription), E_USER_DEPRECATED);
 
-        foreach ($this->importPaths as $dir) {
-            if (is_string($dir)) {
-                // check urls for normal import paths
-                foreach ($urls as $full) {
-                    $separator = (
-                        ! empty($dir) &&
-                        substr($dir, -1) !== '/' &&
-                        substr($full, 0, 1) !== '/'
-                    ) ? '/' : '';
-                    $full = $dir . $separator . $full;
-
-                    if (is_file($file = $full . '.scss') ||
-                        ($hasExtension && is_file($file = $full))
-                    ) {
                         return $file;
                     }
                 }
-            } elseif (is_callable($dir)) {
-                // check custom callback for import path
-                $file = call_user_func($dir, $url);
+            }
+            return null;
+        }
 
-                if (! is_null($file)) {
+        if (!\is_null($currentDir)) {
+            $relativePath = $this->resolveImportPath($url, $currentDir);
+
+            if (!\is_null($relativePath)) {
+                return $relativePath;
+            }
+        }
+
+        foreach ($this->importPaths as $dir) {
+            if (\is_string($dir)) {
+                $path = $this->resolveImportPath($url, $dir);
+
+                if (!\is_null($path)) {
+                    return $path;
+                }
+            } elseif (\is_callable($dir)) {
+                // check custom callback for import path
+                $file = \call_user_func($dir, $url);
+
+                if (! \is_null($file)) {
                     return $file;
                 }
             }
         }
 
-        return null;
+        if ($this->legacyCwdImportPath) {
+            $path = $this->resolveImportPath($url, getcwd());
+
+            if (!\is_null($path)) {
+                @trigger_error('Resolving imports relatively to the current working directory is deprecated. If that\'s the intended behavior, the value of "getcwd()" should be added as an import path explicitly instead. If this was used for resolving relative imports of the input alongside "chdir" with the source directory, the path of the input file should be passed to "compileString()" instead.', E_USER_DEPRECATED);
+
+                return $path;
+            }
+        }
+
+        throw $this->error("`$url` file not found for @import");
+    }
+
+    /**
+     * @param string $url
+     * @param string $baseDir
+     *
+     * @return string|null
+     */
+    private function resolveImportPath($url, $baseDir)
+    {
+        $path = Path::join($baseDir, $url);
+
+        $hasExtension = preg_match('/.s[ac]ss$/', $url);
+
+        if ($hasExtension) {
+            return $this->checkImportPathConflicts($this->tryImportPath($path));
+        }
+
+        $result = $this->checkImportPathConflicts($this->tryImportPathWithExtensions($path));
+
+        if (!\is_null($result)) {
+            return $result;
+        }
+
+        return $this->tryImportPathAsDirectory($path);
+    }
+
+    /**
+     * @param string[] $paths
+     *
+     * @return string|null
+     */
+    private function checkImportPathConflicts(array $paths)
+    {
+        if (\count($paths) === 0) {
+            return null;
+        }
+
+        if (\count($paths) === 1) {
+            return $paths[0];
+        }
+
+        $formattedPrettyPaths = [];
+
+        foreach ($paths as $path) {
+            $formattedPrettyPaths[] = '  ' . $this->getPrettyPath($path);
+        }
+
+        throw $this->error("It's not clear which file to import. Found:\n" . implode("\n", $formattedPrettyPaths));
+    }
+
+    /**
+     * @param string $path
+     *
+     * @return string[]
+     */
+    private function tryImportPathWithExtensions($path)
+    {
+        $result = array_merge(
+            $this->tryImportPath($path.'.sass'),
+            $this->tryImportPath($path.'.scss')
+        );
+
+        if ($result) {
+            return $result;
+        }
+
+        return $this->tryImportPath($path.'.css');
+    }
+
+    /**
+     * @param string $path
+     *
+     * @return string[]
+     */
+    private function tryImportPath($path)
+    {
+        $partial = dirname($path).'/_'.basename($path);
+
+        $candidates = [];
+
+        if (is_file($partial)) {
+            $candidates[] = $partial;
+        }
+
+        if (is_file($path)) {
+            $candidates[] = $path;
+        }
+
+        return $candidates;
+    }
+
+    /**
+     * @param string $path
+     *
+     * @return string|null
+     */
+    private function tryImportPathAsDirectory($path)
+    {
+        if (!is_dir($path)) {
+            return null;
+        }
+
+        return $this->checkImportPathConflicts($this->tryImportPathWithExtensions($path.'/index'));
+    }
+
+    /**
+     * @param string|null $path
+     *
+     * @return string
+     */
+    private function getPrettyPath($path)
+    {
+        if ($path === null) {
+            return '(unknown file)';
+        }
+
+        $normalizedPath = $path;
+        $normalizedRootDirectory = $this->rootDirectory.'/';
+
+        if (\DIRECTORY_SEPARATOR === '\\') {
+            $normalizedRootDirectory = str_replace('\\', '/', $normalizedRootDirectory);
+            $normalizedPath = str_replace('\\', '/', $path);
+        }
+
+        if (0 === strpos($normalizedPath, $normalizedRootDirectory)) {
+            return substr($path, \strlen($normalizedRootDirectory));
+        }
+
+        return $path;
     }
 
     /**
@@ -4592,10 +6003,20 @@ class Compiler
      *
      * @api
      *
-     * @param string $encoding
+     * @param string|null $encoding
+     *
+     * @return void
+     *
+     * @deprecated Non-compliant support for other encodings than UTF-8 is deprecated.
      */
     public function setEncoding($encoding)
     {
+        if (!$encoding || strtolower($encoding) === 'utf-8') {
+            @trigger_error(sprintf('The "%s" method is deprecated.', __METHOD__), E_USER_DEPRECATED);
+        } else {
+            @trigger_error(sprintf('The "%s" method is deprecated. Parsing will only support UTF-8 in ScssPhp 2.0. The non-UTF-8 parsing of ScssPhp 1.x is not spec compliant.', __METHOD__), E_USER_DEPRECATED);
+        }
+
         $this->encoding = $encoding;
     }
 
@@ -4604,17 +6025,37 @@ class Compiler
      *
      * @api
      *
-     * @param boolean $ignoreErrors
+     * @param bool $ignoreErrors
      *
      * @return \ScssPhp\ScssPhp\Compiler
+     *
+     * @deprecated Ignoring Sass errors is not longer supported.
      */
     public function setIgnoreErrors($ignoreErrors)
     {
-        $this->ignoreErrors = $ignoreErrors;
+        @trigger_error('Ignoring Sass errors is not longer supported.', E_USER_DEPRECATED);
 
         return $this;
     }
 
+    /**
+     * Get source position
+     *
+     * @api
+     *
+     * @return array
+     *
+     * @deprecated
+     */
+    public function getSourcePosition()
+    {
+        @trigger_error(sprintf('The "%s" method is deprecated.', __METHOD__), E_USER_DEPRECATED);
+
+        $sourceFile = isset($this->sourceNames[$this->sourceIndex]) ? $this->sourceNames[$this->sourceIndex] : '';
+
+        return [$sourceFile, $this->sourceLine, $this->sourceColumn];
+    }
+
     /**
      * Throw error (exception)
      *
@@ -4622,24 +6063,58 @@ class Compiler
      *
      * @param string $msg Message with optional sprintf()-style vararg parameters
      *
+     * @return never
+     *
      * @throws \ScssPhp\ScssPhp\Exception\CompilerException
+     *
+     * @deprecated use "error" and throw the exception in the caller instead.
      */
     public function throwError($msg)
     {
-        if ($this->ignoreErrors) {
-            return;
+        @trigger_error(
+            'The method "throwError" is deprecated. Use "error" and throw the exception in the caller instead',
+            E_USER_DEPRECATED
+        );
+
+        throw $this->error(...func_get_args());
+    }
+
+    /**
+     * Build an error (exception)
+     *
+     * @internal
+     *
+     * @param string                     $msg Message with optional sprintf()-style vararg parameters
+     * @param bool|float|int|string|null ...$args
+     *
+     * @return CompilerException
+     */
+    public function error($msg, ...$args)
+    {
+        if ($args) {
+            $msg = sprintf($msg, ...$args);
         }
 
+        if (! $this->ignoreCallStackMessage) {
+            $msg = $this->addLocationToMessage($msg);
+        }
+
+        return new CompilerException($msg);
+    }
+
+    /**
+     * @param string $msg
+     *
+     * @return string
+     */
+    private function addLocationToMessage($msg)
+    {
         $line   = $this->sourceLine;
         $column = $this->sourceColumn;
 
         $loc = isset($this->sourceNames[$this->sourceIndex])
-             ? $this->sourceNames[$this->sourceIndex] . " on line $line, at column $column"
-             : "line: $line, column: $column";
-
-        if (func_num_args() > 1) {
-            $msg = call_user_func_array('sprintf', func_get_args());
-        }
+            ? $this->getPrettyPath($this->sourceNames[$this->sourceIndex]) . " on line $line, at column $column"
+            : "line: $line, column: $column";
 
         $msg = "$msg: $loc";
 
@@ -4649,14 +6124,51 @@ class Compiler
             $msg .= "\nCall Stack:\n" . $callStackMsg;
         }
 
-        throw new CompilerException($msg);
+        return $msg;
+    }
+
+    /**
+     * @param string $functionName
+     * @param array $ExpectedArgs
+     * @param int $nbActual
+     * @return CompilerException
+     *
+     * @deprecated
+     */
+    public function errorArgsNumber($functionName, $ExpectedArgs, $nbActual)
+    {
+        @trigger_error(sprintf('The "%s" method is deprecated.', __METHOD__), E_USER_DEPRECATED);
+
+        $nbExpected = \count($ExpectedArgs);
+
+        if ($nbActual > $nbExpected) {
+            return $this->error(
+                'Error: Only %d arguments allowed in %s(), but %d were passed.',
+                $nbExpected,
+                $functionName,
+                $nbActual
+            );
+        } else {
+            $missing = [];
+
+            while (count($ExpectedArgs) && count($ExpectedArgs) > $nbActual) {
+                array_unshift($missing, array_pop($ExpectedArgs));
+            }
+
+            return $this->error(
+                'Error: %s() argument%s %s missing.',
+                $functionName,
+                count($missing) > 1 ? 's' : '',
+                implode(', ', $missing)
+            );
+        }
     }
 
     /**
      * Beautify call stack for output
      *
-     * @param boolean $all
-     * @param null    $limit
+     * @param bool     $all
+     * @param int|null $limit
      *
      * @return string
      */
@@ -4668,15 +6180,15 @@ class Compiler
         if ($this->callStack) {
             foreach (array_reverse($this->callStack) as $call) {
                 if ($all || (isset($call['n']) && $call['n'])) {
-                    $msg = "#" . $ncall++ . " " . $call['n'] . " ";
+                    $msg = '#' . $ncall++ . ' ' . $call['n'] . ' ';
                     $msg .= (isset($this->sourceNames[$call[Parser::SOURCE_INDEX]])
-                          ? $this->sourceNames[$call[Parser::SOURCE_INDEX]]
+                          ? $this->getPrettyPath($this->sourceNames[$call[Parser::SOURCE_INDEX]])
                           : '(unknown file)');
-                    $msg .= " on line " . $call[Parser::SOURCE_LINE];
+                    $msg .= ' on line ' . $call[Parser::SOURCE_LINE];
 
                     $callStackMsg[] = $msg;
 
-                    if (! is_null($limit) && $ncall > $limit) {
+                    if (! \is_null($limit) && $ncall > $limit) {
                         break;
                     }
                 }
@@ -4691,6 +6203,8 @@ class Compiler
      *
      * @param string $name
      *
+     * @return void
+     *
      * @throws \Exception
      */
     protected function handleImportLoop($name)
@@ -4702,9 +6216,12 @@ class Compiler
 
             $file = $this->sourceNames[$env->block->sourceIndex];
 
+            if ($file === null) {
+                continue;
+            }
+
             if (realpath($file) === $name) {
-                $this->throwError('An @import loop has been found: %s imports %s', $file, basename($file));
-                break;
+                throw $this->error('An @import loop has been found: %s imports %s', $file, basename($file));
             }
         }
     }
@@ -4712,100 +6229,86 @@ class Compiler
     /**
      * Call SCSS @function
      *
-     * @param string $name
-     * @param array  $argValues
-     * @param array  $returnValue
+     * @param CallableBlock|null $func
+     * @param array              $argValues
      *
-     * @return boolean Returns true if returnValue is set; otherwise, false
+     * @return array|Number
      */
-    protected function callScssFunction($name, $argValues, &$returnValue)
+    protected function callScssFunction($func, $argValues)
     {
-        $func = $this->get(static::$namespaces['function'] . $name, false);
-
         if (! $func) {
-            return false;
+            return static::$defaultValue;
         }
+        $name = $func->name;
 
         $this->pushEnv();
 
-        $storeEnv = $this->storeEnv;
-        $this->storeEnv = $this->env;
-
         // set the args
         if (isset($func->args)) {
             $this->applyArguments($func->args, $argValues);
         }
 
         // throw away lines and children
-        $tmp = new OutputBlock;
+        $tmp = new OutputBlock();
         $tmp->lines    = [];
         $tmp->children = [];
 
         $this->env->marker = 'function';
+
         if (! empty($func->parentEnv)) {
             $this->env->declarationScopeParent = $func->parentEnv;
         } else {
-            $this->throwError("@function $name() without parentEnv");
+            throw $this->error("@function $name() without parentEnv");
         }
 
-        $ret = $this->compileChildren($func->children, $tmp, $this->env->marker . " " . $name);
-
-        $this->storeEnv = $storeEnv;
+        $ret = $this->compileChildren($func->children, $tmp, $this->env->marker . ' ' . $name);
 
         $this->popEnv();
 
-        $returnValue = ! isset($ret) ? static::$defaultValue : $ret;
-
-        return true;
+        return ! isset($ret) ? static::$defaultValue : $ret;
     }
 
     /**
      * Call built-in and registered (PHP) functions
      *
      * @param string $name
+     * @param callable $function
+     * @param array  $prototype
      * @param array  $args
-     * @param array  $returnValue
      *
-     * @return boolean Returns true if returnValue is set; otherwise, false
+     * @return array|Number|null
      */
-    protected function callNativeFunction($name, $args, &$returnValue)
+    protected function callNativeFunction($name, $function, $prototype, $args)
     {
-        // try a lib function
-        $name = $this->normalizeName($name);
+        $libName = (is_array($function) ? end($function) : null);
+        $sorted_kwargs = $this->sortNativeFunctionArgs($libName, $prototype, $args);
 
-        if (isset($this->userFunctions[$name])) {
-            // see if we can find a user function
-            list($f, $prototype) = $this->userFunctions[$name];
-        } elseif (($f = $this->getBuiltinFunction($name)) && is_callable($f)) {
-            $libName   = $f[1];
-            $prototype = isset(static::$$libName) ? static::$$libName : null;
-        } else {
-            return false;
+        if (\is_null($sorted_kwargs)) {
+            return null;
         }
+        @list($sorted, $kwargs) = $sorted_kwargs;
 
-        @list($sorted, $kwargs) = $this->sortNativeFunctionArgs($libName, $prototype, $args);
-
-        if ($name !== 'if' && $name !== 'call') {
-            $inExp = true;
-
-            if ($name === 'join') {
-                $inExp = false;
-            }
-
+        if ($name !== 'if') {
             foreach ($sorted as &$val) {
-                $val = $this->reduce($val, $inExp);
+                if ($val !== null) {
+                    $val = $this->reduce($val, true);
+                }
             }
         }
 
-        $returnValue = call_user_func($f, $sorted, $kwargs);
+        $returnValue = \call_user_func($function, $sorted, $kwargs);
 
         if (! isset($returnValue)) {
-            return false;
+            return null;
         }
 
-        $returnValue = $this->coerceValue($returnValue);
+        if (\is_array($returnValue) || $returnValue instanceof Number) {
+            return $returnValue;
+        }
 
-        return true;
+        @trigger_error(sprintf('Returning a PHP value from the "%s" custom function is deprecated. A sass value must be returned instead.', $name), E_USER_DEPRECATED);
+
+        return $this->coerceValue($returnValue);
     }
 
     /**
@@ -4817,6 +6320,22 @@ class Compiler
      */
     protected function getBuiltinFunction($name)
     {
+        $libName = self::normalizeNativeFunctionName($name);
+        return [$this, $libName];
+    }
+
+    /**
+     * Normalize native function name
+     *
+     * @internal
+     *
+     * @param string $name
+     *
+     * @return string
+     */
+    public static function normalizeNativeFunctionName($name)
+    {
+        $name = str_replace("-", "_", $name);
         $libName = 'lib' . preg_replace_callback(
             '/_(.)/',
             function ($m) {
@@ -4824,18 +6343,31 @@ class Compiler
             },
             ucfirst($name)
         );
+        return $libName;
+    }
 
-        return [$this, $libName];
+    /**
+     * Check if a function is a native built-in scss function, for css parsing
+     *
+     * @internal
+     *
+     * @param string $name
+     *
+     * @return bool
+     */
+    public static function isNativeFunction($name)
+    {
+        return method_exists(Compiler::class, self::normalizeNativeFunctionName($name));
     }
 
     /**
      * Sorts keyword arguments
      *
      * @param string $functionName
-     * @param array  $prototypes
+     * @param array|null  $prototypes
      * @param array  $args
      *
-     * @return array
+     * @return array|null
      */
     protected function sortNativeFunctionArgs($functionName, $prototypes, $args)
     {
@@ -4845,16 +6377,18 @@ class Compiler
             $keyArgs = [];
             $posArgs = [];
 
+            if (\is_array($args) && \count($args) && \end($args) === static::$null) {
+                array_pop($args);
+            }
+
             // separate positional and keyword arguments
             foreach ($args as $arg) {
                 list($key, $value) = $arg;
 
-                $key = $key[1];
-
-                if (empty($key)) {
+                if (empty($key) or empty($key[1])) {
                     $posArgs[] = empty($arg[2]) ? $value : $arg;
                 } else {
-                    $keyArgs[$key] = $value;
+                    $keyArgs[$key[1]] = $value;
                 }
             }
 
@@ -4862,209 +6396,359 @@ class Compiler
         }
 
         // specific cases ?
-        if (in_array($functionName, ['libRgb', 'libRgba', 'libHsl', 'libHsla'])) {
+        if (\in_array($functionName, ['libRgb', 'libRgba', 'libHsl', 'libHsla'])) {
             // notation 100 127 255 / 0 is in fact a simple list of 4 values
             foreach ($args as $k => $arg) {
-                if ($arg[1][0] === Type::T_LIST && count($arg[1][2]) === 3) {
-                    $last = end($arg[1][2]);
-
-                    if ($last[0] === Type::T_EXPRESSION && $last[1] === '/') {
-                        array_pop($arg[1][2]);
-                        $arg[1][2][] = $last[2];
-                        $arg[1][2][] = $last[3];
-                        $args[$k] = $arg;
-                    }
+                if (!isset($arg[1])) {
+                    continue; // This happens when using a trailing comma
+                }
+                if ($arg[1][0] === Type::T_LIST && \count($arg[1][2]) === 3) {
+                    $args[$k][1][2] = $this->extractSlashAlphaInColorFunction($arg[1][2]);
                 }
             }
         }
 
-        $finalArgs = [];
+        list($positionalArgs, $namedArgs, $names, $separator, $hasSplat) = $this->evaluateArguments($args, false);
 
-        if (! is_array(reset($prototypes))) {
+        if (! \is_array(reset($prototypes))) {
             $prototypes = [$prototypes];
         }
 
+        $parsedPrototypes = array_map([$this, 'parseFunctionPrototype'], $prototypes);
+        assert(!empty($parsedPrototypes));
+        $matchedPrototype = $this->selectFunctionPrototype($parsedPrototypes, \count($positionalArgs), $names);
+
+        $this->verifyPrototype($matchedPrototype, \count($positionalArgs), $names, $hasSplat);
+
+        $vars = $this->applyArgumentsToDeclaration($matchedPrototype, $positionalArgs, $namedArgs, $separator);
+
+        $finalArgs = [];
         $keyArgs = [];
 
-        // trying each prototypes
-        $prototypeHasMatch = false;
-        $exceptionMessage = '';
+        foreach ($matchedPrototype['arguments'] as $argument) {
+            list($normalizedName, $originalName, $default) = $argument;
 
-        foreach ($prototypes as $prototype) {
-            $argDef = [];
-
-            foreach ($prototype as $i => $p) {
-                $default = null;
-                $p       = explode(':', $p, 2);
-                $name    = array_shift($p);
-
-                if (count($p)) {
-                    $p = trim(reset($p));
-
-                    if ($p === 'null') {
-                        // differentiate this null from the static::$null
-                        $default = [Type::T_KEYWORD, 'null'];
-                    } else {
-                        if (is_null($parser)) {
-                            $parser = $this->parserFactory(__METHOD__);
-                        }
-
-                        $parser->parseValue($p, $default);
-                    }
-                }
-
-                $isVariable = false;
-
-                if (substr($name, -3) === '...') {
-                    $isVariable = true;
-                    $name = substr($name, 0, -3);
-                }
-
-                $argDef[] = [$name, $default, $isVariable];
+            if (isset($vars[$normalizedName])) {
+                $value = $vars[$normalizedName];
+            } else {
+                $value = $default;
             }
 
-            try {
-                $vars = $this->applyArguments($argDef, $args, false, false);
-
-                // ensure all args are populated
-                foreach ($prototype as $i => $p) {
-                    $name = explode(':', $p)[0];
-
-                    if (! isset($finalArgs[$i])) {
-                        $finalArgs[$i] = null;
-                    }
-                }
-
-                // apply positional args
-                foreach (array_values($vars) as $i => $val) {
-                    $finalArgs[$i] = $val;
-                }
-
-                $keyArgs = array_merge($keyArgs, $vars);
-                $prototypeHasMatch = true;
-
-                // overwrite positional args with keyword args
-                foreach ($prototype as $i => $p) {
-                    $name = explode(':', $p)[0];
-
-                    if (isset($keyArgs[$name])) {
-                        $finalArgs[$i] = $keyArgs[$name];
-                    }
-
-                    // special null value as default: translate to real null here
-                    if ($finalArgs[$i] === [Type::T_KEYWORD, 'null']) {
-                        $finalArgs[$i] = null;
-                    }
-                }
-                // should we break if this prototype seems fulfilled?
-            } catch (CompilerException $e) {
-                $exceptionMessage = $e->getMessage();
+            // special null value as default: translate to real null here
+            if ($value === [Type::T_KEYWORD, 'null']) {
+                $value = null;
             }
+
+            $finalArgs[] = $value;
+            $keyArgs[$originalName] = $value;
         }
 
-        if ($exceptionMessage && ! $prototypeHasMatch) {
-            $this->throwError($exceptionMessage);
+        if ($matchedPrototype['rest_argument'] !== null) {
+            $value = $vars[$matchedPrototype['rest_argument']];
+
+            $finalArgs[] = $value;
+            $keyArgs[$matchedPrototype['rest_argument']] = $value;
         }
 
         return [$finalArgs, $keyArgs];
     }
 
     /**
-     * Apply argument values per definition
+     * Parses a function prototype to the internal representation of arguments.
      *
-     * @param array   $argDef
-     * @param array   $argValues
-     * @param boolean $storeInEnv
-     * @param boolean $reduce
-     *   only used if $storeInEnv = false
+     * The input is an array of strings describing each argument, as supported
+     * in {@see registerFunction}. Argument names don't include the `$`.
+     * The output contains the list of positional argument, with their normalized
+     * name (underscores are replaced by dashes), their original name (to be used
+     * in case of error reporting) and their default value. The output also contains
+     * the normalized name of the rest argument, or null if the function prototype
+     * is not variadic.
+     *
+     * @param string[] $prototype
+     *
+     * @return array
+     * @phpstan-return array{arguments: list<array{0: string, 1: string, 2: array|Number|null}>, rest_argument: string|null}
+     */
+    private function parseFunctionPrototype(array $prototype)
+    {
+        static $parser = null;
+
+        $arguments = [];
+        $restArgument = null;
+
+        foreach ($prototype as $p) {
+            if (null !== $restArgument) {
+                throw new \InvalidArgumentException('The argument declaration is invalid. The rest argument must be the last one.');
+            }
+
+            $default = null;
+            $p = explode(':', $p, 2);
+            $name = str_replace('_', '-', $p[0]);
+
+            if (isset($p[1])) {
+                $defaultSource = trim($p[1]);
+
+                if ($defaultSource === 'null') {
+                    // differentiate this null from the static::$null
+                    $default = [Type::T_KEYWORD, 'null'];
+                } else {
+                    if (\is_null($parser)) {
+                        $parser = $this->parserFactory(__METHOD__);
+                    }
+
+                    $parser->parseValue($defaultSource, $default);
+                }
+            }
+
+            if (substr($name, -3) === '...') {
+                $restArgument = substr($name, 0, -3);
+            } else {
+                $arguments[] = [$name, $p[0], $default];
+            }
+        }
+
+        return [
+            'arguments' => $arguments,
+            'rest_argument' => $restArgument,
+        ];
+    }
+
+    /**
+     * Returns the function prototype for the given positional and named arguments.
+     *
+     * If no exact match is found, finds the closest approximation. Note that this
+     * doesn't guarantee that $positional and $names are valid for the returned
+     * prototype.
+     *
+     * @param array[]               $prototypes
+     * @param int                   $positional
+     * @param array<string, string> $names A set of names, as both keys and values
      *
      * @return array
      *
-     * @throws \Exception
+     * @phpstan-param non-empty-list<array{arguments: list<array{0: string, 1: string, 2: array|Number|null}>, rest_argument: string|null}> $prototypes
+     * @phpstan-return array{arguments: list<array{0: string, 1: string, 2: array|Number|null}>, rest_argument: string|null}
      */
-    protected function applyArguments($argDef, $argValues, $storeInEnv = true, $reduce = true)
+    private function selectFunctionPrototype(array $prototypes, $positional, array $names)
     {
-        $output = [];
-        if (is_array($argValues) && count($argValues) && end($argValues) === static::$null) {
-            array_pop($argValues);
+        $fuzzyMatch = null;
+        $minMismatchDistance = null;
+
+        foreach ($prototypes as $prototype) {
+            // Ideally, find an exact match.
+            if ($this->checkPrototypeMatches($prototype, $positional, $names)) {
+                return $prototype;
+            }
+
+            $mismatchDistance = \count($prototype['arguments']) - $positional;
+
+            if ($minMismatchDistance !== null) {
+                if (abs($mismatchDistance) > abs($minMismatchDistance)) {
+                    continue;
+                }
+
+                // If two overloads have the same mismatch distance, favor the overload
+                // that has more arguments.
+                if (abs($mismatchDistance) === abs($minMismatchDistance) && $mismatchDistance < 0) {
+                    continue;
+                }
+            }
+
+            $minMismatchDistance = $mismatchDistance;
+            $fuzzyMatch = $prototype;
         }
 
-        if ($storeInEnv) {
-            $storeEnv = $this->getStoreEnv();
+        return $fuzzyMatch;
+    }
 
-            $env = new Environment;
-            $env->store = $storeEnv->store;
+    /**
+     * Checks whether the argument invocation matches the callable prototype.
+     *
+     * The rules are similar to {@see verifyPrototype}. The boolean return value
+     * avoids the overhead of building and catching exceptions when the reason of
+     * not matching the prototype does not need to be known.
+     *
+     * @param array                 $prototype
+     * @param int                   $positional
+     * @param array<string, string> $names
+     *
+     * @return bool
+     *
+     * @phpstan-param array{arguments: list<array{0: string, 1: string, 2: array|Number|null}>, rest_argument: string|null} $prototype
+     */
+    private function checkPrototypeMatches(array $prototype, $positional, array $names)
+    {
+        $nameUsed = 0;
+
+        foreach ($prototype['arguments'] as $i => $argument) {
+            list ($name, $originalName, $default) = $argument;
+
+            if ($i < $positional) {
+                if (isset($names[$name])) {
+                    return false;
+                }
+            } elseif (isset($names[$name])) {
+                $nameUsed++;
+            } elseif ($default === null) {
+                return false;
+            }
         }
 
-        $hasVariable = false;
-        $args = [];
-
-        foreach ($argDef as $i => $arg) {
-            list($name, $default, $isVariable) = $argDef[$i];
-
-            $args[$name] = [$i, $name, $default, $isVariable];
-            $hasVariable |= $isVariable;
+        if ($prototype['rest_argument'] !== null) {
+            return true;
         }
 
-        $splatSeparator      = null;
-        $keywordArgs         = [];
-        $deferredKeywordArgs = [];
-        $remaining           = [];
-        $hasKeywordArgument  = false;
+        if ($positional > \count($prototype['arguments'])) {
+            return false;
+        }
 
-        // assign the keyword args
-        foreach ((array) $argValues as $arg) {
-            if (! empty($arg[0])) {
+        if ($nameUsed < \count($names)) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Verifies that the argument invocation is valid for the callable prototype.
+     *
+     * @param array                 $prototype
+     * @param int                   $positional
+     * @param array<string, string> $names
+     * @param bool                  $hasSplat
+     *
+     * @return void
+     *
+     * @throws SassScriptException
+     *
+     * @phpstan-param array{arguments: list<array{0: string, 1: string, 2: array|Number|null}>, rest_argument: string|null} $prototype
+     */
+    private function verifyPrototype(array $prototype, $positional, array $names, $hasSplat)
+    {
+        $nameUsed = 0;
+
+        foreach ($prototype['arguments'] as $i => $argument) {
+            list ($name, $originalName, $default) = $argument;
+
+            if ($i < $positional) {
+                if (isset($names[$name])) {
+                    throw new SassScriptException(sprintf('Argument $%s was passed both by position and by name.', $originalName));
+                }
+            } elseif (isset($names[$name])) {
+                $nameUsed++;
+            } elseif ($default === null) {
+                throw new SassScriptException(sprintf('Missing argument $%s', $originalName));
+            }
+        }
+
+        if ($prototype['rest_argument'] !== null) {
+            return;
+        }
+
+        if ($positional > \count($prototype['arguments'])) {
+            $message = sprintf(
+                'Only %d %sargument%s allowed, but %d %s passed.',
+                \count($prototype['arguments']),
+                empty($names) ? '' : 'positional ',
+                \count($prototype['arguments']) === 1 ? '' : 's',
+                $positional,
+                $positional === 1 ? 'was' : 'were'
+            );
+            if (!$hasSplat) {
+                throw new SassScriptException($message);
+            }
+
+            $message = $this->addLocationToMessage($message);
+            $message .= "\nThis will be an error in future versions of Sass.";
+            $this->logger->warn($message, true);
+        }
+
+        if ($nameUsed < \count($names)) {
+            $unknownNames = array_values(array_diff($names, array_column($prototype['arguments'], 0)));
+            $lastName = array_pop($unknownNames);
+            $message = sprintf(
+                'No argument%s named $%s%s.',
+                $unknownNames ? 's' : '',
+                $unknownNames ? implode(', $', $unknownNames) . ' or $' : '',
+                $lastName
+            );
+            throw new SassScriptException($message);
+        }
+    }
+
+    /**
+     * Evaluates the argument from the invocation.
+     *
+     * This returns several things about this invocation:
+     * - the list of positional arguments
+     * - the map of named arguments, indexed by normalized names
+     * - the set of names used in the arguments (that's an array using the normalized names as keys for O(1) access)
+     * - the separator used by the list using the splat operator, if any
+     * - a boolean indicator whether any splat argument (list or map) was used, to support the incomplete error reporting.
+     *
+     * @param array[] $args
+     * @param bool    $reduce Whether arguments should be reduced to their value
+     *
+     * @return array
+     *
+     * @throws SassScriptException
+     *
+     * @phpstan-return array{0: list<array|Number>, 1: array<string, array|Number>, 2: array<string, string>, 3: string|null, 4: bool}
+     */
+    private function evaluateArguments(array $args, $reduce = true)
+    {
+        // this represents trailing commas
+        if (\count($args) && end($args) === static::$null) {
+            array_pop($args);
+        }
+
+        $splatSeparator = null;
+        $keywordArgs = [];
+        $names = [];
+        $positionalArgs = [];
+        $hasKeywordArgument = false;
+        $hasSplat = false;
+
+        foreach ($args as $arg) {
+            if (!empty($arg[0])) {
                 $hasKeywordArgument = true;
 
-                $name = $arg[0][1];
-                if (! isset($args[$name])) {
-                    foreach (array_keys($args) as $an) {
-                        if (str_replace("_", "-", $an) === str_replace("_", "-", $name)) {
-                            $name = $an;
-                            break;
-                        }
-                    }
+                assert(\is_string($arg[0][1]));
+                $name = str_replace('_', '-', $arg[0][1]);
+
+                if (isset($keywordArgs[$name])) {
+                    throw new SassScriptException(sprintf('Duplicate named argument $%s.', $arg[0][1]));
                 }
-                if (! isset($args[$name]) || $args[$name][3]) {
-                    if ($hasVariable) {
-                        $deferredKeywordArgs[$name] = $arg[1];
-                    } else {
-                        $this->throwError("Mixin or function doesn't have an argument named $%s.", $arg[0][1]);
-                        break;
-                    }
-                } elseif ($args[$name][0] < count($remaining)) {
-                    $this->throwError("The argument $%s was passed both by position and by name.", $arg[0][1]);
-                    break;
-                } else {
-                    $keywordArgs[$name] = $arg[1];
-                }
-            } elseif ($arg[2] === true) {
+
+                $keywordArgs[$name] = $this->maybeReduce($reduce, $arg[1]);
+                $names[$name] = $name;
+            } elseif (! empty($arg[2])) {
+                // $arg[2] means a var followed by ... in the arg ($list... )
                 $val = $this->reduce($arg[1], true);
+                $hasSplat = true;
 
                 if ($val[0] === Type::T_LIST) {
-                    foreach ($val[2] as $name => $item) {
-                        if (! is_numeric($name)) {
-                            if (! isset($args[$name])) {
-                                foreach (array_keys($args) as $an) {
-                                    if (str_replace("_", "-", $an) === str_replace("_", "-", $name)) {
-                                        $name = $an;
-                                        break;
-                                    }
-                                }
+                    foreach ($val[2] as $item) {
+                        if (\is_null($splatSeparator)) {
+                            $splatSeparator = $val[1];
+                        }
+
+                        $positionalArgs[] = $this->maybeReduce($reduce, $item);
+                    }
+
+                    if (isset($val[3]) && \is_array($val[3])) {
+                        foreach ($val[3] as $name => $item) {
+                            assert(\is_string($name));
+
+                            $normalizedName = str_replace('_', '-', $name);
+
+                            if (isset($keywordArgs[$normalizedName])) {
+                                throw new SassScriptException(sprintf('Duplicate named argument $%s.', $name));
                             }
 
-                            if ($hasVariable) {
-                                $deferredKeywordArgs[$name] = $item;
-                            } else {
-                                $keywordArgs[$name] = $item;
-                            }
-                        } else {
-                            if (is_null($splatSeparator)) {
-                                $splatSeparator = $val[1];
-                            }
-
-                            $remaining[] = $item;
+                            $keywordArgs[$normalizedName] = $this->maybeReduce($reduce, $item);
+                            $names[$normalizedName] = $normalizedName;
+                            $hasKeywordArgument = true;
                         }
                     }
                 } elseif ($val[0] === Type::T_MAP) {
@@ -5073,62 +6757,121 @@ class Compiler
                         $item = $val[2][$i];
 
                         if (! is_numeric($name)) {
-                            if (! isset($args[$name])) {
-                                foreach (array_keys($args) as $an) {
-                                    if (str_replace("_", "-", $an) === str_replace("_", "-", $name)) {
-                                        $name = $an;
-                                        break;
-                                    }
-                                }
+                            $normalizedName = str_replace('_', '-', $name);
+
+                            if (isset($keywordArgs[$normalizedName])) {
+                                throw new SassScriptException(sprintf('Duplicate named argument $%s.', $name));
                             }
 
-                            if ($hasVariable) {
-                                $deferredKeywordArgs[$name] = $item;
-                            } else {
-                                $keywordArgs[$name] = $item;
-                            }
+                            $keywordArgs[$normalizedName] = $this->maybeReduce($reduce, $item);
+                            $names[$normalizedName] = $normalizedName;
+                            $hasKeywordArgument = true;
                         } else {
-                            if (is_null($splatSeparator)) {
+                            if (\is_null($splatSeparator)) {
                                 $splatSeparator = $val[1];
                             }
 
-                            $remaining[] = $item;
+                            $positionalArgs[] = $this->maybeReduce($reduce, $item);
                         }
                     }
-                } else {
-                    $remaining[] = $val;
+                } elseif ($val[0] !== Type::T_NULL) { // values other than null are treated a single-element lists, while null is the empty list
+                    $positionalArgs[] = $this->maybeReduce($reduce, $val);
                 }
             } elseif ($hasKeywordArgument) {
-                $this->throwError('Positional arguments must come before keyword arguments.');
-                break;
+                throw new SassScriptException('Positional arguments must come before keyword arguments.');
             } else {
-                $remaining[] = $arg[1];
+                $positionalArgs[] = $this->maybeReduce($reduce, $arg[1]);
             }
         }
 
-        foreach ($args as $arg) {
-            list($i, $name, $default, $isVariable) = $arg;
+        return [$positionalArgs, $keywordArgs, $names, $splatSeparator, $hasSplat];
+    }
+
+    /**
+     * @param bool         $reduce
+     * @param array|Number $value
+     *
+     * @return array|Number
+     */
+    private function maybeReduce($reduce, $value)
+    {
+        if ($reduce) {
+            return $this->reduce($value, true);
+        }
+
+        return $value;
+    }
+
+    /**
+     * Apply argument values per definition
+     *
+     * @param array[]    $argDef
+     * @param array|null $argValues
+     * @param bool       $storeInEnv
+     * @param bool       $reduce     only used if $storeInEnv = false
+     *
+     * @return array<string, array|Number>
+     *
+     * @phpstan-param list<array{0: string, 1: array|Number|null, 2: bool}> $argDef
+     *
+     * @throws \Exception
+     */
+    protected function applyArguments($argDef, $argValues, $storeInEnv = true, $reduce = true)
+    {
+        $output = [];
+
+        if (\is_null($argValues)) {
+            $argValues = [];
+        }
+
+        if ($storeInEnv) {
+            $storeEnv = $this->getStoreEnv();
+
+            $env = new Environment();
+            $env->store = $storeEnv->store;
+        }
+
+        $prototype = ['arguments' => [], 'rest_argument' => null];
+        $originalRestArgumentName = null;
+
+        foreach ($argDef as $arg) {
+            list($name, $default, $isVariable) = $arg;
+            $normalizedName = str_replace('_', '-', $name);
 
             if ($isVariable) {
-                $val = [Type::T_LIST, is_null($splatSeparator) ? ',' : $splatSeparator , [], $isVariable];
-
-                for ($count = count($remaining); $i < $count; $i++) {
-                    $val[2][] = $remaining[$i];
-                }
-
-                foreach ($deferredKeywordArgs as $itemName => $item) {
-                    $val[2][$itemName] = $item;
-                }
-            } elseif (isset($remaining[$i])) {
-                $val = $remaining[$i];
-            } elseif (isset($keywordArgs[$name])) {
-                $val = $keywordArgs[$name];
-            } elseif (! empty($default)) {
-                continue;
+                $originalRestArgumentName = $name;
+                $prototype['rest_argument'] = $normalizedName;
             } else {
-                $this->throwError("Missing argument $name");
-                break;
+                $prototype['arguments'][] = [$normalizedName, $name, !empty($default) ? $default : null];
             }
+        }
+
+        list($positionalArgs, $namedArgs, $names, $splatSeparator, $hasSplat) = $this->evaluateArguments($argValues, $reduce);
+
+        $this->verifyPrototype($prototype, \count($positionalArgs), $names, $hasSplat);
+
+        $vars = $this->applyArgumentsToDeclaration($prototype, $positionalArgs, $namedArgs, $splatSeparator);
+
+        foreach ($prototype['arguments'] as $argument) {
+            list($normalizedName, $name) = $argument;
+
+            if (!isset($vars[$normalizedName])) {
+                continue;
+            }
+
+            $val = $vars[$normalizedName];
+
+            if ($storeInEnv) {
+                $this->set($name, $this->reduce($val, true), true, $env);
+            } else {
+                $output[$name] = ($reduce ? $this->reduce($val, true) : $val);
+            }
+        }
+
+        if ($prototype['rest_argument'] !== null) {
+            assert($originalRestArgumentName !== null);
+            $name = $originalRestArgumentName;
+            $val = $vars[$prototype['rest_argument']];
 
             if ($storeInEnv) {
                 $this->set($name, $this->reduce($val, true), true, $env);
@@ -5141,12 +6884,13 @@ class Compiler
             $storeEnv->store = $env->store;
         }
 
-        foreach ($args as $arg) {
-            list($i, $name, $default, $isVariable) = $arg;
+        foreach ($prototype['arguments'] as $argument) {
+            list($normalizedName, $name, $default) = $argument;
 
-            if ($isVariable || isset($remaining[$i]) || isset($keywordArgs[$name]) || empty($default)) {
+            if (isset($vars[$normalizedName])) {
                 continue;
             }
+            assert($default !== null);
 
             if ($storeInEnv) {
                 $this->set($name, $this->reduce($default, true), true);
@@ -5158,29 +6902,90 @@ class Compiler
         return $output;
     }
 
+    /**
+     * Apply argument values per definition.
+     *
+     * This method assumes that the arguments are valid for the provided prototype.
+     * The validation with {@see verifyPrototype} must have been run before calling
+     * it.
+     * Arguments are returned as a map from the normalized argument names to the
+     * value. Additional arguments are collected in a sass argument list available
+     * under the name of the rest argument in the result.
+     *
+     * Defaults are not applied as they are resolved in a different environment.
+     *
+     * @param array                       $prototype
+     * @param array<array|Number>         $positionalArgs
+     * @param array<string, array|Number> $namedArgs
+     * @param string|null                 $splatSeparator
+     *
+     * @return array<string, array|Number>
+     *
+     * @phpstan-param array{arguments: list<array{0: string, 1: string, 2: array|Number|null}>, rest_argument: string|null} $prototype
+     */
+    private function applyArgumentsToDeclaration(array $prototype, array $positionalArgs, array $namedArgs, $splatSeparator)
+    {
+        $output = [];
+        $minLength = min(\count($positionalArgs), \count($prototype['arguments']));
+
+        for ($i = 0; $i < $minLength; $i++) {
+            list($name) = $prototype['arguments'][$i];
+            $val = $positionalArgs[$i];
+
+            $output[$name] = $val;
+        }
+
+        $restNamed = $namedArgs;
+
+        for ($i = \count($positionalArgs); $i < \count($prototype['arguments']); $i++) {
+            $argument = $prototype['arguments'][$i];
+            list($name) = $argument;
+
+            if (isset($namedArgs[$name])) {
+                $val = $namedArgs[$name];
+                unset($restNamed[$name]);
+            } else {
+                continue;
+            }
+
+            $output[$name] = $val;
+        }
+
+        if ($prototype['rest_argument'] !== null) {
+            $name = $prototype['rest_argument'];
+            $rest = array_values(array_slice($positionalArgs, \count($prototype['arguments'])));
+
+            $val = [Type::T_LIST, \is_null($splatSeparator) ? ',' : $splatSeparator , $rest, $restNamed];
+
+            $output[$name] = $val;
+        }
+
+        return $output;
+    }
+
     /**
      * Coerce a php value into a scss one
      *
      * @param mixed $value
      *
-     * @return array|\ScssPhp\ScssPhp\Node\Number
+     * @return array|Number
      */
     protected function coerceValue($value)
     {
-        if (is_array($value) || $value instanceof \ArrayAccess) {
+        if (\is_array($value) || $value instanceof Number) {
             return $value;
         }
 
-        if (is_bool($value)) {
+        if (\is_bool($value)) {
             return $this->toBool($value);
         }
 
-        if (is_null($value)) {
+        if (\is_null($value)) {
             return static::$null;
         }
 
         if (is_numeric($value)) {
-            return new Node\Number($value, '');
+            return new Number($value, '');
         }
 
         if ($value === '') {
@@ -5198,80 +7003,102 @@ class Compiler
     }
 
     /**
-     * Coerce something to map
+     * Tries to convert an item to a Sass map
      *
-     * @param array $item
+     * @param Number|array $item
      *
-     * @return array
+     * @return array|null
      */
-    protected function coerceMap($item)
+    private function tryMap($item)
     {
+        if ($item instanceof Number) {
+            return null;
+        }
+
         if ($item[0] === Type::T_MAP) {
             return $item;
         }
 
-        if ($item[0] === static::$emptyList[0]
-            && $item[1] === static::$emptyList[1]
-            && $item[2] === static::$emptyList[2]) {
+        if (
+            $item[0] === Type::T_LIST &&
+            $item[2] === []
+        ) {
             return static::$emptyMap;
         }
 
-        return [Type::T_MAP, [$item], [static::$null]];
+        return null;
+    }
+
+    /**
+     * Coerce something to map
+     *
+     * @param array|Number $item
+     *
+     * @return array|Number
+     */
+    protected function coerceMap($item)
+    {
+        $map = $this->tryMap($item);
+
+        if ($map !== null) {
+            return $map;
+        }
+
+        return $item;
     }
 
     /**
      * Coerce something to list
      *
-     * @param array  $item
-     * @param string $delim
+     * @param array|Number $item
+     * @param string       $delim
+     * @param bool         $removeTrailingNull
      *
      * @return array
      */
-    protected function coerceList($item, $delim = ',')
+    protected function coerceList($item, $delim = ',', $removeTrailingNull = false)
     {
-        if (isset($item) && $item[0] === Type::T_LIST) {
+        if ($item instanceof Number) {
+            return [Type::T_LIST, '', [$item]];
+        }
+
+        if ($item[0] === Type::T_LIST) {
+            // remove trailing null from the list
+            if ($removeTrailingNull && end($item[2]) === static::$null) {
+                array_pop($item[2]);
+            }
+
             return $item;
         }
 
-        if (isset($item) && $item[0] === Type::T_MAP) {
+        if ($item[0] === Type::T_MAP) {
             $keys = $item[1];
             $values = $item[2];
             $list = [];
 
-            for ($i = 0, $s = count($keys); $i < $s; $i++) {
+            for ($i = 0, $s = \count($keys); $i < $s; $i++) {
                 $key = $keys[$i];
                 $value = $values[$i];
 
-                switch ($key[0]) {
-                    case Type::T_LIST:
-                    case Type::T_MAP:
-                    case Type::T_STRING:
-                        break;
-
-                    default:
-                        $key = [Type::T_KEYWORD, $this->compileStringContent($this->coerceString($key))];
-                        break;
-                }
-
                 $list[] = [
                     Type::T_LIST,
-                    '',
+                    ' ',
                     [$key, $value]
                 ];
             }
 
-            return [Type::T_LIST, ',', $list];
+            return [Type::T_LIST, $list ? ',' : '', $list];
         }
 
-        return [Type::T_LIST, $delim, ! isset($item) ? []: [$item]];
+        return [Type::T_LIST, '', [$item]];
     }
 
     /**
      * Coerce color for expression
      *
-     * @param array $value
+     * @param array|Number $value
      *
-     * @return array|null
+     * @return array|Number
      */
     protected function coerceForExpression($value)
     {
@@ -5285,12 +7112,17 @@ class Compiler
     /**
      * Coerce value to color
      *
-     * @param array $value
+     * @param array|Number $value
+     * @param bool         $inRGBFunction
      *
      * @return array|null
      */
     protected function coerceColor($value, $inRGBFunction = false)
     {
+        if ($value instanceof Number) {
+            return null;
+        }
+
         switch ($value[0]) {
             case Type::T_COLOR:
                 for ($i = 1; $i <= 3; $i++) {
@@ -5321,7 +7153,7 @@ class Compiler
 
             case Type::T_LIST:
                 if ($inRGBFunction) {
-                    if (count($value[2]) == 3 || count($value[2]) == 4) {
+                    if (\count($value[2]) == 3 || \count($value[2]) == 4) {
                         $color = $value[2];
                         array_unshift($color, Type::T_COLOR);
 
@@ -5332,16 +7164,17 @@ class Compiler
                 return null;
 
             case Type::T_KEYWORD:
-                if (! is_string($value[1])) {
+                if (! \is_string($value[1])) {
                     return null;
                 }
 
                 $name = strtolower($value[1]);
+
                 // hexa color?
                 if (preg_match('/^#([0-9a-f]+)$/i', $name, $m)) {
-                    $nofValues = strlen($m[1]);
+                    $nofValues = \strlen($m[1]);
 
-                    if (in_array($nofValues, [3, 4, 6, 8])) {
+                    if (\in_array($nofValues, [3, 4, 6, 8])) {
                         $nbChannels = 3;
                         $color      = [];
                         $num        = hexdec($m[1]);
@@ -5375,7 +7208,7 @@ class Compiler
                             if ($color[3] === 255) {
                                 $color[3] = 1; // fully opaque
                             } else {
-                                $color[3] = round($color[3] / 255, 3);
+                                $color[3] = round($color[3] / 255, Number::PRECISION);
                             }
                         }
 
@@ -5398,10 +7231,10 @@ class Compiler
     }
 
     /**
-     * @param integer|\ScssPhp\ScssPhp\Node\Number $value
-     * @param boolean                              $isAlpha
+     * @param int|Number $value
+     * @param bool       $isAlpha
      *
-     * @return integer|mixed
+     * @return int|mixed
      */
     protected function compileRGBAValue($value, $isAlpha = false)
     {
@@ -5413,44 +7246,35 @@ class Compiler
     }
 
     /**
-     * @param mixed         $value
-     * @param integer|float $min
-     * @param integer|float $max
-     * @param boolean       $isInt
-     * @param boolean       $clamp
-     * @param boolean       $modulo
+     * @param mixed     $value
+     * @param int|float $min
+     * @param int|float $max
+     * @param bool      $isInt
      *
-     * @return integer|mixed
+     * @return int|mixed
      */
-    protected function compileColorPartValue($value, $min, $max, $isInt = true, $clamp = true, $modulo = false)
+    protected function compileColorPartValue($value, $min, $max, $isInt = true)
     {
         if (! is_numeric($value)) {
-            if (is_array($value)) {
+            if (\is_array($value)) {
                 $reduced = $this->reduce($value);
 
-                if (is_object($reduced) && $value->type === Type::T_NUMBER) {
+                if ($reduced instanceof Number) {
                     $value = $reduced;
                 }
             }
 
-            if (is_object($value) && $value->type === Type::T_NUMBER) {
-                $num = $value->dimension;
-
-                if (count($value->units)) {
-                    $unit = array_keys($value->units);
-                    $unit = reset($unit);
-
-                    switch ($unit) {
-                        case '%':
-                            $num *= $max / 100;
-                            break;
-                        default:
-                            break;
-                    }
+            if ($value instanceof Number) {
+                if ($value->unitless()) {
+                    $num = $value->getDimension();
+                } elseif ($value->hasUnit('%')) {
+                    $num = $max * $value->getDimension() / 100;
+                } else {
+                    throw $this->error('Expected %s to have no units or "%%".', $value);
                 }
 
                 $value = $num;
-            } elseif (is_array($value)) {
+            } elseif (\is_array($value)) {
                 $value = $this->compileValue($value);
             }
         }
@@ -5460,18 +7284,7 @@ class Compiler
                 $value = round($value);
             }
 
-            if ($clamp) {
-                $value = min($max, max($min, $value));
-            }
-
-            if ($modulo) {
-                $value = $value % $max;
-
-                // still negative?
-                while ($value < $min) {
-                    $value += $max;
-                }
-            }
+            $value = min($max, max($min, $value));
 
             return $value;
         }
@@ -5482,34 +7295,72 @@ class Compiler
     /**
      * Coerce value to string
      *
-     * @param array $value
+     * @param array|Number $value
      *
-     * @return array|null
+     * @return array
      */
     protected function coerceString($value)
     {
         if ($value[0] === Type::T_STRING) {
+            assert(\is_array($value));
+
             return $value;
         }
 
         return [Type::T_STRING, '', [$this->compileValue($value)]];
     }
 
+    /**
+     * Assert value is a string
+     *
+     * This method deals with internal implementation details of the value
+     * representation where unquoted strings can sometimes be stored under
+     * other types.
+     * The returned value is always using the T_STRING type.
+     *
+     * @api
+     *
+     * @param array|Number $value
+     * @param string|null  $varName
+     *
+     * @return array
+     *
+     * @throws SassScriptException
+     */
+    public function assertString($value, $varName = null)
+    {
+        // case of url(...) parsed a a function
+        if ($value[0] === Type::T_FUNCTION) {
+            $value = $this->coerceString($value);
+        }
+
+        if (! \in_array($value[0], [Type::T_STRING, Type::T_KEYWORD])) {
+            $value = $this->compileValue($value);
+            throw SassScriptException::forArgument("$value is not a string.", $varName);
+        }
+
+        return $this->coerceString($value);
+    }
+
     /**
      * Coerce value to a percentage
      *
-     * @param array $value
+     * @param array|Number $value
      *
-     * @return integer|float
+     * @return int|float
+     *
+     * @deprecated
      */
     protected function coercePercent($value)
     {
-        if ($value[0] === Type::T_NUMBER) {
-            if (! empty($value[2]['%'])) {
-                return $value[1] / 100;
+        @trigger_error(sprintf('"%s" is deprecated since 1.7.0.', __METHOD__), E_USER_DEPRECATED);
+
+        if ($value instanceof Number) {
+            if ($value->hasUnit('%')) {
+                return $value->getDimension() / 100;
             }
 
-            return $value[1];
+            return $value->getDimension();
         }
 
         return 0;
@@ -5520,21 +7371,24 @@ class Compiler
      *
      * @api
      *
-     * @param array $value
+     * @param array|Number $value
+     * @param string|null  $varName
      *
      * @return array
      *
-     * @throws \Exception
+     * @throws SassScriptException
      */
-    public function assertMap($value)
+    public function assertMap($value, $varName = null)
     {
-        $value = $this->coerceMap($value);
+        $map = $this->tryMap($value);
 
-        if ($value[0] !== Type::T_MAP) {
-            $this->throwError('expecting map, %s received', $value[0]);
+        if ($map === null) {
+            $value = $this->compileValue($value);
+
+            throw SassScriptException::forArgument("$value is not a map.", $varName);
         }
 
-        return $value;
+        return $map;
     }
 
     /**
@@ -5542,7 +7396,7 @@ class Compiler
      *
      * @api
      *
-     * @param array $value
+     * @param array|Number $value
      *
      * @return array
      *
@@ -5551,30 +7405,55 @@ class Compiler
     public function assertList($value)
     {
         if ($value[0] !== Type::T_LIST) {
-            $this->throwError('expecting list, %s received', $value[0]);
+            throw $this->error('expecting list, %s received', $value[0]);
         }
+        assert(\is_array($value));
 
         return $value;
     }
 
+    /**
+     * Gets the keywords of an argument list.
+     *
+     * Keys in the returned array are normalized names (underscores are replaced with dashes)
+     * without the leading `$`.
+     * Calling this helper with anything that an argument list received for a rest argument
+     * of the function argument declaration is not supported.
+     *
+     * @param array|Number $value
+     *
+     * @return array<string, array|Number>
+     */
+    public function getArgumentListKeywords($value)
+    {
+        if ($value[0] !== Type::T_LIST || !isset($value[3]) || !\is_array($value[3])) {
+            throw new \InvalidArgumentException('The argument is not a sass argument list.');
+        }
+
+        return $value[3];
+    }
+
     /**
      * Assert value is a color
      *
      * @api
      *
-     * @param array $value
+     * @param array|Number $value
+     * @param string|null  $varName
      *
      * @return array
      *
-     * @throws \Exception
+     * @throws SassScriptException
      */
-    public function assertColor($value)
+    public function assertColor($value, $varName = null)
     {
         if ($color = $this->coerceColor($value)) {
             return $color;
         }
 
-        $this->throwError('expecting color, %s received', $value[0]);
+        $value = $this->compileValue($value);
+
+        throw SassScriptException::forArgument("$value is not a color.", $varName);
     }
 
     /**
@@ -5582,21 +7461,64 @@ class Compiler
      *
      * @api
      *
-     * @param array $value
+     * @param array|Number $value
+     * @param string|null  $varName
      *
-     * @return integer|float
+     * @return Number
      *
-     * @throws \Exception
+     * @throws SassScriptException
      */
-    public function assertNumber($value)
+    public function assertNumber($value, $varName = null)
     {
-        if ($value[0] !== Type::T_NUMBER) {
-            $this->throwError('expecting number, %s received', $value[0]);
+        if (!$value instanceof Number) {
+            $value = $this->compileValue($value);
+            throw SassScriptException::forArgument("$value is not a number.", $varName);
         }
 
-        return $value[1];
+        return $value;
     }
 
+    /**
+     * Assert value is a integer
+     *
+     * @api
+     *
+     * @param array|Number $value
+     * @param string|null  $varName
+     *
+     * @return int
+     *
+     * @throws SassScriptException
+     */
+    public function assertInteger($value, $varName = null)
+    {
+        $value = $this->assertNumber($value, $varName)->getDimension();
+        if (round($value - \intval($value), Number::PRECISION) > 0) {
+            throw SassScriptException::forArgument("$value is not an integer.", $varName);
+        }
+
+        return intval($value);
+    }
+
+    /**
+     * Extract the  ... / alpha on the last argument of channel arg
+     * in color functions
+     *
+     * @param array $args
+     * @return array
+     */
+    private function extractSlashAlphaInColorFunction($args)
+    {
+        $last = end($args);
+        if (\count($args) === 3 && $last[0] === Type::T_EXPRESSION && $last[1] === '/') {
+            array_pop($args);
+            $args[] = $last[2];
+            $args[] = $last[3];
+        }
+        return $args;
+    }
+
+
     /**
      * Make sure a color's components don't go out of bounds
      *
@@ -5614,6 +7536,10 @@ class Compiler
             if ($c[$i] > 255) {
                 $c[$i] = 255;
             }
+
+            if (!\is_int($c[$i])) {
+                $c[$i] = round($c[$i]);
+            }
         }
 
         return $c;
@@ -5622,11 +7548,11 @@ class Compiler
     /**
      * Convert RGB to HSL
      *
-     * @api
+     * @internal
      *
-     * @param integer $red
-     * @param integer $green
-     * @param integer $blue
+     * @param int $red
+     * @param int $green
+     * @param int $blue
      *
      * @return array
      */
@@ -5651,12 +7577,12 @@ class Compiler
                 $h = 60 * ($green - $blue) / $d;
             } elseif ($green == $max) {
                 $h = 60 * ($blue - $red) / $d + 120;
-            } elseif ($blue == $max) {
+            } else {
                 $h = 60 * ($red - $green) / $d + 240;
             }
         }
 
-        return [Type::T_HSL, fmod($h, 360), $s * 100, $l / 5.1];
+        return [Type::T_HSL, fmod($h + 360, 360), $s * 100, $l / 5.1];
     }
 
     /**
@@ -5685,7 +7611,7 @@ class Compiler
         }
 
         if ($h * 3 < 2) {
-            return $m1 + ($m2 - $m1) * (2/3 - $h) * 6;
+            return $m1 + ($m2 - $m1) * (2 / 3 - $h) * 6;
         }
 
         return $m1;
@@ -5694,11 +7620,11 @@ class Compiler
     /**
      * Convert HSL to RGB
      *
-     * @api
+     * @internal
      *
-     * @param integer $hue        H from 0 to 360
-     * @param integer $saturation S from 0 to 100
-     * @param integer $lightness  L from 0 to 100
+     * @param int|float $hue        H from 0 to 360
+     * @param int|float $saturation S from 0 to 100
+     * @param int|float $lightness  L from 0 to 100
      *
      * @return array
      */
@@ -5715,35 +7641,133 @@ class Compiler
         $m2 = $l <= 0.5 ? $l * ($s + 1) : $l + $s - $l * $s;
         $m1 = $l * 2 - $m2;
 
-        $r = $this->hueToRGB($m1, $m2, $h + 1/3) * 255;
+        $r = $this->hueToRGB($m1, $m2, $h + 1 / 3) * 255;
         $g = $this->hueToRGB($m1, $m2, $h) * 255;
-        $b = $this->hueToRGB($m1, $m2, $h - 1/3) * 255;
+        $b = $this->hueToRGB($m1, $m2, $h - 1 / 3) * 255;
 
         $out = [Type::T_COLOR, $r, $g, $b];
 
         return $out;
     }
 
-    // Built in functions
-
-    protected static $libCall = ['name', 'args...'];
-    protected function libCall($args, $kwargs)
+    /**
+     * Convert HWB to RGB
+     * https://www.w3.org/TR/css-color-4/#hwb-to-rgb
+     *
+     * @api
+     *
+     * @param int|float $hue        H from 0 to 360
+     * @param int|float $whiteness  W from 0 to 100
+     * @param int|float $blackness  B from 0 to 100
+     *
+     * @return array
+     */
+    private function HWBtoRGB($hue, $whiteness, $blackness)
     {
-        $name = $this->compileStringContent($this->coerceString($this->reduce(array_shift($args), true)));
-        $callArgs = [];
+        $w = min(100, max(0, $whiteness)) / 100;
+        $b = min(100, max(0, $blackness)) / 100;
 
-        // $kwargs['args'] is [Type::T_LIST, ',', [..]]
-        foreach ($kwargs['args'][2] as $varname => $arg) {
-            if (is_numeric($varname)) {
-                $varname = null;
-            } else {
-                $varname = [ 'var', $varname];
-            }
+        $sum = $w + $b;
+        if ($sum > 1.0) {
+            $w = $w / $sum;
+            $b = $b / $sum;
+        }
+        $b = min(1.0 - $w, $b);
 
-            $callArgs[] = [$varname, $arg, false];
+        $rgb = $this->toRGB($hue, 100, 50);
+        for($i = 1; $i < 4; $i++) {
+          $rgb[$i] *= (1.0 - $w - $b);
+          $rgb[$i] = round($rgb[$i] + 255 * $w + 0.0001);
         }
 
-        return $this->reduce([Type::T_FUNCTION_CALL, $name, $callArgs]);
+        return $rgb;
+    }
+
+    /**
+     * Convert RGB to HWB
+     *
+     * @api
+     *
+     * @param int $red
+     * @param int $green
+     * @param int $blue
+     *
+     * @return array
+     */
+    private function RGBtoHWB($red, $green, $blue)
+    {
+        $min = min($red, $green, $blue);
+        $max = max($red, $green, $blue);
+
+        $d = $max - $min;
+
+        if ((int) $d === 0) {
+            $h = 0;
+        } else {
+
+            if ($red == $max) {
+                $h = 60 * ($green - $blue) / $d;
+            } elseif ($green == $max) {
+                $h = 60 * ($blue - $red) / $d + 120;
+            } else {
+                $h = 60 * ($red - $green) / $d + 240;
+            }
+        }
+
+        return [Type::T_HWB, fmod($h, 360), $min / 255 * 100, 100 - $max / 255 *100];
+    }
+
+
+    // Built in functions
+
+    protected static $libCall = ['function', 'args...'];
+    protected function libCall($args)
+    {
+        $functionReference = $args[0];
+
+        if (in_array($functionReference[0], [Type::T_STRING, Type::T_KEYWORD])) {
+            $name = $this->compileStringContent($this->coerceString($functionReference));
+            $warning = "Passing a string to call() is deprecated and will be illegal\n"
+                . "in Sass 4.0. Use call(function-reference($name)) instead.";
+            Warn::deprecation($warning);
+            $functionReference = $this->libGetFunction([$this->assertString($functionReference, 'function')]);
+        }
+
+        if ($functionReference === static::$null) {
+            return static::$null;
+        }
+
+        if (! in_array($functionReference[0], [Type::T_FUNCTION_REFERENCE, Type::T_FUNCTION])) {
+            throw $this->error('Function reference expected, got ' . $functionReference[0]);
+        }
+
+        $callArgs = [
+            [null, $args[1], true]
+        ];
+
+        return $this->reduce([Type::T_FUNCTION_CALL, $functionReference, $callArgs]);
+    }
+
+
+    protected static $libGetFunction = [
+        ['name'],
+        ['name', 'css']
+    ];
+    protected function libGetFunction($args)
+    {
+        $name = $this->compileStringContent($this->assertString(array_shift($args), 'name'));
+        $isCss = false;
+
+        if (count($args)) {
+            $isCss = array_shift($args);
+            $isCss = (($isCss === static::$true) ? true : false);
+        }
+
+        if ($isCss) {
+            return [Type::T_FUNCTION, $name, [Type::T_LIST, ',', []]];
+        }
+
+        return $this->getFunctionReference($name, true);
     }
 
     protected static $libIf = ['condition', 'if-true', 'if-false:'];
@@ -5763,11 +7787,8 @@ class Compiler
     {
         list($list, $value) = $args;
 
-        if ($value[0] === Type::T_MAP) {
-            return static::$null;
-        }
-
-        if ($list[0] === Type::T_MAP ||
+        if (
+            $list[0] === Type::T_MAP ||
             $list[0] === Type::T_STRING ||
             $list[0] === Type::T_KEYWORD ||
             $list[0] === Type::T_INTERPOLATE
@@ -5779,6 +7800,22 @@ class Compiler
             return static::$null;
         }
 
+        // Numbers are represented with value objects, for which the PHP equality operator does not
+        // match the Sass rules (and we cannot overload it). As they are the only type of values
+        // represented with a value object for now, they require a special case.
+        if ($value instanceof Number) {
+            $key = 0;
+            foreach ($list[2] as $item) {
+                $key++;
+                $itemValue = $this->normalizeValue($item);
+
+                if ($itemValue instanceof Number && $value->equals($itemValue)) {
+                    return new Number($key, '');
+                }
+            }
+            return static::$null;
+        }
+
         $values = [];
 
         foreach ($list[2] as $item) {
@@ -5787,7 +7824,7 @@ class Compiler
 
         $key = array_search($this->normalizeValue($value), $values);
 
-        return false === $key ? static::$null : $key + 1;
+        return false === $key ? static::$null : new Number($key + 1, '');
     }
 
     protected static $libRgb = [
@@ -5796,9 +7833,17 @@ class Compiler
         ['channels'],
         ['red', 'green', 'blue'],
         ['red', 'green', 'blue', 'alpha'] ];
+
+    /**
+     * @param array $args
+     * @param array $kwargs
+     * @param string $funcName
+     *
+     * @return array
+     */
     protected function libRgb($args, $kwargs, $funcName = 'rgb')
     {
-        switch (count($args)) {
+        switch (\count($args)) {
             case 1:
                 if (! $color = $this->coerceColor($args[0], true)) {
                     $color = [Type::T_STRING, '', [$funcName . '(', $args[0], ')']];
@@ -5809,7 +7854,7 @@ class Compiler
                 $color = [Type::T_COLOR, $args[0], $args[1], $args[2]];
 
                 if (! $color = $this->coerceColor($color)) {
-                    $color = [Type::T_STRING, '', [$funcName .'(', $args[0], ', ', $args[1], ', ', $args[2], ')']];
+                    $color = [Type::T_STRING, '', [$funcName . '(', $args[0], ', ', $args[1], ', ', $args[2], ')']];
                 }
 
                 return $color;
@@ -5825,7 +7870,7 @@ class Compiler
                             [$funcName . '(', $color[1], ', ', $color[2], ', ', $color[3], ', ', $alpha, ')']];
                     }
                 } else {
-                    $color = [Type::T_STRING, '', [$funcName . '(', $args[0], ')']];
+                    $color = [Type::T_STRING, '', [$funcName . '(', $args[0], ', ', $args[1], ')']];
                 }
                 break;
 
@@ -5854,33 +7899,126 @@ class Compiler
         return $this->libRgb($args, $kwargs, 'rgba');
     }
 
-    // helper function for adjust_color, change_color, and scale_color
-    protected function alterColor($args, $fn)
+    /**
+     * Helper function for adjust_color, change_color, and scale_color
+     *
+     * @param array<array|Number> $args
+     * @param string $operation
+     * @param callable $fn
+     *
+     * @return array
+     *
+     * @phpstan-param callable(float|int, float|int|null, float|int): (float|int) $fn
+     */
+    protected function alterColor(array $args, $operation, $fn)
     {
-        $color = $this->assertColor($args[0]);
+        $color = $this->assertColor($args[0], 'color');
 
-        foreach ([1 => 1, 2 => 2, 3 => 3, 7 => 4] as $iarg => $irgba) {
-            if (isset($args[$iarg])) {
-                $val = $this->assertNumber($args[$iarg]);
-
-                if (! isset($color[$irgba])) {
-                    $color[$irgba] = (($irgba < 4) ? 0 : 1);
-                }
-
-                $color[$irgba] = call_user_func($fn, $color[$irgba], $val, $iarg);
-            }
+        if ($args[1][2]) {
+            throw new SassScriptException('Only one positional argument is allowed. All other arguments must be passed by name.');
         }
 
-        if (! empty($args[4]) || ! empty($args[5]) || ! empty($args[6])) {
-            $hsl = $this->toHSL($color[1], $color[2], $color[3]);
+        $kwargs = $this->getArgumentListKeywords($args[1]);
 
-            foreach ([4 => 1, 5 => 2, 6 => 3] as $iarg => $ihsl) {
-                if (! empty($args[$iarg])) {
-                    $val = $this->assertNumber($args[$iarg]);
-                    $hsl[$ihsl] = call_user_func($fn, $hsl[$ihsl], $val, $iarg);
+        $scale = $operation === 'scale';
+        $change = $operation === 'change';
+
+        /** @phpstan-var callable(string, float|int, bool=, bool=): (float|int|null) $getParam */
+        $getParam = function ($name, $max, $checkPercent = false, $assertPercent = false) use (&$kwargs, $scale, $change) {
+            if (!isset($kwargs[$name])) {
+                return null;
+            }
+
+            $number = $this->assertNumber($kwargs[$name], $name);
+            unset($kwargs[$name]);
+
+            if (!$scale && $checkPercent) {
+                if (!$number->hasUnit('%')) {
+                    $warning = $this->error("{$name} Passing a number `$number` without unit % is deprecated.");
+                    $this->logger->warn($warning->getMessage(), true);
                 }
             }
 
+            if ($scale || $assertPercent) {
+                $number->assertUnit('%', $name);
+            }
+
+            if ($scale) {
+                $max = 100;
+            }
+
+            return $number->valueInRange($change ? 0 : -$max, $max, $name);
+        };
+
+        $alpha = $getParam('alpha', 1);
+        $red = $getParam('red', 255);
+        $green = $getParam('green', 255);
+        $blue = $getParam('blue', 255);
+
+        if ($scale || !isset($kwargs['hue'])) {
+            $hue = null;
+        } else {
+            $hueNumber = $this->assertNumber($kwargs['hue'], 'hue');
+            unset($kwargs['hue']);
+            $hue = $hueNumber->getDimension();
+        }
+        $saturation = $getParam('saturation', 100, true);
+        $lightness = $getParam('lightness', 100, true);
+        $whiteness = $getParam('whiteness', 100, false, true);
+        $blackness = $getParam('blackness', 100, false, true);
+
+        if (!empty($kwargs)) {
+            $unknownNames = array_keys($kwargs);
+            $lastName = array_pop($unknownNames);
+            $message = sprintf(
+                'No argument%s named $%s%s.',
+                $unknownNames ? 's' : '',
+                $unknownNames ? implode(', $', $unknownNames) . ' or $' : '',
+                $lastName
+            );
+            throw new SassScriptException($message);
+        }
+
+        $hasRgb = $red !== null || $green !== null || $blue !== null;
+        $hasSL = $saturation !== null || $lightness !== null;
+        $hasWB = $whiteness !== null || $blackness !== null;
+
+        if ($hasRgb && ($hasSL || $hasWB || $hue !== null)) {
+            throw new SassScriptException(sprintf('RGB parameters may not be passed along with %s parameters.', $hasWB ? 'HWB' : 'HSL'));
+        }
+
+        if ($hasWB && $hasSL) {
+            throw new SassScriptException('HSL parameters may not be passed along with HWB parameters.');
+        }
+
+        if ($hasRgb) {
+            $color[1] = round($fn($color[1], $red, 255));
+            $color[2] = round($fn($color[2], $green, 255));
+            $color[3] = round($fn($color[3], $blue, 255));
+        } elseif ($hasWB) {
+            $hwb = $this->RGBtoHWB($color[1], $color[2], $color[3]);
+            if ($hue !== null) {
+                $hwb[1] = $change ? $hue : $hwb[1] + $hue;
+            }
+            $hwb[2] = $fn($hwb[2], $whiteness, 100);
+            $hwb[3] = $fn($hwb[3], $blackness, 100);
+
+            $rgb = $this->HWBtoRGB($hwb[1], $hwb[2], $hwb[3]);
+
+            if (isset($color[4])) {
+                $rgb[4] = $color[4];
+            }
+
+            $color = $rgb;
+        } elseif ($hue !== null || $hasSL) {
+            $hsl = $this->toHSL($color[1], $color[2], $color[3]);
+
+            if ($hue !== null) {
+                $hsl[1] = $change ? $hue : $hsl[1] + $hue;
+            }
+            $hsl[2] = $fn($hsl[2], $saturation, 100);
+            $hsl[3] = $fn($hsl[3], $lightness, 100);
+
             $rgb = $this->toRGB($hsl[1], $hsl[2], $hsl[3]);
 
             if (isset($color[4])) {
@@ -5890,58 +8028,54 @@ class Compiler
             $color = $rgb;
         }
 
+        if ($alpha !== null) {
+            $existingAlpha = isset($color[4]) ? $color[4] : 1;
+            $color[4] = $fn($existingAlpha, $alpha, 1);
+        }
+
         return $color;
     }
 
-    protected static $libAdjustColor = [
-        'color', 'red:null', 'green:null', 'blue:null',
-        'hue:null', 'saturation:null', 'lightness:null', 'alpha:null'
-    ];
+    protected static $libAdjustColor = ['color', 'kwargs...'];
     protected function libAdjustColor($args)
     {
-        return $this->alterColor($args, function ($base, $alter, $i) {
-            return $base + $alter;
+        return $this->alterColor($args, 'adjust', function ($base, $alter, $max) {
+            if ($alter === null) {
+                return $base;
+            }
+
+            $new = $base + $alter;
+
+            if ($new < 0) {
+                return 0;
+            }
+
+            if ($new > $max) {
+                return $max;
+            }
+
+            return $new;
         });
     }
 
-    protected static $libChangeColor = [
-        'color', 'red:null', 'green:null', 'blue:null',
-        'hue:null', 'saturation:null', 'lightness:null', 'alpha:null'
-    ];
+    protected static $libChangeColor = ['color', 'kwargs...'];
     protected function libChangeColor($args)
     {
-        return $this->alterColor($args, function ($base, $alter, $i) {
+        return $this->alterColor($args,'change', function ($base, $alter, $max) {
+            if ($alter === null) {
+                return $base;
+            }
+
             return $alter;
         });
     }
 
-    protected static $libScaleColor = [
-        'color', 'red:null', 'green:null', 'blue:null',
-        'hue:null', 'saturation:null', 'lightness:null', 'alpha:null'
-    ];
+    protected static $libScaleColor = ['color', 'kwargs...'];
     protected function libScaleColor($args)
     {
-        return $this->alterColor($args, function ($base, $scale, $i) {
-            // 1, 2, 3 - rgb
-            // 4, 5, 6 - hsl
-            // 7 - a
-            switch ($i) {
-                case 1:
-                case 2:
-                case 3:
-                    $max = 255;
-                    break;
-
-                case 4:
-                    $max = 360;
-                    break;
-
-                case 7:
-                    $max = 1;
-                    break;
-
-                default:
-                    $max = 100;
+        return $this->alterColor($args, 'scale', function ($base, $scale, $max) {
+            if ($scale === null) {
+                return $base;
             }
 
             $scale = $scale / 100;
@@ -5958,6 +8092,11 @@ class Compiler
     protected function libIeHexStr($args)
     {
         $color = $this->coerceColor($args[0]);
+
+        if (\is_null($color)) {
+            throw $this->error('Error: argument `$color` of `ie-hex-str($color)` must be a color');
+        }
+
         $color[4] = isset($color[4]) ? round(255 * $color[4]) : 255;
 
         return [Type::T_STRING, '', [sprintf('#%02X%02X%02X%02X', $color[4], $color[1], $color[2], $color[3])]];
@@ -5968,7 +8107,11 @@ class Compiler
     {
         $color = $this->coerceColor($args[0]);
 
-        return $color[1];
+        if (\is_null($color)) {
+            throw $this->error('Error: argument `$color` of `red($color)` must be a color');
+        }
+
+        return new Number((int) $color[1], '');
     }
 
     protected static $libGreen = ['color'];
@@ -5976,7 +8119,11 @@ class Compiler
     {
         $color = $this->coerceColor($args[0]);
 
-        return $color[2];
+        if (\is_null($color)) {
+            throw $this->error('Error: argument `$color` of `green($color)` must be a color');
+        }
+
+        return new Number((int) $color[2], '');
     }
 
     protected static $libBlue = ['color'];
@@ -5984,14 +8131,18 @@ class Compiler
     {
         $color = $this->coerceColor($args[0]);
 
-        return $color[3];
+        if (\is_null($color)) {
+            throw $this->error('Error: argument `$color` of `blue($color)` must be a color');
+        }
+
+        return new Number((int) $color[3], '');
     }
 
     protected static $libAlpha = ['color'];
     protected function libAlpha($args)
     {
         if ($color = $this->coerceColor($args[0])) {
-            return isset($color[4]) ? $color[4] : 1;
+            return new Number(isset($color[4]) ? $color[4] : 1, '');
         }
 
         // this might be the IE function, so return value unchanged
@@ -6003,7 +8154,7 @@ class Compiler
     {
         $value = $args[0];
 
-        if ($value[0] === Type::T_NUMBER) {
+        if ($value instanceof Number) {
             return null;
         }
 
@@ -6011,78 +8162,129 @@ class Compiler
     }
 
     // mix two colors
-    protected static $libMix = ['color-1', 'color-2', 'weight:0.5'];
+    protected static $libMix = [
+        ['color1', 'color2', 'weight:50%'],
+        ['color-1', 'color-2', 'weight:50%']
+        ];
     protected function libMix($args)
     {
         list($first, $second, $weight) = $args;
 
-        $first = $this->assertColor($first);
-        $second = $this->assertColor($second);
-
-        if (! isset($weight)) {
-            $weight = 0.5;
-        } else {
-            $weight = $this->coercePercent($weight);
-        }
+        $first = $this->assertColor($first, 'color1');
+        $second = $this->assertColor($second, 'color2');
+        $weightScale = $this->assertNumber($weight, 'weight')->valueInRange(0, 100, 'weight') / 100;
 
         $firstAlpha = isset($first[4]) ? $first[4] : 1;
         $secondAlpha = isset($second[4]) ? $second[4] : 1;
 
-        $w = $weight * 2 - 1;
-        $a = $firstAlpha - $secondAlpha;
+        $normalizedWeight = $weightScale * 2 - 1;
+        $alphaDistance = $firstAlpha - $secondAlpha;
 
-        $w1 = (($w * $a === -1 ? $w : ($w + $a) / (1 + $w * $a)) + 1) / 2.0;
-        $w2 = 1.0 - $w1;
+        $combinedWeight = $normalizedWeight * $alphaDistance == -1 ? $normalizedWeight : ($normalizedWeight + $alphaDistance) / (1 + $normalizedWeight * $alphaDistance);
+        $weight1 = ($combinedWeight + 1) / 2.0;
+        $weight2 = 1.0 - $weight1;
 
         $new = [Type::T_COLOR,
-            $w1 * $first[1] + $w2 * $second[1],
-            $w1 * $first[2] + $w2 * $second[2],
-            $w1 * $first[3] + $w2 * $second[3],
+            $weight1 * $first[1] + $weight2 * $second[1],
+            $weight1 * $first[2] + $weight2 * $second[2],
+            $weight1 * $first[3] + $weight2 * $second[3],
         ];
 
         if ($firstAlpha != 1.0 || $secondAlpha != 1.0) {
-            $new[] = $firstAlpha * $weight + $secondAlpha * (1 - $weight);
+            $new[] = $firstAlpha * $weightScale + $secondAlpha * (1 - $weightScale);
         }
 
         return $this->fixColor($new);
     }
 
-    protected static $libHsl =[
+    protected static $libHsl = [
         ['channels'],
+        ['hue', 'saturation'],
         ['hue', 'saturation', 'lightness'],
         ['hue', 'saturation', 'lightness', 'alpha'] ];
+
+    /**
+     * @param array $args
+     * @param array $kwargs
+     * @param string $funcName
+     *
+     * @return array|null
+     */
     protected function libHsl($args, $kwargs, $funcName = 'hsl')
     {
-        if (count($args) == 1) {
-            if ($args[0][0] !== Type::T_LIST || count($args[0][2]) < 3 || count($args[0][2]) > 4) {
+        $args_to_check = $args;
+
+        if (\count($args) == 1) {
+            if ($args[0][0] !== Type::T_LIST || \count($args[0][2]) < 3 || \count($args[0][2]) > 4) {
                 return [Type::T_STRING, '', [$funcName . '(', $args[0], ')']];
             }
 
             $args = $args[0][2];
+            $args_to_check = $kwargs['channels'][2];
         }
 
-        $hue = $this->compileColorPartValue($args[0], 0, 360, false, false, true);
-        $saturation = $this->compileColorPartValue($args[1], 0, 100, false);
-        $lightness = $this->compileColorPartValue($args[2], 0, 100, false);
+        if (\count($args) === 2) {
+            // if var() is used as an argument, return as a css function
+            foreach ($args as $arg) {
+                if ($arg[0] === Type::T_FUNCTION && in_array($arg[1], ['var'])) {
+                    return null;
+                }
+            }
 
+            throw new SassScriptException('Missing argument $lightness.');
+        }
+
+        foreach ($kwargs as $arg) {
+            if (in_array($arg[0], [Type::T_FUNCTION_CALL, Type::T_FUNCTION]) && in_array($arg[1], ['min', 'max'])) {
+                return null;
+            }
+        }
+
+        foreach ($args_to_check as $k => $arg) {
+            if (in_array($arg[0], [Type::T_FUNCTION_CALL, Type::T_FUNCTION]) && in_array($arg[1], ['min', 'max'])) {
+                if (count($kwargs) > 1 || ($k >= 2 && count($args) === 4)) {
+                    return null;
+                }
+
+                $args[$k] = $this->stringifyFncallArgs($arg);
+            }
+
+            if (
+                $k >= 2 && count($args) === 4 &&
+                in_array($arg[0], [Type::T_FUNCTION_CALL, Type::T_FUNCTION]) &&
+                in_array($arg[1], ['calc','env'])
+            ) {
+                return null;
+            }
+        }
+
+        $hue = $this->reduce($args[0]);
+        $saturation = $this->reduce($args[1]);
+        $lightness = $this->reduce($args[2]);
         $alpha = null;
 
-        if (count($args) === 4) {
+        if (\count($args) === 4) {
             $alpha = $this->compileColorPartValue($args[3], 0, 100, false);
 
-            if (! is_numeric($hue) || ! is_numeric($saturation) || ! is_numeric($lightness) || ! is_numeric($alpha)) {
+            if (!$hue instanceof Number || !$saturation instanceof Number || ! $lightness instanceof Number || ! is_numeric($alpha)) {
                 return [Type::T_STRING, '',
                     [$funcName . '(', $args[0], ', ', $args[1], ', ', $args[2], ', ', $args[3], ')']];
             }
         } else {
-            if (! is_numeric($hue) || ! is_numeric($saturation) || ! is_numeric($lightness)) {
+            if (!$hue instanceof Number || !$saturation instanceof Number || ! $lightness instanceof Number) {
                 return [Type::T_STRING, '', [$funcName . '(', $args[0], ', ', $args[1], ', ', $args[2], ')']];
             }
         }
 
-        $color = $this->toRGB($hue, $saturation, $lightness);
+        $hueValue = fmod($hue->getDimension(), 360);
 
-        if (! is_null($alpha)) {
+        while ($hueValue < 0) {
+            $hueValue += 360;
+        }
+
+        $color = $this->toRGB($hueValue, max(0, min($saturation->getDimension(), 100)), max(0, min($lightness->getDimension(), 100)));
+
+        if (! \is_null($alpha)) {
             $color[4] = $alpha;
         }
 
@@ -6091,7 +8293,9 @@ class Compiler
 
     protected static $libHsla = [
             ['channels'],
-            ['hue', 'saturation', 'lightness', 'alpha:1'] ];
+            ['hue', 'saturation'],
+            ['hue', 'saturation', 'lightness'],
+            ['hue', 'saturation', 'lightness', 'alpha']];
     protected function libHsla($args, $kwargs)
     {
         return $this->libHsl($args, $kwargs, 'hsla');
@@ -6100,34 +8304,173 @@ class Compiler
     protected static $libHue = ['color'];
     protected function libHue($args)
     {
-        $color = $this->assertColor($args[0]);
+        $color = $this->assertColor($args[0], 'color');
         $hsl = $this->toHSL($color[1], $color[2], $color[3]);
 
-        return new Node\Number($hsl[1], 'deg');
+        return new Number($hsl[1], 'deg');
     }
 
     protected static $libSaturation = ['color'];
     protected function libSaturation($args)
     {
-        $color = $this->assertColor($args[0]);
+        $color = $this->assertColor($args[0], 'color');
         $hsl = $this->toHSL($color[1], $color[2], $color[3]);
 
-        return new Node\Number($hsl[2], '%');
+        return new Number($hsl[2], '%');
     }
 
     protected static $libLightness = ['color'];
     protected function libLightness($args)
     {
-        $color = $this->assertColor($args[0]);
+        $color = $this->assertColor($args[0], 'color');
         $hsl = $this->toHSL($color[1], $color[2], $color[3]);
 
-        return new Node\Number($hsl[3], '%');
+        return new Number($hsl[3], '%');
     }
 
+    /*
+     * Todo : a integrer dans le futur module color
+    protected static $libHwb = [
+        ['channels'],
+        ['hue', 'whiteness', 'blackness'],
+        ['hue', 'whiteness', 'blackness', 'alpha'] ];
+    protected function libHwb($args, $kwargs, $funcName = 'hwb')
+    {
+        $args_to_check = $args;
+
+        if (\count($args) == 1) {
+            if ($args[0][0] !== Type::T_LIST) {
+                throw $this->error("Missing elements \$whiteness and \$blackness");
+            }
+
+            if (\trim($args[0][1])) {
+                throw $this->error("\$channels must be a space-separated list.");
+            }
+
+            if (! empty($args[0]['enclosing'])) {
+                throw $this->error("\$channels must be an unbracketed list.");
+            }
+
+            $args = $args[0][2];
+            if (\count($args) > 3) {
+                throw $this->error("hwb() : Only 3 elements are allowed but ". \count($args) . "were passed");
+            }
+
+            $args_to_check = $this->extractSlashAlphaInColorFunction($kwargs['channels'][2]);
+            if (\count($args_to_check) !== \count($kwargs['channels'][2])) {
+                $args = $args_to_check;
+            }
+        }
+
+        if (\count($args_to_check) < 2) {
+            throw $this->error("Missing elements \$whiteness and \$blackness");
+        }
+        if (\count($args_to_check) < 3) {
+            throw $this->error("Missing element \$blackness");
+        }
+        if (\count($args_to_check) > 4) {
+            throw $this->error("hwb() : Only 4 elements are allowed but ". \count($args) . "were passed");
+        }
+
+        foreach ($kwargs as $k => $arg) {
+            if (in_array($arg[0], [Type::T_FUNCTION_CALL]) && in_array($arg[1], ['min', 'max'])) {
+                return null;
+            }
+        }
+
+        foreach ($args_to_check as $k => $arg) {
+            if (in_array($arg[0], [Type::T_FUNCTION_CALL]) && in_array($arg[1], ['min', 'max'])) {
+                if (count($kwargs) > 1 || ($k >= 2 && count($args) === 4)) {
+                    return null;
+                }
+
+                $args[$k] = $this->stringifyFncallArgs($arg);
+            }
+
+            if (
+                $k >= 2 && count($args) === 4 &&
+                in_array($arg[0], [Type::T_FUNCTION_CALL, Type::T_FUNCTION]) &&
+                in_array($arg[1], ['calc','env'])
+            ) {
+                return null;
+            }
+        }
+
+        $hue = $this->reduce($args[0]);
+        $whiteness = $this->reduce($args[1]);
+        $blackness = $this->reduce($args[2]);
+        $alpha = null;
+
+        if (\count($args) === 4) {
+            $alpha = $this->compileColorPartValue($args[3], 0, 1, false);
+
+            if (! \is_numeric($alpha)) {
+                $val = $this->compileValue($args[3]);
+                throw $this->error("\$alpha: $val is not a number");
+            }
+        }
+
+        $this->assertNumber($hue, 'hue');
+        $this->assertUnit($whiteness, ['%'], 'whiteness');
+        $this->assertUnit($blackness, ['%'], 'blackness');
+
+        $this->assertRange($whiteness, 0, 100, "0% and 100%", "whiteness");
+        $this->assertRange($blackness, 0, 100, "0% and 100%", "blackness");
+
+        $w = $whiteness->getDimension();
+        $b = $blackness->getDimension();
+
+        $hueValue = $hue->getDimension() % 360;
+
+        while ($hueValue < 0) {
+            $hueValue += 360;
+        }
+
+        $color = $this->HWBtoRGB($hueValue, $w, $b);
+
+        if (! \is_null($alpha)) {
+            $color[4] = $alpha;
+        }
+
+        return $color;
+    }
+
+    protected static $libWhiteness = ['color'];
+    protected function libWhiteness($args, $kwargs, $funcName = 'whiteness') {
+
+        $color = $this->assertColor($args[0]);
+        $hwb = $this->RGBtoHWB($color[1], $color[2], $color[3]);
+
+        return new Number($hwb[2], '%');
+    }
+
+    protected static $libBlackness = ['color'];
+    protected function libBlackness($args, $kwargs, $funcName = 'blackness') {
+
+        $color = $this->assertColor($args[0]);
+        $hwb = $this->RGBtoHWB($color[1], $color[2], $color[3]);
+
+        return new Number($hwb[3], '%');
+    }
+    */
+
+    /**
+     * @param array     $color
+     * @param int       $idx
+     * @param int|float $amount
+     *
+     * @return array
+     */
     protected function adjustHsl($color, $idx, $amount)
     {
         $hsl = $this->toHSL($color[1], $color[2], $color[3]);
         $hsl[$idx] += $amount;
+
+        if ($idx !== 1) {
+            // Clamp the saturation and lightness
+            $hsl[$idx] = min(max(0, $hsl[$idx]), 100);
+        }
+
         $out = $this->toRGB($hsl[1], $hsl[2], $hsl[3]);
 
         if (isset($color[4])) {
@@ -6140,8 +8483,8 @@ class Compiler
     protected static $libAdjustHue = ['color', 'degrees'];
     protected function libAdjustHue($args)
     {
-        $color = $this->assertColor($args[0]);
-        $degrees = $this->assertNumber($args[1]);
+        $color = $this->assertColor($args[0], 'color');
+        $degrees = $this->assertNumber($args[1], 'degrees')->getDimension();
 
         return $this->adjustHsl($color, 1, $degrees);
     }
@@ -6149,7 +8492,7 @@ class Compiler
     protected static $libLighten = ['color', 'amount'];
     protected function libLighten($args)
     {
-        $color = $this->assertColor($args[0]);
+        $color = $this->assertColor($args[0], 'color');
         $amount = Util::checkRange('amount', new Range(0, 100), $args[1], '%');
 
         return $this->adjustHsl($color, 3, $amount);
@@ -6158,34 +8501,36 @@ class Compiler
     protected static $libDarken = ['color', 'amount'];
     protected function libDarken($args)
     {
-        $color = $this->assertColor($args[0]);
+        $color = $this->assertColor($args[0], 'color');
         $amount = Util::checkRange('amount', new Range(0, 100), $args[1], '%');
 
         return $this->adjustHsl($color, 3, -$amount);
     }
 
-    protected static $libSaturate = [['color', 'amount'], ['number']];
+    protected static $libSaturate = [['color', 'amount'], ['amount']];
     protected function libSaturate($args)
     {
         $value = $args[0];
 
-        if ($value[0] === Type::T_NUMBER) {
+        if (count($args) === 1) {
+            $this->assertNumber($args[0], 'amount');
+
             return null;
         }
 
-        $color = $this->assertColor($value);
-        $amount = 100 * $this->coercePercent($args[1]);
+        $color = $this->assertColor($args[0], 'color');
+        $amount = $this->assertNumber($args[1], 'amount');
 
-        return $this->adjustHsl($color, 2, $amount);
+        return $this->adjustHsl($color, 2, $amount->valueInRange(0, 100, 'amount'));
     }
 
     protected static $libDesaturate = ['color', 'amount'];
     protected function libDesaturate($args)
     {
-        $color = $this->assertColor($args[0]);
-        $amount = 100 * $this->coercePercent($args[1]);
+        $color = $this->assertColor($args[0], 'color');
+        $amount = $this->assertNumber($args[1], 'amount');
 
-        return $this->adjustHsl($color, 2, -$amount);
+        return $this->adjustHsl($color, 2, -$amount->valueInRange(0, 100, 'amount'));
     }
 
     protected static $libGrayscale = ['color'];
@@ -6193,55 +8538,51 @@ class Compiler
     {
         $value = $args[0];
 
-        if ($value[0] === Type::T_NUMBER) {
+        if ($value instanceof Number) {
             return null;
         }
 
-        return $this->adjustHsl($this->assertColor($value), 2, -100);
+        return $this->adjustHsl($this->assertColor($value, 'color'), 2, -100);
     }
 
     protected static $libComplement = ['color'];
     protected function libComplement($args)
     {
-        return $this->adjustHsl($this->assertColor($args[0]), 1, 180);
+        return $this->adjustHsl($this->assertColor($args[0], 'color'), 1, 180);
     }
 
-    protected static $libInvert = ['color', 'weight:1'];
+    protected static $libInvert = ['color', 'weight:100%'];
     protected function libInvert($args)
     {
-        list($value, $weight) = $args;
+        $value = $args[0];
 
-        if (! isset($weight)) {
-            $weight = 1;
-        } else {
-            $weight = $this->coercePercent($weight);
-        }
+        $weight = $this->assertNumber($args[1], 'weight');
+
+        if ($value instanceof Number) {
+            if ($weight->getDimension() != 100 || !$weight->hasUnit('%')) {
+                throw new SassScriptException('Only one argument may be passed to the plain-CSS invert() function.');
+            }
 
-        if ($value[0] === Type::T_NUMBER) {
             return null;
         }
 
-        $color = $this->assertColor($value);
+        $color = $this->assertColor($value, 'color');
         $inverted = $color;
         $inverted[1] = 255 - $inverted[1];
         $inverted[2] = 255 - $inverted[2];
         $inverted[3] = 255 - $inverted[3];
 
-        if ($weight < 1) {
-            return $this->libMix([$inverted, $color, [Type::T_NUMBER, $weight]]);
-        }
-
-        return $inverted;
+        return $this->libMix([$inverted, $color, $weight]);
     }
 
     // increases opacity by amount
     protected static $libOpacify = ['color', 'amount'];
     protected function libOpacify($args)
     {
-        $color = $this->assertColor($args[0]);
-        $amount = $this->coercePercent($args[1]);
+        $color = $this->assertColor($args[0], 'color');
+        $amount = $this->assertNumber($args[1], 'amount');
 
-        $color[4] = (isset($color[4]) ? $color[4] : 1) + $amount;
+        $color[4] = (isset($color[4]) ? $color[4] : 1) + $amount->valueInRange(0, 1, 'amount');
         $color[4] = min(1, max(0, $color[4]));
 
         return $color;
@@ -6257,10 +8598,10 @@ class Compiler
     protected static $libTransparentize = ['color', 'amount'];
     protected function libTransparentize($args)
     {
-        $color = $this->assertColor($args[0]);
-        $amount = $this->coercePercent($args[1]);
+        $color = $this->assertColor($args[0], 'color');
+        $amount = $this->assertNumber($args[1], 'amount');
 
-        $color[4] = (isset($color[4]) ? $color[4] : 1) - $amount;
+        $color[4] = (isset($color[4]) ? $color[4] : 1) - $amount->valueInRange(0, 1, 'amount');
         $color[4] = min(1, max(0, $color[4]));
 
         return $color;
@@ -6275,166 +8616,165 @@ class Compiler
     protected static $libUnquote = ['string'];
     protected function libUnquote($args)
     {
-        $str = $args[0];
+        try {
+            $str = $this->assertString($args[0], 'string');
+        } catch (SassScriptException $e) {
+            $value = $this->compileValue($args[0]);
+            $fname = $this->getPrettyPath($this->sourceNames[$this->sourceIndex]);
+            $line  = $this->sourceLine;
 
-        if ($str[0] === Type::T_STRING) {
-            $str[1] = '';
+            $message = "Passing $value, a non-string value, to unquote()
+will be an error in future versions of Sass.\n         on line $line of $fname";
+
+            $this->logger->warn($message, true);
+
+            return $args[0];
         }
 
+        $str[1] = '';
+
         return $str;
     }
 
     protected static $libQuote = ['string'];
     protected function libQuote($args)
     {
-        $value = $args[0];
+        $value = $this->assertString($args[0], 'string');
 
-        if ($value[0] === Type::T_STRING && ! empty($value[1])) {
-            return $value;
-        }
+        $value[1] = '"';
 
-        return [Type::T_STRING, '"', [$value]];
+        return $value;
     }
 
-    protected static $libPercentage = ['value'];
+    protected static $libPercentage = ['number'];
     protected function libPercentage($args)
     {
-        return new Node\Number($this->coercePercent($args[0]) * 100, '%');
+        $num = $this->assertNumber($args[0], 'number');
+        $num->assertNoUnits('number');
+
+        return new Number($num->getDimension() * 100, '%');
     }
 
-    protected static $libRound = ['value'];
+    protected static $libRound = ['number'];
     protected function libRound($args)
     {
-        $num = $args[0];
+        $num = $this->assertNumber($args[0], 'number');
 
-        return new Node\Number(round($num[1]), $num[2]);
+        return new Number(round($num->getDimension()), $num->getNumeratorUnits(), $num->getDenominatorUnits());
     }
 
-    protected static $libFloor = ['value'];
+    protected static $libFloor = ['number'];
     protected function libFloor($args)
     {
-        $num = $args[0];
+        $num = $this->assertNumber($args[0], 'number');
 
-        return new Node\Number(floor($num[1]), $num[2]);
+        return new Number(floor($num->getDimension()), $num->getNumeratorUnits(), $num->getDenominatorUnits());
     }
 
-    protected static $libCeil = ['value'];
+    protected static $libCeil = ['number'];
     protected function libCeil($args)
     {
-        $num = $args[0];
+        $num = $this->assertNumber($args[0], 'number');
 
-        return new Node\Number(ceil($num[1]), $num[2]);
+        return new Number(ceil($num->getDimension()), $num->getNumeratorUnits(), $num->getDenominatorUnits());
     }
 
-    protected static $libAbs = ['value'];
+    protected static $libAbs = ['number'];
     protected function libAbs($args)
     {
-        $num = $args[0];
+        $num = $this->assertNumber($args[0], 'number');
 
-        return new Node\Number(abs($num[1]), $num[2]);
+        return new Number(abs($num->getDimension()), $num->getNumeratorUnits(), $num->getDenominatorUnits());
     }
 
+    protected static $libMin = ['numbers...'];
     protected function libMin($args)
     {
-        $numbers = $this->getNormalizedNumbers($args);
+        /**
+         * @var Number|null
+         */
         $min = null;
 
-        foreach ($numbers as $key => $number) {
-            if (is_null($min) || $number[1] <= $min[1]) {
-                $min = [$key, $number[1]];
+        foreach ($args[0][2] as $arg) {
+            $number = $this->assertNumber($arg);
+
+            if (\is_null($min) || $min->greaterThan($number)) {
+                $min = $number;
             }
         }
 
-        return $args[$min[0]];
+        if (!\is_null($min)) {
+            return $min;
+        }
+
+        throw $this->error('At least one argument must be passed.');
     }
 
+    protected static $libMax = ['numbers...'];
     protected function libMax($args)
     {
-        $numbers = $this->getNormalizedNumbers($args);
+        /**
+         * @var Number|null
+         */
         $max = null;
 
-        foreach ($numbers as $key => $number) {
-            if (is_null($max) || $number[1] >= $max[1]) {
-                $max = [$key, $number[1]];
+        foreach ($args[0][2] as $arg) {
+            $number = $this->assertNumber($arg);
+
+            if (\is_null($max) || $max->lessThan($number)) {
+                $max = $number;
             }
         }
 
-        return $args[$max[0]];
-    }
-
-    /**
-     * Helper to normalize args containing numbers
-     *
-     * @param array $args
-     *
-     * @return array
-     */
-    protected function getNormalizedNumbers($args)
-    {
-        $unit         = null;
-        $originalUnit = null;
-        $numbers      = [];
-
-        foreach ($args as $key => $item) {
-            if ($item[0] !== Type::T_NUMBER) {
-                $this->throwError('%s is not a number', $item[0]);
-                break;
-            }
-
-            $number = $item->normalize();
-
-            if (is_null($unit)) {
-                $unit = $number[2];
-                $originalUnit = $item->unitStr();
-            } elseif ($number[1] && $unit !== $number[2]) {
-                $this->throwError('Incompatible units: "%s" and "%s".', $originalUnit, $item->unitStr());
-                break;
-            }
-
-            $numbers[$key] = $number;
+        if (!\is_null($max)) {
+            return $max;
         }
 
-        return $numbers;
+        throw $this->error('At least one argument must be passed.');
     }
 
     protected static $libLength = ['list'];
     protected function libLength($args)
     {
-        $list = $this->coerceList($args[0]);
+        $list = $this->coerceList($args[0], ',', true);
 
-        return count($list[2]);
+        return new Number(\count($list[2]), '');
     }
 
-    //protected static $libListSeparator = ['list...'];
+    protected static $libListSeparator = ['list'];
     protected function libListSeparator($args)
     {
-        if (count($args) > 1) {
-            return 'comma';
+        if (! \in_array($args[0][0], [Type::T_LIST, Type::T_MAP])) {
+            return [Type::T_KEYWORD, 'space'];
         }
 
         $list = $this->coerceList($args[0]);
 
-        if (count($list[2]) <= 1) {
-            return 'space';
+        if ($list[1] === '' && \count($list[2]) <= 1 && empty($list['enclosing'])) {
+            return [Type::T_KEYWORD, 'space'];
         }
 
         if ($list[1] === ',') {
-            return 'comma';
+            return [Type::T_KEYWORD, 'comma'];
         }
 
-        return 'space';
+        if ($list[1] === '/') {
+            return [Type::T_KEYWORD, 'slash'];
+        }
+
+        return [Type::T_KEYWORD, 'space'];
     }
 
     protected static $libNth = ['list', 'n'];
     protected function libNth($args)
     {
-        $list = $this->coerceList($args[0]);
-        $n = $this->assertNumber($args[1]);
+        $list = $this->coerceList($args[0], ',', false);
+        $n = $this->assertNumber($args[1])->getDimension();
 
         if ($n > 0) {
             $n--;
         } elseif ($n < 0) {
-            $n += count($list[2]);
+            $n += \count($list[2]);
         }
 
         return isset($list[2][$n]) ? $list[2][$n] : static::$defaultValue;
@@ -6444,18 +8784,16 @@ class Compiler
     protected function libSetNth($args)
     {
         $list = $this->coerceList($args[0]);
-        $n = $this->assertNumber($args[1]);
+        $n = $this->assertNumber($args[1])->getDimension();
 
         if ($n > 0) {
             $n--;
         } elseif ($n < 0) {
-            $n += count($list[2]);
+            $n += \count($list[2]);
         }
 
         if (! isset($list[2][$n])) {
-            $this->throwError('Invalid argument for "n"');
-
-            return null;
+            throw $this->error('Invalid argument for "n"');
         }
 
         $list[2][$n] = $args[2];
@@ -6463,29 +8801,78 @@ class Compiler
         return $list;
     }
 
-    protected static $libMapGet = ['map', 'key'];
+    protected static $libMapGet = ['map', 'key', 'keys...'];
     protected function libMapGet($args)
     {
-        $map = $this->assertMap($args[0]);
-        $key = $args[1];
+        $map = $this->assertMap($args[0], 'map');
+        if (!isset($args[2])) {
+            // BC layer for usages of the function from PHP code rather than from the Sass function
+            $args[2] = self::$emptyArgumentList;
+        }
+        $keys = array_merge([$args[1]], $args[2][2]);
+        $value = static::$null;
 
-        if (! is_null($key)) {
-            $key = $this->compileStringContent($this->coerceString($key));
+        foreach ($keys as $key) {
+            if (!\is_array($map) || $map[0] !== Type::T_MAP) {
+                return static::$null;
+            }
 
-            for ($i = count($map[1]) - 1; $i >= 0; $i--) {
-                if ($key === $this->compileStringContent($this->coerceString($map[1][$i]))) {
-                    return $map[2][$i];
-                }
+            $map = $this->mapGet($map, $key);
+
+            if ($map === null) {
+                return static::$null;
+            }
+
+            $value = $map;
+        }
+
+        return $value;
+    }
+
+    /**
+     * Gets the value corresponding to that key in the map
+     *
+     * @param array        $map
+     * @param Number|array $key
+     *
+     * @return Number|array|null
+     */
+    private function mapGet(array $map, $key)
+    {
+        $index = $this->mapGetEntryIndex($map, $key);
+
+        if ($index !== null) {
+            return $map[2][$index];
+        }
+
+        return null;
+    }
+
+    /**
+     * Gets the index corresponding to that key in the map entries
+     *
+     * @param array        $map
+     * @param Number|array $key
+     *
+     * @return int|null
+     */
+    private function mapGetEntryIndex(array $map, $key)
+    {
+        $key = $this->compileStringContent($this->coerceString($key));
+
+        for ($i = \count($map[1]) - 1; $i >= 0; $i--) {
+            if ($key === $this->compileStringContent($this->coerceString($map[1][$i]))) {
+                return $i;
             }
         }
 
-        return static::$null;
+        return null;
     }
 
     protected static $libMapKeys = ['map'];
     protected function libMapKeys($args)
     {
-        $map = $this->assertMap($args[0]);
+        $map = $this->assertMap($args[0], 'map');
         $keys = $map[1];
 
         return [Type::T_LIST, ',', $keys];
@@ -6494,20 +8881,33 @@ class Compiler
     protected static $libMapValues = ['map'];
     protected function libMapValues($args)
     {
-        $map = $this->assertMap($args[0]);
+        $map = $this->assertMap($args[0], 'map');
         $values = $map[2];
 
         return [Type::T_LIST, ',', $values];
     }
 
-    protected static $libMapRemove = ['map', 'key'];
+    protected static $libMapRemove = [
+        ['map'],
+        ['map', 'key', 'keys...'],
+    ];
     protected function libMapRemove($args)
     {
-        $map = $this->assertMap($args[0]);
-        $key = $this->compileStringContent($this->coerceString($args[1]));
+        $map = $this->assertMap($args[0], 'map');
 
-        for ($i = count($map[1]) - 1; $i >= 0; $i--) {
-            if ($key === $this->compileStringContent($this->coerceString($map[1][$i]))) {
+        if (\count($args) === 1) {
+            return $map;
+        }
+
+        $keys = [];
+        $keys[] = $this->compileStringContent($this->coerceString($args[1]));
+
+        foreach ($args[2][2] as $key) {
+            $keys[] = $this->compileStringContent($this->coerceString($key));
+        }
+
+        for ($i = \count($map[1]) - 1; $i >= 0; $i--) {
+            if (in_array($this->compileStringContent($this->coerceString($map[1][$i])), $keys)) {
                 array_splice($map[1], $i, 1);
                 array_splice($map[2], $i, 1);
             }
@@ -6516,13 +8916,40 @@ class Compiler
         return $map;
     }
 
-    protected static $libMapHasKey = ['map', 'key'];
+    protected static $libMapHasKey = ['map', 'key', 'keys...'];
     protected function libMapHasKey($args)
     {
-        $map = $this->assertMap($args[0]);
-        $key = $this->compileStringContent($this->coerceString($args[1]));
+        $map = $this->assertMap($args[0], 'map');
+        if (!isset($args[2])) {
+            // BC layer for usages of the function from PHP code rather than from the Sass function
+            $args[2] = self::$emptyArgumentList;
+        }
+        $keys = array_merge([$args[1]], $args[2][2]);
+        $lastKey = array_pop($keys);
 
-        for ($i = count($map[1]) - 1; $i >= 0; $i--) {
+        foreach ($keys as $key) {
+            $value = $this->mapGet($map, $key);
+
+            if ($value === null || $value instanceof Number || $value[0] !== Type::T_MAP) {
+                return self::$false;
+            }
+
+            $map = $value;
+        }
+
+        return $this->toBool($this->mapHasKey($map, $lastKey));
+    }
+
+    /**
+     * @param array|Number $keyValue
+     *
+     * @return bool
+     */
+    private function mapHasKey(array $map, $keyValue)
+    {
+        $key = $this->compileStringContent($this->coerceString($keyValue));
+
+        for ($i = \count($map[1]) - 1; $i >= 0; $i--) {
             if ($key === $this->compileStringContent($this->coerceString($map[1][$i]))) {
                 return true;
             }
@@ -6531,23 +8958,129 @@ class Compiler
         return false;
     }
 
-    protected static $libMapMerge = ['map-1', 'map-2'];
+    protected static $libMapMerge = [
+        ['map1', 'map2'],
+        ['map-1', 'map-2'],
+        ['map1', 'args...']
+    ];
     protected function libMapMerge($args)
     {
-        $map1 = $this->assertMap($args[0]);
-        $map2 = $this->assertMap($args[1]);
+        $map1 = $this->assertMap($args[0], 'map1');
+        $map2 = $args[1];
+        $keys = [];
+        if ($map2[0] === Type::T_LIST && isset($map2[3]) && \is_array($map2[3])) {
+            // This is an argument list for the variadic signature
+            if (\count($map2[2]) === 0) {
+                throw new SassScriptException('Expected $args to contain a key.');
+            }
+            if (\count($map2[2]) === 1) {
+                throw new SassScriptException('Expected $args to contain a value.');
+            }
+            $keys = $map2[2];
+            $map2 = array_pop($keys);
+        }
+        $map2 = $this->assertMap($map2, 'map2');
 
-        foreach ($map2[1] as $i2 => $key2) {
-            $key = $this->compileStringContent($this->coerceString($key2));
+        return $this->modifyMap($map1, $keys, function ($oldValue) use ($map2) {
+            $nestedMap = $this->tryMap($oldValue);
 
-            foreach ($map1[1] as $i1 => $key1) {
-                if ($key === $this->compileStringContent($this->coerceString($key1))) {
-                    $map1[2][$i1] = $map2[2][$i2];
-                    continue 2;
-                }
+            if ($nestedMap === null) {
+                return $map2;
             }
 
-            $map1[1][] = $map2[1][$i2];
+            return $this->mergeMaps($nestedMap, $map2);
+        });
+    }
+
+    /**
+     * @param array    $map
+     * @param array    $keys
+     * @param callable $modify
+     * @param bool     $addNesting
+     *
+     * @return Number|array
+     *
+     * @phpstan-param array<Number|array> $keys
+     * @phpstan-param callable(Number|array): (Number|array) $modify
+     */
+    private function modifyMap(array $map, array $keys, callable $modify, $addNesting = true)
+    {
+        if ($keys === []) {
+            return $modify($map);
+        }
+
+        return $this->modifyNestedMap($map, $keys, $modify, $addNesting);
+    }
+
+    /**
+     * @param array    $map
+     * @param array    $keys
+     * @param callable $modify
+     * @param bool     $addNesting
+     *
+     * @return array
+     *
+     * @phpstan-param non-empty-array<Number|array> $keys
+     * @phpstan-param callable(Number|array): (Number|array) $modify
+     */
+    private function modifyNestedMap(array $map, array $keys, callable $modify, $addNesting)
+    {
+        $key = array_shift($keys);
+
+        $nestedValueIndex = $this->mapGetEntryIndex($map, $key);
+
+        if ($keys === []) {
+            if ($nestedValueIndex !== null) {
+                $map[2][$nestedValueIndex] = $modify($map[2][$nestedValueIndex]);
+            } else {
+                $map[1][] = $key;
+                $map[2][] = $modify(self::$null);
+            }
+
+            return $map;
+        }
+
+        $nestedMap = $nestedValueIndex !== null ? $this->tryMap($map[2][$nestedValueIndex]) : null;
+
+        if ($nestedMap === null && !$addNesting) {
+            return $map;
+        }
+
+        if ($nestedMap === null) {
+            $nestedMap = self::$emptyMap;
+        }
+
+        $newNestedMap = $this->modifyNestedMap($nestedMap, $keys, $modify, $addNesting);
+
+        if ($nestedValueIndex !== null) {
+            $map[2][$nestedValueIndex] = $newNestedMap;
+        } else {
+            $map[1][] = $key;
+            $map[2][] = $newNestedMap;
+        }
+
+        return $map;
+    }
+
+    /**
+     * Merges 2 Sass maps together
+     *
+     * @param array $map1
+     * @param array $map2
+     *
+     * @return array
+     */
+    private function mergeMaps(array $map1, array $map2)
+    {
+        foreach ($map2[1] as $i2 => $key2) {
+            $map1EntryIndex = $this->mapGetEntryIndex($map1, $key2);
+
+            if ($map1EntryIndex !== null) {
+                $map1[2][$map1EntryIndex] = $map2[2][$i2];
+                continue;
+            }
+
+            $map1[1][] = $key2;
             $map1[2][] = $map2[2][$i2];
         }
 
@@ -6557,12 +9090,18 @@ class Compiler
     protected static $libKeywords = ['args'];
     protected function libKeywords($args)
     {
-        $this->assertList($args[0]);
+        $value = $args[0];
+
+        if ($value[0] !== Type::T_LIST || !isset($value[3]) || !\is_array($value[3])) {
+            $compiledValue = $this->compileValue($value);
+
+            throw SassScriptException::forArgument($compiledValue . ' is not an argument list.', 'args');
+        }
 
         $keys = [];
         $values = [];
 
-        foreach ($args[0][2] as $name => $arg) {
+        foreach ($this->getArgumentListKeywords($value) as $name => $arg) {
             $keys[] = [Type::T_KEYWORD, $name];
             $values[] = $arg;
         }
@@ -6575,15 +9114,27 @@ class Compiler
     {
         $list = $args[0];
         $this->coerceList($list, ' ');
+
         if (! empty($list['enclosing']) && $list['enclosing'] === 'bracket') {
-            return true;
+            return self::$true;
         }
-        return false;
+
+        return self::$false;
     }
 
-
+    /**
+     * @param array $list1
+     * @param array|Number|null $sep
+     *
+     * @return string
+     * @throws CompilerException
+     *
+     * @deprecated
+     */
     protected function listSeparatorForJoin($list1, $sep)
     {
+        @trigger_error(sprintf('The "%s" method is deprecated.', __METHOD__), E_USER_DEPRECATED);
+
         if (! isset($sep)) {
             return $list1[1];
         }
@@ -6600,14 +9151,40 @@ class Compiler
         }
     }
 
-    protected static $libJoin = ['list1', 'list2', 'separator:null', 'bracketed:auto'];
+    protected static $libJoin = ['list1', 'list2', 'separator:auto', 'bracketed:auto'];
     protected function libJoin($args)
     {
         list($list1, $list2, $sep, $bracketed) = $args;
 
-        $list1 = $this->coerceList($list1, ' ');
-        $list2 = $this->coerceList($list2, ' ');
-        $sep   = $this->listSeparatorForJoin($list1, $sep);
+        $list1 = $this->coerceList($list1, ' ', true);
+        $list2 = $this->coerceList($list2, ' ', true);
+
+        switch ($this->compileStringContent($this->assertString($sep, 'separator'))) {
+            case 'comma':
+                $separator = ',';
+                break;
+
+            case 'space':
+                $separator = ' ';
+                break;
+
+            case 'slash':
+                $separator = '/';
+                break;
+
+            case 'auto':
+                if ($list1[1] !== '' || count($list1[2]) > 1 || !empty($list1['enclosing']) && $list1['enclosing'] !== 'parent') {
+                    $separator = $list1[1] ?: ' ';
+                } elseif ($list2[1] !== '' || count($list2[2]) > 1 || !empty($list2['enclosing']) && $list2['enclosing'] !== 'parent') {
+                    $separator = $list2[1] ?: ' ';
+                } else {
+                    $separator = ' ';
+                }
+                break;
+
+            default:
+                throw SassScriptException::forArgument('Must be "space", "comma", "slash", or "auto".', 'separator');
+        }
 
         if ($bracketed === static::$true) {
             $bracketed = true;
@@ -6620,6 +9197,7 @@ class Compiler
         } else {
             $bracketed = $this->compileValue($bracketed);
             $bracketed = ! ! $bracketed;
+
             if ($bracketed === true) {
                 $bracketed = true;
             }
@@ -6627,60 +9205,91 @@ class Compiler
 
         if ($bracketed === 'auto') {
             $bracketed = false;
+
             if (! empty($list1['enclosing']) && $list1['enclosing'] === 'bracket') {
                 $bracketed = true;
             }
         }
 
-        $res = [Type::T_LIST, $sep, array_merge($list1[2], $list2[2])];
-        if (isset($list1['enclosing'])) {
-            $res['enlcosing'] = $list1['enclosing'];
-        }
+        $res = [Type::T_LIST, $separator, array_merge($list1[2], $list2[2])];
+
         if ($bracketed) {
             $res['enclosing'] = 'bracket';
         }
+
         return $res;
     }
 
-    protected static $libAppend = ['list', 'val', 'separator:null'];
+    protected static $libAppend = ['list', 'val', 'separator:auto'];
     protected function libAppend($args)
     {
         list($list1, $value, $sep) = $args;
 
-        $list1 = $this->coerceList($list1, ' ');
-        $sep = $this->listSeparatorForJoin($list1, $sep);
+        $list1 = $this->coerceList($list1, ' ', true);
+
+        switch ($this->compileStringContent($this->assertString($sep, 'separator'))) {
+            case 'comma':
+                $separator = ',';
+                break;
+
+            case 'space':
+                $separator = ' ';
+                break;
+
+            case 'slash':
+                $separator = '/';
+                break;
+
+            case 'auto':
+                $separator = $list1[1] === '' && \count($list1[2]) <= 1 && (empty($list1['enclosing']) || $list1['enclosing'] === 'parent') ? ' ' : $list1[1];
+                break;
+
+            default:
+                throw SassScriptException::forArgument('Must be "space", "comma", "slash", or "auto".', 'separator');
+        }
+
+        $res = [Type::T_LIST, $separator, array_merge($list1[2], [$value])];
 
-        $res = [Type::T_LIST, $sep, array_merge($list1[2], [$value])];
         if (isset($list1['enclosing'])) {
             $res['enclosing'] = $list1['enclosing'];
         }
+
         return $res;
     }
 
+    protected static $libZip = ['lists...'];
     protected function libZip($args)
     {
-        foreach ($args as $key => $arg) {
-            $args[$key] = $this->coerceList($arg);
+        $argLists = [];
+        foreach ($args[0][2] as $arg) {
+            $argLists[] = $this->coerceList($arg);
         }
 
         $lists = [];
-        $firstList = array_shift($args);
+        $firstList = array_shift($argLists);
 
-        foreach ($firstList[2] as $key => $item) {
-            $list = [Type::T_LIST, '', [$item]];
+        $result = [Type::T_LIST, ',', $lists];
+        if (! \is_null($firstList)) {
+            foreach ($firstList[2] as $key => $item) {
+                $list = [Type::T_LIST, ' ', [$item]];
 
-            foreach ($args as $arg) {
-                if (isset($arg[2][$key])) {
-                    $list[2][] = $arg[2][$key];
-                } else {
-                    break 2;
+                foreach ($argLists as $arg) {
+                    if (isset($arg[2][$key])) {
+                        $list[2][] = $arg[2][$key];
+                    } else {
+                        break 2;
+                    }
                 }
+
+                $lists[] = $list;
             }
 
-            $lists[] = $list;
+            $result[2] = $lists;
+        } else {
+            $result['enclosing'] = 'parent';
         }
 
-        return [Type::T_LIST, ',', $lists];
+        return $result;
     }
 
     protected static $libTypeOf = ['value'];
@@ -6688,6 +9297,16 @@ class Compiler
     {
         $value = $args[0];
 
+        return [Type::T_KEYWORD, $this->getTypeOf($value)];
+    }
+
+    /**
+     * @param array|Number $value
+     *
+     * @return string
+     */
+    private function getTypeOf($value)
+    {
         switch ($value[0]) {
             case Type::T_KEYWORD:
                 if ($value === static::$true || $value === static::$false) {
@@ -6702,8 +9321,11 @@ class Compiler
             case Type::T_FUNCTION:
                 return 'string';
 
+            case Type::T_FUNCTION_REFERENCE:
+                return 'function';
+
             case Type::T_LIST:
-                if (isset($value[3]) && $value[3]) {
+                if (isset($value[3]) && \is_array($value[3])) {
                     return 'arglist';
                 }
 
@@ -6716,68 +9338,77 @@ class Compiler
     protected static $libUnit = ['number'];
     protected function libUnit($args)
     {
-        $num = $args[0];
+        $num = $this->assertNumber($args[0], 'number');
 
-        if ($num[0] === Type::T_NUMBER) {
-            return [Type::T_STRING, '"', [$num->unitStr()]];
-        }
-
-        return '';
+        return [Type::T_STRING, '"', [$num->unitStr()]];
     }
 
     protected static $libUnitless = ['number'];
     protected function libUnitless($args)
     {
-        $value = $args[0];
+        $value = $this->assertNumber($args[0], 'number');
 
-        return $value[0] === Type::T_NUMBER && $value->unitless();
+        return $this->toBool($value->unitless());
     }
 
-    protected static $libComparable = ['number-1', 'number-2'];
+    protected static $libComparable = [
+        ['number1', 'number2'],
+        ['number-1', 'number-2']
+    ];
     protected function libComparable($args)
     {
         list($number1, $number2) = $args;
 
-        if (! isset($number1[0]) || $number1[0] !== Type::T_NUMBER ||
-            ! isset($number2[0]) || $number2[0] !== Type::T_NUMBER
+        if (
+            ! $number1 instanceof Number ||
+            ! $number2 instanceof Number
         ) {
-            $this->throwError('Invalid argument(s) for "comparable"');
-
-            return null;
+            throw $this->error('Invalid argument(s) for "comparable"');
         }
 
-        $number1 = $number1->normalize();
-        $number2 = $number2->normalize();
-
-        return $number1[2] === $number2[2] || $number1->unitless() || $number2->unitless();
+        return $this->toBool($number1->isComparableTo($number2));
     }
 
     protected static $libStrIndex = ['string', 'substring'];
     protected function libStrIndex($args)
     {
-        $string = $this->coerceString($args[0]);
+        $string = $this->assertString($args[0], 'string');
         $stringContent = $this->compileStringContent($string);
 
-        $substring = $this->coerceString($args[1]);
+        $substring = $this->assertString($args[1], 'substring');
         $substringContent = $this->compileStringContent($substring);
 
-        $result = strpos($stringContent, $substringContent);
+        if (! \strlen($substringContent)) {
+            $result = 0;
+        } else {
+            $result = Util::mbStrpos($stringContent, $substringContent);
+        }
 
-        return $result === false ? static::$null : new Node\Number($result + 1, '');
+        return $result === false ? static::$null : new Number($result + 1, '');
     }
 
     protected static $libStrInsert = ['string', 'insert', 'index'];
     protected function libStrInsert($args)
     {
-        $string = $this->coerceString($args[0]);
+        $string = $this->assertString($args[0], 'string');
         $stringContent = $this->compileStringContent($string);
 
-        $insert = $this->coerceString($args[1]);
+        $insert = $this->assertString($args[1], 'insert');
         $insertContent = $this->compileStringContent($insert);
 
-        list(, $index) = $args[2];
+        $index = $this->assertInteger($args[2], 'index');
+        if ($index > 0) {
+            $index = $index - 1;
+        }
+        if ($index < 0) {
+            $index = max(Util::mbStrlen($stringContent) + 1 + $index, 0);
+        }
 
-        $string[2] = [substr_replace($stringContent, $insertContent, $index - 1, 0)];
+        $string[2] = [
+            Util::mbSubstr($stringContent, 0, $index),
+            $insertContent,
+            Util::mbSubstr($stringContent, $index)
+        ];
 
         return $string;
     }
@@ -6785,34 +9416,46 @@ class Compiler
     protected static $libStrLength = ['string'];
     protected function libStrLength($args)
     {
-        $string = $this->coerceString($args[0]);
+        $string = $this->assertString($args[0], 'string');
         $stringContent = $this->compileStringContent($string);
 
-        return new Node\Number(strlen($stringContent), '');
+        return new Number(Util::mbStrlen($stringContent), '');
     }
 
     protected static $libStrSlice = ['string', 'start-at', 'end-at:-1'];
     protected function libStrSlice($args)
     {
-        if (isset($args[2]) && ! $args[2][1]) {
-            return static::$nullString;
-        }
-
-        $string = $this->coerceString($args[0]);
+        $string = $this->assertString($args[0], 'string');
         $stringContent = $this->compileStringContent($string);
 
-        $start = (int) $args[1][1];
+        $start = $this->assertNumber($args[1], 'start-at');
+        $start->assertNoUnits('start-at');
+        $startInt = $this->assertInteger($start, 'start-at');
+        $end = $this->assertNumber($args[2], 'end-at');
+        $end->assertNoUnits('end-at');
+        $endInt = $this->assertInteger($end, 'end-at');
 
-        if ($start > 0) {
-            $start--;
+        if ($endInt === 0) {
+            return [Type::T_STRING, $string[1], []];
         }
 
-        $end    = isset($args[2]) ? (int) $args[2][1] : -1;
-        $length = $end < 0 ? $end + 1 : ($end > 0 ? $end - $start : $end);
+        if ($startInt > 0) {
+            $startInt--;
+        }
 
-        $string[2] = $length
-            ? [substr($stringContent, $start, $length)]
-            : [substr($stringContent, $start)];
+        if ($endInt < 0) {
+            $endInt = Util::mbStrlen($stringContent) + $endInt;
+        } else {
+            $endInt--;
+        }
+
+        if ($endInt < $startInt) {
+            return [Type::T_STRING, $string[1], []];
+        }
+
+        $length = $endInt - $startInt + 1; // The end of the slice is inclusive
+
+        $string[2] = [Util::mbSubstr($stringContent, $startInt, $length)];
 
         return $string;
     }
@@ -6820,10 +9463,10 @@ class Compiler
     protected static $libToLowerCase = ['string'];
     protected function libToLowerCase($args)
     {
-        $string = $this->coerceString($args[0]);
+        $string = $this->assertString($args[0], 'string');
         $stringContent = $this->compileStringContent($string);
 
-        $string[2] = [function_exists('mb_strtolower') ? mb_strtolower($stringContent) : strtolower($stringContent)];
+        $string[2] = [$this->stringTransformAsciiOnly($stringContent, 'strtolower')];
 
         return $string;
     }
@@ -6831,75 +9474,103 @@ class Compiler
     protected static $libToUpperCase = ['string'];
     protected function libToUpperCase($args)
     {
-        $string = $this->coerceString($args[0]);
+        $string = $this->assertString($args[0], 'string');
         $stringContent = $this->compileStringContent($string);
 
-        $string[2] = [function_exists('mb_strtoupper') ? mb_strtoupper($stringContent) : strtoupper($stringContent)];
+        $string[2] = [$this->stringTransformAsciiOnly($stringContent, 'strtoupper')];
 
         return $string;
     }
 
+    /**
+     * Apply a filter on a string content, only on ascii chars
+     * let extended chars untouched
+     *
+     * @param string $stringContent
+     * @param callable $filter
+     * @return string
+     */
+    protected function stringTransformAsciiOnly($stringContent, $filter)
+    {
+        $mblength = Util::mbStrlen($stringContent);
+        if ($mblength === strlen($stringContent)) {
+            return $filter($stringContent);
+        }
+        $filteredString = "";
+        for ($i = 0; $i < $mblength; $i++) {
+            $char = Util::mbSubstr($stringContent, $i, 1);
+            if (strlen($char) > 1) {
+                $filteredString .= $char;
+            } else {
+                $filteredString .= $filter($char);
+            }
+        }
+
+        return $filteredString;
+    }
+
     protected static $libFeatureExists = ['feature'];
     protected function libFeatureExists($args)
     {
-        $string = $this->coerceString($args[0]);
+        $string = $this->assertString($args[0], 'feature');
         $name = $this->compileStringContent($string);
 
         return $this->toBool(
-            array_key_exists($name, $this->registeredFeatures) ? $this->registeredFeatures[$name] : false
+            \array_key_exists($name, $this->registeredFeatures) ? $this->registeredFeatures[$name] : false
         );
     }
 
     protected static $libFunctionExists = ['name'];
     protected function libFunctionExists($args)
     {
-        $string = $this->coerceString($args[0]);
+        $string = $this->assertString($args[0], 'name');
         $name = $this->compileStringContent($string);
 
         // user defined functions
         if ($this->has(static::$namespaces['function'] . $name)) {
-            return true;
+            return self::$true;
         }
 
         $name = $this->normalizeName($name);
 
         if (isset($this->userFunctions[$name])) {
-            return true;
+            return self::$true;
         }
 
         // built-in functions
         $f = $this->getBuiltinFunction($name);
 
-        return $this->toBool(is_callable($f));
+        return $this->toBool(\is_callable($f));
     }
 
     protected static $libGlobalVariableExists = ['name'];
     protected function libGlobalVariableExists($args)
     {
-        $string = $this->coerceString($args[0]);
+        $string = $this->assertString($args[0], 'name');
         $name = $this->compileStringContent($string);
 
-        return $this->has($name, $this->rootEnv);
+        return $this->toBool($this->has($name, $this->rootEnv));
     }
 
     protected static $libMixinExists = ['name'];
     protected function libMixinExists($args)
     {
-        $string = $this->coerceString($args[0]);
+        $string = $this->assertString($args[0], 'name');
         $name = $this->compileStringContent($string);
 
-        return $this->has(static::$namespaces['mixin'] . $name);
+        return $this->toBool($this->has(static::$namespaces['mixin'] . $name));
     }
 
     protected static $libVariableExists = ['name'];
     protected function libVariableExists($args)
     {
-        $string = $this->coerceString($args[0]);
+        $string = $this->assertString($args[0], 'name');
         $name = $this->compileStringContent($string);
 
-        return $this->has($name);
+        return $this->toBool($this->has($name));
     }
 
+    protected static $libCounter = ['args...'];
     /**
      * Workaround IE7's content counter bug.
      *
@@ -6909,35 +9580,37 @@ class Compiler
      */
     protected function libCounter($args)
     {
-        $list = array_map([$this, 'compileValue'], $args);
+        $list = array_map([$this, 'compileValue'], $args[0][2]);
 
         return [Type::T_STRING, '', ['counter(' . implode(',', $list) . ')']];
     }
 
-    protected static $libRandom = ['limit'];
+    protected static $libRandom = ['limit:null'];
     protected function libRandom($args)
     {
-        if (isset($args[0])) {
-            $n = $this->assertNumber($args[0]);
+        if (isset($args[0]) && $args[0] !== static::$null) {
+            $n = $this->assertInteger($args[0], 'limit');
 
             if ($n < 1) {
-                $this->throwError("limit must be greater than or equal to 1");
-
-                return null;
+                throw new SassScriptException("\$limit: Must be greater than 0, was $n.");
             }
 
-            return new Node\Number(mt_rand(1, $n), '');
+            return new Number(mt_rand(1, $n), '');
         }
 
-        return new Node\Number(mt_rand(1, mt_getrandmax()), '');
+        $max = mt_getrandmax();
+        return new Number(mt_rand(0, $max - 1) / $max, '');
     }
 
+    protected static $libUniqueId = [];
     protected function libUniqueId()
     {
         static $id;
 
         if (! isset($id)) {
-            $id = mt_rand(0, pow(36, 8));
+            $id = PHP_INT_SIZE === 4
+                ? mt_rand(0, pow(36, 5)) . str_pad(mt_rand(0, pow(36, 5)) % 10000000, 7, '0', STR_PAD_LEFT)
+                : mt_rand(0, pow(36, 8));
         }
 
         $id += mt_rand(0, 10) + 1;
@@ -6945,29 +9618,47 @@ class Compiler
         return [Type::T_STRING, '', ['u' . str_pad(base_convert($id, 10, 36), 8, '0', STR_PAD_LEFT)]];
     }
 
+    /**
+     * @param array|Number $value
+     * @param bool         $force_enclosing_display
+     *
+     * @return array
+     */
     protected function inspectFormatValue($value, $force_enclosing_display = false)
     {
         if ($value === static::$null) {
             $value = [Type::T_KEYWORD, 'null'];
         }
+
         $stringValue = [$value];
+
+        if ($value instanceof Number) {
+            return [Type::T_STRING, '', $stringValue];
+        }
+
         if ($value[0] === Type::T_LIST) {
             if (end($value[2]) === static::$null) {
                 array_pop($value[2]);
                 $value[2][] = [Type::T_STRING, '', ['']];
                 $force_enclosing_display = true;
             }
-            if (! empty($value['enclosing'])) {
-                if ($force_enclosing_display
-                    || ($value['enclosing'] === 'bracket' )
-                    || !count($value[2])) {
-                    $value['enclosing'] = 'forced_'.$value['enclosing'];
-                    $force_enclosing_display = true;
-                }
+
+            if (
+                ! empty($value['enclosing']) &&
+                ($force_enclosing_display ||
+                    ($value['enclosing'] === 'bracket') ||
+                    ! \count($value[2]))
+            ) {
+                $value['enclosing'] = 'forced_' . $value['enclosing'];
+                $force_enclosing_display = true;
+            } elseif (! \count($value[2])) {
+                $value['enclosing'] = 'forced_parent';
             }
+
             foreach ($value[2] as $k => $listelement) {
                 $value[2][$k] = $this->inspectFormatValue($listelement, $force_enclosing_display);
             }
+
             $stringValue = [$value];
         }
 
@@ -6978,37 +9669,80 @@ class Compiler
     protected function libInspect($args)
     {
         $value = $args[0];
+
         return $this->inspectFormatValue($value);
     }
 
     /**
      * Preprocess selector args
      *
-     * @param array $arg
+     * @param array       $arg
+     * @param string|null $varname
+     * @param bool        $allowParent
      *
-     * @return array|boolean
+     * @return array
      */
-    protected function getSelectorArg($arg)
+    protected function getSelectorArg($arg, $varname = null, $allowParent = false)
     {
         static $parser = null;
 
-        if (is_null($parser)) {
+        if (\is_null($parser)) {
             $parser = $this->parserFactory(__METHOD__);
         }
 
-        $arg = $this->libUnquote([$arg]);
+        if (! $this->checkSelectorArgType($arg)) {
+            $var_value = $this->compileValue($arg);
+            throw SassScriptException::forArgument("$var_value is not a valid selector: it must be a string, a list of strings, or a list of lists of strings", $varname);
+        }
+
+
+        if ($arg[0] === Type::T_STRING) {
+            $arg[1] = '';
+        }
         $arg = $this->compileValue($arg);
 
         $parsedSelector = [];
 
-        if ($parser->parseSelector($arg, $parsedSelector)) {
+        if ($parser->parseSelector($arg, $parsedSelector, true)) {
             $selector = $this->evalSelectors($parsedSelector);
             $gluedSelector = $this->glueFunctionSelectors($selector);
 
+            if (! $allowParent) {
+                foreach ($gluedSelector as $selector) {
+                    foreach ($selector as $s) {
+                        if (in_array(static::$selfSelector, $s)) {
+                            throw SassScriptException::forArgument("Parent selectors aren't allowed here.", $varname);
+                        }
+                    }
+                }
+            }
+
             return $gluedSelector;
         }
 
-        return false;
+        throw SassScriptException::forArgument("expected more input, invalid selector.", $varname);
+    }
+
+    /**
+     * Check variable type for getSelectorArg() function
+     * @param array $arg
+     * @param int $maxDepth
+     * @return bool
+     */
+    protected function checkSelectorArgType($arg, $maxDepth = 2)
+    {
+        if ($arg[0] === Type::T_LIST && $maxDepth > 0) {
+            foreach ($arg[2] as $elt) {
+                if (! $this->checkSelectorArgType($elt, $maxDepth - 1)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+        if (!in_array($arg[0], [Type::T_STRING, Type::T_KEYWORD])) {
+            return false;
+        }
+        return true;
     }
 
     /**
@@ -7016,11 +9750,11 @@ class Compiler
      *
      * @param array $selectors
      *
-     * @return string
+     * @return array
      */
     protected function formatOutputSelector($selectors)
     {
-        $selectors = $this->collapseSelectors($selectors, true);
+        $selectors = $this->collapseSelectorsAsList($selectors);
 
         return $selectors;
     }
@@ -7030,10 +9764,10 @@ class Compiler
     {
         list($super, $sub) = $args;
 
-        $super = $this->getSelectorArg($super);
-        $sub = $this->getSelectorArg($sub);
+        $super = $this->getSelectorArg($super, 'super');
+        $sub = $this->getSelectorArg($sub, 'sub');
 
-        return $this->isSuperSelector($super, $sub);
+        return $this->toBool($this->isSuperSelector($super, $sub));
     }
 
     /**
@@ -7042,17 +9776,35 @@ class Compiler
      * @param array $super
      * @param array $sub
      *
-     * @return boolean
+     * @return bool
      */
     protected function isSuperSelector($super, $sub)
     {
         // one and only one selector for each arg
-        if (! $super || count($super) !== 1) {
-            $this->throwError("Invalid super selector for isSuperSelector()");
+        if (! $super) {
+            throw $this->error('Invalid super selector for isSuperSelector()');
         }
 
-        if (! $sub || count($sub) !== 1) {
-            $this->throwError("Invalid sub selector for isSuperSelector()");
+        if (! $sub) {
+            throw $this->error('Invalid sub selector for isSuperSelector()');
+        }
+
+        if (count($sub) > 1) {
+            foreach ($sub as $s) {
+                if (! $this->isSuperSelector($super, [$s])) {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        if (count($super) > 1) {
+            foreach ($super as $s) {
+                if ($this->isSuperSelector([$s], $sub)) {
+                    return true;
+                }
+            }
+            return false;
         }
 
         $super = reset($super);
@@ -7079,7 +9831,7 @@ class Compiler
                 $nextMustMatch = true;
                 $i++;
             } else {
-                while ($i < count($sub) && ! $this->isSuperPart($node, $sub[$i])) {
+                while ($i < \count($sub) && ! $this->isSuperPart($node, $sub[$i])) {
                     if ($nextMustMatch) {
                         return false;
                     }
@@ -7087,7 +9839,7 @@ class Compiler
                     $i++;
                 }
 
-                if ($i >= count($sub)) {
+                if ($i >= \count($sub)) {
                     return false;
                 }
 
@@ -7105,18 +9857,18 @@ class Compiler
      * @param array $superParts
      * @param array $subParts
      *
-     * @return boolean
+     * @return bool
      */
     protected function isSuperPart($superParts, $subParts)
     {
         $i = 0;
 
         foreach ($superParts as $superPart) {
-            while ($i < count($subParts) && $subParts[$i] !== $superPart) {
+            while ($i < \count($subParts) && $subParts[$i] !== $superPart) {
                 $i++;
             }
 
-            if ($i >= count($subParts)) {
+            if ($i >= \count($subParts)) {
                 return false;
             }
 
@@ -7133,11 +9885,14 @@ class Compiler
         $args = reset($args);
         $args = $args[2];
 
-        if (count($args) < 1) {
-            $this->throwError("selector-append() needs at least 1 argument");
+        if (\count($args) < 1) {
+            throw $this->error('selector-append() needs at least 1 argument');
         }
 
-        $selectors = array_map([$this, 'getSelectorArg'], $args);
+        $selectors = [];
+        foreach ($args as $arg) {
+            $selectors[] = $this->getSelectorArg($arg, 'selector');
+        }
 
         return $this->formatOutputSelector($this->selectorAppend($selectors));
     }
@@ -7156,34 +9911,31 @@ class Compiler
         $lastSelectors = array_pop($selectors);
 
         if (! $lastSelectors) {
-            $this->throwError("Invalid selector list in selector-append()");
+            throw $this->error('Invalid selector list in selector-append()');
         }
 
-        while (count($selectors)) {
+        while (\count($selectors)) {
             $previousSelectors = array_pop($selectors);
 
             if (! $previousSelectors) {
-                $this->throwError("Invalid selector list in selector-append()");
+                throw $this->error('Invalid selector list in selector-append()');
             }
 
             // do the trick, happening $lastSelector to $previousSelector
             $appended = [];
 
-            foreach ($lastSelectors as $lastSelector) {
-                $previous = $previousSelectors;
-
-                foreach ($lastSelector as $lastSelectorParts) {
-                    foreach ($lastSelectorParts as $lastSelectorPart) {
-                        foreach ($previous as $i => $previousSelector) {
-                            foreach ($previousSelector as $j => $previousSelectorParts) {
-                                $previous[$i][$j][] = $lastSelectorPart;
+            foreach ($previousSelectors as $previousSelector) {
+                foreach ($lastSelectors as $lastSelector) {
+                    $previous = $previousSelector;
+                    foreach ($previousSelector as $j => $previousSelectorParts) {
+                        foreach ($lastSelector as $lastSelectorParts) {
+                            foreach ($lastSelectorParts as $lastSelectorPart) {
+                                $previous[$j][] = $lastSelectorPart;
                             }
                         }
                     }
-                }
 
-                foreach ($previous as $ps) {
-                    $appended[] = $ps;
+                    $appended[] = $previous;
                 }
             }
 
@@ -7193,17 +9945,20 @@ class Compiler
         return $lastSelectors;
     }
 
-    protected static $libSelectorExtend = ['selectors', 'extendee', 'extender'];
+    protected static $libSelectorExtend = [
+        ['selector', 'extendee', 'extender'],
+        ['selectors', 'extendee', 'extender']
+    ];
     protected function libSelectorExtend($args)
     {
         list($selectors, $extendee, $extender) = $args;
 
-        $selectors = $this->getSelectorArg($selectors);
-        $extendee  = $this->getSelectorArg($extendee);
-        $extender  = $this->getSelectorArg($extender);
+        $selectors = $this->getSelectorArg($selectors, 'selector');
+        $extendee  = $this->getSelectorArg($extendee, 'extendee');
+        $extender  = $this->getSelectorArg($extender, 'extender');
 
         if (! $selectors || ! $extendee || ! $extender) {
-            $this->throwError("selector-extend() invalid arguments");
+            throw $this->error('selector-extend() invalid arguments');
         }
 
         $extended = $this->extendOrReplaceSelectors($selectors, $extendee, $extender);
@@ -7211,17 +9966,20 @@ class Compiler
         return $this->formatOutputSelector($extended);
     }
 
-    protected static $libSelectorReplace = ['selectors', 'original', 'replacement'];
+    protected static $libSelectorReplace = [
+        ['selector', 'original', 'replacement'],
+        ['selectors', 'original', 'replacement']
+    ];
     protected function libSelectorReplace($args)
     {
         list($selectors, $original, $replacement) = $args;
 
-        $selectors   = $this->getSelectorArg($selectors);
-        $original    = $this->getSelectorArg($original);
-        $replacement = $this->getSelectorArg($replacement);
+        $selectors   = $this->getSelectorArg($selectors, 'selector');
+        $original    = $this->getSelectorArg($original, 'original');
+        $replacement = $this->getSelectorArg($replacement, 'replacement');
 
         if (! $selectors || ! $original || ! $replacement) {
-            $this->throwError("selector-replace() invalid arguments");
+            throw $this->error('selector-replace() invalid arguments');
         }
 
         $replaced = $this->extendOrReplaceSelectors($selectors, $original, $replacement, true);
@@ -7233,10 +9991,10 @@ class Compiler
      * Extend/replace in selectors
      * used by selector-extend and selector-replace that use the same logic
      *
-     * @param array   $selectors
-     * @param array   $extendee
-     * @param array   $extender
-     * @param boolean $replace
+     * @param array $selectors
+     * @param array $extendee
+     * @param array $extender
+     * @param bool  $replace
      *
      * @return array
      */
@@ -7249,6 +10007,10 @@ class Compiler
         $this->extendsMap = [];
 
         foreach ($extendee as $es) {
+            if (\count($es) !== 1) {
+                throw $this->error('Can\'t extend complex selector.');
+            }
+
             // only use the first one
             $this->pushExtends(reset($es), $extender, null);
         }
@@ -7260,12 +10022,12 @@ class Compiler
                 $extended[] = $selector;
             }
 
-            $n = count($extended);
+            $n = \count($extended);
 
             $this->matchExtends($selector, $extended);
 
             // if didnt match, keep the original selector if we are in a replace operation
-            if ($replace and count($extended) === $n) {
+            if ($replace && \count($extended) === $n) {
                 $extended[] = $selector;
             }
         }
@@ -7283,11 +10045,17 @@ class Compiler
         $args = reset($args);
         $args = $args[2];
 
-        if (count($args) < 1) {
-            $this->throwError("selector-nest() needs at least 1 argument");
+        if (\count($args) < 1) {
+            throw $this->error('selector-nest() needs at least 1 argument');
         }
 
-        $selectorsMap = array_map([$this, 'getSelectorArg'], $args);
+        $selectorsMap = [];
+        foreach ($args as $arg) {
+            $selectorsMap[] = $this->getSelectorArg($arg, 'selector', true);
+        }
+
+        assert(!empty($selectorsMap));
+
         $envs = [];
 
         foreach ($selectorsMap as $selectors) {
@@ -7304,11 +10072,14 @@ class Compiler
         return $this->formatOutputSelector($outputSelectors);
     }
 
-    protected static $libSelectorParse = ['selectors'];
+    protected static $libSelectorParse = [
+        ['selector'],
+        ['selectors']
+    ];
     protected function libSelectorParse($args)
     {
         $selectors = reset($args);
-        $selectors = $this->getSelectorArg($selectors);
+        $selectors = $this->getSelectorArg($selectors, 'selector');
 
         return $this->formatOutputSelector($selectors);
     }
@@ -7318,11 +10089,11 @@ class Compiler
     {
         list($selectors1, $selectors2) = $args;
 
-        $selectors1 = $this->getSelectorArg($selectors1);
-        $selectors2 = $this->getSelectorArg($selectors2);
+        $selectors1 = $this->getSelectorArg($selectors1, 'selectors1');
+        $selectors2 = $this->getSelectorArg($selectors2, 'selectors2');
 
         if (! $selectors1 || ! $selectors2) {
-            $this->throwError("selector-unify() invalid arguments");
+            throw $this->error('selector-unify() invalid arguments');
         }
 
         // only consider the first compound of each
@@ -7342,15 +10113,15 @@ class Compiler
      * @param array $compound1
      * @param array $compound2
      *
-     * @return array|mixed
+     * @return array
      */
     protected function unifyCompoundSelectors($compound1, $compound2)
     {
-        if (! count($compound1)) {
+        if (! \count($compound1)) {
             return $compound2;
         }
 
-        if (! count($compound2)) {
+        if (! \count($compound2)) {
             return $compound1;
         }
 
@@ -7367,7 +10138,7 @@ class Compiler
         $unifiedSelectors = [$unifiedCompound];
 
         // do the rest
-        while (count($compound1) || count($compound2)) {
+        while (\count($compound1) || \count($compound2)) {
             $part1 = end($compound1);
             $part2 = end($compound2);
 
@@ -7458,7 +10229,7 @@ class Compiler
      * @param array $part
      * @param array $compound
      *
-     * @return array|boolean
+     * @return array|false
      */
     protected function matchPartInCompound($part, $compound)
     {
@@ -7467,7 +10238,7 @@ class Compiler
         $after   = [];
 
         // try to find a match by tag name first
-        while (count($before)) {
+        while (\count($before)) {
             $p = array_pop($before);
 
             if ($partTag && $partTag !== '*' && $partTag == $this->findTagName($p)) {
@@ -7481,11 +10252,11 @@ class Compiler
         $before = $compound;
         $after = [];
 
-        while (count($before)) {
+        while (\count($before)) {
             $p = array_pop($before);
 
             if ($this->checkCompatibleTags($partTag, $this->findTagName($p))) {
-                if (count(array_intersect($part, $p))) {
+                if (\count(array_intersect($part, $p))) {
                     return [$before, $p, $after];
                 }
             }
@@ -7553,7 +10324,7 @@ class Compiler
      * @param string $tag1
      * @param string $tag2
      *
-     * @return array|boolean
+     * @return array|false
      */
     protected function checkCompatibleTags($tag1, $tag2)
     {
@@ -7561,12 +10332,12 @@ class Compiler
         $tags = array_unique($tags);
         $tags = array_filter($tags);
 
-        if (count($tags) > 1) {
+        if (\count($tags) > 1) {
             $tags = array_diff($tags, ['*']);
         }
 
         // not compatible nodes
-        if (count($tags) > 1) {
+        if (\count($tags) > 1) {
             return false;
         }
 
@@ -7576,9 +10347,9 @@ class Compiler
     /**
      * Find the html tag name in a selector parts list
      *
-     * @param array $parts
+     * @param string[] $parts
      *
-     * @return mixed|string
+     * @return string
      */
     protected function findTagName($parts)
     {
@@ -7595,7 +10366,7 @@ class Compiler
     protected function libSimpleSelectors($args)
     {
         $selector = reset($args);
-        $selector = $this->getSelectorArg($selector);
+        $selector = $this->getSelectorArg($selector, 'selector');
 
         // remove selectors list layer, keeping the first one
         $selector = reset($selector);
@@ -7611,4 +10382,27 @@ class Compiler
 
         return [Type::T_LIST, ',', $listParts];
     }
+
+    protected static $libScssphpGlob = ['pattern'];
+    protected function libScssphpGlob($args)
+    {
+        @trigger_error(sprintf('The "scssphp-glob" function is deprecated an will be removed in ScssPhp 2.0. Register your own alternative through "%s::registerFunction', __CLASS__), E_USER_DEPRECATED);
+
+        $this->logger->warn('The "scssphp-glob" function is deprecated an will be removed in ScssPhp 2.0.', true);
+
+        $string = $this->assertString($args[0], 'pattern');
+        $pattern = $this->compileStringContent($string);
+        $matches = glob($pattern);
+        $listParts = [];
+
+        foreach ($matches as $match) {
+            if (! is_file($match)) {
+                continue;
+            }
+
+            $listParts[] = [Type::T_STRING, '"', [$match]];
+        }
+
+        return [Type::T_LIST, ',', $listParts];
+    }
 }
diff --git a/lib/scssphp/scssphp/src/Compiler/CachedResult.php b/lib/scssphp/scssphp/src/Compiler/CachedResult.php
new file mode 100644
index 000000000..a66291996
--- /dev/null
+++ b/lib/scssphp/scssphp/src/Compiler/CachedResult.php
@@ -0,0 +1,77 @@
+<?php
+
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2020 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://scssphp.github.io/scssphp
+ */
+
+namespace ScssPhp\ScssPhp\Compiler;
+
+use ScssPhp\ScssPhp\CompilationResult;
+
+/**
+ * @internal
+ */
+class CachedResult
+{
+    /**
+     * @var CompilationResult
+     */
+    private $result;
+
+    /**
+     * @var array<string, int>
+     */
+    private $parsedFiles;
+
+    /**
+     * @var array
+     * @phpstan-var list<array{currentDir: string|null, path: string, filePath: string}>
+     */
+    private $resolvedImports;
+
+    /**
+     * @param CompilationResult  $result
+     * @param array<string, int> $parsedFiles
+     * @param array              $resolvedImports
+     *
+     * @phpstan-param list<array{currentDir: string|null, path: string, filePath: string}> $resolvedImports
+     */
+    public function __construct(CompilationResult $result, array $parsedFiles, array $resolvedImports)
+    {
+        $this->result = $result;
+        $this->parsedFiles = $parsedFiles;
+        $this->resolvedImports = $resolvedImports;
+    }
+
+    /**
+     * @return CompilationResult
+     */
+    public function getResult()
+    {
+        return $this->result;
+    }
+
+    /**
+     * @return array<string, int>
+     */
+    public function getParsedFiles()
+    {
+        return $this->parsedFiles;
+    }
+
+    /**
+     * @return array
+     *
+     * @phpstan-return list<array{currentDir: string|null, path: string, filePath: string}>
+     */
+    public function getResolvedImports()
+    {
+        return $this->resolvedImports;
+    }
+}
diff --git a/lib/scssphp/scssphp/src/Compiler/Environment.php b/lib/scssphp/scssphp/src/Compiler/Environment.php
index 03eb86a5d..b205a077f 100644
--- a/lib/scssphp/scssphp/src/Compiler/Environment.php
+++ b/lib/scssphp/scssphp/src/Compiler/Environment.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -15,19 +16,41 @@ namespace ScssPhp\ScssPhp\Compiler;
  * Compiler environment
  *
  * @author Anthon Pang <anthon.pang@gmail.com>
+ *
+ * @internal
  */
 class Environment
 {
     /**
-     * @var \ScssPhp\ScssPhp\Block
+     * @var \ScssPhp\ScssPhp\Block|null
      */
     public $block;
 
     /**
-     * @var \ScssPhp\ScssPhp\Compiler\Environment
+     * @var \ScssPhp\ScssPhp\Compiler\Environment|null
      */
     public $parent;
 
+    /**
+     * @var Environment|null
+     */
+    public $declarationScopeParent;
+
+    /**
+     * @var Environment|null
+     */
+    public $parentStore;
+
+    /**
+     * @var array|null
+     */
+    public $selectors;
+
+    /**
+     * @var string|null
+     */
+    public $marker;
+
     /**
      * @var array
      */
@@ -39,7 +62,7 @@ class Environment
     public $storeUnreduced;
 
     /**
-     * @var integer
+     * @var int
      */
     public $depth;
 }
diff --git a/lib/scssphp/scssphp/src/Exception/CompilerException.php b/lib/scssphp/scssphp/src/Exception/CompilerException.php
index a9d134fca..0b00cf525 100644
--- a/lib/scssphp/scssphp/src/Exception/CompilerException.php
+++ b/lib/scssphp/scssphp/src/Exception/CompilerException.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -15,7 +16,9 @@ namespace ScssPhp\ScssPhp\Exception;
  * Compiler exception
  *
  * @author Oleksandr Savchenko <traveltino@gmail.com>
+ *
+ * @internal
  */
-class CompilerException extends \Exception
+class CompilerException extends \Exception implements SassException
 {
 }
diff --git a/lib/scssphp/scssphp/src/Exception/ParserException.php b/lib/scssphp/scssphp/src/Exception/ParserException.php
index 2fa12dd7a..f0726698f 100644
--- a/lib/scssphp/scssphp/src/Exception/ParserException.php
+++ b/lib/scssphp/scssphp/src/Exception/ParserException.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -15,7 +16,43 @@ namespace ScssPhp\ScssPhp\Exception;
  * Parser Exception
  *
  * @author Oleksandr Savchenko <traveltino@gmail.com>
+ *
+ * @internal
  */
-class ParserException extends \Exception
+class ParserException extends \Exception implements SassException
 {
+    /**
+     * @var array|null
+     * @phpstan-var array{string, int, int}|null
+     */
+    private $sourcePosition;
+
+    /**
+     * Get source position
+     *
+     * @api
+     *
+     * @return array|null
+     * @phpstan-return array{string, int, int}|null
+     */
+    public function getSourcePosition()
+    {
+        return $this->sourcePosition;
+    }
+
+    /**
+     * Set source position
+     *
+     * @api
+     *
+     * @param array $sourcePosition
+     *
+     * @return void
+     *
+     * @phpstan-param array{string, int, int} $sourcePosition
+     */
+    public function setSourcePosition($sourcePosition)
+    {
+        $this->sourcePosition = $sourcePosition;
+    }
 }
diff --git a/lib/scssphp/scssphp/src/Exception/RangeException.php b/lib/scssphp/scssphp/src/Exception/RangeException.php
index ee36c97e1..4be4dee70 100644
--- a/lib/scssphp/scssphp/src/Exception/RangeException.php
+++ b/lib/scssphp/scssphp/src/Exception/RangeException.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -15,7 +16,9 @@ namespace ScssPhp\ScssPhp\Exception;
  * Range exception
  *
  * @author Anthon Pang <anthon.pang@gmail.com>
+ *
+ * @internal
  */
-class RangeException extends \Exception
+class RangeException extends \Exception implements SassException
 {
 }
diff --git a/lib/scssphp/scssphp/src/Exception/SassException.php b/lib/scssphp/scssphp/src/Exception/SassException.php
new file mode 100644
index 000000000..9f62b3cd2
--- /dev/null
+++ b/lib/scssphp/scssphp/src/Exception/SassException.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace ScssPhp\ScssPhp\Exception;
+
+interface SassException
+{
+}
diff --git a/lib/scssphp/scssphp/src/Exception/SassScriptException.php b/lib/scssphp/scssphp/src/Exception/SassScriptException.php
new file mode 100644
index 000000000..19356a7a1
--- /dev/null
+++ b/lib/scssphp/scssphp/src/Exception/SassScriptException.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace ScssPhp\ScssPhp\Exception;
+
+/**
+ * An exception thrown by SassScript.
+ *
+ * This class does not implement SassException on purpose, as it should
+ * never be returned to the outside code. The compilation will catch it
+ * and replace it with a SassException reporting the location of the
+ * error.
+ */
+class SassScriptException extends \Exception
+{
+    /**
+     * Creates a SassScriptException with support for an argument name.
+     *
+     * This helper ensures a consistent handling of argument names in the
+     * error message, without duplicating it.
+     *
+     * @param string      $message
+     * @param string|null $name    The argument name, without $
+     *
+     * @return SassScriptException
+     */
+    public static function forArgument($message, $name = null)
+    {
+        $varDisplay = !\is_null($name) ? "\${$name}: " : '';
+
+        return new self($varDisplay . $message);
+    }
+}
diff --git a/lib/scssphp/scssphp/src/Exception/ServerException.php b/lib/scssphp/scssphp/src/Exception/ServerException.php
index d4a207aff..e593c4014 100644
--- a/lib/scssphp/scssphp/src/Exception/ServerException.php
+++ b/lib/scssphp/scssphp/src/Exception/ServerException.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -11,11 +12,15 @@
 
 namespace ScssPhp\ScssPhp\Exception;
 
+@trigger_error(sprintf('The "%s" class is deprecated.', ServerException::class), E_USER_DEPRECATED);
+
 /**
  * Server Exception
  *
  * @author Anthon Pang <anthon.pang@gmail.com>
+ *
+ * @deprecated The Scssphp server should define its own exception instead.
  */
-class ServerException extends \Exception
+class ServerException extends \Exception implements SassException
 {
 }
diff --git a/lib/scssphp/scssphp/src/Formatter.php b/lib/scssphp/scssphp/src/Formatter.php
index e17770458..6137dc650 100644
--- a/lib/scssphp/scssphp/src/Formatter.php
+++ b/lib/scssphp/scssphp/src/Formatter.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -18,11 +19,13 @@ use ScssPhp\ScssPhp\SourceMap\SourceMapGenerator;
  * Base formatter
  *
  * @author Leaf Corcoran <leafot@gmail.com>
+ *
+ * @internal
  */
 abstract class Formatter
 {
     /**
-     * @var integer
+     * @var int
      */
     public $indentLevel;
 
@@ -57,7 +60,7 @@ abstract class Formatter
     public $assignSeparator;
 
     /**
-     * @var boolean
+     * @var bool
      */
     public $keepSemicolons;
 
@@ -67,17 +70,17 @@ abstract class Formatter
     protected $currentBlock;
 
     /**
-     * @var integer
+     * @var int
      */
     protected $currentLine;
 
     /**
-     * @var integer
+     * @var int
      */
     protected $currentColumn;
 
     /**
-     * @var \ScssPhp\ScssPhp\SourceMap\SourceMapGenerator
+     * @var \ScssPhp\ScssPhp\SourceMap\SourceMapGenerator|null
      */
     protected $sourceMapGenerator;
 
@@ -118,16 +121,33 @@ abstract class Formatter
         return rtrim($name) . $this->assignSeparator . $value . ';';
     }
 
+    /**
+     * Return custom property assignment
+     * differs in that you have to keep spaces in the value as is
+     *
+     * @api
+     *
+     * @param string $name
+     * @param mixed  $value
+     *
+     * @return string
+     */
+    public function customProperty($name, $value)
+    {
+        return rtrim($name) . trim($this->assignSeparator) . $value . ';';
+    }
+
     /**
      * Output lines inside a block
      *
      * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $block
+     *
+     * @return void
      */
     protected function blockLines(OutputBlock $block)
     {
         $inner = $this->indentStr();
-
-        $glue = $this->break . $inner;
+        $glue  = $this->break . $inner;
 
         $this->write($inner . implode($glue, $block->lines));
 
@@ -140,9 +160,13 @@ abstract class Formatter
      * Output block selectors
      *
      * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $block
+     *
+     * @return void
      */
     protected function blockSelectors(OutputBlock $block)
     {
+        assert(! empty($block->selectors));
+
         $inner = $this->indentStr();
 
         $this->write($inner
@@ -154,6 +178,8 @@ abstract class Formatter
      * Output block children
      *
      * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $block
+     *
+     * @return void
      */
     protected function blockChildren(OutputBlock $block)
     {
@@ -166,6 +192,8 @@ abstract class Formatter
      * Output non-empty block
      *
      * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $block
+     *
+     * @return void
      */
     protected function block(OutputBlock $block)
     {
@@ -211,7 +239,7 @@ abstract class Formatter
      *
      * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $block
      *
-     * @return boolean
+     * @return bool
      */
     protected function testEmptyChildren($block)
     {
@@ -258,9 +286,18 @@ abstract class Formatter
 
         ob_start();
 
-        $this->block($block);
+        try {
+            $this->block($block);
+        } catch (\Exception $e) {
+            ob_end_clean();
+            throw $e;
+        } catch (\Throwable $e) {
+            ob_end_clean();
+            throw $e;
+        }
 
         $out = ob_get_clean();
+        assert($out !== false);
 
         return $out;
     }
@@ -269,6 +306,8 @@ abstract class Formatter
      * Output content
      *
      * @param string $str
+     *
+     * @return void
      */
     protected function write($str)
     {
@@ -282,7 +321,8 @@ abstract class Formatter
          * Maybe Strip semi-colon appended by property(); it's a separator, not a terminator
          * will be striped for real before a closing, otherwise displayed unchanged starting the next write
          */
-        if (! $this->keepSemicolons &&
+        if (
+            ! $this->keepSemicolons &&
             $str &&
             (strpos($str, ';') !== false) &&
             (substr($str, -1) === ';')
@@ -293,22 +333,43 @@ abstract class Formatter
         }
 
         if ($this->sourceMapGenerator) {
-            $this->sourceMapGenerator->addMapping(
-                $this->currentLine,
-                $this->currentColumn,
-                $this->currentBlock->sourceLine,
-                //columns from parser are off by one
-                $this->currentBlock->sourceColumn > 0 ? $this->currentBlock->sourceColumn - 1 : 0,
-                $this->currentBlock->sourceName
-            );
-
             $lines = explode("\n", $str);
-            $lineCount = count($lines);
-            $this->currentLine += $lineCount-1;
-
             $lastLine = array_pop($lines);
 
-            $this->currentColumn = ($lineCount === 1 ? $this->currentColumn : 0) + strlen($lastLine);
+            foreach ($lines as $line) {
+                // If the written line starts is empty, adding a mapping would add it for
+                // a non-existent column as we are at the end of the line
+                if ($line !== '') {
+                    assert($this->currentBlock->sourceLine !== null);
+                    assert($this->currentBlock->sourceName !== null);
+                    $this->sourceMapGenerator->addMapping(
+                        $this->currentLine,
+                        $this->currentColumn,
+                        $this->currentBlock->sourceLine,
+                        //columns from parser are off by one
+                        $this->currentBlock->sourceColumn > 0 ? $this->currentBlock->sourceColumn - 1 : 0,
+                        $this->currentBlock->sourceName
+                    );
+                }
+
+                $this->currentLine++;
+                $this->currentColumn = 0;
+            }
+
+            if ($lastLine !== '') {
+                assert($this->currentBlock->sourceLine !== null);
+                assert($this->currentBlock->sourceName !== null);
+                $this->sourceMapGenerator->addMapping(
+                    $this->currentLine,
+                    $this->currentColumn,
+                    $this->currentBlock->sourceLine,
+                    //columns from parser are off by one
+                    $this->currentBlock->sourceColumn > 0 ? $this->currentBlock->sourceColumn - 1 : 0,
+                    $this->currentBlock->sourceName
+                );
+            }
+
+            $this->currentColumn += \strlen($lastLine);
         }
 
         echo $str;
diff --git a/lib/scssphp/scssphp/src/Formatter/Compact.php b/lib/scssphp/scssphp/src/Formatter/Compact.php
index 591f0c92e..22f226889 100644
--- a/lib/scssphp/scssphp/src/Formatter/Compact.php
+++ b/lib/scssphp/scssphp/src/Formatter/Compact.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -17,6 +18,10 @@ use ScssPhp\ScssPhp\Formatter;
  * Compact formatter
  *
  * @author Leaf Corcoran <leafot@gmail.com>
+ *
+ * @deprecated since 1.4.0. Use the Compressed formatter instead.
+ *
+ * @internal
  */
 class Compact extends Formatter
 {
@@ -25,6 +30,8 @@ class Compact extends Formatter
      */
     public function __construct()
     {
+        @trigger_error('The Compact formatter is deprecated since 1.4.0. Use the Compressed formatter instead.', E_USER_DEPRECATED);
+
         $this->indentLevel = 0;
         $this->indentChar = '';
         $this->break = '';
diff --git a/lib/scssphp/scssphp/src/Formatter/Compressed.php b/lib/scssphp/scssphp/src/Formatter/Compressed.php
index ec4722eaf..58ebe3f11 100644
--- a/lib/scssphp/scssphp/src/Formatter/Compressed.php
+++ b/lib/scssphp/scssphp/src/Formatter/Compressed.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -12,12 +13,13 @@
 namespace ScssPhp\ScssPhp\Formatter;
 
 use ScssPhp\ScssPhp\Formatter;
-use ScssPhp\ScssPhp\Formatter\OutputBlock;
 
 /**
  * Compressed formatter
  *
  * @author Leaf Corcoran <leafot@gmail.com>
+ *
+ * @internal
  */
 class Compressed extends Formatter
 {
@@ -48,8 +50,6 @@ class Compressed extends Formatter
         foreach ($block->lines as $index => $line) {
             if (substr($line, 0, 2) === '/*' && substr($line, 2, 1) !== '!') {
                 unset($block->lines[$index]);
-            } elseif (substr($line, 0, 3) === '/*!') {
-                $block->lines[$index] = '/*' . substr($line, 3);
             }
         }
 
@@ -67,6 +67,8 @@ class Compressed extends Formatter
      */
     protected function blockSelectors(OutputBlock $block)
     {
+        assert(! empty($block->selectors));
+
         $inner = $this->indentStr();
 
         $this->write(
diff --git a/lib/scssphp/scssphp/src/Formatter/Crunched.php b/lib/scssphp/scssphp/src/Formatter/Crunched.php
index 51ccb516d..2bc1e9299 100644
--- a/lib/scssphp/scssphp/src/Formatter/Crunched.php
+++ b/lib/scssphp/scssphp/src/Formatter/Crunched.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -12,12 +13,15 @@
 namespace ScssPhp\ScssPhp\Formatter;
 
 use ScssPhp\ScssPhp\Formatter;
-use ScssPhp\ScssPhp\Formatter\OutputBlock;
 
 /**
  * Crunched formatter
  *
  * @author Anthon Pang <anthon.pang@gmail.com>
+ *
+ * @deprecated since 1.4.0. Use the Compressed formatter instead.
+ *
+ * @internal
  */
 class Crunched extends Formatter
 {
@@ -26,6 +30,8 @@ class Crunched extends Formatter
      */
     public function __construct()
     {
+        @trigger_error('The Crunched formatter is deprecated since 1.4.0. Use the Compressed formatter instead.', E_USER_DEPRECATED);
+
         $this->indentLevel = 0;
         $this->indentChar = '  ';
         $this->break = '';
@@ -65,6 +71,8 @@ class Crunched extends Formatter
      */
     protected function blockSelectors(OutputBlock $block)
     {
+        assert(! empty($block->selectors));
+
         $inner = $this->indentStr();
 
         $this->write(
diff --git a/lib/scssphp/scssphp/src/Formatter/Debug.php b/lib/scssphp/scssphp/src/Formatter/Debug.php
index 94e70c815..b3f442253 100644
--- a/lib/scssphp/scssphp/src/Formatter/Debug.php
+++ b/lib/scssphp/scssphp/src/Formatter/Debug.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -12,12 +13,15 @@
 namespace ScssPhp\ScssPhp\Formatter;
 
 use ScssPhp\ScssPhp\Formatter;
-use ScssPhp\ScssPhp\Formatter\OutputBlock;
 
 /**
  * Debug formatter
  *
  * @author Anthon Pang <anthon.pang@gmail.com>
+ *
+ * @deprecated since 1.4.0.
+ *
+ * @internal
  */
 class Debug extends Formatter
 {
@@ -26,6 +30,8 @@ class Debug extends Formatter
      */
     public function __construct()
     {
+        @trigger_error('The Debug formatter is deprecated since 1.4.0.', E_USER_DEPRECATED);
+
         $this->indentLevel = 0;
         $this->indentChar = '';
         $this->break = "\n";
diff --git a/lib/scssphp/scssphp/src/Formatter/Expanded.php b/lib/scssphp/scssphp/src/Formatter/Expanded.php
index 9549c6cfa..6eb4a0cb7 100644
--- a/lib/scssphp/scssphp/src/Formatter/Expanded.php
+++ b/lib/scssphp/scssphp/src/Formatter/Expanded.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -12,12 +13,13 @@
 namespace ScssPhp\ScssPhp\Formatter;
 
 use ScssPhp\ScssPhp\Formatter;
-use ScssPhp\ScssPhp\Formatter\OutputBlock;
 
 /**
  * Expanded formatter
  *
  * @author Leaf Corcoran <leafot@gmail.com>
+ *
+ * @internal
  */
 class Expanded extends Formatter
 {
@@ -55,7 +57,9 @@ class Expanded extends Formatter
 
         foreach ($block->lines as $index => $line) {
             if (substr($line, 0, 2) === '/*') {
-                $block->lines[$index] = preg_replace('/[\r\n]+/', $glue, $line);
+                $replacedLine = preg_replace('/\r\n?|\n|\f/', $this->break, $line);
+                assert($replacedLine !== null);
+                $block->lines[$index] = $replacedLine;
             }
         }
 
diff --git a/lib/scssphp/scssphp/src/Formatter/Nested.php b/lib/scssphp/scssphp/src/Formatter/Nested.php
index f9e7f037f..d5ed85cc2 100644
--- a/lib/scssphp/scssphp/src/Formatter/Nested.php
+++ b/lib/scssphp/scssphp/src/Formatter/Nested.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -12,18 +13,21 @@
 namespace ScssPhp\ScssPhp\Formatter;
 
 use ScssPhp\ScssPhp\Formatter;
-use ScssPhp\ScssPhp\Formatter\OutputBlock;
 use ScssPhp\ScssPhp\Type;
 
 /**
  * Nested formatter
  *
  * @author Leaf Corcoran <leafot@gmail.com>
+ *
+ * @deprecated since 1.4.0. Use the Expanded formatter instead.
+ *
+ * @internal
  */
 class Nested extends Formatter
 {
     /**
-     * @var integer
+     * @var int
      */
     private $depth;
 
@@ -32,6 +36,8 @@ class Nested extends Formatter
      */
     public function __construct()
     {
+        @trigger_error('The Nested formatter is deprecated since 1.4.0. Use the Expanded formatter instead.', E_USER_DEPRECATED);
+
         $this->indentLevel = 0;
         $this->indentChar = '  ';
         $this->break = "\n";
@@ -58,12 +64,13 @@ class Nested extends Formatter
     protected function blockLines(OutputBlock $block)
     {
         $inner = $this->indentStr();
-
-        $glue = $this->break . $inner;
+        $glue  = $this->break . $inner;
 
         foreach ($block->lines as $index => $line) {
             if (substr($line, 0, 2) === '/*') {
-                $block->lines[$index] = preg_replace('/[\r\n]+/', $glue, $line);
+                $replacedLine = preg_replace('/\r\n?|\n|\f/', $this->break, $line);
+                assert($replacedLine !== null);
+                $block->lines[$index] = $replacedLine;
             }
         }
 
@@ -90,7 +97,7 @@ class Nested extends Formatter
             $previousHasSelector = false;
         }
 
-        $isMediaOrDirective = in_array($block->type, [Type::T_DIRECTIVE, Type::T_MEDIA]);
+        $isMediaOrDirective = \in_array($block->type, [Type::T_DIRECTIVE, Type::T_MEDIA]);
         $isSupport = ($block->type === Type::T_DIRECTIVE
             && $block->selectors && strpos(implode('', $block->selectors), '@supports') !== false);
 
@@ -98,7 +105,8 @@ class Nested extends Formatter
             array_pop($depths);
             $this->depth--;
 
-            if (! $this->depth && ($block->depth <= 1 || (! $this->indentLevel && $block->type === Type::T_COMMENT)) &&
+            if (
+                ! $this->depth && ($block->depth <= 1 || (! $this->indentLevel && $block->type === Type::T_COMMENT)) &&
                 (($block->selectors && ! $isMediaOrDirective) || $previousHasSelector)
             ) {
                 $downLevel = $this->break;
@@ -119,10 +127,12 @@ class Nested extends Formatter
             if ($block->depth > end($depths)) {
                 if (! $previousEmpty || $this->depth < 1) {
                     $this->depth++;
+
                     $depths[] = $block->depth;
                 } else {
                     // keep the current depth unchanged but take the block depth as a new reference for following blocks
                     array_pop($depths);
+
                     $depths[] = $block->depth;
                 }
             }
@@ -213,7 +223,7 @@ class Nested extends Formatter
      *
      * @param \ScssPhp\ScssPhp\Formatter\OutputBlock $block
      *
-     * @return boolean
+     * @return bool
      */
     private function hasFlatChild($block)
     {
diff --git a/lib/scssphp/scssphp/src/Formatter/OutputBlock.php b/lib/scssphp/scssphp/src/Formatter/OutputBlock.php
index 3e6fd9289..2799656a4 100644
--- a/lib/scssphp/scssphp/src/Formatter/OutputBlock.php
+++ b/lib/scssphp/scssphp/src/Formatter/OutputBlock.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -15,51 +16,53 @@ namespace ScssPhp\ScssPhp\Formatter;
  * Output block
  *
  * @author Anthon Pang <anthon.pang@gmail.com>
+ *
+ * @internal
  */
 class OutputBlock
 {
     /**
-     * @var string
+     * @var string|null
      */
     public $type;
 
     /**
-     * @var integer
+     * @var int
      */
     public $depth;
 
     /**
-     * @var array
+     * @var array|null
      */
     public $selectors;
 
     /**
-     * @var array
+     * @var string[]
      */
     public $lines;
 
     /**
-     * @var array
+     * @var OutputBlock[]
      */
     public $children;
 
     /**
-     * @var \ScssPhp\ScssPhp\Formatter\OutputBlock
+     * @var OutputBlock|null
      */
     public $parent;
 
     /**
-     * @var string
+     * @var string|null
      */
     public $sourceName;
 
     /**
-     * @var integer
+     * @var int|null
      */
     public $sourceLine;
 
     /**
-     * @var integer
+     * @var int|null
      */
     public $sourceColumn;
 }
diff --git a/lib/scssphp/scssphp/src/Logger/LoggerInterface.php b/lib/scssphp/scssphp/src/Logger/LoggerInterface.php
new file mode 100644
index 000000000..7c0a2f76e
--- /dev/null
+++ b/lib/scssphp/scssphp/src/Logger/LoggerInterface.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2020 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://scssphp.github.io/scssphp
+ */
+
+namespace ScssPhp\ScssPhp\Logger;
+
+/**
+ * Interface implemented by loggers for warnings and debug messages.
+ *
+ * The official Sass implementation recommends that loggers report the
+ * messages immediately rather than waiting for the end of the
+ * compilation, to provide a better debugging experience when the
+ * compilation does not end (error or infinite loop after the warning
+ * for instance).
+ */
+interface LoggerInterface
+{
+    /**
+     * Emits a warning with the given message.
+     *
+     * If $deprecation is true, it indicates that this is a deprecation
+     * warning. Implementations should surface all this information to
+     * the end user.
+     *
+     * @param string $message
+     * @param bool  $deprecation
+     *
+     * @return void
+     */
+    public function warn($message, $deprecation = false);
+
+    /**
+     * Emits a debugging message.
+     *
+     * @param string $message
+     *
+     * @return void
+     */
+    public function debug($message);
+}
diff --git a/lib/scssphp/scssphp/src/Logger/QuietLogger.php b/lib/scssphp/scssphp/src/Logger/QuietLogger.php
new file mode 100644
index 000000000..0f358c646
--- /dev/null
+++ b/lib/scssphp/scssphp/src/Logger/QuietLogger.php
@@ -0,0 +1,27 @@
+<?php
+
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2020 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://scssphp.github.io/scssphp
+ */
+
+namespace ScssPhp\ScssPhp\Logger;
+
+/**
+ * A logger that silently ignores all messages.
+ */
+class QuietLogger implements LoggerInterface
+{
+    public function warn($message, $deprecation = false)
+    {
+    }
+
+    public function debug($message)
+    {
+    }
+}
diff --git a/lib/scssphp/scssphp/src/Logger/StreamLogger.php b/lib/scssphp/scssphp/src/Logger/StreamLogger.php
new file mode 100644
index 000000000..f5da6c9cf
--- /dev/null
+++ b/lib/scssphp/scssphp/src/Logger/StreamLogger.php
@@ -0,0 +1,60 @@
+<?php
+
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2020 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://scssphp.github.io/scssphp
+ */
+
+namespace ScssPhp\ScssPhp\Logger;
+
+/**
+ * A logger that prints to a PHP stream (for instance stderr)
+ */
+class StreamLogger implements LoggerInterface
+{
+    private $stream;
+    private $closeOnDestruct;
+
+    /**
+     * @param resource $stream          A stream resource
+     * @param bool     $closeOnDestruct If true, takes ownership of the stream and close it on destruct to avoid leaks.
+     */
+    public function __construct($stream, $closeOnDestruct = false)
+    {
+        $this->stream = $stream;
+        $this->closeOnDestruct = $closeOnDestruct;
+    }
+
+    /**
+     * @internal
+     */
+    public function __destruct()
+    {
+        if ($this->closeOnDestruct) {
+            fclose($this->stream);
+        }
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function warn($message, $deprecation = false)
+    {
+        $prefix = ($deprecation ? 'DEPRECATION ' : '') . 'WARNING: ';
+
+        fwrite($this->stream, $prefix . $message . "\n\n");
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function debug($message)
+    {
+        fwrite($this->stream, $message . "\n");
+    }
+}
diff --git a/lib/scssphp/scssphp/src/Node.php b/lib/scssphp/scssphp/src/Node.php
index dab565a63..fcaf8a95f 100644
--- a/lib/scssphp/scssphp/src/Node.php
+++ b/lib/scssphp/scssphp/src/Node.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -15,6 +16,8 @@ namespace ScssPhp\ScssPhp;
  * Base node
  *
  * @author Anthon Pang <anthon.pang@gmail.com>
+ *
+ * @internal
  */
 abstract class Node
 {
@@ -24,17 +27,17 @@ abstract class Node
     public $type;
 
     /**
-     * @var integer
+     * @var int
      */
     public $sourceIndex;
 
     /**
-     * @var integer
+     * @var int|null
      */
     public $sourceLine;
 
     /**
-     * @var integer
+     * @var int|null
      */
     public $sourceColumn;
 }
diff --git a/lib/scssphp/scssphp/src/Node/Number.php b/lib/scssphp/scssphp/src/Node/Number.php
index acbabff7f..ca9b5b652 100644
--- a/lib/scssphp/scssphp/src/Node/Number.php
+++ b/lib/scssphp/scssphp/src/Node/Number.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -11,9 +12,13 @@
 
 namespace ScssPhp\ScssPhp\Node;
 
+use ScssPhp\ScssPhp\Base\Range;
 use ScssPhp\ScssPhp\Compiler;
+use ScssPhp\ScssPhp\Exception\RangeException;
+use ScssPhp\ScssPhp\Exception\SassScriptException;
 use ScssPhp\ScssPhp\Node;
 use ScssPhp\ScssPhp\Type;
+use ScssPhp\ScssPhp\Util;
 
 /**
  * Dimension + optional units
@@ -25,20 +30,26 @@ use ScssPhp\ScssPhp\Type;
  * }}
  *
  * @author Anthon Pang <anthon.pang@gmail.com>
+ *
+ * @template-implements \ArrayAccess<int, mixed>
  */
 class Number extends Node implements \ArrayAccess
 {
+    const PRECISION = 10;
+
     /**
-     * @var integer
+     * @var int
+     * @deprecated use {Number::PRECISION} instead to read the precision. Configuring it is not supported anymore.
      */
-    static public $precision = 10;
+    public static $precision = self::PRECISION;
 
     /**
      * @see http://www.w3.org/TR/2012/WD-css3-values-20120308/
      *
      * @var array
+     * @phpstan-var array<string, array<string, float|int>>
      */
-    static protected $unitTable = [
+    protected static $unitTable = [
         'in' => [
             'in' => 1,
             'pc' => 6,
@@ -64,91 +75,93 @@ class Number extends Node implements \ArrayAccess
         ],
         'dpi' => [
             'dpi'  => 1,
-            'dpcm' => 2.54,
-            'dppx' => 96,
+            'dpcm' => 1 / 2.54,
+            'dppx' => 1 / 96,
         ],
     ];
 
     /**
-     * @var integer|float
+     * @var int|float
      */
-    public $dimension;
+    private $dimension;
 
     /**
-     * @var array
+     * @var string[]
+     * @phpstan-var list<string>
      */
-    public $units;
+    private $numeratorUnits;
+
+    /**
+     * @var string[]
+     * @phpstan-var list<string>
+     */
+    private $denominatorUnits;
 
     /**
      * Initialize number
      *
-     * @param mixed $dimension
-     * @param mixed $initialUnit
+     * @param int|float       $dimension
+     * @param string[]|string $numeratorUnits
+     * @param string[]        $denominatorUnits
+     *
+     * @phpstan-param list<string>|string $numeratorUnits
+     * @phpstan-param list<string>        $denominatorUnits
      */
-    public function __construct($dimension, $initialUnit)
+    public function __construct($dimension, $numeratorUnits, array $denominatorUnits = [])
     {
-        $this->type      = Type::T_NUMBER;
+        if (is_string($numeratorUnits)) {
+            $numeratorUnits = $numeratorUnits ? [$numeratorUnits] : [];
+        } elseif (isset($numeratorUnits['numerator_units'], $numeratorUnits['denominator_units'])) {
+            // TODO get rid of this once `$number[2]` is not used anymore
+            $denominatorUnits = $numeratorUnits['denominator_units'];
+            $numeratorUnits = $numeratorUnits['numerator_units'];
+        }
+
         $this->dimension = $dimension;
-        $this->units     = is_array($initialUnit)
-            ? $initialUnit
-            : ($initialUnit ? [$initialUnit => 1]
-                            : []);
+        $this->numeratorUnits = $numeratorUnits;
+        $this->denominatorUnits = $denominatorUnits;
     }
 
     /**
-     * Coerce number to target units
-     *
-     * @param array $units
-     *
-     * @return \ScssPhp\ScssPhp\Node\Number
+     * @return float|int
      */
-    public function coerce($units)
+    public function getDimension()
     {
-        if ($this->unitless()) {
-            return new Number($this->dimension, $units);
-        }
-
-        $dimension = $this->dimension;
-
-        foreach (static::$unitTable['in'] as $unit => $conv) {
-            $from       = isset($this->units[$unit]) ? $this->units[$unit] : 0;
-            $to         = isset($units[$unit]) ? $units[$unit] : 0;
-            $factor     = pow($conv, $from - $to);
-            $dimension /= $factor;
-        }
-
-        return new Number($dimension, $units);
+        return $this->dimension;
     }
 
     /**
-     * Normalize number
-     *
-     * @return \ScssPhp\ScssPhp\Node\Number
+     * @return string[]
      */
-    public function normalize()
+    public function getNumeratorUnits()
     {
-        $dimension = $this->dimension;
-        $units     = [];
-
-        $this->normalizeUnits($dimension, $units, 'in');
-
-        return new Number($dimension, $units);
+        return $this->numeratorUnits;
     }
 
     /**
-     * {@inheritdoc}
+     * @return string[]
      */
+    public function getDenominatorUnits()
+    {
+        return $this->denominatorUnits;
+    }
+
+    /**
+     * @return bool
+     */
+    #[\ReturnTypeWillChange]
     public function offsetExists($offset)
     {
         if ($offset === -3) {
-            return ! is_null($this->sourceColumn);
+            return ! \is_null($this->sourceColumn);
         }
 
         if ($offset === -2) {
-            return ! is_null($this->sourceLine);
+            return ! \is_null($this->sourceLine);
         }
 
-        if ($offset === -1 ||
+        if (
+            $offset === -1 ||
             $offset === 0 ||
             $offset === 1 ||
             $offset === 2
@@ -160,8 +173,9 @@ class Number extends Node implements \ArrayAccess
     }
 
     /**
-     * {@inheritdoc}
+     * @return mixed
      */
+    #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         switch ($offset) {
@@ -175,60 +189,54 @@ class Number extends Node implements \ArrayAccess
                 return $this->sourceIndex;
 
             case 0:
-                return $this->type;
+                return Type::T_NUMBER;
 
             case 1:
                 return $this->dimension;
 
             case 2:
-                return $this->units;
+                return array('numerator_units' => $this->numeratorUnits, 'denominator_units' => $this->denominatorUnits);
         }
     }
 
     /**
-     * {@inheritdoc}
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function offsetSet($offset, $value)
     {
-        if ($offset === 1) {
-            $this->dimension = $value;
-        } elseif ($offset === 2) {
-            $this->units = $value;
-        } elseif ($offset == -1) {
-            $this->sourceIndex = $value;
-        } elseif ($offset == -2) {
-            $this->sourceLine = $value;
-        } elseif ($offset == -3) {
-            $this->sourceColumn = $value;
-        }
+        throw new \BadMethodCallException('Number is immutable');
     }
 
     /**
-     * {@inheritdoc}
+     * @return void
      */
+    #[\ReturnTypeWillChange]
     public function offsetUnset($offset)
     {
-        if ($offset === 1) {
-            $this->dimension = null;
-        } elseif ($offset === 2) {
-            $this->units = null;
-        } elseif ($offset === -1) {
-            $this->sourceIndex = null;
-        } elseif ($offset === -2) {
-            $this->sourceLine = null;
-        } elseif ($offset === -3) {
-            $this->sourceColumn = null;
-        }
+        throw new \BadMethodCallException('Number is immutable');
     }
 
     /**
      * Returns true if the number is unitless
      *
-     * @return boolean
+     * @return bool
      */
     public function unitless()
     {
-        return ! array_sum($this->units);
+        return \count($this->numeratorUnits) === 0 && \count($this->denominatorUnits) === 0;
+    }
+
+    /**
+     * Checks whether the number has exactly this unit
+     *
+     * @param string $unit
+     *
+     * @return bool
+     */
+    public function hasUnit($unit)
+    {
+        return \count($this->numeratorUnits) === 1 && \count($this->denominatorUnits) === 0 && $this->numeratorUnits[0] === $unit;
     }
 
     /**
@@ -238,22 +246,289 @@ class Number extends Node implements \ArrayAccess
      */
     public function unitStr()
     {
-        $numerators   = [];
-        $denominators = [];
-
-        foreach ($this->units as $unit => $unitSize) {
-            if ($unitSize > 0) {
-                $numerators = array_pad($numerators, count($numerators) + $unitSize, $unit);
-                continue;
-            }
-
-            if ($unitSize < 0) {
-                $denominators = array_pad($denominators, count($denominators) + $unitSize, $unit);
-                continue;
-            }
+        if ($this->unitless()) {
+            return '';
         }
 
-        return implode('*', $numerators) . (count($denominators) ? '/' . implode('*', $denominators) : '');
+        return self::getUnitString($this->numeratorUnits, $this->denominatorUnits);
+    }
+
+    /**
+     * @param float|int $min
+     * @param float|int $max
+     * @param string|null $name
+     *
+     * @return float|int
+     * @throws SassScriptException
+     */
+    public function valueInRange($min, $max, $name = null)
+    {
+        try {
+            return Util::checkRange('', new Range($min, $max), $this);
+        } catch (RangeException $e) {
+            throw SassScriptException::forArgument(sprintf('Expected %s to be within %s%s and %s%3$s', $this, $min, $this->unitStr(), $max), $name);
+        }
+    }
+
+    /**
+     * @param string|null $varName
+     *
+     * @return void
+     */
+    public function assertNoUnits($varName = null)
+    {
+        if ($this->unitless()) {
+            return;
+        }
+
+        throw SassScriptException::forArgument(sprintf('Expected %s to have no units.', $this), $varName);
+    }
+
+    /**
+     * @param string      $unit
+     * @param string|null $varName
+     *
+     * @return void
+     */
+    public function assertUnit($unit, $varName = null)
+    {
+        if ($this->hasUnit($unit)) {
+            return;
+        }
+
+        throw SassScriptException::forArgument(sprintf('Expected %s to have unit "%s".', $this, $unit), $varName);
+    }
+
+    /**
+     * @param Number $other
+     *
+     * @return void
+     */
+    public function assertSameUnitOrUnitless(Number $other)
+    {
+        if ($other->unitless()) {
+            return;
+        }
+
+        if ($this->numeratorUnits === $other->numeratorUnits && $this->denominatorUnits === $other->denominatorUnits) {
+            return;
+        }
+
+        throw new SassScriptException(sprintf(
+            'Incompatible units %s and %s.',
+            self::getUnitString($this->numeratorUnits, $this->denominatorUnits),
+            self::getUnitString($other->numeratorUnits, $other->denominatorUnits)
+        ));
+    }
+
+    /**
+     * Returns a copy of this number, converted to the units represented by $newNumeratorUnits and $newDenominatorUnits.
+     *
+     * This does not throw an error if this number is unitless and
+     * $newNumeratorUnits/$newDenominatorUnits are not empty, or vice versa. Instead,
+     * it treats all unitless numbers as convertible to and from all units without
+     * changing the value.
+     *
+     * @param string[] $newNumeratorUnits
+     * @param string[] $newDenominatorUnits
+     *
+     * @return Number
+     *
+     * @phpstan-param list<string> $newNumeratorUnits
+     * @phpstan-param list<string> $newDenominatorUnits
+     *
+     * @throws SassScriptException if this number's units are not compatible with $newNumeratorUnits and $newDenominatorUnits
+     */
+    public function coerce(array $newNumeratorUnits, array $newDenominatorUnits)
+    {
+        return new Number($this->valueInUnits($newNumeratorUnits, $newDenominatorUnits), $newNumeratorUnits, $newDenominatorUnits);
+    }
+
+    /**
+     * @param Number $other
+     *
+     * @return bool
+     */
+    public function isComparableTo(Number $other)
+    {
+        if ($this->unitless() || $other->unitless()) {
+            return true;
+        }
+
+        try {
+            $this->greaterThan($other);
+            return true;
+        } catch (SassScriptException $e) {
+            return false;
+        }
+    }
+
+    /**
+     * @param Number $other
+     *
+     * @return bool
+     */
+    public function lessThan(Number $other)
+    {
+        return $this->coerceUnits($other, function ($num1, $num2) {
+            return $num1 < $num2;
+        });
+    }
+
+    /**
+     * @param Number $other
+     *
+     * @return bool
+     */
+    public function lessThanOrEqual(Number $other)
+    {
+        return $this->coerceUnits($other, function ($num1, $num2) {
+            return $num1 <= $num2;
+        });
+    }
+
+    /**
+     * @param Number $other
+     *
+     * @return bool
+     */
+    public function greaterThan(Number $other)
+    {
+        return $this->coerceUnits($other, function ($num1, $num2) {
+            return $num1 > $num2;
+        });
+    }
+
+    /**
+     * @param Number $other
+     *
+     * @return bool
+     */
+    public function greaterThanOrEqual(Number $other)
+    {
+        return $this->coerceUnits($other, function ($num1, $num2) {
+            return $num1 >= $num2;
+        });
+    }
+
+    /**
+     * @param Number $other
+     *
+     * @return Number
+     */
+    public function plus(Number $other)
+    {
+        return $this->coerceNumber($other, function ($num1, $num2) {
+            return $num1 + $num2;
+        });
+    }
+
+    /**
+     * @param Number $other
+     *
+     * @return Number
+     */
+    public function minus(Number $other)
+    {
+        return $this->coerceNumber($other, function ($num1, $num2) {
+            return $num1 - $num2;
+        });
+    }
+
+    /**
+     * @return Number
+     */
+    public function unaryMinus()
+    {
+        return new Number(-$this->dimension, $this->numeratorUnits, $this->denominatorUnits);
+    }
+
+    /**
+     * @param Number $other
+     *
+     * @return Number
+     */
+    public function modulo(Number $other)
+    {
+        return $this->coerceNumber($other, function ($num1, $num2) {
+            if ($num2 == 0) {
+                return NAN;
+            }
+
+            $result = fmod($num1, $num2);
+
+            if ($result == 0) {
+                return 0;
+            }
+
+            if ($num2 < 0 xor $num1 < 0) {
+                $result += $num2;
+            }
+
+            return $result;
+        });
+    }
+
+    /**
+     * @param Number $other
+     *
+     * @return Number
+     */
+    public function times(Number $other)
+    {
+        return $this->multiplyUnits($this->dimension * $other->dimension, $this->numeratorUnits, $this->denominatorUnits, $other->numeratorUnits, $other->denominatorUnits);
+    }
+
+    /**
+     * @param Number $other
+     *
+     * @return Number
+     */
+    public function dividedBy(Number $other)
+    {
+        if ($other->dimension == 0) {
+            if ($this->dimension == 0) {
+                $value = NAN;
+            } elseif ($this->dimension > 0) {
+                $value = INF;
+            } else {
+                $value = -INF;
+            }
+        } else {
+            $value = $this->dimension / $other->dimension;
+        }
+
+        return $this->multiplyUnits($value, $this->numeratorUnits, $this->denominatorUnits, $other->denominatorUnits, $other->numeratorUnits);
+    }
+
+    /**
+     * @param Number $other
+     *
+     * @return bool
+     */
+    public function equals(Number $other)
+    {
+        // Unitless numbers are convertable to unit numbers, but not equal, so we special-case unitless here.
+        if ($this->unitless() !== $other->unitless()) {
+            return false;
+        }
+
+        // In Sass, neither NaN nor Infinity are equal to themselves, while PHP defines INF==INF
+        if (is_nan($this->dimension) || is_nan($other->dimension) || !is_finite($this->dimension) || !is_finite($other->dimension)) {
+            return false;
+        }
+
+        if ($this->unitless()) {
+            return round($this->dimension, self::PRECISION) == round($other->dimension, self::PRECISION);
+        }
+
+        try {
+            return $this->coerceUnits($other, function ($num1, $num2) {
+                return round($num1,self::PRECISION) == round($num2, self::PRECISION);
+            });
+        } catch (SassScriptException $e) {
+            return false;
+        }
     }
 
     /**
@@ -265,35 +540,31 @@ class Number extends Node implements \ArrayAccess
      */
     public function output(Compiler $compiler = null)
     {
-        $dimension = round($this->dimension, static::$precision);
+        $dimension = round($this->dimension, self::PRECISION);
 
-        $units = array_filter($this->units, function ($unitSize) {
-            return $unitSize;
-        });
-
-        if (count($units) > 1 && array_sum($units) === 0) {
-            $dimension = $this->dimension;
-            $units     = [];
-
-            $this->normalizeUnits($dimension, $units, 'in');
-
-            $dimension = round($dimension, static::$precision);
-            $units     = array_filter($units, function ($unitSize) {
-                return $unitSize;
-            });
+        if (is_nan($dimension)) {
+            return 'NaN';
         }
 
-        $unitSize = array_sum($units);
-
-        if ($compiler && ($unitSize > 1 || $unitSize < 0 || count($units) > 1)) {
-            $compiler->throwError((string) $dimension . $this->unitStr() . " isn't a valid CSS value.");
+        if ($dimension === INF) {
+            return 'Infinity';
         }
 
-        reset($units);
-        $unit = key($units);
-        $dimension = number_format($dimension, static::$precision, '.', '');
+        if ($dimension === -INF) {
+            return '-Infinity';
+        }
 
-        return (static::$precision ? rtrim(rtrim($dimension, '0'), '.') : $dimension) . $unit;
+        if ($compiler) {
+            $unit = $this->unitStr();
+        } elseif (isset($this->numeratorUnits[0])) {
+            $unit = $this->numeratorUnits[0];
+        } else {
+            $unit = '';
+        }
+
+        $dimension = number_format($dimension, self::PRECISION, '.', '');
+
+        return rtrim(rtrim($dimension, '0'), '.') . $unit;
     }
 
     /**
@@ -305,26 +576,229 @@ class Number extends Node implements \ArrayAccess
     }
 
     /**
-     * Normalize units
+     * @param Number   $other
+     * @param callable $operation
      *
-     * @param integer|float $dimension
-     * @param array         $units
-     * @param string        $baseUnit
+     * @return Number
+     *
+     * @phpstan-param callable(int|float, int|float): (int|float) $operation
      */
-    private function normalizeUnits(&$dimension, &$units, $baseUnit = 'in')
+    private function coerceNumber(Number $other, $operation)
     {
-        $dimension = $this->dimension;
-        $units     = [];
+        $result = $this->coerceUnits($other, $operation);
 
-        foreach ($this->units as $unit => $exp) {
-            if (isset(static::$unitTable[$baseUnit][$unit])) {
-                $factor = pow(static::$unitTable[$baseUnit][$unit], $exp);
+        if (!$this->unitless()) {
+            return new Number($result, $this->numeratorUnits, $this->denominatorUnits);
+        }
 
-                $unit = $baseUnit;
-                $dimension /= $factor;
+        return new Number($result, $other->numeratorUnits, $other->denominatorUnits);
+    }
+
+    /**
+     * @param Number $other
+     * @param callable $operation
+     *
+     * @return mixed
+     *
+     * @phpstan-template T
+     * @phpstan-param callable(int|float, int|float): T $operation
+     * @phpstan-return T
+     */
+    private function coerceUnits(Number $other, $operation)
+    {
+        if (!$this->unitless()) {
+            $num1 = $this->dimension;
+            $num2 = $other->valueInUnits($this->numeratorUnits, $this->denominatorUnits);
+        } else {
+            $num1 = $this->valueInUnits($other->numeratorUnits, $other->denominatorUnits);
+            $num2 = $other->dimension;
+        }
+
+        return \call_user_func($operation, $num1, $num2);
+    }
+
+    /**
+     * @param string[] $numeratorUnits
+     * @param string[] $denominatorUnits
+     *
+     * @return int|float
+     *
+     * @phpstan-param list<string> $numeratorUnits
+     * @phpstan-param list<string> $denominatorUnits
+     *
+     * @throws SassScriptException if this number's units are not compatible with $numeratorUnits and $denominatorUnits
+     */
+    private function valueInUnits(array $numeratorUnits, array $denominatorUnits)
+    {
+        if (
+            $this->unitless()
+            || (\count($numeratorUnits) === 0 && \count($denominatorUnits) === 0)
+            || ($this->numeratorUnits === $numeratorUnits && $this->denominatorUnits === $denominatorUnits)
+        ) {
+            return $this->dimension;
+        }
+
+        $value = $this->dimension;
+        $oldNumerators = $this->numeratorUnits;
+
+        foreach ($numeratorUnits as $newNumerator) {
+            foreach ($oldNumerators as $key => $oldNumerator) {
+                $conversionFactor = self::getConversionFactor($newNumerator, $oldNumerator);
+
+                if (\is_null($conversionFactor)) {
+                    continue;
+                }
+
+                $value *= $conversionFactor;
+                unset($oldNumerators[$key]);
+                continue 2;
             }
 
-            $units[$unit] = $exp + (isset($units[$unit]) ? $units[$unit] : 0);
+            throw new SassScriptException(sprintf(
+                'Incompatible units %s and %s.',
+                self::getUnitString($this->numeratorUnits, $this->denominatorUnits),
+                self::getUnitString($numeratorUnits, $denominatorUnits)
+            ));
         }
+
+        $oldDenominators = $this->denominatorUnits;
+
+        foreach ($denominatorUnits as $newDenominator) {
+            foreach ($oldDenominators as $key => $oldDenominator) {
+                $conversionFactor = self::getConversionFactor($newDenominator, $oldDenominator);
+
+                if (\is_null($conversionFactor)) {
+                    continue;
+                }
+
+                $value /= $conversionFactor;
+                unset($oldDenominators[$key]);
+                continue 2;
+            }
+
+            throw new SassScriptException(sprintf(
+                'Incompatible units %s and %s.',
+                self::getUnitString($this->numeratorUnits, $this->denominatorUnits),
+                self::getUnitString($numeratorUnits, $denominatorUnits)
+            ));
+        }
+
+        if (\count($oldNumerators) || \count($oldDenominators)) {
+            throw new SassScriptException(sprintf(
+                'Incompatible units %s and %s.',
+                self::getUnitString($this->numeratorUnits, $this->denominatorUnits),
+                self::getUnitString($numeratorUnits, $denominatorUnits)
+            ));
+        }
+
+        return $value;
+    }
+
+    /**
+     * @param int|float $value
+     * @param string[] $numerators1
+     * @param string[] $denominators1
+     * @param string[] $numerators2
+     * @param string[] $denominators2
+     *
+     * @return Number
+     *
+     * @phpstan-param list<string> $numerators1
+     * @phpstan-param list<string> $denominators1
+     * @phpstan-param list<string> $numerators2
+     * @phpstan-param list<string> $denominators2
+     */
+    private function multiplyUnits($value, array $numerators1, array $denominators1, array $numerators2, array $denominators2)
+    {
+        $newNumerators = array();
+
+        foreach ($numerators1 as $numerator) {
+            foreach ($denominators2 as $key => $denominator) {
+                $conversionFactor = self::getConversionFactor($numerator, $denominator);
+
+                if (\is_null($conversionFactor)) {
+                    continue;
+                }
+
+                $value /= $conversionFactor;
+                unset($denominators2[$key]);
+                continue 2;
+            }
+
+            $newNumerators[] = $numerator;
+        }
+
+        foreach ($numerators2 as $numerator) {
+            foreach ($denominators1 as $key => $denominator) {
+                $conversionFactor = self::getConversionFactor($numerator, $denominator);
+
+                if (\is_null($conversionFactor)) {
+                    continue;
+                }
+
+                $value /= $conversionFactor;
+                unset($denominators1[$key]);
+                continue 2;
+            }
+
+            $newNumerators[] = $numerator;
+        }
+
+        $newDenominators = array_values(array_merge($denominators1, $denominators2));
+
+        return new Number($value, $newNumerators, $newDenominators);
+    }
+
+    /**
+     * Returns the number of [unit1]s per [unit2].
+     *
+     * Equivalently, `1unit1 * conversionFactor(unit1, unit2) = 1unit2`.
+     *
+     * @param string $unit1
+     * @param string $unit2
+     *
+     * @return float|int|null
+     */
+    private static function getConversionFactor($unit1, $unit2)
+    {
+        if ($unit1 === $unit2) {
+            return 1;
+        }
+
+        foreach (static::$unitTable as $unitVariants) {
+            if (isset($unitVariants[$unit1]) && isset($unitVariants[$unit2])) {
+                return $unitVariants[$unit1] / $unitVariants[$unit2];
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * Returns unit(s) as the product of numerator units divided by the product of denominator units
+     *
+     * @param string[] $numerators
+     * @param string[] $denominators
+     *
+     * @phpstan-param list<string> $numerators
+     * @phpstan-param list<string> $denominators
+     *
+     * @return string
+     */
+    private static function getUnitString(array $numerators, array $denominators)
+    {
+        if (!\count($numerators)) {
+            if (\count($denominators) === 0) {
+                return 'no units';
+            }
+
+            if (\count($denominators) === 1) {
+                return $denominators[0] . '^-1';
+            }
+
+            return '(' . implode('*', $denominators) . ')^-1';
+        }
+
+        return implode('*', $numerators) . (\count($denominators) ? '/' . implode('*', $denominators) : '');
     }
 }
diff --git a/lib/scssphp/scssphp/src/OutputStyle.php b/lib/scssphp/scssphp/src/OutputStyle.php
new file mode 100644
index 000000000..c284639c1
--- /dev/null
+++ b/lib/scssphp/scssphp/src/OutputStyle.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace ScssPhp\ScssPhp;
+
+final class OutputStyle
+{
+    const EXPANDED = 'expanded';
+    const COMPRESSED = 'compressed';
+}
diff --git a/lib/scssphp/scssphp/src/Parser.php b/lib/scssphp/scssphp/src/Parser.php
index 6a30af129..e9cbaf375 100644
--- a/lib/scssphp/scssphp/src/Parser.php
+++ b/lib/scssphp/scssphp/src/Parser.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -11,17 +12,29 @@
 
 namespace ScssPhp\ScssPhp;
 
-use ScssPhp\ScssPhp\Block;
-use ScssPhp\ScssPhp\Cache;
-use ScssPhp\ScssPhp\Compiler;
+use ScssPhp\ScssPhp\Block\AtRootBlock;
+use ScssPhp\ScssPhp\Block\CallableBlock;
+use ScssPhp\ScssPhp\Block\ContentBlock;
+use ScssPhp\ScssPhp\Block\DirectiveBlock;
+use ScssPhp\ScssPhp\Block\EachBlock;
+use ScssPhp\ScssPhp\Block\ElseBlock;
+use ScssPhp\ScssPhp\Block\ElseifBlock;
+use ScssPhp\ScssPhp\Block\ForBlock;
+use ScssPhp\ScssPhp\Block\IfBlock;
+use ScssPhp\ScssPhp\Block\MediaBlock;
+use ScssPhp\ScssPhp\Block\NestedPropertyBlock;
+use ScssPhp\ScssPhp\Block\WhileBlock;
 use ScssPhp\ScssPhp\Exception\ParserException;
-use ScssPhp\ScssPhp\Node;
-use ScssPhp\ScssPhp\Type;
+use ScssPhp\ScssPhp\Logger\LoggerInterface;
+use ScssPhp\ScssPhp\Logger\QuietLogger;
+use ScssPhp\ScssPhp\Node\Number;
 
 /**
  * Parser
  *
  * @author Leaf Corcoran <leafot@gmail.com>
+ *
+ * @internal
  */
 class Parser
 {
@@ -30,7 +43,7 @@ class Parser
     const SOURCE_COLUMN = -3;
 
     /**
-     * @var array
+     * @var array<string, int>
      */
     protected static $precedence = [
         '='   => 0,
@@ -38,7 +51,6 @@ class Parser
         'and' => 2,
         '=='  => 3,
         '!='  => 3,
-        '<=>' => 3,
         '<='  => 4,
         '>='  => 4,
         '<'   => 4,
@@ -50,49 +62,97 @@ class Parser
         '%'   => 6,
     ];
 
+    /**
+     * @var string
+     */
     protected static $commentPattern;
+    /**
+     * @var string
+     */
     protected static $operatorPattern;
+    /**
+     * @var string
+     */
     protected static $whitePattern;
 
+    /**
+     * @var Cache|null
+     */
     protected $cache;
 
     private $sourceName;
     private $sourceIndex;
+    /**
+     * @var array<int, int>
+     */
     private $sourcePositions;
-    private $charset;
+    /**
+     * The current offset in the buffer
+     *
+     * @var int
+     */
     private $count;
+    /**
+     * @var Block|null
+     */
     private $env;
+    /**
+     * @var bool
+     */
     private $inParens;
+    /**
+     * @var bool
+     */
     private $eatWhiteDefault;
+    /**
+     * @var bool
+     */
     private $discardComments;
+    private $allowVars;
+    /**
+     * @var string
+     */
     private $buffer;
     private $utf8;
+    /**
+     * @var string|null
+     */
     private $encoding;
     private $patternModifiers;
     private $commentsSeen;
 
+    private $cssOnly;
+
+    /**
+     * @var LoggerInterface
+     */
+    private $logger;
+
     /**
      * Constructor
      *
      * @api
      *
-     * @param string                 $sourceName
-     * @param integer                $sourceIndex
-     * @param string                 $encoding
-     * @param \ScssPhp\ScssPhp\Cache $cache
+     * @param string|null          $sourceName
+     * @param int                  $sourceIndex
+     * @param string|null          $encoding
+     * @param Cache|null           $cache
+     * @param bool                 $cssOnly
+     * @param LoggerInterface|null $logger
      */
-    public function __construct($sourceName, $sourceIndex = 0, $encoding = 'utf-8', $cache = null)
+    public function __construct($sourceName, $sourceIndex = 0, $encoding = 'utf-8', Cache $cache = null, $cssOnly = false, LoggerInterface $logger = null)
     {
         $this->sourceName       = $sourceName ?: '(stdin)';
         $this->sourceIndex      = $sourceIndex;
-        $this->charset          = null;
         $this->utf8             = ! $encoding || strtolower($encoding) === 'utf-8';
         $this->patternModifiers = $this->utf8 ? 'Aisu' : 'Ais';
         $this->commentsSeen     = [];
-        $this->discardComments  = false;
+        $this->allowVars        = true;
+        $this->cssOnly          = $cssOnly;
+        $this->logger = $logger ?: new QuietLogger();
 
         if (empty(static::$operatorPattern)) {
-            static::$operatorPattern = '([*\/%+-]|[!=]\=|\>\=?|\<\=\>|\<\=?|and|or)';
+            static::$operatorPattern = '([*\/%+-]|[!=]\=|\>\=?|\<\=?|and|or)';
 
             $commentSingle      = '\/\/';
             $commentMultiLeft   = '\/\*';
@@ -104,9 +164,7 @@ class Parser
                 : '/' . $commentSingle . '[^\n]*\s*|(' . static::$commentPattern . ')\s*|\s+/AisS';
         }
 
-        if ($cache) {
-            $this->cache = $cache;
-        }
+        $this->cache = $cache;
     }
 
     /**
@@ -128,9 +186,32 @@ class Parser
      *
      * @param string $msg
      *
-     * @throws \ScssPhp\ScssPhp\Exception\ParserException
+     * @phpstan-return never-return
+     *
+     * @throws ParserException
+     *
+     * @deprecated use "parseError" and throw the exception in the caller instead.
      */
     public function throwParseError($msg = 'parse error')
+    {
+        @trigger_error(
+            'The method "throwParseError" is deprecated. Use "parseError" and throw the exception in the caller instead',
+            E_USER_DEPRECATED
+        );
+
+        throw $this->parseError($msg);
+    }
+
+    /**
+     * Creates a parser error
+     *
+     * @api
+     *
+     * @param string $msg
+     *
+     * @return ParserException
+     */
+    public function parseError($msg = 'parse error')
     {
         list($line, $column) = $this->getSourcePosition($this->count);
 
@@ -138,11 +219,21 @@ class Parser
              ? "line: $line, column: $column"
              : "$this->sourceName on line $line, at column $column";
 
-        if ($this->peek("(.*?)(\n|$)", $m, $this->count)) {
-            throw new ParserException("$msg: failed at `$m[1]` $loc");
+        if ($this->peek('(.*?)(\n|$)', $m, $this->count)) {
+            $this->restoreEncoding();
+
+            $e = new ParserException("$msg: failed at `$m[1]` $loc");
+            $e->setSourcePosition([$this->sourceName, $line, $column]);
+
+            return $e;
         }
 
-        throw new ParserException("$msg: $loc");
+        $this->restoreEncoding();
+
+        $e = new ParserException("$msg: $loc");
+        $e->setSourcePosition([$this->sourceName, $line, $column]);
+
+        return $e;
     }
 
     /**
@@ -152,19 +243,18 @@ class Parser
      *
      * @param string $buffer
      *
-     * @return \ScssPhp\ScssPhp\Block
+     * @return Block
      */
     public function parse($buffer)
     {
         if ($this->cache) {
-            $cacheKey = $this->sourceName . ":" . md5($buffer);
+            $cacheKey = $this->sourceName . ':' . md5($buffer);
             $parseOptions = [
-                'charset' => $this->charset,
                 'utf8' => $this->utf8,
             ];
-            $v = $this->cache->getCache("parse", $cacheKey, $parseOptions);
+            $v = $this->cache->getCache('parse', $cacheKey, $parseOptions);
 
-            if (! is_null($v)) {
+            if (! \is_null($v)) {
                 return $v;
             }
         }
@@ -192,22 +282,19 @@ class Parser
             ;
         }
 
-        if ($this->count !== strlen($this->buffer)) {
-            $this->throwParseError();
+        if ($this->count !== \strlen($this->buffer)) {
+            throw $this->parseError();
         }
 
         if (! empty($this->env->parent)) {
-            $this->throwParseError('unclosed block');
-        }
-
-        if ($this->charset) {
-            array_unshift($this->env->children, $this->charset);
+            throw $this->parseError('unclosed block');
         }
 
         $this->restoreEncoding();
+        assert($this->env !== null);
 
         if ($this->cache) {
-            $this->cache->setCache("parse", $cacheKey, $this->env, $parseOptions);
+            $this->cache->setCache('parse', $cacheKey, $this->env, $parseOptions);
         }
 
         return $this->env;
@@ -221,7 +308,7 @@ class Parser
      * @param string       $buffer
      * @param string|array $out
      *
-     * @return boolean
+     * @return bool
      */
     public function parseValue($buffer, &$out)
     {
@@ -232,6 +319,7 @@ class Parser
         $this->buffer          = (string) $buffer;
 
         $this->saveEncoding();
+        $this->extractLineNumbers($this->buffer);
 
         $list = $this->valueList($out);
 
@@ -247,10 +335,11 @@ class Parser
      *
      * @param string       $buffer
      * @param string|array $out
+     * @param bool         $shouldValidate
      *
-     * @return boolean
+     * @return bool
      */
-    public function parseSelector($buffer, &$out)
+    public function parseSelector($buffer, &$out, $shouldValidate = true)
     {
         $this->count           = 0;
         $this->env             = null;
@@ -259,11 +348,21 @@ class Parser
         $this->buffer          = (string) $buffer;
 
         $this->saveEncoding();
+        $this->extractLineNumbers($this->buffer);
+
+        // discard space/comments at the start
+        $this->discardComments = true;
+        $this->whitespace();
+        $this->discardComments = false;
 
         $selector = $this->selectors($out);
 
         $this->restoreEncoding();
 
+        if ($shouldValidate && $this->count !== strlen($buffer)) {
+            throw $this->parseError("`" . substr($buffer, $this->count) . "` is not a valid Selector in `$buffer`");
+        }
+
         return $selector;
     }
 
@@ -272,10 +371,10 @@ class Parser
      *
      * @api
      *
-     * @param string       $buffer
-     * @param string|array $out
+     * @param string $buffer
+     * @param array  $out
      *
-     * @return boolean
+     * @return bool
      */
     public function parseMediaQueryList($buffer, &$out)
     {
@@ -286,6 +385,7 @@ class Parser
         $this->buffer          = (string) $buffer;
 
         $this->saveEncoding();
+        $this->extractLineNumbers($this->buffer);
 
         $isMediaQuery = $this->mediaQueryList($out);
 
@@ -331,7 +431,7 @@ class Parser
      * position into $s. Then if a chain fails, use $this->seek($s) to
      * go back where we started.
      *
-     * @return boolean
+     * @return bool
      */
     protected function parseChunk()
     {
@@ -339,15 +439,19 @@ class Parser
 
         // the directives
         if (isset($this->buffer[$this->count]) && $this->buffer[$this->count] === '@') {
-            if ($this->literal('@at-root', 8) &&
+            if (
+                $this->literal('@at-root', 8) &&
                 ($this->selectors($selector) || true) &&
                 ($this->map($with) || true) &&
-                (($this->matchChar('(')
-                    && $this->interpolation($with)
-                    && $this->matchChar(')')) || true) &&
+                (($this->matchChar('(') &&
+                    $this->interpolation($with) &&
+                    $this->matchChar(')')) || true) &&
                 $this->matchChar('{', false)
             ) {
-                $atRoot = $this->pushSpecialBlock(Type::T_AT_ROOT, $s);
+                ! $this->cssOnly || $this->assertPlainCssValid(false, $s);
+
+                $atRoot = new AtRootBlock();
+                $this->registerPushedBlock($atRoot, $s);
                 $atRoot->selector = $selector;
                 $atRoot->with     = $with;
 
@@ -356,8 +460,13 @@ class Parser
 
             $this->seek($s);
 
-            if ($this->literal('@media', 6) && $this->mediaQueryList($mediaQueryList) && $this->matchChar('{', false)) {
-                $media = $this->pushSpecialBlock(Type::T_MEDIA, $s);
+            if (
+                $this->literal('@media', 6) &&
+                $this->mediaQueryList($mediaQueryList) &&
+                $this->matchChar('{', false)
+            ) {
+                $media = new MediaBlock();
+                $this->registerPushedBlock($media, $s);
                 $media->queryList = $mediaQueryList[2];
 
                 return true;
@@ -365,12 +474,16 @@ class Parser
 
             $this->seek($s);
 
-            if ($this->literal('@mixin', 6) &&
+            if (
+                $this->literal('@mixin', 6) &&
                 $this->keyword($mixinName) &&
                 ($this->argumentDef($args) || true) &&
                 $this->matchChar('{', false)
             ) {
-                $mixin = $this->pushSpecialBlock(Type::T_MIXIN, $s);
+                ! $this->cssOnly || $this->assertPlainCssValid(false, $s);
+
+                $mixin = new CallableBlock(Type::T_MIXIN);
+                $this->registerPushedBlock($mixin, $s);
                 $mixin->name = $mixinName;
                 $mixin->args = $args;
 
@@ -379,17 +492,20 @@ class Parser
 
             $this->seek($s);
 
-            if ($this->literal('@include', 8) &&
-                $this->keyword($mixinName) &&
-                ($this->matchChar('(') &&
+            if (
+                ($this->literal('@include', 8) &&
+                    $this->keyword($mixinName) &&
+                    ($this->matchChar('(') &&
                     ($this->argValues($argValues) || true) &&
                     $this->matchChar(')') || true) &&
-                ($this->end() ||
-                    ($this->literal('using', 5) &&
-                        $this->argumentDef($argUsing) &&
-                        ($this->end() || $this->matchChar('{') && $hasBlock = true)) ||
-                    $this->matchChar('{') && $hasBlock = true)
+                    ($this->end()) ||
+                ($this->literal('using', 5) &&
+                    $this->argumentDef($argUsing) &&
+                    ($this->end() || $this->matchChar('{') && $hasBlock = true)) ||
+                $this->matchChar('{') && $hasBlock = true)
             ) {
+                ! $this->cssOnly || $this->assertPlainCssValid(false, $s);
+
                 $child = [
                     Type::T_INCLUDE,
                     $mixinName,
@@ -399,7 +515,8 @@ class Parser
                 ];
 
                 if (! empty($hasBlock)) {
-                    $include = $this->pushSpecialBlock(Type::T_INCLUDE, $s);
+                    $include = new ContentBlock();
+                    $this->registerPushedBlock($include, $s);
                     $include->child = $child;
                 } else {
                     $this->append($child, $s);
@@ -410,10 +527,17 @@ class Parser
 
             $this->seek($s);
 
-            if ($this->literal('@scssphp-import-once', 20) &&
+            if (
+                $this->literal('@scssphp-import-once', 20) &&
                 $this->valueList($importPath) &&
                 $this->end()
             ) {
+                ! $this->cssOnly || $this->assertPlainCssValid(false, $s);
+
+                list($line, $column) = $this->getSourcePosition($s);
+                $file = $this->sourceName;
+                $this->logger->warn("The \"@scssphp-import-once\" directive is deprecated and will be removed in ScssPhp 2.0, in \"$file\", line $line, column $column.", true);
+
                 $this->append([Type::T_SCSSPHP_IMPORT_ONCE, $importPath], $s);
 
                 return true;
@@ -421,10 +545,18 @@ class Parser
 
             $this->seek($s);
 
-            if ($this->literal('@import', 7) &&
+            if (
+                $this->literal('@import', 7) &&
                 $this->valueList($importPath) &&
+                $importPath[0] !== Type::T_FUNCTION_CALL &&
                 $this->end()
             ) {
+                if ($this->cssOnly) {
+                    $this->assertPlainCssValid([Type::T_IMPORT, $importPath], $s);
+                    $this->append([Type::T_COMMENT, rtrim(substr($this->buffer, $s, $this->count - $s))]);
+                    return true;
+                }
+
                 $this->append([Type::T_IMPORT, $importPath], $s);
 
                 return true;
@@ -432,10 +564,17 @@ class Parser
 
             $this->seek($s);
 
-            if ($this->literal('@import', 7) &&
+            if (
+                $this->literal('@import', 7) &&
                 $this->url($importPath) &&
                 $this->end()
             ) {
+                if ($this->cssOnly) {
+                    $this->assertPlainCssValid([Type::T_IMPORT, $importPath], $s);
+                    $this->append([Type::T_COMMENT, rtrim(substr($this->buffer, $s, $this->count - $s))]);
+                    return true;
+                }
+
                 $this->append([Type::T_IMPORT, $importPath], $s);
 
                 return true;
@@ -443,10 +582,13 @@ class Parser
 
             $this->seek($s);
 
-            if ($this->literal('@extend', 7) &&
+            if (
+                $this->literal('@extend', 7) &&
                 $this->selectors($selectors) &&
                 $this->end()
             ) {
+                ! $this->cssOnly || $this->assertPlainCssValid(false, $s);
+
                 // check for '!flag'
                 $optional = $this->stripOptionalFlag($selectors);
                 $this->append([Type::T_EXTEND, $selectors, $optional], $s);
@@ -456,12 +598,16 @@ class Parser
 
             $this->seek($s);
 
-            if ($this->literal('@function', 9) &&
+            if (
+                $this->literal('@function', 9) &&
                 $this->keyword($fnName) &&
                 $this->argumentDef($args) &&
                 $this->matchChar('{', false)
             ) {
-                $func = $this->pushSpecialBlock(Type::T_FUNCTION, $s);
+                ! $this->cssOnly || $this->assertPlainCssValid(false, $s);
+
+                $func = new CallableBlock(Type::T_FUNCTION);
+                $this->registerPushedBlock($func, $s);
                 $func->name = $fnName;
                 $func->args = $args;
 
@@ -470,23 +616,13 @@ class Parser
 
             $this->seek($s);
 
-            if ($this->literal('@break', 6) && $this->end()) {
-                $this->append([Type::T_BREAK], $s);
+            if (
+                $this->literal('@return', 7) &&
+                ($this->valueList($retVal) || true) &&
+                $this->end()
+            ) {
+                ! $this->cssOnly || $this->assertPlainCssValid(false, $s);
 
-                return true;
-            }
-
-            $this->seek($s);
-
-            if ($this->literal('@continue', 9) && $this->end()) {
-                $this->append([Type::T_CONTINUE], $s);
-
-                return true;
-            }
-
-            $this->seek($s);
-
-            if ($this->literal('@return', 7) && ($this->valueList($retVal) || true) && $this->end()) {
                 $this->append([Type::T_RETURN, isset($retVal) ? $retVal : [Type::T_NULL]], $s);
 
                 return true;
@@ -494,13 +630,17 @@ class Parser
 
             $this->seek($s);
 
-            if ($this->literal('@each', 5) &&
+            if (
+                $this->literal('@each', 5) &&
                 $this->genericList($varNames, 'variable', ',', false) &&
                 $this->literal('in', 2) &&
                 $this->valueList($list) &&
                 $this->matchChar('{', false)
             ) {
-                $each = $this->pushSpecialBlock(Type::T_EACH, $s);
+                ! $this->cssOnly || $this->assertPlainCssValid(false, $s);
+
+                $each = new EachBlock();
+                $this->registerPushedBlock($each, $s);
 
                 foreach ($varNames[2] as $varName) {
                     $each->vars[] = $varName[1];
@@ -513,11 +653,24 @@ class Parser
 
             $this->seek($s);
 
-            if ($this->literal('@while', 6) &&
+            if (
+                $this->literal('@while', 6) &&
                 $this->expression($cond) &&
                 $this->matchChar('{', false)
             ) {
-                $while = $this->pushSpecialBlock(Type::T_WHILE, $s);
+                ! $this->cssOnly || $this->assertPlainCssValid(false, $s);
+
+                while (
+                    $cond[0] === Type::T_LIST &&
+                    ! empty($cond['enclosing']) &&
+                    $cond['enclosing'] === 'parent' &&
+                    \count($cond[2]) == 1
+                ) {
+                    $cond = reset($cond[2]);
+                }
+
+                $while = new WhileBlock();
+                $this->registerPushedBlock($while, $s);
                 $while->cond = $cond;
 
                 return true;
@@ -525,7 +678,8 @@ class Parser
 
             $this->seek($s);
 
-            if ($this->literal('@for', 4) &&
+            if (
+                $this->literal('@for', 4) &&
                 $this->variable($varName) &&
                 $this->literal('from', 4) &&
                 $this->expression($start) &&
@@ -534,7 +688,10 @@ class Parser
                 $this->expression($end) &&
                 $this->matchChar('{', false)
             ) {
-                $for = $this->pushSpecialBlock(Type::T_FOR, $s);
+                ! $this->cssOnly || $this->assertPlainCssValid(false, $s);
+
+                $for = new ForBlock();
+                $this->registerPushedBlock($for, $s);
                 $for->var   = $varName[1];
                 $for->start = $start;
                 $for->end   = $end;
@@ -545,14 +702,24 @@ class Parser
 
             $this->seek($s);
 
-            if ($this->literal('@if', 3) && $this->valueList($cond) && $this->matchChar('{', false)) {
-                $if = $this->pushSpecialBlock(Type::T_IF, $s);
-                while ($cond[0] === Type::T_LIST
-                    && !empty($cond['enclosing'])
-                    && $cond['enclosing'] === 'parent'
-                    && count($cond[2]) == 1) {
+            if (
+                $this->literal('@if', 3) &&
+                $this->functionCallArgumentsList($cond, false, '{', false)
+            ) {
+                ! $this->cssOnly || $this->assertPlainCssValid(false, $s);
+
+                $if = new IfBlock();
+                $this->registerPushedBlock($if, $s);
+
+                while (
+                    $cond[0] === Type::T_LIST &&
+                    ! empty($cond['enclosing']) &&
+                    $cond['enclosing'] === 'parent' &&
+                    \count($cond[2]) == 1
+                ) {
                     $cond = reset($cond[2]);
                 }
+
                 $if->cond  = $cond;
                 $if->cases = [];
 
@@ -561,10 +728,12 @@ class Parser
 
             $this->seek($s);
 
-            if ($this->literal('@debug', 6) &&
-                $this->valueList($value) &&
-                $this->end()
+            if (
+                $this->literal('@debug', 6) &&
+                $this->functionCallArgumentsList($value, false)
             ) {
+                ! $this->cssOnly || $this->assertPlainCssValid(false, $s);
+
                 $this->append([Type::T_DEBUG, $value], $s);
 
                 return true;
@@ -572,10 +741,12 @@ class Parser
 
             $this->seek($s);
 
-            if ($this->literal('@warn', 5) &&
-                $this->valueList($value) &&
-                $this->end()
+            if (
+                $this->literal('@warn', 5) &&
+                $this->functionCallArgumentsList($value, false)
             ) {
+                ! $this->cssOnly || $this->assertPlainCssValid(false, $s);
+
                 $this->append([Type::T_WARN, $value], $s);
 
                 return true;
@@ -583,10 +754,12 @@ class Parser
 
             $this->seek($s);
 
-            if ($this->literal('@error', 6) &&
-                $this->valueList($value) &&
-                $this->end()
+            if (
+                $this->literal('@error', 6) &&
+                $this->functionCallArgumentsList($value, false)
             ) {
+                ! $this->cssOnly || $this->assertPlainCssValid(false, $s);
+
                 $this->append([Type::T_ERROR, $value], $s);
 
                 return true;
@@ -594,14 +767,16 @@ class Parser
 
             $this->seek($s);
 
-            #if ($this->literal('@content', 8))
-
-            if ($this->literal('@content', 8) &&
+            if (
+                $this->literal('@content', 8) &&
                 ($this->end() ||
                     $this->matchChar('(') &&
-                        $this->argValues($argContent) &&
-                        $this->matchChar(')') &&
-                    $this->end())) {
+                    $this->argValues($argContent) &&
+                    $this->matchChar(')') &&
+                    $this->end())
+            ) {
+                ! $this->cssOnly || $this->assertPlainCssValid(false, $s);
+
                 $this->append([Type::T_MIXIN_CONTENT, isset($argContent) ? $argContent : null], $s);
 
                 return true;
@@ -613,17 +788,21 @@ class Parser
 
             if (isset($last) && $last[0] === Type::T_IF) {
                 list(, $if) = $last;
+                assert($if instanceof IfBlock);
 
                 if ($this->literal('@else', 5)) {
                     if ($this->matchChar('{', false)) {
-                        $else = $this->pushSpecialBlock(Type::T_ELSE, $s);
-                    } elseif ($this->literal('if', 2) && $this->valueList($cond) && $this->matchChar('{', false)) {
-                        $else = $this->pushSpecialBlock(Type::T_ELSEIF, $s);
+                        $else = new ElseBlock();
+                    } elseif (
+                        $this->literal('if', 2) &&
+                        $this->functionCallArgumentsList($cond, false, '{', false)
+                    ) {
+                        $else = new ElseifBlock();
                         $else->cond = $cond;
                     }
 
                     if (isset($else)) {
-                        $else->dontAppend = true;
+                        $this->registerPushedBlock($else, $s);
                         $if->cases[] = $else;
 
                         return true;
@@ -634,32 +813,23 @@ class Parser
             }
 
             // only retain the first @charset directive encountered
-            if ($this->literal('@charset', 8) &&
+            if (
+                $this->literal('@charset', 8) &&
                 $this->valueList($charset) &&
                 $this->end()
             ) {
-                if (! isset($this->charset)) {
-                    $statement = [Type::T_CHARSET, $charset];
-
-                    list($line, $column) = $this->getSourcePosition($s);
-
-                    $statement[static::SOURCE_LINE]   = $line;
-                    $statement[static::SOURCE_COLUMN] = $column;
-                    $statement[static::SOURCE_INDEX]  = $this->sourceIndex;
-
-                    $this->charset = $statement;
-                }
-
                 return true;
             }
 
             $this->seek($s);
 
-            if ($this->literal('@supports', 9) &&
-                ($t1=$this->supportsQuery($supportQuery)) &&
-                ($t2=$this->matchChar('{', false))
+            if (
+                $this->literal('@supports', 9) &&
+                ($t1 = $this->supportsQuery($supportQuery)) &&
+                ($t2 = $this->matchChar('{', false))
             ) {
-                $directive = $this->pushSpecialBlock(Type::T_DIRECTIVE, $s);
+                $directive = new DirectiveBlock();
+                $this->registerPushedBlock($directive, $s);
                 $directive->name  = 'supports';
                 $directive->value = $supportQuery;
 
@@ -669,19 +839,26 @@ class Parser
             $this->seek($s);
 
             // doesn't match built in directive, do generic one
-            if ($this->matchChar('@', false) &&
-                $this->keyword($dirName) &&
-                ($this->variable($dirValue) || $this->openString('{', $dirValue) || true) &&
-                $this->matchChar('{', false)
+            if (
+                $this->matchChar('@', false) &&
+                $this->mixedKeyword($dirName) &&
+                $this->directiveValue($dirValue, '{')
             ) {
-                if ($dirName === 'media') {
-                    $directive = $this->pushSpecialBlock(Type::T_MEDIA, $s);
+                if (count($dirName) === 1 && is_string(reset($dirName))) {
+                    $dirName = reset($dirName);
                 } else {
-                    $directive = $this->pushSpecialBlock(Type::T_DIRECTIVE, $s);
+                    $dirName = [Type::T_STRING, '', $dirName];
+                }
+                if ($dirName === 'media') {
+                    $directive = new MediaBlock();
+                } else {
+                    $directive = new DirectiveBlock();
                     $directive->name = $dirName;
                 }
+                $this->registerPushedBlock($directive, $s);
 
                 if (isset($dirValue)) {
+                    ! $this->cssOnly || ($dirValue = $this->assertPlainCssValid($dirValue));
                     $directive->value = $dirValue;
                 }
 
@@ -691,12 +868,38 @@ class Parser
             $this->seek($s);
 
             // maybe it's a generic blockless directive
-            if ($this->matchChar('@', false) &&
-                $this->keyword($dirName) &&
-                $this->valueList($dirValue) &&
-                $this->end()
+            if (
+                $this->matchChar('@', false) &&
+                $this->mixedKeyword($dirName) &&
+                ! $this->isKnownGenericDirective($dirName) &&
+                ($this->end(false) || ($this->directiveValue($dirValue, '') && $this->end(false)))
             ) {
-                $this->append([Type::T_DIRECTIVE, [$dirName, $dirValue]], $s);
+                if (\count($dirName) === 1 && \is_string(\reset($dirName))) {
+                    $dirName = \reset($dirName);
+                } else {
+                    $dirName = [Type::T_STRING, '', $dirName];
+                }
+                if (
+                    ! empty($this->env->parent) &&
+                    $this->env->type &&
+                    ! \in_array($this->env->type, [Type::T_DIRECTIVE, Type::T_MEDIA])
+                ) {
+                    $plain = \trim(\substr($this->buffer, $s, $this->count - $s));
+                    throw $this->parseError(
+                        "Unknown directive `{$plain}` not allowed in `" . $this->env->type . "` block"
+                    );
+                }
+                // blockless directives with a blank line after keeps their blank lines after
+                // sass-spec compliance purpose
+                $s = $this->count;
+                $hasBlankLine = false;
+                if ($this->match('\s*?\n\s*\n', $out, false)) {
+                    $hasBlankLine = true;
+                    $this->seek($s);
+                }
+                $isNotRoot = ! empty($this->env->parent);
+                $this->append([Type::T_DIRECTIVE, [$dirName, $dirValue, $hasBlankLine, $isNotRoot]], $s);
+                $this->whitespace();
 
                 return true;
             }
@@ -706,9 +909,60 @@ class Parser
             return false;
         }
 
+        $inCssSelector = null;
+        if ($this->cssOnly) {
+            $inCssSelector = (! empty($this->env->parent) &&
+                ! in_array($this->env->type, [Type::T_DIRECTIVE, Type::T_MEDIA]));
+        }
+        // custom properties : right part is static
+        if (($this->customProperty($name) ) && $this->matchChar(':', false)) {
+            $start = $this->count;
+
+            // but can be complex and finish with ; or }
+            foreach ([';','}'] as $ending) {
+                if (
+                    $this->openString($ending, $stringValue, '(', ')', false) &&
+                    $this->end()
+                ) {
+                    $end = $this->count;
+                    $value = $stringValue;
+
+                    // check if we have only a partial value due to nested [] or { } to take in account
+                    $nestingPairs = [['[', ']'], ['{', '}']];
+
+                    foreach ($nestingPairs as $nestingPair) {
+                        $p = strpos($this->buffer, $nestingPair[0], $start);
+
+                        if ($p && $p < $end) {
+                            $this->seek($start);
+
+                            if (
+                                $this->openString($ending, $stringValue, $nestingPair[0], $nestingPair[1], false) &&
+                                $this->end() &&
+                                $this->count > $end
+                            ) {
+                                $end = $this->count;
+                                $value = $stringValue;
+                            }
+                        }
+                    }
+
+                    $this->seek($end);
+                    $this->append([Type::T_CUSTOM_PROPERTY, $name, $value], $s);
+
+                    return true;
+                }
+            }
+
+            // TODO: output an error here if nothing found according to sass spec
+        }
+
+        $this->seek($s);
+
         // property shortcut
         // captures most properties before having to parse a selector
-        if ($this->keyword($name, false) &&
+        if (
+            $this->keyword($name, false) &&
             $this->literal(': ', 2) &&
             $this->valueList($value) &&
             $this->end()
@@ -722,11 +976,14 @@ class Parser
         $this->seek($s);
 
         // variable assigns
-        if ($this->variable($name) &&
+        if (
+            $this->variable($name) &&
             $this->matchChar(':') &&
             $this->valueList($value) &&
             $this->end()
         ) {
+            ! $this->cssOnly || $this->assertPlainCssValid(false, $s);
+
             // check for '!flag'
             $assignmentFlags = $this->stripAssignmentFlags($value);
             $this->append([Type::T_ASSIGN, $name, $value, $assignmentFlags], $s);
@@ -736,13 +993,13 @@ class Parser
 
         $this->seek($s);
 
-        // misc
-        if ($this->literal('-->', 3)) {
-            return true;
-        }
-
         // opening css block
-        if ($this->selectors($selectors) && $this->matchChar('{', false)) {
+        if (
+            $this->selectors($selectors) &&
+            $this->matchChar('{', false)
+        ) {
+            ! $this->cssOnly || ! $inCssSelector || $this->assertPlainCssValid(false);
+
             $this->pushBlock($selectors, $s);
 
             if ($this->eatWhiteDefault) {
@@ -756,12 +1013,15 @@ class Parser
         $this->seek($s);
 
         // property assign, or nested assign
-        if ($this->propertyName($name) && $this->matchChar(':')) {
+        if (
+            $this->propertyName($name) &&
+            $this->matchChar(':')
+        ) {
             $foundSomething = false;
 
             if ($this->valueList($value)) {
                 if (empty($this->env->parent)) {
-                    $this->throwParseError('expected "{"');
+                    throw $this->parseError('expected "{"');
                 }
 
                 $this->append([Type::T_ASSIGN, $name, $value], $s);
@@ -769,7 +1029,10 @@ class Parser
             }
 
             if ($this->matchChar('{', false)) {
-                $propBlock = $this->pushSpecialBlock(Type::T_NESTED_PROPERTY, $s);
+                ! $this->cssOnly || $this->assertPlainCssValid(false);
+
+                $propBlock = new NestedPropertyBlock();
+                $this->registerPushedBlock($propBlock, $s);
                 $propBlock->prefix = $name;
                 $propBlock->hasValue = $foundSomething;
 
@@ -790,17 +1053,20 @@ class Parser
             $block = $this->popBlock();
 
             if (! isset($block->type) || $block->type !== Type::T_IF) {
+                assert($this->env !== null);
+
                 if ($this->env->parent) {
                     $this->append(null); // collect comments before next statement if needed
                 }
             }
 
-            if (isset($block->type) && $block->type === Type::T_INCLUDE) {
+            if ($block instanceof ContentBlock) {
                 $include = $block->child;
+                assert(\is_array($include));
                 unset($block->child);
                 $include[3] = $block;
                 $this->append($include, $s);
-            } elseif (empty($block->dontAppend)) {
+            } elseif (!$block instanceof ElseBlock && !$block instanceof ElseifBlock) {
                 $type = isset($block->type) ? $block->type : Type::T_BLOCK;
                 $this->append([$type, $block], $s);
             }
@@ -808,6 +1074,7 @@ class Parser
             // collect comments just after the block closing if needed
             if ($this->eatWhiteDefault) {
                 $this->whitespace();
+                assert($this->env !== null);
 
                 if ($this->env->comments) {
                     $this->append(null);
@@ -818,9 +1085,7 @@ class Parser
         }
 
         // extra stuff
-        if ($this->matchChar(';') ||
-            $this->literal('<!--', 4)
-        ) {
+        if ($this->matchChar(';')) {
             return true;
         }
 
@@ -830,21 +1095,35 @@ class Parser
     /**
      * Push block onto parse tree
      *
-     * @param array   $selectors
-     * @param integer $pos
+     * @param array|null $selectors
+     * @param int        $pos
      *
-     * @return \ScssPhp\ScssPhp\Block
+     * @return Block
      */
     protected function pushBlock($selectors, $pos = 0)
+    {
+        $b = new Block();
+        $b->selectors = $selectors;
+
+        $this->registerPushedBlock($b, $pos);
+
+        return $b;
+    }
+
+    /**
+     * @param Block $b
+     * @param int   $pos
+     *
+     * @return void
+     */
+    private function registerPushedBlock(Block $b, $pos)
     {
         list($line, $column) = $this->getSourcePosition($pos);
 
-        $b = new Block;
         $b->sourceName   = $this->sourceName;
         $b->sourceLine   = $line;
         $b->sourceColumn = $column;
         $b->sourceIndex  = $this->sourceIndex;
-        $b->selectors    = $selectors;
         $b->comments     = [];
         $b->parent       = $this->env;
 
@@ -864,22 +1143,23 @@ class Parser
         // collect comments at the beginning of a block if needed
         if ($this->eatWhiteDefault) {
             $this->whitespace();
+            assert($this->env !== null);
 
             if ($this->env->comments) {
                 $this->append(null);
             }
         }
-
-        return $b;
     }
 
     /**
      * Push special (named) block onto parse tree
      *
-     * @param string  $type
-     * @param integer $pos
+     * @deprecated
      *
-     * @return \ScssPhp\ScssPhp\Block
+     * @param string  $type
+     * @param int     $pos
+     *
+     * @return Block
      */
     protected function pushSpecialBlock($type, $pos)
     {
@@ -892,12 +1172,13 @@ class Parser
     /**
      * Pop scope and return last block
      *
-     * @return \ScssPhp\ScssPhp\Block
+     * @return Block
      *
      * @throws \Exception
      */
     protected function popBlock()
     {
+        assert($this->env !== null);
 
         // collect comments ending just before of a block closing
         if ($this->env->comments) {
@@ -908,7 +1189,7 @@ class Parser
         $block = $this->env;
 
         if (empty($block->parent)) {
-            $this->throwParseError('unexpected }');
+            throw $this->parseError('unexpected }');
         }
 
         if ($block->type == Type::T_AT_ROOT) {
@@ -926,11 +1207,11 @@ class Parser
     /**
      * Peek input stream
      *
-     * @param string  $regex
-     * @param array   $out
-     * @param integer $from
+     * @param string $regex
+     * @param array  $out
+     * @param int    $from
      *
-     * @return integer
+     * @return int
      */
     protected function peek($regex, &$out, $from = null)
     {
@@ -939,7 +1220,7 @@ class Parser
         }
 
         $r = '/' . $regex . '/' . $this->patternModifiers;
-        $result = preg_match($r, $this->buffer, $out, null, $from);
+        $result = preg_match($r, $this->buffer, $out, 0, $from);
 
         return $result;
     }
@@ -947,31 +1228,245 @@ class Parser
     /**
      * Seek to position in input stream (or return current position in input stream)
      *
-     * @param integer $where
+     * @param int $where
+     *
+     * @return void
      */
     protected function seek($where)
     {
         $this->count = $where;
     }
 
+    /**
+     * Assert a parsed part is plain CSS Valid
+     *
+     * @param array|false $parsed
+     * @param int         $startPos
+     *
+     * @return array
+     *
+     * @throws ParserException
+     */
+    protected function assertPlainCssValid($parsed, $startPos = null)
+    {
+        $type = '';
+        if ($parsed) {
+            $type = $parsed[0];
+            $parsed = $this->isPlainCssValidElement($parsed);
+        }
+        if (! $parsed) {
+            if (! \is_null($startPos)) {
+                $plain = rtrim(substr($this->buffer, $startPos, $this->count - $startPos));
+                $message = "Error : `{$plain}` isn't allowed in plain CSS";
+            } else {
+                $message = 'Error: SCSS syntax not allowed in CSS file';
+            }
+            if ($type) {
+                $message .= " ($type)";
+            }
+            throw $this->parseError($message);
+        }
+
+        return $parsed;
+    }
+
+    /**
+     * Check a parsed element is plain CSS Valid
+     *
+     * @param array $parsed
+     * @param bool  $allowExpression
+     *
+     * @return array|false
+     */
+    protected function isPlainCssValidElement($parsed, $allowExpression = false)
+    {
+        // keep string as is
+        if (is_string($parsed)) {
+            return $parsed;
+        }
+
+        if (
+            \in_array($parsed[0], [Type::T_FUNCTION, Type::T_FUNCTION_CALL]) &&
+            !\in_array($parsed[1], [
+                'alpha',
+                'attr',
+                'calc',
+                'cubic-bezier',
+                'env',
+                'grayscale',
+                'hsl',
+                'hsla',
+                'hwb',
+                'invert',
+                'linear-gradient',
+                'min',
+                'max',
+                'radial-gradient',
+                'repeating-linear-gradient',
+                'repeating-radial-gradient',
+                'rgb',
+                'rgba',
+                'rotate',
+                'saturate',
+                'var',
+            ]) &&
+            Compiler::isNativeFunction($parsed[1])
+        ) {
+            return false;
+        }
+
+        switch ($parsed[0]) {
+            case Type::T_BLOCK:
+            case Type::T_KEYWORD:
+            case Type::T_NULL:
+            case Type::T_NUMBER:
+            case Type::T_MEDIA:
+                return $parsed;
+
+            case Type::T_COMMENT:
+                if (isset($parsed[2])) {
+                    return false;
+                }
+                return $parsed;
+
+            case Type::T_DIRECTIVE:
+                if (\is_array($parsed[1])) {
+                    $parsed[1][1] = $this->isPlainCssValidElement($parsed[1][1]);
+                    if (! $parsed[1][1]) {
+                        return false;
+                    }
+                }
+
+                return $parsed;
+
+            case Type::T_IMPORT:
+                if ($parsed[1][0] === Type::T_LIST) {
+                    return false;
+                }
+                $parsed[1] = $this->isPlainCssValidElement($parsed[1]);
+                if ($parsed[1] === false) {
+                    return false;
+                }
+                return $parsed;
+
+            case Type::T_STRING:
+                foreach ($parsed[2] as $k => $substr) {
+                    if (\is_array($substr)) {
+                        $parsed[2][$k] = $this->isPlainCssValidElement($substr);
+                        if (! $parsed[2][$k]) {
+                            return false;
+                        }
+                    }
+                }
+                return $parsed;
+
+            case Type::T_LIST:
+                if (!empty($parsed['enclosing'])) {
+                    return false;
+                }
+                foreach ($parsed[2] as $k => $listElement) {
+                    $parsed[2][$k] = $this->isPlainCssValidElement($listElement);
+                    if (! $parsed[2][$k]) {
+                        return false;
+                    }
+                }
+                return $parsed;
+
+            case Type::T_ASSIGN:
+                foreach ([1, 2, 3] as $k) {
+                    if (! empty($parsed[$k])) {
+                        $parsed[$k] = $this->isPlainCssValidElement($parsed[$k]);
+                        if (! $parsed[$k]) {
+                            return false;
+                        }
+                    }
+                }
+                return $parsed;
+
+            case Type::T_EXPRESSION:
+                list( ,$op, $lhs, $rhs, $inParens, $whiteBefore, $whiteAfter) = $parsed;
+                if (! $allowExpression &&  ! \in_array($op, ['and', 'or', '/'])) {
+                    return false;
+                }
+                $lhs = $this->isPlainCssValidElement($lhs, true);
+                if (! $lhs) {
+                    return false;
+                }
+                $rhs = $this->isPlainCssValidElement($rhs, true);
+                if (! $rhs) {
+                    return false;
+                }
+
+                return [
+                    Type::T_STRING,
+                    '', [
+                        $this->inParens ? '(' : '',
+                        $lhs,
+                        ($whiteBefore ? ' ' : '') . $op . ($whiteAfter ? ' ' : ''),
+                        $rhs,
+                        $this->inParens ? ')' : ''
+                    ]
+                ];
+
+            case Type::T_CUSTOM_PROPERTY:
+            case Type::T_UNARY:
+                $parsed[2] = $this->isPlainCssValidElement($parsed[2]);
+                if (! $parsed[2]) {
+                    return false;
+                }
+                return $parsed;
+
+            case Type::T_FUNCTION:
+                $argsList = $parsed[2];
+                foreach ($argsList[2] as $argElement) {
+                    if (! $this->isPlainCssValidElement($argElement)) {
+                        return false;
+                    }
+                }
+                return $parsed;
+
+            case Type::T_FUNCTION_CALL:
+                $parsed[0] = Type::T_FUNCTION;
+                $argsList = [Type::T_LIST, ',', []];
+                foreach ($parsed[2] as $arg) {
+                    if ($arg[0] || ! empty($arg[2])) {
+                        // no named arguments possible in a css function call
+                        // nor ... argument
+                        return false;
+                    }
+                    $arg = $this->isPlainCssValidElement($arg[1], $parsed[1] === 'calc');
+                    if (! $arg) {
+                        return false;
+                    }
+                    $argsList[2][] = $arg;
+                }
+                $parsed[2] = $argsList;
+                return $parsed;
+        }
+
+        return false;
+    }
+
     /**
      * Match string looking for either ending delim, escape, or string interpolation
      *
      * {@internal This is a workaround for preg_match's 250K string match limit. }}
      *
      * @param array  $m     Matches (passed by reference)
-     * @param string $delim Delimeter
+     * @param string $delim Delimiter
      *
-     * @return boolean True if match; false otherwise
+     * @return bool True if match; false otherwise
+     *
+     * @phpstan-impure
      */
     protected function matchString(&$m, $delim)
     {
         $token = null;
 
-        $end = strlen($this->buffer);
+        $end = \strlen($this->buffer);
 
         // look for either ending delim, escape, or string interpolation
-        foreach (['#{', '\\', $delim] as $lookahead) {
+        foreach (['#{', '\\', "\r", $delim] as $lookahead) {
             $pos = strpos($this->buffer, $lookahead, $this->count);
 
             if ($pos !== false && $pos < $end) {
@@ -990,7 +1485,7 @@ class Parser
             $match,
             $token
         ];
-        $this->count = $end + strlen($token);
+        $this->count = $end + \strlen($token);
 
         return true;
     }
@@ -998,21 +1493,23 @@ class Parser
     /**
      * Try to match something on head of buffer
      *
-     * @param string  $regex
-     * @param array   $out
-     * @param boolean $eatWhitespace
+     * @param string $regex
+     * @param array  $out
+     * @param bool   $eatWhitespace
      *
-     * @return boolean
+     * @return bool
+     *
+     * @phpstan-impure
      */
     protected function match($regex, &$out, $eatWhitespace = null)
     {
         $r = '/' . $regex . '/' . $this->patternModifiers;
 
-        if (! preg_match($r, $this->buffer, $out, null, $this->count)) {
+        if (! preg_match($r, $this->buffer, $out, 0, $this->count)) {
             return false;
         }
 
-        $this->count += strlen($out[0]);
+        $this->count += \strlen($out[0]);
 
         if (! isset($eatWhitespace)) {
             $eatWhitespace = $this->eatWhiteDefault;
@@ -1028,10 +1525,12 @@ class Parser
     /**
      * Match a single string
      *
-     * @param string  $char
-     * @param boolean $eatWhitespace
+     * @param string $char
+     * @param bool   $eatWhitespace
      *
-     * @return boolean
+     * @return bool
+     *
+     * @phpstan-impure
      */
     protected function matchChar($char, $eatWhitespace = null)
     {
@@ -1055,11 +1554,13 @@ class Parser
     /**
      * Match literal string
      *
-     * @param string  $what
-     * @param integer $len
-     * @param boolean $eatWhitespace
+     * @param string $what
+     * @param int    $len
+     * @param bool   $eatWhitespace
      *
-     * @return boolean
+     * @return bool
+     *
+     * @phpstan-impure
      */
     protected function literal($what, $len, $eatWhitespace = null)
     {
@@ -1083,18 +1584,20 @@ class Parser
     /**
      * Match some whitespace
      *
-     * @return boolean
+     * @return bool
+     *
+     * @phpstan-impure
      */
     protected function whitespace()
     {
         $gotWhite = false;
 
-        while (preg_match(static::$whitePattern, $this->buffer, $m, null, $this->count)) {
+        while (preg_match(static::$whitePattern, $this->buffer, $m, 0, $this->count)) {
             if (isset($m[1]) && empty($this->commentsSeen[$this->count])) {
                 // comment that are kept in the output CSS
                 $comment = [];
                 $startCommentCount = $this->count;
-                $endCommentCount = $this->count + strlen($m[1]);
+                $endCommentCount = $this->count + \strlen($m[1]);
 
                 // find interpolations in comment
                 $p = strpos($this->buffer, '#{', $this->count);
@@ -1108,7 +1611,7 @@ class Parser
                     if ($this->interpolation($out)) {
                         // keep right spaces in the following string part
                         if ($out[3]) {
-                            while ($this->buffer[$this->count-1] !== '}') {
+                            while ($this->buffer[$this->count - 1] !== '}') {
                                 $this->count--;
                             }
 
@@ -1117,6 +1620,11 @@ class Parser
 
                         $comment[] = [Type::T_COMMENT, substr($this->buffer, $p, $this->count - $p), $out];
                     } else {
+                        list($line, $column) = $this->getSourcePosition($this->count);
+                        $file = $this->sourceName;
+                        if (!$this->discardComments) {
+                            $this->logger->warn("Unterminated interpolations in multiline comments are deprecated and will be removed in ScssPhp 2.0, in \"$file\", line $line, column $column.", true);
+                        }
                         $comment[] = substr($this->buffer, $this->count, 2);
 
                         $this->count += 2;
@@ -1130,18 +1638,29 @@ class Parser
 
                 if (! $comment) {
                     // single part static comment
-                    $this->appendComment([Type::T_COMMENT, $c]);
+                    $commentStatement = [Type::T_COMMENT, $c];
                 } else {
                     $comment[] = $c;
                     $staticComment = substr($this->buffer, $startCommentCount, $endCommentCount - $startCommentCount);
-                    $this->appendComment([Type::T_COMMENT, $staticComment, [Type::T_STRING, '', $comment]]);
+                    $commentStatement = [Type::T_COMMENT, $staticComment, [Type::T_STRING, '', $comment]];
                 }
 
+                list($line, $column) = $this->getSourcePosition($startCommentCount);
+                $commentStatement[self::SOURCE_LINE] = $line;
+                $commentStatement[self::SOURCE_COLUMN] = $column;
+                $commentStatement[self::SOURCE_INDEX] = $this->sourceIndex;
+
+                $this->appendComment($commentStatement);
+
                 $this->commentsSeen[$startCommentCount] = true;
                 $this->count = $endCommentCount;
             } else {
                 // comment that are ignored and not kept in the output css
-                $this->count += strlen($m[0]);
+                $this->count += \strlen($m[0]);
+                // silent comments are not allowed in plain CSS files
+                ! $this->cssOnly
+                  || ! \strlen(trim($m[0]))
+                  || $this->assertPlainCssValid(false, $this->count - \strlen($m[0]));
             }
 
             $gotWhite = true;
@@ -1154,27 +1673,14 @@ class Parser
      * Append comment to current block
      *
      * @param array $comment
+     *
+     * @return void
      */
     protected function appendComment($comment)
     {
-        if (! $this->discardComments) {
-            if ($comment[0] === Type::T_COMMENT) {
-                if (is_string($comment[1])) {
-                    $comment[1] = substr(preg_replace(['/^\s+/m', '/^(.)/m'], ['', ' \1'], $comment[1]), 1);
-                }
-                if (isset($comment[2]) and is_array($comment[2]) and $comment[2][0] === Type::T_STRING) {
-                    foreach ($comment[2][2] as $k => $v) {
-                        if (is_string($v)) {
-                            $p = strpos($v, "\n");
-                            if ($p !== false) {
-                                $comment[2][2][$k] = substr($v, 0, $p + 1)
-                                    . preg_replace(['/^\s+/m', '/^(.)/m'], ['', ' \1'], substr($v, $p+1));
-                            }
-                        }
-                    }
-                }
-            }
+        assert($this->env !== null);
 
+        if (! $this->discardComments) {
             $this->env->comments[] = $comment;
         }
     }
@@ -1182,13 +1688,19 @@ class Parser
     /**
      * Append statement to current block
      *
-     * @param array   $statement
-     * @param integer $pos
+     * @param array|null $statement
+     * @param int        $pos
+     *
+     * @return void
      */
     protected function append($statement, $pos = null)
     {
-        if (! is_null($statement)) {
-            if (! is_null($pos)) {
+        assert($this->env !== null);
+
+        if (! \is_null($statement)) {
+            ! $this->cssOnly || ($statement = $this->assertPlainCssValid($statement, $pos));
+
+            if (! \is_null($pos)) {
                 list($line, $column) = $this->getSourcePosition($pos);
 
                 $statement[static::SOURCE_LINE]   = $line;
@@ -1214,11 +1726,15 @@ class Parser
      */
     protected function last()
     {
-        $i = count($this->env->children) - 1;
+        assert($this->env !== null);
+
+        $i = \count($this->env->children) - 1;
 
         if (isset($this->env->children[$i])) {
             return $this->env->children[$i];
         }
+
+        return null;
     }
 
     /**
@@ -1226,7 +1742,7 @@ class Parser
      *
      * @param array $out
      *
-     * @return boolean
+     * @return bool
      */
     protected function mediaQueryList(&$out)
     {
@@ -1238,14 +1754,16 @@ class Parser
      *
      * @param array $out
      *
-     * @return boolean
+     * @return bool
      */
     protected function mediaQuery(&$out)
     {
         $expressions = null;
         $parts = [];
 
-        if (($this->literal('only', 4) && ($only = true) || $this->literal('not', 3) && ($not = true) || true) &&
+        if (
+            ($this->literal('only', 4) && ($only = true) ||
+            $this->literal('not', 3) && ($not = true) || true) &&
             $this->mixedKeyword($mediaType)
         ) {
             $prop = [Type::T_MEDIA_TYPE];
@@ -1261,7 +1779,7 @@ class Parser
             $media = [Type::T_LIST, '', []];
 
             foreach ((array) $mediaType as $type) {
-                if (is_array($type)) {
+                if (\is_array($type)) {
                     $media[2][] = $type;
                 } else {
                     $media[2][] = [Type::T_KEYWORD, $type];
@@ -1275,7 +1793,7 @@ class Parser
         if (empty($parts) || $this->literal('and', 3)) {
             $this->genericList($expressions, 'mediaExpression', 'and', false);
 
-            if (is_array($expressions)) {
+            if (\is_array($expressions)) {
                 $parts = array_merge($parts, $expressions[2]);
             }
         }
@@ -1290,7 +1808,7 @@ class Parser
      *
      * @param array $out
      *
-     * @return boolean
+     * @return bool
      */
     protected function supportsQuery(&$out)
     {
@@ -1301,13 +1819,14 @@ class Parser
 
         $not = false;
 
-        if (($this->literal('not', 3) && ($not = true) || true) &&
+        if (
+            ($this->literal('not', 3) && ($not = true) || true) &&
             $this->matchChar('(') &&
             ($this->expression($property)) &&
             $this->literal(': ', 2) &&
             $this->valueList($value) &&
             $this->matchChar(')')
-         ) {
+        ) {
             $support = [Type::T_STRING, '', [[Type::T_KEYWORD, ($not ? 'not ' : '') . '(']]];
             $support[2][] = $property;
             $support[2][] = [Type::T_KEYWORD, ': '];
@@ -1320,7 +1839,8 @@ class Parser
             $this->seek($s);
         }
 
-        if ($this->matchChar('(') &&
+        if (
+            $this->matchChar('(') &&
             $this->supportsQuery($subQuery) &&
             $this->matchChar(')')
         ) {
@@ -1330,7 +1850,8 @@ class Parser
             $this->seek($s);
         }
 
-        if ($this->literal('not', 3) &&
+        if (
+            $this->literal('not', 3) &&
             $this->supportsQuery($subQuery)
         ) {
             $parts[] = [Type::T_STRING, '', [[Type::T_KEYWORD, 'not '], $subQuery]];
@@ -1339,7 +1860,8 @@ class Parser
             $this->seek($s);
         }
 
-        if ($this->literal('selector(', 9) &&
+        if (
+            $this->literal('selector(', 9) &&
             $this->selector($selector) &&
             $this->matchChar(')')
         ) {
@@ -1351,7 +1873,7 @@ class Parser
                 $compound = [Type::T_STRING, '', []];
 
                 foreach ($sc as $scp) {
-                    if (is_array($scp)) {
+                    if (\is_array($scp)) {
                         $compound[2][] = $scp;
                     } else {
                         $compound[2][] = [Type::T_KEYWORD, $scp];
@@ -1360,6 +1882,7 @@ class Parser
 
                 $selectorList[2][] = $compound;
             }
+
             $support[2][] = $selectorList;
             $support[2][] = [Type::T_KEYWORD, ')'];
             $parts[] = $support;
@@ -1375,8 +1898,10 @@ class Parser
             $this->seek($s);
         }
 
-        if ($this->literal('and', 3) &&
-            $this->genericList($expressions, 'supportsQuery', ' and', false)) {
+        if (
+            $this->literal('and', 3) &&
+            $this->genericList($expressions, 'supportsQuery', ' and', false)
+        ) {
             array_unshift($expressions[2], [Type::T_STRING, '', $parts]);
 
             $parts = [$expressions];
@@ -1385,8 +1910,10 @@ class Parser
             $this->seek($s);
         }
 
-        if ($this->literal('or', 2) &&
-            $this->genericList($expressions, 'supportsQuery', ' or', false)) {
+        if (
+            $this->literal('or', 2) &&
+            $this->genericList($expressions, 'supportsQuery', ' or', false)
+        ) {
             array_unshift($expressions[2], [Type::T_STRING, '', $parts]);
 
             $parts = [$expressions];
@@ -1395,7 +1922,7 @@ class Parser
             $this->seek($s);
         }
 
-        if (count($parts)) {
+        if (\count($parts)) {
             if ($this->eatWhiteDefault) {
                 $this->whitespace();
             }
@@ -1414,16 +1941,18 @@ class Parser
      *
      * @param array $out
      *
-     * @return boolean
+     * @return bool
      */
     protected function mediaExpression(&$out)
     {
         $s = $this->count;
         $value = null;
 
-        if ($this->matchChar('(') &&
+        if (
+            $this->matchChar('(') &&
             $this->expression($feature) &&
-            ($this->matchChar(':') && $this->expression($value) || true) &&
+            ($this->matchChar(':') &&
+                $this->expression($value) || true) &&
             $this->matchChar(')')
         ) {
             $out = [Type::T_MEDIA_EXPRESSION, $feature];
@@ -1445,16 +1974,23 @@ class Parser
      *
      * @param array $out
      *
-     * @return boolean
+     * @return bool
      */
     protected function argValues(&$out)
     {
+        $discardComments = $this->discardComments;
+        $this->discardComments = true;
+
         if ($this->genericList($list, 'argValue', ',', false)) {
             $out = $list[2];
 
+            $this->discardComments = $discardComments;
+
             return true;
         }
 
+        $this->discardComments = $discardComments;
+
         return false;
     }
 
@@ -1463,7 +1999,7 @@ class Parser
      *
      * @param array $out
      *
-     * @return boolean
+     * @return bool
      */
     protected function argValue(&$out)
     {
@@ -1477,7 +2013,7 @@ class Parser
             $keyword = null;
         }
 
-        if ($this->genericList($value, 'expression')) {
+        if ($this->genericList($value, 'expression', '', true)) {
             $out = [$keyword, $value, false];
             $s = $this->count;
 
@@ -1493,12 +2029,123 @@ class Parser
         return false;
     }
 
+    /**
+     * Check if a generic directive is known to be able to allow almost any syntax or not
+     * @param mixed $directiveName
+     * @return bool
+     */
+    protected function isKnownGenericDirective($directiveName)
+    {
+        if (\is_array($directiveName) && \is_string(reset($directiveName))) {
+            $directiveName = reset($directiveName);
+        }
+        if (! \is_string($directiveName)) {
+            return false;
+        }
+        if (
+            \in_array($directiveName, [
+            'at-root',
+            'media',
+            'mixin',
+            'include',
+            'scssphp-import-once',
+            'import',
+            'extend',
+            'function',
+            'break',
+            'continue',
+            'return',
+            'each',
+            'while',
+            'for',
+            'if',
+            'debug',
+            'warn',
+            'error',
+            'content',
+            'else',
+            'charset',
+            'supports',
+            // Todo
+            'use',
+            'forward',
+            ])
+        ) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * Parse directive value list that considers $vars as keyword
+     *
+     * @param array        $out
+     * @param string|false $endChar
+     *
+     * @return bool
+     *
+     * @phpstan-impure
+     */
+    protected function directiveValue(&$out, $endChar = false)
+    {
+        $s = $this->count;
+
+        if ($this->variable($out)) {
+            if ($endChar && $this->matchChar($endChar, false)) {
+                return true;
+            }
+
+            if (! $endChar && $this->end()) {
+                return true;
+            }
+        }
+
+        $this->seek($s);
+
+        if (\is_string($endChar) && $this->openString($endChar ? $endChar : ';', $out, null, null, true, ";}{")) {
+            if ($endChar && $this->matchChar($endChar, false)) {
+                return true;
+            }
+            $ss = $this->count;
+            if (!$endChar && $this->end()) {
+                $this->seek($ss);
+                return true;
+            }
+        }
+
+        $this->seek($s);
+
+        $allowVars = $this->allowVars;
+        $this->allowVars = false;
+
+        $res = $this->genericList($out, 'spaceList', ',');
+        $this->allowVars = $allowVars;
+
+        if ($res) {
+            if ($endChar && $this->matchChar($endChar, false)) {
+                return true;
+            }
+
+            if (! $endChar && $this->end()) {
+                return true;
+            }
+        }
+
+        $this->seek($s);
+
+        if ($endChar && $this->matchChar($endChar, false)) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Parse comma separated value list
      *
      * @param array $out
      *
-     * @return boolean
+     * @return bool
      */
     protected function valueList(&$out)
     {
@@ -1510,12 +2157,52 @@ class Parser
         return $res;
     }
 
+    /**
+     * Parse a function call, where externals () are part of the call
+     * and not of the value list
+     *
+     * @param array       $out
+     * @param bool        $mandatoryEnclos
+     * @param null|string $charAfter
+     * @param null|bool   $eatWhiteSp
+     *
+     * @return bool
+     */
+    protected function functionCallArgumentsList(&$out, $mandatoryEnclos = true, $charAfter = null, $eatWhiteSp = null)
+    {
+        $s = $this->count;
+
+        if (
+            $this->matchChar('(') &&
+            $this->valueList($out) &&
+            $this->matchChar(')') &&
+            ($charAfter ? $this->matchChar($charAfter, $eatWhiteSp) : $this->end())
+        ) {
+            return true;
+        }
+
+        if (! $mandatoryEnclos) {
+            $this->seek($s);
+
+            if (
+                $this->valueList($out) &&
+                ($charAfter ? $this->matchChar($charAfter, $eatWhiteSp) : $this->end())
+            ) {
+                return true;
+            }
+        }
+
+        $this->seek($s);
+
+        return false;
+    }
+
     /**
      * Parse space separated value list
      *
      * @param array $out
      *
-     * @return boolean
+     * @return bool
      */
     protected function spaceList(&$out)
     {
@@ -1525,17 +2212,18 @@ class Parser
     /**
      * Parse generic list
      *
-     * @param array    $out
-     * @param callable $parseItem
-     * @param string   $delim
-     * @param boolean  $flatten
+     * @param array  $out
+     * @param string $parseItem The name of the method used to parse items
+     * @param string $delim
+     * @param bool   $flatten
      *
-     * @return boolean
+     * @return bool
      */
     protected function genericList(&$out, $parseItem, $delim = '', $flatten = true)
     {
         $s     = $this->count;
         $items = [];
+        /** @var array|Number|null $value */
         $value = null;
 
         while ($this->$parseItem($value)) {
@@ -1543,10 +2231,69 @@ class Parser
             $items[] = $value;
 
             if ($delim) {
-                if (! $this->literal($delim, strlen($delim))) {
+                if (! $this->literal($delim, \strlen($delim))) {
                     break;
                 }
+
                 $trailing_delim = true;
+            } else {
+                assert(\is_array($value) || $value instanceof Number);
+                // if no delim watch that a keyword didn't eat the single/double quote
+                // from the following starting string
+                if ($value[0] === Type::T_KEYWORD) {
+                    assert(\is_array($value));
+                    /** @var string $word */
+                    $word = $value[1];
+
+                    $last_char = substr($word, -1);
+
+                    if (
+                        strlen($word) > 1 &&
+                        in_array($last_char, [ "'", '"']) &&
+                        substr($word, -2, 1) !== '\\'
+                    ) {
+                        // if there is a non escaped opening quote in the keyword, this seems unlikely a mistake
+                        $word = str_replace('\\' . $last_char, '\\\\', $word);
+                        if (strpos($word, $last_char) < strlen($word) - 1) {
+                            continue;
+                        }
+
+                        $currentCount = $this->count;
+
+                        // let's try to rewind to previous char and try a parse
+                        $this->count--;
+                        // in case the keyword also eat spaces
+                        while (substr($this->buffer, $this->count, 1) !== $last_char) {
+                            $this->count--;
+                        }
+
+                        /** @var array|Number|null $nextValue */
+                        $nextValue = null;
+                        if ($this->$parseItem($nextValue)) {
+                            assert(\is_array($nextValue) || $nextValue instanceof Number);
+                            if ($nextValue[0] === Type::T_KEYWORD && $nextValue[1] === $last_char) {
+                                // bad try, forget it
+                                $this->seek($currentCount);
+                                continue;
+                            }
+                            if ($nextValue[0] !== Type::T_STRING) {
+                                // bad try, forget it
+                                $this->seek($currentCount);
+                                continue;
+                            }
+
+                            // OK it was a good idea
+                            $value[1] = substr($value[1], 0, -1);
+                            array_pop($items);
+                            $items[] = $value;
+                            $items[] = $nextValue;
+                        } else {
+                            // bad try, forget it
+                            $this->seek($currentCount);
+                            continue;
+                        }
+                    }
+                }
             }
         }
 
@@ -1559,7 +2306,8 @@ class Parser
         if ($trailing_delim) {
             $items[] = [Type::T_NULL];
         }
-        if ($flatten && count($items) === 1) {
+
+        if ($flatten && \count($items) === 1) {
             $out = $items[0];
         } else {
             $out = [Type::T_LIST, $delim, $items];
@@ -1572,10 +2320,12 @@ class Parser
      * Parse expression
      *
      * @param array $out
-     * @param bool $listOnly
-     * @param bool $lookForExp
+     * @param bool  $listOnly
+     * @param bool  $lookForExp
      *
-     * @return boolean
+     * @return bool
+     *
+     * @phpstan-impure
      */
     protected function expression(&$out, $listOnly = false, $lookForExp = true)
     {
@@ -1585,7 +2335,7 @@ class Parser
         $allowedTypes = ($listOnly ? [Type::T_LIST] : [Type::T_LIST, Type::T_MAP]);
 
         if ($this->matchChar('(')) {
-            if ($this->enclosedExpression($lhs, $s, ")", $allowedTypes)) {
+            if ($this->enclosedExpression($lhs, $s, ')', $allowedTypes)) {
                 if ($lookForExp) {
                     $out = $this->expHelper($lhs, 0);
                 } else {
@@ -1600,13 +2350,14 @@ class Parser
             $this->seek($s);
         }
 
-        if (in_array(Type::T_LIST, $allowedTypes) && $this->matchChar('[')) {
-            if ($this->enclosedExpression($lhs, $s, "]", [Type::T_LIST])) {
+        if (\in_array(Type::T_LIST, $allowedTypes) && $this->matchChar('[')) {
+            if ($this->enclosedExpression($lhs, $s, ']', [Type::T_LIST])) {
                 if ($lookForExp) {
                     $out = $this->expHelper($lhs, 0);
                 } else {
                     $out = $lhs;
                 }
+
                 $this->discardComments = $discard;
 
                 return true;
@@ -1615,7 +2366,7 @@ class Parser
             $this->seek($s);
         }
 
-        if (!$listOnly && $this->value($lhs)) {
+        if (! $listOnly && $this->value($lhs)) {
             if ($lookForExp) {
                 $out = $this->expHelper($lhs, 0);
             } else {
@@ -1628,54 +2379,66 @@ class Parser
         }
 
         $this->discardComments = $discard;
+
         return false;
     }
 
     /**
      * Parse expression specifically checking for lists in parenthesis or brackets
      *
-     * @param array   $out
-     * @param integer $s
-     * @param string  $closingParen
-     * @param array   $allowedTypes
+     * @param array    $out
+     * @param int      $s
+     * @param string   $closingParen
+     * @param string[] $allowedTypes
      *
-     * @return boolean
+     * @return bool
+     *
+     * @phpstan-param array<Type::*> $allowedTypes
      */
-    protected function enclosedExpression(&$out, $s, $closingParen = ")", $allowedTypes = [Type::T_LIST, Type::T_MAP])
+    protected function enclosedExpression(&$out, $s, $closingParen = ')', $allowedTypes = [Type::T_LIST, Type::T_MAP])
     {
-        if ($this->matchChar($closingParen) && in_array(Type::T_LIST, $allowedTypes)) {
+        if ($this->matchChar($closingParen) && \in_array(Type::T_LIST, $allowedTypes)) {
             $out = [Type::T_LIST, '', []];
+
             switch ($closingParen) {
-                case ")":
+                case ')':
                     $out['enclosing'] = 'parent'; // parenthesis list
                     break;
-                case "]":
+
+                case ']':
                     $out['enclosing'] = 'bracket'; // bracketed list
                     break;
             }
+
             return true;
         }
 
-        if ($this->valueList($out) && $this->matchChar($closingParen)
-            && in_array($out[0], [Type::T_LIST, Type::T_KEYWORD])
-            && in_array(Type::T_LIST, $allowedTypes)) {
+        if (
+            $this->valueList($out) &&
+            $this->matchChar($closingParen) && ! ($closingParen === ')' &&
+            \in_array($out[0], [Type::T_EXPRESSION, Type::T_UNARY])) &&
+            \in_array(Type::T_LIST, $allowedTypes)
+        ) {
             if ($out[0] !== Type::T_LIST || ! empty($out['enclosing'])) {
                 $out = [Type::T_LIST, '', [$out]];
             }
+
             switch ($closingParen) {
-                case ")":
+                case ')':
                     $out['enclosing'] = 'parent'; // parenthesis list
                     break;
-                case "]":
+
+                case ']':
                     $out['enclosing'] = 'bracket'; // bracketed list
                     break;
             }
+
             return true;
         }
 
         $this->seek($s);
 
-        if (in_array(Type::T_MAP, $allowedTypes) && $this->map($out)) {
+        if (\in_array(Type::T_MAP, $allowedTypes) && $this->map($out)) {
             return true;
         }
 
@@ -1685,8 +2448,8 @@ class Parser
     /**
      * Parse left-hand side of subexpression
      *
-     * @param array   $lhs
-     * @param integer $minP
+     * @param array $lhs
+     * @param int   $minP
      *
      * @return array
      */
@@ -1717,12 +2480,15 @@ class Parser
                 break;
             }
 
-            // peek and see if rhs belongs to next operator
-            if ($this->peek($operators, $next) && static::$precedence[$next[1]] > static::$precedence[$op]) {
-                $rhs = $this->expHelper($rhs, static::$precedence[$next[1]]);
+            if ($op === '-' && ! $whiteAfter && $rhs[0] === Type::T_KEYWORD) {
+                break;
             }
 
+            // consume higher-precedence operators on the right-hand side
+            $rhs = $this->expHelper($rhs, static::$precedence[$op] + 1);
+
             $lhs = [Type::T_EXPRESSION, $op, $lhs, $rhs, $this->inParens, $whiteBefore, $whiteAfter];
+
             $ss = $this->count;
             $whiteBefore = isset($this->buffer[$this->count - 1]) &&
                 ctype_space($this->buffer[$this->count - 1]);
@@ -1738,7 +2504,7 @@ class Parser
      *
      * @param array $out
      *
-     * @return boolean
+     * @return bool
      */
     protected function value(&$out)
     {
@@ -1749,7 +2515,10 @@ class Parser
         $s = $this->count;
         $char = $this->buffer[$this->count];
 
-        if ($this->literal('url(', 4) && $this->match('data:([a-z]+)\/([a-z0-9.+-]+);base64,', $m, false)) {
+        if (
+            $this->literal('url(', 4) &&
+            $this->match('data:([a-z]+)\/([a-z0-9.+-]+);base64,', $m, false)
+        ) {
             $len = strspn(
                 $this->buffer,
                 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwyxz0123456789+/=',
@@ -1768,7 +2537,10 @@ class Parser
 
         $this->seek($s);
 
-        if ($this->literal('url(', 4, false) && $this->match('\s*(\/\/[^\s\)]+)\s*', $m)) {
+        if (
+            $this->literal('url(', 4, false) &&
+            $this->match('\s*(\/\/[^\s\)]+)\s*', $m)
+        ) {
             $content = 'url(' . $m[1];
 
             if ($this->matchChar(')')) {
@@ -1783,7 +2555,10 @@ class Parser
 
         // not
         if ($char === 'n' && $this->literal('not', 3, false)) {
-            if ($this->whitespace() && $this->value($inner)) {
+            if (
+                $this->whitespace() &&
+                $this->value($inner)
+            ) {
                 $out = [Type::T_UNARY, 'not', $inner, $this->inParens];
 
                 return true;
@@ -1804,28 +2579,56 @@ class Parser
         if ($char === '+') {
             $this->count++;
 
+            $follow_white = $this->whitespace();
+
             if ($this->value($inner)) {
                 $out = [Type::T_UNARY, '+', $inner, $this->inParens];
 
                 return true;
             }
 
-            $this->count--;
+            if ($follow_white) {
+                $out = [Type::T_KEYWORD, $char];
+                return  true;
+            }
+
+            $this->seek($s);
 
             return false;
         }
 
         // negation
         if ($char === '-') {
+            if ($this->customProperty($out)) {
+                return true;
+            }
+
             $this->count++;
 
+            $follow_white = $this->whitespace();
+
             if ($this->variable($inner) || $this->unit($inner) || $this->parenValue($inner)) {
                 $out = [Type::T_UNARY, '-', $inner, $this->inParens];
 
                 return true;
             }
 
-            $this->count--;
+            if (
+                $this->keyword($inner) &&
+                ! $this->func($inner, $out)
+            ) {
+                $out = [Type::T_UNARY, '-', $inner, $this->inParens];
+
+                return true;
+            }
+
+            if ($follow_white) {
+                $out = [Type::T_KEYWORD, $char];
+
+                return  true;
+            }
+
+            $this->seek($s);
         }
 
         // paren
@@ -1837,6 +2640,16 @@ class Parser
             if ($this->interpolation($out) || $this->color($out)) {
                 return true;
             }
+
+            $this->count++;
+
+            if ($this->keyword($keyword)) {
+                $out = [Type::T_KEYWORD, '#' . $keyword];
+
+                return true;
+            }
+
+            $this->count--;
         }
 
         if ($this->matchChar('&', true)) {
@@ -1862,10 +2675,17 @@ class Parser
         }
 
         // unicode range with wildcards
-        if ($this->literal('U+', 2) && $this->match('([0-9A-F]+\?*)(-([0-9A-F]+))?', $m, false)) {
-            $out = [Type::T_KEYWORD, 'U+' . $m[0]];
+        if (
+            $this->literal('U+', 2) &&
+            $this->match('\?+|([0-9A-F]+(\?+|(-[0-9A-F]+))?)', $m, false)
+        ) {
+            $unicode = explode('-', $m[0]);
+            if (strlen(reset($unicode)) <= 6 && strlen(end($unicode)) <= 6) {
+                $out = [Type::T_KEYWORD, 'U+' . $m[0]];
 
-            return true;
+                return true;
+            }
+            $this->count -= strlen($m[0]) + 2;
         }
 
         if ($this->keyword($keyword, false)) {
@@ -1892,7 +2712,7 @@ class Parser
      *
      * @param array $out
      *
-     * @return boolean
+     * @return bool
      */
     protected function parenValue(&$out)
     {
@@ -1909,7 +2729,10 @@ class Parser
 
             $this->inParens = true;
 
-            if ($this->expression($exp) && $this->matchChar(')')) {
+            if (
+                $this->expression($exp) &&
+                $this->matchChar(')')
+            ) {
                 $out = $exp;
                 $this->inParens = $inParens;
 
@@ -1928,13 +2751,14 @@ class Parser
      *
      * @param array $out
      *
-     * @return boolean
+     * @return bool
      */
     protected function progid(&$out)
     {
         $s = $this->count;
 
-        if ($this->literal('progid:', 7, false) &&
+        if (
+            $this->literal('progid:', 7, false) &&
             $this->openString('(', $fn) &&
             $this->matchChar('(')
         ) {
@@ -1960,7 +2784,7 @@ class Parser
      * @param string $name
      * @param array  $func
      *
-     * @return boolean
+     * @return bool
      */
     protected function func($name, &$func)
     {
@@ -1976,7 +2800,10 @@ class Parser
             if ($name !== 'expression' && ! preg_match('/^(-[a-z]+-)?calc$/', $name)) {
                 $ss = $this->count;
 
-                if ($this->argValues($args) && $this->matchChar(')')) {
+                if (
+                    $this->argValues($args) &&
+                    $this->matchChar(')')
+                ) {
                     $func = [Type::T_FUNCTION_CALL, $name, $args];
 
                     return true;
@@ -1985,7 +2812,8 @@ class Parser
                 $this->seek($ss);
             }
 
-            if (($this->openString(')', $str, '(') || true) &&
+            if (
+                ($this->openString(')', $str, '(') || true) &&
                 $this->matchChar(')')
             ) {
                 $args = [];
@@ -2010,7 +2838,7 @@ class Parser
      *
      * @param array $out
      *
-     * @return boolean
+     * @return bool
      */
     protected function argumentList(&$out)
     {
@@ -2020,7 +2848,10 @@ class Parser
         $args = [];
 
         while ($this->keyword($var)) {
-            if ($this->matchChar('=') && $this->expression($exp)) {
+            if (
+                $this->matchChar('=') &&
+                $this->expression($exp)
+            ) {
                 $args[] = [Type::T_STRING, '', [$var . '=']];
                 $arg = $exp;
             } else {
@@ -2052,7 +2883,7 @@ class Parser
      *
      * @param array $out
      *
-     * @return boolean
+     * @return bool
      */
     protected function argumentDef(&$out)
     {
@@ -2066,7 +2897,10 @@ class Parser
 
             $ss = $this->count;
 
-            if ($this->matchChar(':') && $this->genericList($defaultVal, 'expression')) {
+            if (
+                $this->matchChar(':') &&
+                $this->genericList($defaultVal, 'expression', '', true)
+            ) {
                 $arg[1] = $defaultVal;
             } else {
                 $this->seek($ss);
@@ -2078,10 +2912,11 @@ class Parser
                 $sss = $this->count;
 
                 if (! $this->matchChar(')')) {
-                    $this->throwParseError('... has to be after the final argument');
+                    throw $this->parseError('... has to be after the final argument');
                 }
 
                 $arg[2] = true;
+
                 $this->seek($sss);
             } else {
                 $this->seek($ss);
@@ -2110,7 +2945,7 @@ class Parser
      *
      * @param array $out
      *
-     * @return boolean
+     * @return bool
      */
     protected function map(&$out)
     {
@@ -2123,8 +2958,10 @@ class Parser
         $keys = [];
         $values = [];
 
-        while ($this->genericList($key, 'expression') && $this->matchChar(':') &&
-            $this->genericList($value, 'expression')
+        while (
+            $this->genericList($key, 'expression', '', true) &&
+            $this->matchChar(':') &&
+            $this->genericList($value, 'expression', '', true)
         ) {
             $keys[] = $key;
             $values[] = $value;
@@ -2150,19 +2987,21 @@ class Parser
      *
      * @param array $out
      *
-     * @return boolean
+     * @return bool
      */
     protected function color(&$out)
     {
         $s = $this->count;
 
-        if ($this->match('(#([0-9a-f]+))', $m)) {
-            if (in_array(strlen($m[2]), [3,4,6,8])) {
+        if ($this->match('(#([0-9a-f]+)\b)', $m)) {
+            if (\in_array(\strlen($m[2]), [3,4,6,8])) {
                 $out = [Type::T_KEYWORD, $m[0]];
+
                 return true;
             }
 
             $this->seek($s);
+
             return false;
         }
 
@@ -2174,14 +3013,14 @@ class Parser
      *
      * @param array $unit
      *
-     * @return boolean
+     * @return bool
      */
     protected function unit(&$unit)
     {
         $s = $this->count;
 
         if ($this->match('([0-9]*(\.)?[0-9]+)([%a-zA-Z]+)?', $m, false)) {
-            if (strlen($this->buffer) === $this->count || ! ctype_digit($this->buffer[$this->count])) {
+            if (\strlen($this->buffer) === $this->count || ! ctype_digit($this->buffer[$this->count])) {
                 $this->whitespace();
 
                 $unit = new Node\Number($m[1], empty($m[3]) ? '' : $m[3]);
@@ -2199,10 +3038,11 @@ class Parser
      * Parse string
      *
      * @param array $out
+     * @param bool  $keepDelimWithInterpolation
      *
-     * @return boolean
+     * @return bool
      */
-    protected function string(&$out)
+    protected function string(&$out, $keepDelimWithInterpolation = false)
     {
         $s = $this->count;
 
@@ -2225,52 +3065,48 @@ class Parser
             }
 
             if ($m[2] === '#{') {
-                $this->count -= strlen($m[2]);
+                $this->count -= \strlen($m[2]);
 
                 if ($this->interpolation($inter, false)) {
                     $content[] = $inter;
                     $hasInterpolation = true;
                 } else {
-                    $this->count += strlen($m[2]);
+                    $this->count += \strlen($m[2]);
                     $content[] = '#{'; // ignore it
                 }
+            } elseif ($m[2] === "\r") {
+                $content[] = chr(10);
+                // TODO : warning
+                # DEPRECATION WARNING on line x, column y of zzz:
+                # Unescaped multiline strings are deprecated and will be removed in a future version of Sass.
+                # To include a newline in a string, use "\a" or "\a " as in CSS.
+                if ($this->matchChar("\n", false)) {
+                    $content[] = ' ';
+                }
             } elseif ($m[2] === '\\') {
-                if ($this->matchChar('"', false)) {
-                    $content[] = $m[2] . '"';
-                } elseif ($this->matchChar("'", false)) {
-                    $content[] = $m[2] . "'";
-                } elseif ($this->literal("\\", 1, false)) {
-                    $content[] = $m[2] . "\\";
-                } elseif ($this->literal("\r\n", 2, false) ||
-                  $this->matchChar("\r", false) ||
-                  $this->matchChar("\n", false) ||
-                  $this->matchChar("\f", false)
+                if (
+                    $this->literal("\r\n", 2, false) ||
+                    $this->matchChar("\r", false) ||
+                    $this->matchChar("\n", false) ||
+                    $this->matchChar("\f", false)
                 ) {
                     // this is a continuation escaping, to be ignored
+                } elseif ($this->matchEscapeCharacter($c)) {
+                    $content[] = $c;
                 } else {
-                    $content[] = $m[2];
+                    throw $this->parseError('Unterminated escape sequence');
                 }
             } else {
-                $this->count -= strlen($delim);
+                $this->count -= \strlen($delim);
                 break; // delim
             }
         }
 
         $this->eatWhiteDefault = $oldWhite;
 
-        if ($this->literal($delim, strlen($delim))) {
-            if ($hasInterpolation) {
+        if ($this->literal($delim, \strlen($delim))) {
+            if ($hasInterpolation && ! $keepDelimWithInterpolation) {
                 $delim = '"';
-
-                foreach ($content as &$string) {
-                    if ($string === "\\\\") {
-                        $string = "\\";
-                    } elseif ($string === "\\'") {
-                        $string = "'";
-                    } elseif ($string === '\\"') {
-                        $string = '"';
-                    }
-                }
             }
 
             $out = [Type::T_STRING, $delim, $content];
@@ -2283,13 +3119,63 @@ class Parser
         return false;
     }
 
+    /**
+     * @param string $out
+     * @param bool   $inKeywords
+     *
+     * @return bool
+     */
+    protected function matchEscapeCharacter(&$out, $inKeywords = false)
+    {
+        $s = $this->count;
+        if ($this->match('[a-f0-9]', $m, false)) {
+            $hex = $m[0];
+
+            for ($i = 5; $i--;) {
+                if ($this->match('[a-f0-9]', $m, false)) {
+                    $hex .= $m[0];
+                } else {
+                    break;
+                }
+            }
+
+            // CSS allows Unicode escape sequences to be followed by a delimiter space
+            // (necessary in some cases for shorter sequences to disambiguate their end)
+            $this->matchChar(' ', false);
+
+            $value = hexdec($hex);
+
+            if (!$inKeywords && ($value == 0 || ($value >= 0xD800 && $value <= 0xDFFF) || $value >= 0x10FFFF)) {
+                $out = "\xEF\xBF\xBD"; // "\u{FFFD}" but with a syntax supported on PHP 5
+            } elseif ($value < 0x20) {
+                $out = Util::mbChr($value);
+            } else {
+                $out = Util::mbChr($value);
+            }
+
+            return true;
+        }
+
+        if ($this->match('.', $m, false)) {
+            if ($inKeywords && in_array($m[0], ["'",'"','@','&',' ','\\',':','/','%'])) {
+                $this->seek($s);
+                return false;
+            }
+            $out = $m[0];
+
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Parse keyword or interpolation
      *
-     * @param array   $out
-     * @param boolean $restricted
+     * @param array $out
+     * @param bool  $restricted
      *
-     * @return boolean
+     * @return bool
      */
     protected function mixedKeyword(&$out, $restricted = false)
     {
@@ -2332,16 +3218,27 @@ class Parser
      *
      * @param string $end
      * @param array  $out
-     * @param string $nestingOpen
+     * @param string $nestOpen
+     * @param string $nestClose
+     * @param bool   $rtrim
+     * @param string $disallow
      *
-     * @return boolean
+     * @return bool
      */
-    protected function openString($end, &$out, $nestingOpen = null)
+    protected function openString($end, &$out, $nestOpen = null, $nestClose = null, $rtrim = true, $disallow = null)
     {
         $oldWhite = $this->eatWhiteDefault;
         $this->eatWhiteDefault = false;
 
-        $patt = '(.*?)([\'"]|#\{|' . $this->pregQuote($end) . '|' . static::$commentPattern . ')';
+        if ($nestOpen && ! $nestClose) {
+            $nestClose = $end;
+        }
+
+        $patt = ($disallow ? '[^' . $this->pregQuote($disallow) . ']' : '.');
+        $patt = '(' . $patt . '*?)([\'"]|#\{|'
+            . $this->pregQuote($end) . '|'
+            . (($nestClose && $nestClose !== $end) ? $this->pregQuote($nestClose) . '|' : '')
+            . static::$commentPattern . ')';
 
         $nestingLevel = 0;
 
@@ -2351,20 +3248,24 @@ class Parser
             if (isset($m[1]) && $m[1] !== '') {
                 $content[] = $m[1];
 
-                if ($nestingOpen) {
-                    $nestingLevel += substr_count($m[1], $nestingOpen);
+                if ($nestOpen) {
+                    $nestingLevel += substr_count($m[1], $nestOpen);
                 }
             }
 
             $tok = $m[2];
 
-            $this->count-= strlen($tok);
+            $this->count -= \strlen($tok);
 
-            if ($tok === $end && ! $nestingLevel--) {
+            if ($tok === $end && ! $nestingLevel) {
                 break;
             }
 
-            if (($tok === "'" || $tok === '"') && $this->string($str)) {
+            if ($tok === $nestClose) {
+                $nestingLevel--;
+            }
+
+            if (($tok === "'" || $tok === '"') && $this->string($str, true)) {
                 $content[] = $str;
                 continue;
             }
@@ -2375,18 +3276,18 @@ class Parser
             }
 
             $content[] = $tok;
-            $this->count+= strlen($tok);
+            $this->count += \strlen($tok);
         }
 
         $this->eatWhiteDefault = $oldWhite;
 
-        if (! $content) {
+        if (! $content || $tok !== $end) {
             return false;
         }
 
         // trim the end
-        if (is_string(end($content))) {
-            $content[count($content) - 1] = rtrim(end($content));
+        if ($rtrim && \is_string(end($content))) {
+            $content[\count($content) - 1] = rtrim(end($content));
         }
 
         $out = [Type::T_STRING, '', $content];
@@ -2398,24 +3299,33 @@ class Parser
      * Parser interpolation
      *
      * @param string|array $out
-     * @param boolean      $lookWhite save information about whitespace before and after
+     * @param bool         $lookWhite save information about whitespace before and after
      *
-     * @return boolean
+     * @return bool
      */
     protected function interpolation(&$out, $lookWhite = true)
     {
         $oldWhite = $this->eatWhiteDefault;
+        $allowVars = $this->allowVars;
+        $this->allowVars = true;
         $this->eatWhiteDefault = true;
 
         $s = $this->count;
 
-        if ($this->literal('#{', 2) && $this->valueList($value) && $this->matchChar('}', false)) {
+        if (
+            $this->literal('#{', 2) &&
+            $this->valueList($value) &&
+            $this->matchChar('}', false)
+        ) {
             if ($value === [Type::T_SELF]) {
                 $out = $value;
             } else {
                 if ($lookWhite) {
                     $left = ($s > 0 && preg_match('/\s/', $this->buffer[$s - 1])) ? ' ' : '';
-                    $right = preg_match('/\s/', $this->buffer[$this->count]) ? ' ': '';
+                    $right = (
+                        ! empty($this->buffer[$this->count]) &&
+                        preg_match('/\s/', $this->buffer[$this->count])
+                    ) ? ' ' : '';
                 } else {
                     $left = $right = false;
                 }
@@ -2424,6 +3334,7 @@ class Parser
             }
 
             $this->eatWhiteDefault = $oldWhite;
+            $this->allowVars = $allowVars;
 
             if ($this->eatWhiteDefault) {
                 $this->whitespace();
@@ -2435,6 +3346,7 @@ class Parser
         $this->seek($s);
 
         $this->eatWhiteDefault = $oldWhite;
+        $this->allowVars = $allowVars;
 
         return false;
     }
@@ -2444,7 +3356,7 @@ class Parser
      *
      * @param array $out
      *
-     * @return boolean
+     * @return bool
      */
     protected function propertyName(&$out)
     {
@@ -2480,16 +3392,10 @@ class Parser
         }
 
         // match comment hack
-        if (preg_match(
-            static::$whitePattern,
-            $this->buffer,
-            $m,
-            null,
-            $this->count
-        )) {
+        if (preg_match(static::$whitePattern, $this->buffer, $m, 0, $this->count)) {
             if (! empty($m[0])) {
                 $parts[] = $m[0];
-                $this->count += strlen($m[0]);
+                $this->count += \strlen($m[0]);
             }
         }
 
@@ -2500,13 +3406,72 @@ class Parser
         return true;
     }
 
+    /**
+     * Parse custom property name (as an array of parts or a string)
+     *
+     * @param array $out
+     *
+     * @return bool
+     */
+    protected function customProperty(&$out)
+    {
+        $s = $this->count;
+
+        if (! $this->literal('--', 2, false)) {
+            return false;
+        }
+
+        $parts = ['--'];
+
+        $oldWhite = $this->eatWhiteDefault;
+        $this->eatWhiteDefault = false;
+
+        for (;;) {
+            if ($this->interpolation($inter)) {
+                $parts[] = $inter;
+                continue;
+            }
+
+            if ($this->matchChar('&', false)) {
+                $parts[] = [Type::T_SELF];
+                continue;
+            }
+
+            if ($this->variable($var)) {
+                $parts[] = $var;
+                continue;
+            }
+
+            if ($this->keyword($text)) {
+                $parts[] = $text;
+                continue;
+            }
+
+            break;
+        }
+
+        $this->eatWhiteDefault = $oldWhite;
+
+        if (\count($parts) == 1) {
+            $this->seek($s);
+
+            return false;
+        }
+
+        $this->whitespace(); // get any extra whitespace
+
+        $out = [Type::T_STRING, '', $parts];
+
+        return true;
+    }
+
     /**
      * Parse comma separated selector list
      *
-     * @param array   $out
-     * @param boolean $subSelector
+     * @param array $out
+     * @param string|bool $subSelector
      *
-     * @return boolean
+     * @return bool
      */
     protected function selectors(&$out, $subSelector = false)
     {
@@ -2539,20 +3504,24 @@ class Parser
     /**
      * Parse whitespace separated selector list
      *
-     * @param array   $out
-     * @param boolean $subSelector
+     * @param array          $out
+     * @param string|bool $subSelector
      *
-     * @return boolean
+     * @return bool
      */
     protected function selector(&$out, $subSelector = false)
     {
         $selector = [];
 
+        $discardComments = $this->discardComments;
+        $this->discardComments = true;
+
         for (;;) {
             $s = $this->count;
 
             if ($this->match('[>+~]+', $m, true)) {
-                if ($subSelector && is_string($subSelector) && strpos($subSelector, 'nth-') === 0 &&
+                if (
+                    $subSelector && \is_string($subSelector) && strpos($subSelector, 'nth-') === 0 &&
                     $m[0] === '+' && $this->match("(\d+|n\b)", $counter)
                 ) {
                     $this->seek($s);
@@ -2564,18 +3533,15 @@ class Parser
 
             if ($this->selectorSingle($part, $subSelector)) {
                 $selector[] = $part;
-                $this->match('\s+', $m);
-                continue;
-            }
-
-            if ($this->match('\/[^\/]+\/', $m, true)) {
-                $selector[] = [$m[0]];
+                $this->whitespace();
                 continue;
             }
 
             break;
         }
 
+        $this->discardComments = $discardComments;
+
         if (! $selector) {
             return false;
         }
@@ -2585,6 +3551,56 @@ class Parser
         return true;
     }
 
+    /**
+     * parsing escaped chars in selectors:
+     * - escaped single chars are kept escaped in the selector but in a normalized form
+     *   (if not in 0-9a-f range as this would be ambigous)
+     * - other escaped sequences (multibyte chars or 0-9a-f) are kept in their initial escaped form,
+     *   normalized to lowercase
+     *
+     * TODO: this is a fallback solution. Ideally escaped chars in selectors should be encoded as the genuine chars,
+     * and escaping added when printing in the Compiler, where/if it's mandatory
+     * - but this require a better formal selector representation instead of the array we have now
+     *
+     * @param string $out
+     * @param bool   $keepEscapedNumber
+     *
+     * @return bool
+     */
+    protected function matchEscapeCharacterInSelector(&$out, $keepEscapedNumber = false)
+    {
+        $s_escape = $this->count;
+        if ($this->match('\\\\', $m)) {
+            $out = '\\' . $m[0];
+            return true;
+        }
+
+        if ($this->matchEscapeCharacter($escapedout, true)) {
+            if (strlen($escapedout) === 1) {
+                if (!preg_match(",\w,", $escapedout)) {
+                    $out = '\\' . $escapedout;
+                    return true;
+                } elseif (! $keepEscapedNumber || ! \is_numeric($escapedout)) {
+                    $out = $escapedout;
+                    return true;
+                }
+            }
+            $escape_sequence = rtrim(substr($this->buffer, $s_escape, $this->count - $s_escape));
+            if (strlen($escape_sequence) < 6) {
+                $escape_sequence .= ' ';
+            }
+            $out = '\\' . strtolower($escape_sequence);
+            return true;
+        }
+        if ($this->match('\\S', $m)) {
+            $out = '\\' . $m[0];
+            return true;
+        }
+
+
+        return false;
+    }
+
     /**
      * Parse the parts that make up a selector
      *
@@ -2592,10 +3608,10 @@ class Parser
      *     div[yes=no]#something.hello.world:nth-child(-2n+1)%placeholder
      * }}
      *
-     * @param array   $out
-     * @param boolean $subSelector
+     * @param array          $out
+     * @param string|bool $subSelector
      *
-     * @return boolean
+     * @return bool
      */
     protected function selectorSingle(&$out, $subSelector = false)
     {
@@ -2631,6 +3647,7 @@ class Parser
                 case '&':
                     $parts[] = Compiler::$selfSelector;
                     $this->count++;
+                    ! $this->cssOnly || $this->assertPlainCssValid(false, $s);
                     continue 2;
 
                 case '.':
@@ -2644,9 +3661,14 @@ class Parser
                     continue 2;
             }
 
-            if ($char === '\\' && $this->match('\\\\\S', $m)) {
-                $parts[] = $m[0];
-                continue;
+            // handling of escaping in selectors : get the escaped char
+            if ($char === '\\') {
+                $this->count++;
+                if ($this->matchEscapeCharacterInSelector($escaped, true)) {
+                    $parts[] = $escaped;
+                    continue;
+                }
+                $this->count--;
             }
 
             if ($char === '%') {
@@ -2655,6 +3677,7 @@ class Parser
                 if ($this->placeholder($placeholder)) {
                     $parts[] = '%';
                     $parts[] = $placeholder;
+                    ! $this->cssOnly || $this->assertPlainCssValid(false, $s);
                     continue;
                 }
 
@@ -2664,6 +3687,7 @@ class Parser
             if ($char === '#') {
                 if ($this->interpolation($inter)) {
                     $parts[] = $inter;
+                    ! $this->cssOnly || $this->assertPlainCssValid(false, $s);
                     continue;
                 }
 
@@ -2691,15 +3715,21 @@ class Parser
 
                     $ss = $this->count;
 
-                    if ($nameParts === ['not'] || $nameParts === ['is'] ||
-                        $nameParts === ['has'] || $nameParts === ['where'] ||
+                    if (
+                        $nameParts === ['not'] ||
+                        $nameParts === ['is'] ||
+                        $nameParts === ['has'] ||
+                        $nameParts === ['where'] ||
                         $nameParts === ['slotted'] ||
-                        $nameParts === ['nth-child'] || $nameParts == ['nth-last-child'] ||
-                        $nameParts === ['nth-of-type'] || $nameParts == ['nth-last-of-type']
+                        $nameParts === ['nth-child'] ||
+                        $nameParts === ['nth-last-child'] ||
+                        $nameParts === ['nth-of-type'] ||
+                        $nameParts === ['nth-last-of-type']
                     ) {
-                        if ($this->matchChar('(', true) &&
-                          ($this->selectors($subs, reset($nameParts)) || true) &&
-                          $this->matchChar(')')
+                        if (
+                            $this->matchChar('(', true) &&
+                            ($this->selectors($subs, reset($nameParts)) || true) &&
+                            $this->matchChar(')')
                         ) {
                             $parts[] = '(';
 
@@ -2709,12 +3739,12 @@ class Parser
                                         $parts[] = $p;
                                     }
 
-                                    if (count($sub) && reset($sub)) {
+                                    if (\count($sub) && reset($sub)) {
                                         $parts[] = ' ';
                                     }
                                 }
 
-                                if (count($subs) && reset($subs)) {
+                                if (\count($subs) && reset($subs)) {
                                     $parts[] = ', ';
                                 }
                             }
@@ -2723,21 +3753,20 @@ class Parser
                         } else {
                             $this->seek($ss);
                         }
-                    } else {
-                        if ($this->matchChar('(') &&
-                          ($this->openString(')', $str, '(') || true) &&
-                          $this->matchChar(')')
-                        ) {
-                            $parts[] = '(';
+                    } elseif (
+                        $this->matchChar('(', true) &&
+                        ($this->openString(')', $str, '(') || true) &&
+                        $this->matchChar(')')
+                    ) {
+                        $parts[] = '(';
 
-                            if (! empty($str)) {
-                                $parts[] = $str;
-                            }
-
-                            $parts[] = ')';
-                        } else {
-                            $this->seek($ss);
+                        if (! empty($str)) {
+                            $parts[] = $str;
                         }
+
+                        $parts[] = ')';
+                    } else {
+                        $this->seek($ss);
                     }
 
                     continue;
@@ -2747,7 +3776,7 @@ class Parser
             $this->seek($s);
 
             // 2n+1
-            if ($subSelector && is_string($subSelector) && strpos($subSelector, 'nth-') === 0) {
+            if ($subSelector && \is_string($subSelector) && strpos($subSelector, 'nth-') === 0) {
                 if ($this->match("(\s*(\+\s*|\-\s*)?(\d+|n|\d+n))+", $counter)) {
                     $parts[] = $counter[0];
                     //$parts[] = str_replace(' ', '', $counter[0]);
@@ -2758,7 +3787,8 @@ class Parser
             $this->seek($s);
 
             // attribute selector
-            if ($char === '[' &&
+            if (
+                $char === '[' &&
                 $this->matchChar('[') &&
                 ($this->openString(']', $str, '[') || true) &&
                 $this->matchChar(']')
@@ -2781,7 +3811,7 @@ class Parser
                 continue;
             }
 
-            if ($this->restrictedKeyword($name)) {
+            if ($this->restrictedKeyword($name, false, true)) {
                 $parts[] = $name;
                 continue;
             }
@@ -2805,14 +3835,21 @@ class Parser
      *
      * @param array $out
      *
-     * @return boolean
+     * @return bool
      */
     protected function variable(&$out)
     {
         $s = $this->count;
 
-        if ($this->matchChar('$', false) && $this->keyword($name)) {
-            $out = [Type::T_VARIABLE, $name];
+        if (
+            $this->matchChar('$', false) &&
+            $this->keyword($name)
+        ) {
+            if ($this->allowVars) {
+                $out = [Type::T_VARIABLE, $name];
+            } else {
+                $out = [Type::T_KEYWORD, '$' . $name];
+            }
 
             return true;
         }
@@ -2825,22 +3862,64 @@ class Parser
     /**
      * Parse a keyword
      *
-     * @param string  $word
-     * @param boolean $eatWhitespace
+     * @param string $word
+     * @param bool   $eatWhitespace
+     * @param bool   $inSelector
      *
-     * @return boolean
+     * @return bool
      */
-    protected function keyword(&$word, $eatWhitespace = null)
+    protected function keyword(&$word, $eatWhitespace = null, $inSelector = false)
     {
-        if ($this->match(
+        $s = $this->count;
+        $match = $this->match(
             $this->utf8
-                ? '(([\pL\w\x{00A0}-\x{10FFFF}_\-\*!"\']|[\\\\].)([\pL\w\x{00A0}-\x{10FFFF}\-_"\']|[\\\\].)*)'
-                : '(([\w_\-\*!"\']|[\\\\].)([\w\-_"\']|[\\\\].)*)',
+                ? '(([\pL\w\x{00A0}-\x{10FFFF}_\-\*!"\']|\\\\[a-f0-9]{6} ?|\\\\[a-f0-9]{1,5}(?![a-f0-9]) ?|[\\\\].)([\pL\w\x{00A0}-\x{10FFFF}\-_"\']|\\\\[a-f0-9]{6} ?|\\\\[a-f0-9]{1,5}(?![a-f0-9]) ?|[\\\\].)*)'
+                : '(([\w_\-\*!"\']|\\\\[a-f0-9]{6} ?|\\\\[a-f0-9]{1,5}(?![a-f0-9]) ?|[\\\\].)([\w\-_"\']|\\\\[a-f0-9]{6} ?|\\\\[a-f0-9]{1,5}(?![a-f0-9]) ?|[\\\\].)*)',
             $m,
-            $eatWhitespace
-        )) {
+            false
+        );
+
+        if ($match) {
             $word = $m[1];
 
+            // handling of escaping in keyword : get the escaped char
+            if (strpos($word, '\\') !== false) {
+                $send = $this->count;
+                $escapedWord = [];
+                $this->seek($s);
+                $previousEscape = false;
+                while ($this->count < $send) {
+                    $char = $this->buffer[$this->count];
+                    $this->count++;
+                    if (
+                        $this->count < $send
+                        && $char === '\\'
+                        && !$previousEscape
+                        && (
+                            $inSelector ?
+                                $this->matchEscapeCharacterInSelector($out)
+                                :
+                                $this->matchEscapeCharacter($out, true)
+                        )
+                    ) {
+                        $escapedWord[] = $out;
+                    } else {
+                        if ($previousEscape) {
+                            $previousEscape = false;
+                        } elseif ($char === '\\') {
+                            $previousEscape = true;
+                        }
+                        $escapedWord[] = $char;
+                    }
+                }
+
+                $word = implode('', $escapedWord);
+            }
+
+            if (is_null($eatWhitespace) ? $this->eatWhiteDefault : $eatWhitespace) {
+                $this->whitespace();
+            }
+
             return true;
         }
 
@@ -2850,16 +3929,17 @@ class Parser
     /**
      * Parse a keyword that should not start with a number
      *
-     * @param string  $word
-     * @param boolean $eatWhitespace
+     * @param string $word
+     * @param bool   $eatWhitespace
+     * @param bool   $inSelector
      *
-     * @return boolean
+     * @return bool
      */
-    protected function restrictedKeyword(&$word, $eatWhitespace = null)
+    protected function restrictedKeyword(&$word, $eatWhitespace = null, $inSelector = false)
     {
         $s = $this->count;
 
-        if ($this->keyword($word, $eatWhitespace) && (ord($word[0]) > 57 || ord($word[0]) < 48)) {
+        if ($this->keyword($word, $eatWhitespace, $inSelector) && (\ord($word[0]) > 57 || \ord($word[0]) < 48)) {
             return true;
         }
 
@@ -2873,16 +3953,18 @@ class Parser
      *
      * @param string|array $placeholder
      *
-     * @return boolean
+     * @return bool
      */
     protected function placeholder(&$placeholder)
     {
-        if ($this->match(
+        $match = $this->match(
             $this->utf8
                 ? '([\pL\w\-_]+)'
                 : '([\w\-_]+)',
             $m
-        )) {
+        );
+
+        if ($match) {
             $placeholder = $m[1];
 
             return true;
@@ -2900,14 +3982,32 @@ class Parser
      *
      * @param array $out
      *
-     * @return boolean
+     * @return bool
      */
     protected function url(&$out)
     {
-        if ($this->match('(url\(\s*(["\']?)([^)]+)\2\s*\))', $m)) {
-            $out = [Type::T_STRING, '', ['url(' . $m[2] . $m[3] . $m[2] . ')']];
+        if ($this->literal('url(', 4)) {
+            $s = $this->count;
 
-            return true;
+            if (
+                ($this->string($out) || $this->spaceList($out)) &&
+                $this->matchChar(')')
+            ) {
+                $out = [Type::T_STRING, '', ['url(', $out, ')']];
+
+                return true;
+            }
+
+            $this->seek($s);
+
+            if (
+                $this->openString(')', $out) &&
+                $this->matchChar(')')
+            ) {
+                $out = [Type::T_STRING, '', ['url(', $out, ')']];
+
+                return true;
+            }
         }
 
         return false;
@@ -2915,16 +4015,17 @@ class Parser
 
     /**
      * Consume an end of statement delimiter
+     * @param bool $eatWhitespace
      *
-     * @return boolean
+     * @return bool
      */
-    protected function end()
+    protected function end($eatWhitespace = null)
     {
-        if ($this->matchChar(';')) {
+        if ($this->matchChar(';', $eatWhitespace)) {
             return true;
         }
 
-        if ($this->count === strlen($this->buffer) || $this->buffer[$this->count] === '}') {
+        if ($this->count === \strlen($this->buffer) || $this->buffer[$this->count] === '}') {
             // if there is end of file or a closing block next then we don't need a ;
             return true;
         }
@@ -2937,16 +4038,16 @@ class Parser
      *
      * @param array $value
      *
-     * @return array
+     * @return string[]
      */
     protected function stripAssignmentFlags(&$value)
     {
         $flags = [];
 
-        for ($token = &$value; $token[0] === Type::T_LIST && ($s = count($token[2])); $token = &$lastNode) {
+        for ($token = &$value; $token[0] === Type::T_LIST && ($s = \count($token[2])); $token = &$lastNode) {
             $lastNode = &$token[2][$s - 1];
 
-            while ($lastNode[0] === Type::T_KEYWORD && in_array($lastNode[1], ['!default', '!global'])) {
+            while ($lastNode[0] === Type::T_KEYWORD && \in_array($lastNode[1], ['!default', '!global'])) {
                 array_pop($token[2]);
 
                 $node     = end($token[2]);
@@ -2964,7 +4065,7 @@ class Parser
      *
      * @param array $selectors
      *
-     * @return string
+     * @return bool
      */
     protected function stripOptionalFlag(&$selectors)
     {
@@ -2973,7 +4074,7 @@ class Parser
         $part     = end($selector);
 
         if ($part === ['!optional']) {
-            array_pop($selectors[count($selectors) - 1]);
+            array_pop($selectors[\count($selectors) - 1]);
 
             $optional = true;
         }
@@ -2990,57 +4091,13 @@ class Parser
      */
     protected function flattenList($value)
     {
-        if ($value[0] === Type::T_LIST && count($value[2]) === 1) {
+        if ($value[0] === Type::T_LIST && \count($value[2]) === 1) {
             return $this->flattenList($value[2][0]);
         }
 
         return $value;
     }
 
-    /**
-     * @deprecated
-     *
-     * {@internal
-     *     advance counter to next occurrence of $what
-     *     $until - don't include $what in advance
-     *     $allowNewline, if string, will be used as valid char set
-     * }}
-     */
-    protected function to($what, &$out, $until = false, $allowNewline = false)
-    {
-        if (is_string($allowNewline)) {
-            $validChars = $allowNewline;
-        } else {
-            $validChars = $allowNewline ? '.' : "[^\n]";
-        }
-
-        $m = null;
-
-        if (! $this->match('(' . $validChars . '*?)' . $this->pregQuote($what), $m, ! $until)) {
-            return false;
-        }
-
-        if ($until) {
-            $this->count -= strlen($what); // give back $what
-        }
-
-        $out = $m[1];
-
-        return true;
-    }
-
-    /**
-     * @deprecated
-     */
-    protected function show()
-    {
-        if ($this->peek("(.*?)(\n|$)", $m, $this->count)) {
-            return $m[1];
-        }
-
-        return '';
-    }
-
     /**
      * Quote regular expression
      *
@@ -3057,6 +4114,8 @@ class Parser
      * Extract line numbers from buffer
      *
      * @param string $buffer
+     *
+     * @return void
      */
     private function extractLineNumbers($buffer)
     {
@@ -3068,24 +4127,25 @@ class Parser
             $prev = $pos + 1;
         }
 
-        $this->sourcePositions[] = strlen($buffer);
+        $this->sourcePositions[] = \strlen($buffer);
 
         if (substr($buffer, -1) !== "\n") {
-            $this->sourcePositions[] = strlen($buffer) + 1;
+            $this->sourcePositions[] = \strlen($buffer) + 1;
         }
     }
 
     /**
      * Get source line number and column (given character position in the buffer)
      *
-     * @param integer $pos
+     * @param int $pos
      *
      * @return array
+     * @phpstan-return array{int, int}
      */
     private function getSourcePosition($pos)
     {
         $low = 0;
-        $high = count($this->sourcePositions);
+        $high = \count($this->sourcePositions);
 
         while ($low < $high) {
             $mid = (int) (($high + $low) / 2);
@@ -3107,18 +4167,20 @@ class Parser
     }
 
     /**
-     * Save internal encoding
+     * Save internal encoding of mbstring
+     *
+     * When mbstring.func_overload is used to replace the standard PHP string functions,
+     * this method configures the internal encoding to a single-byte one so that the
+     * behavior matches the normal behavior of PHP string functions while using the parser.
+     * The existing internal encoding is saved and will be restored when calling {@see restoreEncoding}.
+     *
+     * If mbstring.func_overload is not used (or does not override string functions), this method is a no-op.
+     *
+     * @return void
      */
     private function saveEncoding()
     {
-        if (version_compare(PHP_VERSION, '7.2.0') >= 0) {
-            return;
-        }
-
-        // deprecated in PHP 7.2
-        $iniDirective = 'mbstring.func_overload';
-
-        if (extension_loaded('mbstring') && ini_get($iniDirective) & 2) {
+        if (\PHP_VERSION_ID < 80000 && \extension_loaded('mbstring') && (2 & (int) ini_get('mbstring.func_overload')) > 0) {
             $this->encoding = mb_internal_encoding();
 
             mb_internal_encoding('iso-8859-1');
@@ -3127,10 +4189,12 @@ class Parser
 
     /**
      * Restore internal encoding
+     *
+     * @return void
      */
     private function restoreEncoding()
     {
-        if (extension_loaded('mbstring') && $this->encoding) {
+        if (\extension_loaded('mbstring') && $this->encoding) {
             mb_internal_encoding($this->encoding);
         }
     }
diff --git a/lib/scssphp/scssphp/src/SourceMap/Base64.php b/lib/scssphp/scssphp/src/SourceMap/Base64.php
index 93c6c1b47..00b6b4545 100644
--- a/lib/scssphp/scssphp/src/SourceMap/Base64.php
+++ b/lib/scssphp/scssphp/src/SourceMap/Base64.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -15,11 +16,13 @@ namespace ScssPhp\ScssPhp\SourceMap;
  * Base 64 Encode/Decode
  *
  * @author Anthon Pang <anthon.pang@gmail.com>
+ *
+ * @internal
  */
 class Base64
 {
     /**
-     * @var array
+     * @var array<int, string>
      */
     private static $encodingMap = [
         0 => 'A',
@@ -89,7 +92,7 @@ class Base64
     ];
 
     /**
-     * @var array
+     * @var array<string|int, int>
      */
     private static $decodingMap = [
         'A' => 0,
@@ -161,7 +164,7 @@ class Base64
     /**
      * Convert to base64
      *
-     * @param integer $value
+     * @param int $value
      *
      * @return string
      */
@@ -175,7 +178,7 @@ class Base64
      *
      * @param string $value
      *
-     * @return integer
+     * @return int
      */
     public static function decode($value)
     {
diff --git a/lib/scssphp/scssphp/src/SourceMap/Base64VLQ.php b/lib/scssphp/scssphp/src/SourceMap/Base64VLQ.php
index 61c1d30e4..2a5210c68 100644
--- a/lib/scssphp/scssphp/src/SourceMap/Base64VLQ.php
+++ b/lib/scssphp/scssphp/src/SourceMap/Base64VLQ.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -11,8 +12,6 @@
 
 namespace ScssPhp\ScssPhp\SourceMap;
 
-use ScssPhp\ScssPhp\SourceMap\Base64;
-
 /**
  * Base 64 VLQ
  *
@@ -35,6 +34,8 @@ use ScssPhp\ScssPhp\SourceMap\Base64;
  *
  * @author John Lenz <johnlenz@google.com>
  * @author Anthon Pang <anthon.pang@gmail.com>
+ *
+ * @internal
  */
 class Base64VLQ
 {
@@ -50,7 +51,7 @@ class Base64VLQ
     /**
      * Returns the VLQ encoded value.
      *
-     * @param integer $value
+     * @param int $value
      *
      * @return string
      */
@@ -61,7 +62,9 @@ class Base64VLQ
 
         do {
             $digit = $vlq & self::VLQ_BASE_MASK;
-            $vlq >>= self::VLQ_BASE_SHIFT;
+
+            //$vlq >>>= self::VLQ_BASE_SHIFT; // unsigned right shift
+            $vlq = (($vlq >> 1) & PHP_INT_MAX) >> (self::VLQ_BASE_SHIFT - 1);
 
             if ($vlq > 0) {
                 $digit |= self::VLQ_CONTINUATION_BIT;
@@ -77,9 +80,9 @@ class Base64VLQ
      * Decodes VLQValue.
      *
      * @param string $str
-     * @param integer $index
+     * @param int    $index
      *
-     * @return integer
+     * @return int
      */
     public static function decode($str, &$index)
     {
@@ -104,9 +107,9 @@ class Base64VLQ
      *   1 becomes 2 (10 binary), -1 becomes 3 (11 binary)
      *   2 becomes 4 (100 binary), -2 becomes 5 (101 binary)
      *
-     * @param integer $value
+     * @param int $value
      *
-     * @return integer
+     * @return int
      */
     private static function toVLQSigned($value)
     {
@@ -123,14 +126,16 @@ class Base64VLQ
      *   2 (10 binary) becomes 1, 3 (11 binary) becomes -1
      *   4 (100 binary) becomes 2, 5 (101 binary) becomes -2
      *
-     * @param integer $value
+     * @param int $value
      *
-     * @return integer
+     * @return int
      */
     private static function fromVLQSigned($value)
     {
         $negate = ($value & 1) === 1;
-        $value = ($value >> 1) & ~(1<<(8 * PHP_INT_SIZE - 1)); // unsigned right shift
+
+        //$value >>>= 1; // unsigned right shift
+        $value = ($value >> 1) & PHP_INT_MAX;
 
         if (! $negate) {
             return $value;
diff --git a/lib/scssphp/scssphp/src/SourceMap/SourceMapGenerator.php b/lib/scssphp/scssphp/src/SourceMap/SourceMapGenerator.php
index d0231b49d..ccd4f0261 100644
--- a/lib/scssphp/scssphp/src/SourceMap/SourceMapGenerator.php
+++ b/lib/scssphp/scssphp/src/SourceMap/SourceMapGenerator.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -20,6 +21,8 @@ use ScssPhp\ScssPhp\Exception\CompilerException;
  *
  * @author Josh Schmidt <oyejorge@gmail.com>
  * @author Nicolas FRANÇOIS <nicolas.francois@frog-labs.com>
+ *
+ * @internal
  */
 class SourceMapGenerator
 {
@@ -32,6 +35,7 @@ class SourceMapGenerator
      * Array of default options
      *
      * @var array
+     * @phpstan-var array{sourceRoot: string, sourceMapFilename: string|null, sourceMapURL: string|null, sourceMapWriteTo: string|null, outputSourceFiles: bool, sourceMapRootpath: string, sourceMapBasepath: string}
      */
     protected $defaultOptions = [
         // an optional source root, useful for relocating source files
@@ -69,6 +73,7 @@ class SourceMapGenerator
      * Array of mappings
      *
      * @var array
+     * @phpstan-var list<array{generated_line: int, generated_column: int, original_line: int, original_column: int, source_file: string}>
      */
     protected $mappings = [];
 
@@ -82,30 +87,40 @@ class SourceMapGenerator
     /**
      * File to content map
      *
-     * @var array
+     * @var array<string, string>
      */
     protected $sources = [];
+
+    /**
+     * @var array<string, int>
+     */
     protected $sourceKeys = [];
 
     /**
      * @var array
+     * @phpstan-var array{sourceRoot: string, sourceMapFilename: string|null, sourceMapURL: string|null, sourceMapWriteTo: string|null, outputSourceFiles: bool, sourceMapRootpath: string, sourceMapBasepath: string}
      */
     private $options;
 
+    /**
+     * @phpstan-param array{sourceRoot?: string, sourceMapFilename?: string|null, sourceMapURL?: string|null, sourceMapWriteTo?: string|null, outputSourceFiles?: bool, sourceMapRootpath?: string, sourceMapBasepath?: string} $options
+     */
     public function __construct(array $options = [])
     {
-        $this->options = array_merge($this->defaultOptions, $options);
+        $this->options = array_replace($this->defaultOptions, $options);
         $this->encoder = new Base64VLQ();
     }
 
     /**
      * Adds a mapping
      *
-     * @param integer $generatedLine   The line number in generated file
-     * @param integer $generatedColumn The column number in generated file
-     * @param integer $originalLine    The line number in original file
-     * @param integer $originalColumn  The column number in original file
-     * @param string  $sourceFile      The original source file
+     * @param int    $generatedLine   The line number in generated file
+     * @param int    $generatedColumn The column number in generated file
+     * @param int    $originalLine    The line number in original file
+     * @param int    $originalColumn  The column number in original file
+     * @param string $sourceFile      The original source file
+     *
+     * @return void
      */
     public function addMapping($generatedLine, $generatedColumn, $originalLine, $originalColumn, $sourceFile)
     {
@@ -125,14 +140,16 @@ class SourceMapGenerator
      *
      * @param string $content The content to write
      *
-     * @return string
+     * @return string|null
      *
      * @throws \ScssPhp\ScssPhp\Exception\CompilerException If the file could not be saved
+     * @deprecated
      */
     public function saveMap($content)
     {
         $file = $this->options['sourceMapWriteTo'];
-        $dir  = dirname($file);
+        assert($file !== null);
+        $dir  = \dirname($file);
 
         // directory does not exist
         if (! is_dir($dir)) {
@@ -153,14 +170,16 @@ class SourceMapGenerator
     /**
      * Generates the JSON source map
      *
+     * @param string $prefix A prefix added in the output file, which needs to shift mappings
+     *
      * @return string
      *
      * @see https://docs.google.com/document/d/1U1RGAehQwRypUTovF1KRlpiOFze0b-_2gc6fAH0KY0k/edit#
      */
-    public function generateJson()
+    public function generateJson($prefix = '')
     {
         $sourceMap = [];
-        $mappings  = $this->generateMappings();
+        $mappings  = $this->generateMappings($prefix);
 
         // File version (always the first entry in the object) and must be a positive integer.
         $sourceMap['version'] = self::VERSION;
@@ -183,7 +202,7 @@ class SourceMapGenerator
         // A list of original sources used by the 'mappings' entry.
         $sourceMap['sources'] = [];
 
-        foreach ($this->sources as $sourceUri => $sourceFilename) {
+        foreach ($this->sources as $sourceFilename) {
             $sourceMap['sources'][] = $this->normalizeFilename($sourceFilename);
         }
 
@@ -201,17 +220,25 @@ class SourceMapGenerator
         }
 
         // less.js compat fixes
-        if (count($sourceMap['sources']) && empty($sourceMap['sourceRoot'])) {
+        if (\count($sourceMap['sources']) && empty($sourceMap['sourceRoot'])) {
             unset($sourceMap['sourceRoot']);
         }
 
-        return json_encode($sourceMap, JSON_UNESCAPED_SLASHES);
+        $jsonSourceMap = json_encode($sourceMap, JSON_UNESCAPED_SLASHES);
+
+        if (json_last_error() !== JSON_ERROR_NONE) {
+            throw new \RuntimeException(json_last_error_msg());
+        }
+
+        assert($jsonSourceMap !== false);
+
+        return $jsonSourceMap;
     }
 
     /**
      * Returns the sources contents
      *
-     * @return array|null
+     * @return string[]|null
      */
     protected function getSourcesContent()
     {
@@ -231,14 +258,21 @@ class SourceMapGenerator
     /**
      * Generates the mappings string
      *
+     * @param string $prefix A prefix added in the output file, which needs to shift mappings
+     *
      * @return string
      */
-    public function generateMappings()
+    public function generateMappings($prefix = '')
     {
-        if (! count($this->mappings)) {
+        if (! \count($this->mappings)) {
             return '';
         }
 
+        $prefixLines = substr_count($prefix, "\n");
+        $lastPrefixNewLine = strrpos($prefix, "\n");
+        $lastPrefixLineStart = false === $lastPrefixNewLine ? 0 : $lastPrefixNewLine + 1;
+        $prefixColumn = strlen($prefix) - $lastPrefixLineStart;
+
         $this->sourceKeys = array_flip(array_keys($this->sources));
 
         // group mappings by generated line number.
@@ -249,9 +283,16 @@ class SourceMapGenerator
         }
 
         ksort($groupedMap);
+
         $lastGeneratedLine = $lastOriginalIndex = $lastOriginalLine = $lastOriginalColumn = 0;
 
         foreach ($groupedMap as $lineNumber => $lineMap) {
+            if ($lineNumber > 1) {
+                // The prefix only impacts the column for the first line of the original output
+                $prefixColumn = 0;
+            }
+            $lineNumber += $prefixLines;
+
             while (++$lastGeneratedLine < $lineNumber) {
                 $groupedMapEncoded[] = ';';
             }
@@ -260,8 +301,10 @@ class SourceMapGenerator
             $lastGeneratedColumn = 0;
 
             foreach ($lineMap as $m) {
-                $mapEncoded = $this->encoder->encode($m['generated_column'] - $lastGeneratedColumn);
-                $lastGeneratedColumn = $m['generated_column'];
+                $generatedColumn = $m['generated_column'] + $prefixColumn;
+
+                $mapEncoded = $this->encoder->encode($generatedColumn - $lastGeneratedColumn);
+                $lastGeneratedColumn = $generatedColumn;
 
                 // find the index
                 if ($m['source_file']) {
@@ -292,7 +335,7 @@ class SourceMapGenerator
      *
      * @param string $filename
      *
-     * @return integer|false
+     * @return int|false
      */
     protected function findFileIndex($filename)
     {
@@ -313,8 +356,8 @@ class SourceMapGenerator
         $basePath = $this->options['sourceMapBasepath'];
 
         // "Trim" the 'sourceMapBasepath' from the output filename.
-        if (strlen($basePath) && strpos($filename, $basePath) === 0) {
-            $filename = substr($filename, strlen($basePath));
+        if (\strlen($basePath) && strpos($filename, $basePath) === 0) {
+            $filename = substr($filename, \strlen($basePath));
         }
 
         // Remove extra leading path separators.
@@ -328,8 +371,8 @@ class SourceMapGenerator
     /**
      * Fix windows paths
      *
-     * @param string  $path
-     * @param boolean $addEndSlash
+     * @param string $path
+     * @param bool   $addEndSlash
      *
      * @return string
      */
diff --git a/lib/scssphp/scssphp/src/Type.php b/lib/scssphp/scssphp/src/Type.php
index a12da72f2..d43088785 100644
--- a/lib/scssphp/scssphp/src/Type.php
+++ b/lib/scssphp/scssphp/src/Type.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -18,52 +19,190 @@ namespace ScssPhp\ScssPhp;
  */
 class Type
 {
+    /**
+     * @internal
+     */
     const T_ASSIGN = 'assign';
+    /**
+     * @internal
+     */
     const T_AT_ROOT = 'at-root';
+    /**
+     * @internal
+     */
     const T_BLOCK = 'block';
+    /**
+     * @deprecated
+     * @internal
+     */
     const T_BREAK = 'break';
+    /**
+     * @internal
+     */
     const T_CHARSET = 'charset';
     const T_COLOR = 'color';
+    /**
+     * @internal
+     */
     const T_COMMENT = 'comment';
+    /**
+     * @deprecated
+     * @internal
+     */
     const T_CONTINUE = 'continue';
+    /**
+     * @deprecated
+     * @internal
+     */
     const T_CONTROL = 'control';
+    /**
+     * @internal
+     */
+    const T_CUSTOM_PROPERTY = 'custom';
+    /**
+     * @internal
+     */
     const T_DEBUG = 'debug';
+    /**
+     * @internal
+     */
     const T_DIRECTIVE = 'directive';
+    /**
+     * @internal
+     */
     const T_EACH = 'each';
+    /**
+     * @internal
+     */
     const T_ELSE = 'else';
+    /**
+     * @internal
+     */
     const T_ELSEIF = 'elseif';
+    /**
+     * @internal
+     */
     const T_ERROR = 'error';
+    /**
+     * @internal
+     */
     const T_EXPRESSION = 'exp';
+    /**
+     * @internal
+     */
     const T_EXTEND = 'extend';
+    /**
+     * @internal
+     */
     const T_FOR = 'for';
     const T_FUNCTION = 'function';
+    /**
+     * @internal
+     */
+    const T_FUNCTION_REFERENCE = 'function-reference';
+    /**
+     * @internal
+     */
     const T_FUNCTION_CALL = 'fncall';
+    /**
+     * @internal
+     */
     const T_HSL = 'hsl';
+    /**
+     * @internal
+     */
+    const T_HWB = 'hwb';
+    /**
+     * @internal
+     */
     const T_IF = 'if';
+    /**
+     * @internal
+     */
     const T_IMPORT = 'import';
+    /**
+     * @internal
+     */
     const T_INCLUDE = 'include';
+    /**
+     * @internal
+     */
     const T_INTERPOLATE = 'interpolate';
+    /**
+     * @internal
+     */
     const T_INTERPOLATED = 'interpolated';
+    /**
+     * @internal
+     */
     const T_KEYWORD = 'keyword';
     const T_LIST = 'list';
     const T_MAP = 'map';
+    /**
+     * @internal
+     */
     const T_MEDIA = 'media';
+    /**
+     * @internal
+     */
     const T_MEDIA_EXPRESSION = 'mediaExp';
+    /**
+     * @internal
+     */
     const T_MEDIA_TYPE = 'mediaType';
+    /**
+     * @internal
+     */
     const T_MEDIA_VALUE = 'mediaValue';
+    /**
+     * @internal
+     */
     const T_MIXIN = 'mixin';
+    /**
+     * @internal
+     */
     const T_MIXIN_CONTENT = 'mixin_content';
+    /**
+     * @internal
+     */
     const T_NESTED_PROPERTY = 'nestedprop';
+    /**
+     * @internal
+     */
     const T_NOT = 'not';
     const T_NULL = 'null';
     const T_NUMBER = 'number';
+    /**
+     * @internal
+     */
     const T_RETURN = 'return';
+    /**
+     * @internal
+     */
     const T_ROOT = 'root';
+    /**
+     * @internal
+     */
     const T_SCSSPHP_IMPORT_ONCE = 'scssphp-import-once';
+    /**
+     * @internal
+     */
     const T_SELF = 'self';
     const T_STRING = 'string';
+    /**
+     * @internal
+     */
     const T_UNARY = 'unary';
+    /**
+     * @internal
+     */
     const T_VARIABLE = 'var';
+    /**
+     * @internal
+     */
     const T_WARN = 'warn';
+    /**
+     * @internal
+     */
     const T_WHILE = 'while';
 }
diff --git a/lib/scssphp/scssphp/src/Util.php b/lib/scssphp/scssphp/src/Util.php
index b0b76fdb4..ad608ceb3 100644
--- a/lib/scssphp/scssphp/src/Util.php
+++ b/lib/scssphp/scssphp/src/Util.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -13,11 +14,14 @@ namespace ScssPhp\ScssPhp;
 
 use ScssPhp\ScssPhp\Base\Range;
 use ScssPhp\ScssPhp\Exception\RangeException;
+use ScssPhp\ScssPhp\Node\Number;
 
 /**
- * Utilty functions
+ * Utility functions
  *
  * @author Anthon Pang <anthon.pang@gmail.com>
+ *
+ * @internal
  */
 class Util
 {
@@ -25,10 +29,10 @@ class Util
      * Asserts that `value` falls within `range` (inclusive), leaving
      * room for slight floating-point errors.
      *
-     * @param string                    $name  The name of the value. Used in the error message.
-     * @param \ScssPhp\ScssPhp\Base\Range $range Range of values.
-     * @param array                     $value The value to check.
-     * @param string                    $unit  The unit of the value. Used in error reporting.
+     * @param string       $name  The name of the value. Used in the error message.
+     * @param Range        $range Range of values.
+     * @param array|Number $value The value to check.
+     * @param string       $unit  The unit of the value. Used in error reporting.
      *
      * @return mixed `value` adjusted to fall within range, if it was outside by a floating-point margin.
      *
@@ -39,6 +43,10 @@ class Util
         $val = $value[1];
         $grace = new Range(-0.00001, 0.00001);
 
+        if (! \is_numeric($val)) {
+            throw new RangeException("$name {$val} is not a number.");
+        }
+
         if ($range->includes($val)) {
             return $val;
         }
@@ -67,4 +75,110 @@ class Util
 
         return strtr(rawurlencode($string), $revert);
     }
+
+    /**
+     * mb_chr() wrapper
+     *
+     * @param int $code
+     *
+     * @return string
+     */
+    public static function mbChr($code)
+    {
+        // Use the native implementation if available, but not on PHP 7.2 as mb_chr(0) is buggy there
+        if (\PHP_VERSION_ID > 70300 && \function_exists('mb_chr')) {
+            return mb_chr($code, 'UTF-8');
+        }
+
+        if (0x80 > $code %= 0x200000) {
+            $s = \chr($code);
+        } elseif (0x800 > $code) {
+            $s = \chr(0xC0 | $code >> 6) . \chr(0x80 | $code & 0x3F);
+        } elseif (0x10000 > $code) {
+            $s = \chr(0xE0 | $code >> 12) . \chr(0x80 | $code >> 6 & 0x3F) . \chr(0x80 | $code & 0x3F);
+        } else {
+            $s = \chr(0xF0 | $code >> 18) . \chr(0x80 | $code >> 12 & 0x3F)
+                . \chr(0x80 | $code >> 6 & 0x3F) . \chr(0x80 | $code & 0x3F);
+        }
+
+        return $s;
+    }
+
+    /**
+     * mb_strlen() wrapper
+     *
+     * @param string $string
+     * @return int
+     */
+    public static function mbStrlen($string)
+    {
+        // Use the native implementation if available.
+        if (\function_exists('mb_strlen')) {
+            return mb_strlen($string, 'UTF-8');
+        }
+
+        if (\function_exists('iconv_strlen')) {
+            return (int) @iconv_strlen($string, 'UTF-8');
+        }
+
+        throw new \LogicException('Either mbstring (recommended) or iconv is necessary to use Scssphp.');
+    }
+
+    /**
+     * mb_substr() wrapper
+     * @param string $string
+     * @param int $start
+     * @param null|int $length
+     * @return string
+     */
+    public static function mbSubstr($string, $start, $length = null)
+    {
+        // Use the native implementation if available.
+        if (\function_exists('mb_substr')) {
+            return mb_substr($string, $start, $length, 'UTF-8');
+        }
+
+        if (\function_exists('iconv_substr')) {
+            if ($start < 0) {
+                $start = static::mbStrlen($string) + $start;
+                if ($start < 0) {
+                    $start = 0;
+                }
+            }
+
+            if (null === $length) {
+                $length = 2147483647;
+            } elseif ($length < 0) {
+                $length = static::mbStrlen($string) + $length - $start;
+                if ($length < 0) {
+                    return '';
+                }
+            }
+
+            return (string)iconv_substr($string, $start, $length, 'UTF-8');
+        }
+
+        throw new \LogicException('Either mbstring (recommended) or iconv is necessary to use Scssphp.');
+    }
+
+    /**
+     * mb_strpos wrapper
+     * @param string $haystack
+     * @param string $needle
+     * @param int $offset
+     *
+     * @return int|false
+     */
+    public static function mbStrpos($haystack, $needle, $offset = 0)
+    {
+        if (\function_exists('mb_strpos')) {
+            return mb_strpos($haystack, $needle, $offset, 'UTF-8');
+        }
+
+        if (\function_exists('iconv_strpos')) {
+            return iconv_strpos($haystack, $needle, $offset, 'UTF-8');
+        }
+
+        throw new \LogicException('Either mbstring (recommended) or iconv is necessary to use Scssphp.');
+    }
 }
diff --git a/lib/scssphp/scssphp/src/Util/Path.php b/lib/scssphp/scssphp/src/Util/Path.php
new file mode 100644
index 000000000..f399e41ab
--- /dev/null
+++ b/lib/scssphp/scssphp/src/Util/Path.php
@@ -0,0 +1,77 @@
+<?php
+
+namespace ScssPhp\ScssPhp\Util;
+
+/**
+ * @internal
+ */
+class Path
+{
+    /**
+     * @param string $path
+     *
+     * @return bool
+     */
+    public static function isAbsolute($path)
+    {
+        if ($path === '') {
+            return false;
+        }
+
+        if ($path[0] === '/') {
+            return true;
+        }
+
+        if (\DIRECTORY_SEPARATOR !== '\\') {
+            return false;
+        }
+
+        if ($path[0] === '\\') {
+            return true;
+        }
+
+        if (\strlen($path) < 3) {
+            return false;
+        }
+
+        if ($path[1] !== ':') {
+            return false;
+        }
+
+        if ($path[2] !== '/' && $path[2] !== '\\') {
+            return false;
+        }
+
+        if (!preg_match('/^[A-Za-z]$/', $path[0])) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param string $part1
+     * @param string $part2
+     *
+     * @return string
+     */
+    public static function join($part1, $part2)
+    {
+        if ($part1 === '' || self::isAbsolute($part2)) {
+            return $part2;
+        }
+
+        if ($part2 === '') {
+            return $part1;
+        }
+
+        $last = $part1[\strlen($part1) - 1];
+        $separator = \DIRECTORY_SEPARATOR;
+
+        if ($last === '/' || $last === \DIRECTORY_SEPARATOR) {
+            $separator = '';
+        }
+
+        return $part1 . $separator . $part2;
+    }
+}
diff --git a/lib/scssphp/scssphp/src/ValueConverter.php b/lib/scssphp/scssphp/src/ValueConverter.php
new file mode 100644
index 000000000..e12a0eb54
--- /dev/null
+++ b/lib/scssphp/scssphp/src/ValueConverter.php
@@ -0,0 +1,95 @@
+<?php
+
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2020 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://scssphp.github.io/scssphp
+ */
+
+namespace ScssPhp\ScssPhp;
+
+use ScssPhp\ScssPhp\Node\Number;
+
+final class ValueConverter
+{
+    // Prevent instantiating it
+    private function __construct()
+    {
+    }
+
+    /**
+     * Parses a value from a Scss source string.
+     *
+     * The returned value is guaranteed to be supported by the
+     * Compiler methods for registering custom variables. No other
+     * guarantee about it is provided. It should be considered
+     * opaque values by the caller.
+     *
+     * @param string $source
+     *
+     * @return mixed
+     */
+    public static function parseValue($source)
+    {
+        $parser = new Parser(__CLASS__);
+
+        if (!$parser->parseValue($source, $value)) {
+            throw new \InvalidArgumentException(sprintf('Invalid value source "%s".', $source));
+        }
+
+        return $value;
+    }
+
+    /**
+     * Converts a PHP value to a Sass value
+     *
+     * The returned value is guaranteed to be supported by the
+     * Compiler methods for registering custom variables. No other
+     * guarantee about it is provided. It should be considered
+     * opaque values by the caller.
+     *
+     * @param mixed $value
+     *
+     * @return mixed
+     */
+    public static function fromPhp($value)
+    {
+        if ($value instanceof Number) {
+            return $value;
+        }
+
+        if (is_array($value) && isset($value[0]) && \in_array($value[0], [Type::T_NULL, Type::T_COLOR, Type::T_KEYWORD, Type::T_LIST, Type::T_MAP, Type::T_STRING])) {
+            return $value;
+        }
+
+        if ($value === null) {
+            return Compiler::$null;
+        }
+
+        if ($value === true) {
+            return Compiler::$true;
+        }
+
+        if ($value === false) {
+            return Compiler::$false;
+        }
+
+        if ($value === '') {
+            return Compiler::$emptyString;
+        }
+
+        if (\is_int($value) || \is_float($value)) {
+            return new Number($value, '');
+        }
+
+        if (\is_string($value)) {
+            return [Type::T_STRING, '"', [$value]];
+        }
+
+        throw new \InvalidArgumentException(sprintf('Cannot convert the value of type "%s" to a Sass value.', gettype($value)));
+    }
+}
diff --git a/lib/scssphp/scssphp/src/Version.php b/lib/scssphp/scssphp/src/Version.php
index db3e7a3b6..0cf18ff7b 100644
--- a/lib/scssphp/scssphp/src/Version.php
+++ b/lib/scssphp/scssphp/src/Version.php
@@ -1,8 +1,9 @@
 <?php
+
 /**
  * SCSSPHP
  *
- * @copyright 2012-2019 Leaf Corcoran
+ * @copyright 2012-2020 Leaf Corcoran
  *
  * @license http://opensource.org/licenses/MIT MIT
  *
@@ -18,5 +19,5 @@ namespace ScssPhp\ScssPhp;
  */
 class Version
 {
-    const VERSION = 'v1.0.6';
+    const VERSION = '1.10.2';
 }
diff --git a/lib/scssphp/scssphp/src/Warn.php b/lib/scssphp/scssphp/src/Warn.php
new file mode 100644
index 000000000..592b44c70
--- /dev/null
+++ b/lib/scssphp/scssphp/src/Warn.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * SCSSPHP
+ *
+ * @copyright 2012-2020 Leaf Corcoran
+ *
+ * @license http://opensource.org/licenses/MIT MIT
+ *
+ * @link http://scssphp.github.io/scssphp
+ */
+
+namespace ScssPhp\ScssPhp;
+
+final class Warn
+{
+    /**
+     * @var callable|null
+     * @phpstan-var (callable(string, bool): void)|null
+     */
+    private static $callback;
+
+    /**
+     * Prints a warning message associated with the current `@import` or function call.
+     *
+     * This may only be called within a custom function or importer callback.
+     *
+     * @param string $message
+     *
+     * @return void
+     */
+    public static function warning($message)
+    {
+        self::reportWarning($message, false);
+    }
+
+    /**
+     * Prints a deprecation warning message associated with the current `@import` or function call.
+     *
+     * This may only be called within a custom function or importer callback.
+     *
+     * @param string $message
+     *
+     * @return void
+     */
+    public static function deprecation($message)
+    {
+        self::reportWarning($message, true);
+    }
+
+    /**
+     * @param callable|null $callback
+     *
+     * @return callable|null The previous warn callback
+     *
+     * @phpstan-param (callable(string, bool): void)|null $callback
+     *
+     * @phpstan-return (callable(string, bool): void)|null
+     *
+     * @internal
+     */
+    public static function setCallback(callable $callback = null)
+    {
+        $previousCallback = self::$callback;
+        self::$callback = $callback;
+
+        return $previousCallback;
+    }
+
+    /**
+     * @param string $message
+     * @param bool   $deprecation
+     *
+     * @return void
+     */
+    private static function reportWarning($message, $deprecation)
+    {
+        if (self::$callback === null) {
+            throw new \BadMethodCallException('The warning Reporter may only be called within a custom function or importer callback.');
+        }
+
+        \call_user_func(self::$callback, $message, $deprecation);
+    }
+}

From 71ceedc4bb74838125f630cf92b2a825974d8308 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Fri, 29 Apr 2022 15:00:03 +0200
Subject: [PATCH 11/15] =?UTF-8?q?:hammer:=20N=C2=B04284=20Detect=20new=20t?=
 =?UTF-8?q?est=20dirs=20on=20composer=20update?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .make/composer/rmDeniedTestDir.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.make/composer/rmDeniedTestDir.php b/.make/composer/rmDeniedTestDir.php
index 02a7278e0..a77ce1292 100644
--- a/.make/composer/rmDeniedTestDir.php
+++ b/.make/composer/rmDeniedTestDir.php
@@ -50,14 +50,24 @@ foreach ($aDeniedButStillPresent as $sDir)
 		continue;
 	}
 
-	try
-	{
+	try {
 		SetupUtils::rrmdir($sDir);
 		echo "OK Remove denied test dir: '$sDir'\n";
 	}
-	catch (\Exception $e)
-	{
+	catch (\Exception $e) {
 		echo "\nFAILED to remove denied test dir: '$sDir'\n";
 	}
+}
 
+
+$aAllowedAndDeniedDirs = array_merge(
+	$oiTopComposer->ListAllowedTestDir(),
+	$oiTopComposer->ListDeniedTestDir()
+);
+$aExistingDirs = $oiTopComposer->ListAllTestDir();
+$aMissing = array_diff($aExistingDirs, $aAllowedAndDeniedDirs);
+if (false === empty($aMissing)) {
+	echo "Some new tests dirs exists !\n"
+		.'  They must be declared either in the allowed or denied list in '.iTopComposer::class." (see N°2651).\n"
+		.'  List of dirs:'."\n".var_export($aMissing, true);
 }
\ No newline at end of file

From 0ef9bb1a47de80cfefaa43256f4b63be4186ed23 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Fri, 29 Apr 2022 14:52:45 +0200
Subject: [PATCH 12/15] =?UTF-8?q?:arrow=5Fup:=20N=C2=B04824=20Composer=20l?=
 =?UTF-8?q?ibs=20:=20update=20swiftmailer/swiftmailer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 composer.json                                 |     2 +-
 composer.lock                                 |   502 +-
 lib/composer/autoload_classmap.php            |    74 +
 lib/composer/autoload_files.php               |     6 +-
 lib/composer/autoload_psr4.php                |     6 +
 lib/composer/autoload_static.php              |   116 +-
 lib/composer/installed.json                   |   520 +-
 lib/composer/installed.php                    |    64 +-
 lib/doctrine/lexer/.doctrine-project.json     |    17 +
 lib/doctrine/lexer/.github/FUNDING.yml        |     3 +
 lib/doctrine/lexer/.gitignore                 |     2 +
 lib/doctrine/lexer/LICENSE                    |    19 +
 lib/doctrine/lexer/README.md                  |     7 +
 lib/doctrine/lexer/composer.json              |    36 +
 lib/doctrine/lexer/docs/en/dql-parser.rst     |   294 +
 lib/doctrine/lexer/docs/en/index.rst          |    53 +
 lib/doctrine/lexer/docs/en/sidebar.rst        |     6 +
 .../lexer/docs/en/simple-parser-example.rst   |   102 +
 .../Doctrine/Common/Lexer/AbstractLexer.php   |   332 +
 lib/doctrine/lexer/phpunit.xml.dist           |    26 +
 .../Common/Lexer/AbstractLexerTest.php        |   268 +
 .../Doctrine/Common/Lexer/ConcreteLexer.php   |    49 +
 lib/egulias/email-validator/LICENSE           |    19 +
 lib/egulias/email-validator/composer.json     |    38 +
 .../email-validator/src/EmailLexer.php        |   283 +
 .../email-validator/src/EmailParser.php       |   137 +
 .../email-validator/src/EmailValidator.php    |    67 +
 .../src/Exception/AtextAfterCFWS.php          |     9 +
 .../src/Exception/CRLFAtTheEnd.php            |     9 +
 .../email-validator/src/Exception/CRLFX2.php  |     9 +
 .../email-validator/src/Exception/CRNoLF.php  |     9 +
 .../src/Exception/CharNotAllowed.php          |     9 +
 .../src/Exception/CommaInDomain.php           |     9 +
 .../src/Exception/ConsecutiveAt.php           |     9 +
 .../src/Exception/ConsecutiveDot.php          |     9 +
 .../src/Exception/DomainAcceptsNoMail.php     |     9 +
 .../src/Exception/DomainHyphened.php          |     9 +
 .../src/Exception/DotAtEnd.php                |     9 +
 .../src/Exception/DotAtStart.php              |     9 +
 .../src/Exception/ExpectingAT.php             |     9 +
 .../src/Exception/ExpectingATEXT.php          |     9 +
 .../src/Exception/ExpectingCTEXT.php          |     9 +
 .../src/Exception/ExpectingDTEXT.php          |     9 +
 .../Exception/ExpectingDomainLiteralClose.php |     9 +
 .../src/Exception/ExpectingQPair.php          |     9 +
 .../src/Exception/InvalidEmail.php            |    14 +
 .../src/Exception/LocalOrReservedDomain.php   |     9 +
 .../src/Exception/NoDNSRecord.php             |     9 +
 .../src/Exception/NoDomainPart.php            |     9 +
 .../src/Exception/NoLocalPart.php             |     9 +
 .../src/Exception/UnclosedComment.php         |     9 +
 .../src/Exception/UnclosedQuotedString.php    |     9 +
 .../src/Exception/UnopenedComment.php         |     9 +
 .../email-validator/src/Parser/DomainPart.php |   443 +
 .../email-validator/src/Parser/LocalPart.php  |   145 +
 .../email-validator/src/Parser/Parser.php     |   249 +
 .../src/Validation/DNSCheckValidation.php     |   166 +
 .../src/Validation/EmailValidation.php        |    34 +
 .../src/Validation/Error/RFCWarnings.php      |    11 +
 .../src/Validation/Error/SpoofEmail.php       |    11 +
 .../Exception/EmptyValidationList.php         |    16 +
 .../src/Validation/MultipleErrors.php         |    32 +
 .../Validation/MultipleValidationWithAnd.php  |   124 +
 .../Validation/NoRFCWarningsValidation.php    |    41 +
 .../src/Validation/RFCValidation.php          |    49 +
 .../src/Validation/SpoofCheckValidation.php   |    51 +
 .../src/Warning/AddressLiteral.php            |    14 +
 .../src/Warning/CFWSNearAt.php                |    13 +
 .../src/Warning/CFWSWithFWS.php               |    13 +
 .../email-validator/src/Warning/Comment.php   |    13 +
 .../src/Warning/DeprecatedComment.php         |    13 +
 .../src/Warning/DomainLiteral.php             |    14 +
 .../src/Warning/DomainTooLong.php             |    14 +
 .../src/Warning/EmailTooLong.php              |    15 +
 .../src/Warning/IPV6BadChar.php               |    14 +
 .../src/Warning/IPV6ColonEnd.php              |    14 +
 .../src/Warning/IPV6ColonStart.php            |    14 +
 .../src/Warning/IPV6Deprecated.php            |    14 +
 .../src/Warning/IPV6DoubleColon.php           |    14 +
 .../src/Warning/IPV6GroupCount.php            |    14 +
 .../src/Warning/IPV6MaxGroups.php             |    14 +
 .../src/Warning/LabelTooLong.php              |    14 +
 .../src/Warning/LocalTooLong.php              |    15 +
 .../src/Warning/NoDNSMXRecord.php             |    14 +
 .../src/Warning/ObsoleteDTEXT.php             |    14 +
 .../src/Warning/QuotedPart.php                |    17 +
 .../src/Warning/QuotedString.php              |    17 +
 .../email-validator/src/Warning/TLD.php       |    13 +
 .../email-validator/src/Warning/Warning.php   |    47 +
 lib/swiftmailer/swiftmailer/.gitattributes    |     6 +-
 lib/swiftmailer/swiftmailer/.gitignore        |     1 +
 lib/swiftmailer/swiftmailer/.php_cs.dist      |    16 +-
 lib/swiftmailer/swiftmailer/.travis.yml       |    31 -
 lib/swiftmailer/swiftmailer/CHANGES           |   120 +-
 lib/swiftmailer/swiftmailer/LICENSE           |     2 +-
 lib/swiftmailer/swiftmailer/README            |    15 -
 lib/swiftmailer/swiftmailer/README.md         |    25 +
 lib/swiftmailer/swiftmailer/VERSION           |     1 -
 lib/swiftmailer/swiftmailer/composer.json     |    23 +-
 .../swiftmailer/lib/classes/Swift.php         |    10 +-
 .../lib/classes/Swift/AddressEncoder.php      |    25 +
 .../AddressEncoder/IdnAddressEncoder.php      |    50 +
 .../AddressEncoder/Utf8AddressEncoder.php     |    36 +
 .../classes/Swift/AddressEncoderException.php |    32 +
 .../lib/classes/Swift/Attachment.php          |    31 +-
 .../AbstractFilterableInputStream.php         |    65 +-
 .../Swift/ByteStream/ArrayByteStream.php      |    60 +-
 .../Swift/ByteStream/FileByteStream.php       |   137 +-
 .../ByteStream/TemporaryFileByteStream.php    |    14 +-
 .../GenericFixedWidthReader.php               |    20 +-
 .../Swift/CharacterReader/UsAsciiReader.php   |     4 +-
 .../Swift/CharacterReader/Utf8Reader.php      |    22 +-
 .../SimpleCharacterReaderFactory.php          |    68 +-
 .../lib/classes/Swift/CharacterStream.php     |     2 -
 .../CharacterStream/ArrayCharacterStream.php  |   140 +-
 .../CharacterStream/NgCharacterStream.php     |   113 +-
 .../lib/classes/Swift/ConfigurableSpool.php   |    12 +-
 .../lib/classes/Swift/DependencyContainer.php |   148 +-
 .../lib/classes/Swift/EmbeddedFile.php        |    22 +-
 .../classes/Swift/Encoder/Base64Encoder.php   |     2 +-
 .../lib/classes/Swift/Encoder/QpEncoder.php   |    94 +-
 .../classes/Swift/Encoder/Rfc2231Encoder.php  |    22 +-
 .../lib/classes/Swift/Encoding.php            |    62 -
 .../lib/classes/Swift/Events/CommandEvent.php |    19 +-
 .../classes/Swift/Events/CommandListener.php  |     2 -
 .../classes/Swift/Events/EventDispatcher.php  |    27 +-
 .../lib/classes/Swift/Events/EventObject.php  |    14 +-
 .../classes/Swift/Events/ResponseEvent.php    |    17 +-
 .../classes/Swift/Events/ResponseListener.php |     2 -
 .../lib/classes/Swift/Events/SendEvent.php    |    29 +-
 .../lib/classes/Swift/Events/SendListener.php |     4 -
 .../Swift/Events/SimpleEventDispatcher.php    |    68 +-
 .../Swift/Events/TransportChangeListener.php  |     8 -
 .../Swift/Events/TransportExceptionEvent.php  |     9 +-
 .../Events/TransportExceptionListener.php     |     2 -
 .../lib/classes/Swift/FailoverTransport.php   |    18 +-
 .../lib/classes/Swift/FileSpool.php           |    40 +-
 .../lib/classes/Swift/Filterable.php          |     3 +-
 .../lib/classes/Swift/IdGenerator.php         |    22 +
 .../swiftmailer/lib/classes/Swift/Image.php   |    16 +-
 .../lib/classes/Swift/InputByteStream.php     |     4 +-
 .../lib/classes/Swift/IoException.php         |     5 +-
 .../lib/classes/Swift/KeyCache.php            |     7 +-
 .../classes/Swift/KeyCache/ArrayKeyCache.php  |    67 +-
 .../classes/Swift/KeyCache/DiskKeyCache.php   |   135 +-
 .../Swift/KeyCache/KeyCacheInputStream.php    |     4 -
 .../classes/Swift/KeyCache/NullKeyCache.php   |    12 +-
 .../KeyCache/SimpleKeyCacheInputStream.php    |    32 +-
 .../classes/Swift/LoadBalancedTransport.php   |    18 +-
 .../lib/classes/Swift/MailTransport.php       |    47 -
 .../swiftmailer/lib/classes/Swift/Mailer.php  |    36 +-
 .../Swift/Mailer/ArrayRecipientIterator.php   |    10 +-
 .../lib/classes/Swift/MemorySpool.php         |     6 +-
 .../swiftmailer/lib/classes/Swift/Message.php |    64 +-
 .../lib/classes/Swift/Mime/Attachment.php     |    35 +-
 .../ContentEncoder/Base64ContentEncoder.php   |    21 +-
 .../ContentEncoder/NativeQpContentEncoder.php |    24 +-
 .../ContentEncoder/NullContentEncoder.php     |    79 +
 .../ContentEncoder/PlainContentEncoder.php    |    50 +-
 .../Mime/ContentEncoder/QpContentEncoder.php  |    40 +-
 .../ContentEncoder/QpContentEncoderProxy.php  |     6 +-
 .../Mime/ContentEncoder/RawContentEncoder.php |     9 +-
 .../lib/classes/Swift/Mime/EmbeddedFile.php   |    10 +-
 .../classes/Swift/Mime/EncodingObserver.php   |     2 -
 .../lib/classes/Swift/Mime/Grammar.php        |   176 -
 .../lib/classes/Swift/Mime/Header.php         |     2 +-
 .../HeaderEncoder/Base64HeaderEncoder.php     |     2 +-
 .../Mime/HeaderEncoder/QpHeaderEncoder.php    |     6 +-
 .../lib/classes/Swift/Mime/HeaderFactory.php  |    78 -
 .../lib/classes/Swift/Mime/HeaderSet.php      |   169 -
 .../Swift/Mime/Headers/AbstractHeader.php     |   193 +-
 .../classes/Swift/Mime/Headers/DateHeader.php |    60 +-
 .../Mime/Headers/IdentificationHeader.php     |    59 +-
 .../Swift/Mime/Headers/MailboxHeader.php      |    61 +-
 .../Swift/Mime/Headers/OpenDKIMHeader.php     |    18 +-
 .../Mime/Headers/ParameterizedHeader.php      |    69 +-
 .../classes/Swift/Mime/Headers/PathHeader.php |    46 +-
 .../Swift/Mime/Headers/UnstructuredHeader.php |    17 +-
 .../lib/classes/Swift/Mime/IdGenerator.php    |    54 +
 .../lib/classes/Swift/Mime/Message.php        |   223 -
 .../lib/classes/Swift/Mime/MimeEntity.php     |   117 -
 .../lib/classes/Swift/Mime/MimePart.php       |    83 +-
 .../Swift/Mime/ParameterizedHeader.php        |    34 -
 .../Swift/Mime/SimpleHeaderFactory.php        |    90 +-
 .../classes/Swift/Mime/SimpleHeaderSet.php    |   171 +-
 .../lib/classes/Swift/Mime/SimpleMessage.php  |   151 +-
 .../classes/Swift/Mime/SimpleMimeEntity.php   |   442 +-
 .../lib/classes/Swift/MimePart.php            |    18 +-
 .../lib/classes/Swift/NullTransport.php       |    14 +-
 .../classes/Swift/Plugins/AntiFloodPlugin.php |    36 +-
 .../Swift/Plugins/BandwidthMonitorPlugin.php  |    40 +-
 .../classes/Swift/Plugins/DecoratorPlugin.php |    74 +-
 .../Swift/Plugins/ImpersonatePlugin.php       |    10 +-
 .../classes/Swift/Plugins/LoggerPlugin.php    |    52 +-
 .../Swift/Plugins/Loggers/ArrayLogger.php     |    16 +-
 .../Swift/Plugins/Loggers/EchoLogger.php      |     6 +-
 .../classes/Swift/Plugins/MessageLogger.php   |    14 +-
 .../Swift/Plugins/PopBeforeSmtpPlugin.php     |   135 +-
 .../Swift/Plugins/RedirectingPlugin.php       |    66 +-
 .../lib/classes/Swift/Plugins/Reporter.php    |     7 +-
 .../classes/Swift/Plugins/ReporterPlugin.php  |    14 +-
 .../Swift/Plugins/Reporters/HitReporter.php   |    21 +-
 .../Swift/Plugins/Reporters/HtmlReporter.php  |     7 +-
 .../classes/Swift/Plugins/ThrottlerPlugin.php |    62 +-
 .../lib/classes/Swift/Preferences.php         |    10 +-
 .../lib/classes/Swift/SendmailTransport.php   |    16 +-
 .../lib/classes/Swift/SignedMessage.php       |    23 -
 .../swiftmailer/lib/classes/Swift/Signer.php  |     1 -
 .../lib/classes/Swift/Signers/BodySigner.php  |     2 -
 .../lib/classes/Swift/Signers/DKIMSigner.php  |   340 +-
 .../classes/Swift/Signers/DomainKeySigner.php |   210 +-
 .../classes/Swift/Signers/HeaderSigner.php    |     8 +-
 .../classes/Swift/Signers/OpenDKIMSigner.php  |    87 +-
 .../lib/classes/Swift/Signers/SMimeSigner.php |   508 +-
 .../lib/classes/Swift/SmtpTransport.php       |    33 +-
 .../swiftmailer/lib/classes/Swift/Spool.php   |     4 +-
 .../lib/classes/Swift/SpoolTransport.php      |    18 +-
 .../ByteArrayReplacementFilter.php            |    82 +-
 .../StreamFilters/StringReplacementFilter.php |    12 +-
 .../StringReplacementFilterFactory.php        |    16 +-
 .../lib/classes/Swift/SwiftException.php      |     5 +-
 .../lib/classes/Swift/Transport.php           |    32 +-
 .../Swift/Transport/AbstractSmtpTransport.php |   356 +-
 .../Esmtp/Auth/CramMd5Authenticator.php       |    32 +-
 .../Esmtp/Auth/LoginAuthenticator.php         |    18 +-
 .../Esmtp/Auth/NTLMAuthenticator.php          |   166 +-
 .../Esmtp/Auth/PlainAuthenticator.php         |    16 +-
 .../Esmtp/Auth/XOAuth2Authenticator.php       |    16 +-
 .../Swift/Transport/Esmtp/AuthHandler.php     |    81 +-
 .../Swift/Transport/Esmtp/Authenticator.php   |     9 +-
 .../Transport/Esmtp/EightBitMimeHandler.php   |   113 +
 .../Swift/Transport/Esmtp/SmtpUtf8Handler.php |   107 +
 .../classes/Swift/Transport/EsmtpHandler.php  |     4 +-
 .../Swift/Transport/EsmtpTransport.php        |   195 +-
 .../Swift/Transport/FailoverTransport.php     |    55 +-
 .../lib/classes/Swift/Transport/IoBuffer.php  |     2 -
 .../Swift/Transport/LoadBalancedTransport.php |    71 +-
 .../classes/Swift/Transport/MailInvoker.php   |    32 -
 .../classes/Swift/Transport/MailTransport.php |   297 -
 .../classes/Swift/Transport/NullTransport.php |    33 +-
 .../Swift/Transport/SendmailTransport.php     |    48 +-
 .../Swift/Transport/SimpleMailInvoker.php     |    39 -
 .../lib/classes/Swift/Transport/SmtpAgent.php |     2 +-
 .../Swift/Transport/SpoolTransport.php        |    39 +-
 .../classes/Swift/Transport/StreamBuffer.php  |   215 +-
 .../lib/classes/Swift/TransportException.php  |     5 +-
 .../lib/classes/Swift/Validate.php            |    43 -
 .../lib/dependency_maps/cache_deps.php        |     4 +-
 .../lib/dependency_maps/mime_deps.php         |    87 +-
 .../lib/dependency_maps/transport_deps.php    |    69 +-
 .../swiftmailer/lib/mime_types.php            |     4 +-
 .../swiftmailer/lib/preferences.php           |     6 -
 .../swiftmailer/lib/swift_init.php            |    28 -
 .../swiftmailer/lib/swift_required.php        |    26 +-
 .../swiftmailer/lib/swift_required_pear.php   |    30 -
 .../lib/swiftmailer_generate_mimes_config.php |    43 +-
 lib/swiftmailer/swiftmailer/phpunit.xml.dist  |    39 -
 lib/symfony/polyfill-iconv/Iconv.php          |   745 +
 lib/symfony/polyfill-iconv/LICENSE            |    19 +
 lib/symfony/polyfill-iconv/README.md          |    14 +
 .../Resources/charset/from.big5.php           | 13719 ++++++++++++++++
 .../Resources/charset/from.cp037.php          |   Bin 0 -> 3779 bytes
 .../Resources/charset/from.cp1006.php         |   Bin 0 -> 3860 bytes
 .../Resources/charset/from.cp1026.php         |   Bin 0 -> 3779 bytes
 .../Resources/charset/from.cp424.php          |   Bin 0 -> 3210 bytes
 .../Resources/charset/from.cp437.php          |   Bin 0 -> 3841 bytes
 .../Resources/charset/from.cp500.php          |   Bin 0 -> 3779 bytes
 .../Resources/charset/from.cp737.php          |   Bin 0 -> 3834 bytes
 .../Resources/charset/from.cp775.php          |   Bin 0 -> 3815 bytes
 .../Resources/charset/from.cp850.php          |   Bin 0 -> 3809 bytes
 .../Resources/charset/from.cp852.php          |   Bin 0 -> 3808 bytes
 .../Resources/charset/from.cp855.php          |   Bin 0 -> 3809 bytes
 .../Resources/charset/from.cp856.php          |   Bin 0 -> 3194 bytes
 .../Resources/charset/from.cp857.php          |   Bin 0 -> 3763 bytes
 .../Resources/charset/from.cp860.php          |   Bin 0 -> 3840 bytes
 .../Resources/charset/from.cp861.php          |   Bin 0 -> 3841 bytes
 .../Resources/charset/from.cp862.php          |   Bin 0 -> 3841 bytes
 .../Resources/charset/from.cp863.php          |   Bin 0 -> 3841 bytes
 .../Resources/charset/from.cp864.php          |   Bin 0 -> 3779 bytes
 .../Resources/charset/from.cp865.php          |   Bin 0 -> 3841 bytes
 .../Resources/charset/from.cp866.php          |   Bin 0 -> 3831 bytes
 .../Resources/charset/from.cp869.php          |   Bin 0 -> 3676 bytes
 .../Resources/charset/from.cp874.php          |   Bin 0 -> 3410 bytes
 .../Resources/charset/from.cp875.php          |   Bin 0 -> 3776 bytes
 .../Resources/charset/from.cp932.php          |   Bin 0 -> 134095 bytes
 .../Resources/charset/from.cp936.php          |   Bin 0 -> 372283 bytes
 .../Resources/charset/from.cp949.php          |   Bin 0 -> 291504 bytes
 .../Resources/charset/from.cp950.php          |   Bin 0 -> 231436 bytes
 .../Resources/charset/from.iso-8859-1.php     |   Bin 0 -> 3779 bytes
 .../Resources/charset/from.iso-8859-10.php    |   Bin 0 -> 3780 bytes
 .../Resources/charset/from.iso-8859-11.php    |   Bin 0 -> 3746 bytes
 .../Resources/charset/from.iso-8859-13.php    |   Bin 0 -> 3783 bytes
 .../Resources/charset/from.iso-8859-14.php    |   Bin 0 -> 3801 bytes
 .../Resources/charset/from.iso-8859-15.php    |   Bin 0 -> 3780 bytes
 .../Resources/charset/from.iso-8859-16.php    |   Bin 0 -> 3782 bytes
 .../Resources/charset/from.iso-8859-2.php     |   Bin 0 -> 3779 bytes
 .../Resources/charset/from.iso-8859-3.php     |   Bin 0 -> 3674 bytes
 .../Resources/charset/from.iso-8859-4.php     |   Bin 0 -> 3779 bytes
 .../Resources/charset/from.iso-8859-5.php     |   Bin 0 -> 3780 bytes
 .../Resources/charset/from.iso-8859-6.php     |   Bin 0 -> 3104 bytes
 .../Resources/charset/from.iso-8859-7.php     |   Bin 0 -> 3692 bytes
 .../Resources/charset/from.iso-8859-8.php     |   Bin 0 -> 3242 bytes
 .../Resources/charset/from.iso-8859-9.php     |   Bin 0 -> 3779 bytes
 .../Resources/charset/from.koi8-r.php         |   Bin 0 -> 3835 bytes
 .../Resources/charset/from.koi8-u.php         |   Bin 0 -> 3827 bytes
 .../Resources/charset/from.us-ascii.php       |   Bin 0 -> 1859 bytes
 .../Resources/charset/from.windows-1250.php   |   Bin 0 -> 3721 bytes
 .../Resources/charset/from.windows-1251.php   |   Bin 0 -> 3782 bytes
 .../Resources/charset/from.windows-1252.php   |   Bin 0 -> 3721 bytes
 .../Resources/charset/from.windows-1253.php   |   Bin 0 -> 3542 bytes
 .../Resources/charset/from.windows-1254.php   |   Bin 0 -> 3691 bytes
 .../Resources/charset/from.windows-1255.php   |   Bin 0 -> 3454 bytes
 .../Resources/charset/from.windows-1256.php   |   Bin 0 -> 3800 bytes
 .../Resources/charset/from.windows-1257.php   |   Bin 0 -> 3616 bytes
 .../Resources/charset/from.windows-1258.php   |   Bin 0 -> 3662 bytes
 .../Resources/charset/translit.php            |  4103 +++++
 lib/symfony/polyfill-iconv/bootstrap.php      |    84 +
 lib/symfony/polyfill-iconv/composer.json      |    38 +
 lib/symfony/polyfill-intl-idn/Idn.php         |   923 ++
 lib/symfony/polyfill-intl-idn/Info.php        |    23 +
 lib/symfony/polyfill-intl-idn/LICENSE         |    19 +
 lib/symfony/polyfill-intl-idn/README.md       |    12 +
 .../Resources/unidata/DisallowedRanges.php    |   375 +
 .../Resources/unidata/Regex.php               |    24 +
 .../Resources/unidata/deviation.php           |     8 +
 .../Resources/unidata/disallowed.php          |  2638 +++
 .../unidata/disallowed_STD3_mapped.php        |   308 +
 .../unidata/disallowed_STD3_valid.php         |    71 +
 .../Resources/unidata/ignored.php             |   273 +
 .../Resources/unidata/mapped.php              |  5778 +++++++
 .../Resources/unidata/virama.php              |    65 +
 lib/symfony/polyfill-intl-idn/bootstrap.php   |   141 +
 lib/symfony/polyfill-intl-idn/composer.json   |    45 +
 lib/symfony/polyfill-intl-normalizer/LICENSE  |    19 +
 .../polyfill-intl-normalizer/Normalizer.php   |   308 +
 .../polyfill-intl-normalizer/README.md        |    14 +
 .../Resources/stubs/Normalizer.php            |    17 +
 .../unidata/canonicalComposition.php          |   945 ++
 .../unidata/canonicalDecomposition.php        |  2065 +++
 .../Resources/unidata/combiningClass.php      |   876 +
 .../unidata/compatibilityDecomposition.php    |  3695 +++++
 .../polyfill-intl-normalizer/bootstrap.php    |    19 +
 .../polyfill-intl-normalizer/composer.json    |    39 +
 lib/symfony/polyfill-php72/LICENSE            |    19 +
 lib/symfony/polyfill-php72/Php72.php          |   217 +
 lib/symfony/polyfill-php72/README.md          |    28 +
 lib/symfony/polyfill-php72/bootstrap.php      |    57 +
 lib/symfony/polyfill-php72/composer.json      |    35 +
 348 files changed, 46727 insertions(+), 5172 deletions(-)
 create mode 100644 lib/doctrine/lexer/.doctrine-project.json
 create mode 100644 lib/doctrine/lexer/.github/FUNDING.yml
 create mode 100644 lib/doctrine/lexer/.gitignore
 create mode 100644 lib/doctrine/lexer/LICENSE
 create mode 100644 lib/doctrine/lexer/README.md
 create mode 100644 lib/doctrine/lexer/composer.json
 create mode 100644 lib/doctrine/lexer/docs/en/dql-parser.rst
 create mode 100644 lib/doctrine/lexer/docs/en/index.rst
 create mode 100644 lib/doctrine/lexer/docs/en/sidebar.rst
 create mode 100644 lib/doctrine/lexer/docs/en/simple-parser-example.rst
 create mode 100644 lib/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
 create mode 100644 lib/doctrine/lexer/phpunit.xml.dist
 create mode 100644 lib/doctrine/lexer/tests/Doctrine/Common/Lexer/AbstractLexerTest.php
 create mode 100644 lib/doctrine/lexer/tests/Doctrine/Common/Lexer/ConcreteLexer.php
 create mode 100644 lib/egulias/email-validator/LICENSE
 create mode 100644 lib/egulias/email-validator/composer.json
 create mode 100644 lib/egulias/email-validator/src/EmailLexer.php
 create mode 100644 lib/egulias/email-validator/src/EmailParser.php
 create mode 100644 lib/egulias/email-validator/src/EmailValidator.php
 create mode 100644 lib/egulias/email-validator/src/Exception/AtextAfterCFWS.php
 create mode 100644 lib/egulias/email-validator/src/Exception/CRLFAtTheEnd.php
 create mode 100644 lib/egulias/email-validator/src/Exception/CRLFX2.php
 create mode 100644 lib/egulias/email-validator/src/Exception/CRNoLF.php
 create mode 100644 lib/egulias/email-validator/src/Exception/CharNotAllowed.php
 create mode 100644 lib/egulias/email-validator/src/Exception/CommaInDomain.php
 create mode 100644 lib/egulias/email-validator/src/Exception/ConsecutiveAt.php
 create mode 100644 lib/egulias/email-validator/src/Exception/ConsecutiveDot.php
 create mode 100644 lib/egulias/email-validator/src/Exception/DomainAcceptsNoMail.php
 create mode 100644 lib/egulias/email-validator/src/Exception/DomainHyphened.php
 create mode 100644 lib/egulias/email-validator/src/Exception/DotAtEnd.php
 create mode 100644 lib/egulias/email-validator/src/Exception/DotAtStart.php
 create mode 100644 lib/egulias/email-validator/src/Exception/ExpectingAT.php
 create mode 100644 lib/egulias/email-validator/src/Exception/ExpectingATEXT.php
 create mode 100644 lib/egulias/email-validator/src/Exception/ExpectingCTEXT.php
 create mode 100644 lib/egulias/email-validator/src/Exception/ExpectingDTEXT.php
 create mode 100644 lib/egulias/email-validator/src/Exception/ExpectingDomainLiteralClose.php
 create mode 100644 lib/egulias/email-validator/src/Exception/ExpectingQPair.php
 create mode 100644 lib/egulias/email-validator/src/Exception/InvalidEmail.php
 create mode 100644 lib/egulias/email-validator/src/Exception/LocalOrReservedDomain.php
 create mode 100644 lib/egulias/email-validator/src/Exception/NoDNSRecord.php
 create mode 100644 lib/egulias/email-validator/src/Exception/NoDomainPart.php
 create mode 100644 lib/egulias/email-validator/src/Exception/NoLocalPart.php
 create mode 100644 lib/egulias/email-validator/src/Exception/UnclosedComment.php
 create mode 100644 lib/egulias/email-validator/src/Exception/UnclosedQuotedString.php
 create mode 100644 lib/egulias/email-validator/src/Exception/UnopenedComment.php
 create mode 100644 lib/egulias/email-validator/src/Parser/DomainPart.php
 create mode 100644 lib/egulias/email-validator/src/Parser/LocalPart.php
 create mode 100644 lib/egulias/email-validator/src/Parser/Parser.php
 create mode 100644 lib/egulias/email-validator/src/Validation/DNSCheckValidation.php
 create mode 100644 lib/egulias/email-validator/src/Validation/EmailValidation.php
 create mode 100644 lib/egulias/email-validator/src/Validation/Error/RFCWarnings.php
 create mode 100644 lib/egulias/email-validator/src/Validation/Error/SpoofEmail.php
 create mode 100644 lib/egulias/email-validator/src/Validation/Exception/EmptyValidationList.php
 create mode 100644 lib/egulias/email-validator/src/Validation/MultipleErrors.php
 create mode 100644 lib/egulias/email-validator/src/Validation/MultipleValidationWithAnd.php
 create mode 100644 lib/egulias/email-validator/src/Validation/NoRFCWarningsValidation.php
 create mode 100644 lib/egulias/email-validator/src/Validation/RFCValidation.php
 create mode 100644 lib/egulias/email-validator/src/Validation/SpoofCheckValidation.php
 create mode 100644 lib/egulias/email-validator/src/Warning/AddressLiteral.php
 create mode 100644 lib/egulias/email-validator/src/Warning/CFWSNearAt.php
 create mode 100644 lib/egulias/email-validator/src/Warning/CFWSWithFWS.php
 create mode 100644 lib/egulias/email-validator/src/Warning/Comment.php
 create mode 100644 lib/egulias/email-validator/src/Warning/DeprecatedComment.php
 create mode 100644 lib/egulias/email-validator/src/Warning/DomainLiteral.php
 create mode 100644 lib/egulias/email-validator/src/Warning/DomainTooLong.php
 create mode 100644 lib/egulias/email-validator/src/Warning/EmailTooLong.php
 create mode 100644 lib/egulias/email-validator/src/Warning/IPV6BadChar.php
 create mode 100644 lib/egulias/email-validator/src/Warning/IPV6ColonEnd.php
 create mode 100644 lib/egulias/email-validator/src/Warning/IPV6ColonStart.php
 create mode 100644 lib/egulias/email-validator/src/Warning/IPV6Deprecated.php
 create mode 100644 lib/egulias/email-validator/src/Warning/IPV6DoubleColon.php
 create mode 100644 lib/egulias/email-validator/src/Warning/IPV6GroupCount.php
 create mode 100644 lib/egulias/email-validator/src/Warning/IPV6MaxGroups.php
 create mode 100644 lib/egulias/email-validator/src/Warning/LabelTooLong.php
 create mode 100644 lib/egulias/email-validator/src/Warning/LocalTooLong.php
 create mode 100644 lib/egulias/email-validator/src/Warning/NoDNSMXRecord.php
 create mode 100644 lib/egulias/email-validator/src/Warning/ObsoleteDTEXT.php
 create mode 100644 lib/egulias/email-validator/src/Warning/QuotedPart.php
 create mode 100644 lib/egulias/email-validator/src/Warning/QuotedString.php
 create mode 100644 lib/egulias/email-validator/src/Warning/TLD.php
 create mode 100644 lib/egulias/email-validator/src/Warning/Warning.php
 delete mode 100644 lib/swiftmailer/swiftmailer/.travis.yml
 delete mode 100644 lib/swiftmailer/swiftmailer/README
 create mode 100644 lib/swiftmailer/swiftmailer/README.md
 delete mode 100644 lib/swiftmailer/swiftmailer/VERSION
 create mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder.php
 create mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/IdnAddressEncoder.php
 create mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/Utf8AddressEncoder.php
 create mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoderException.php
 delete mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php
 create mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/IdGenerator.php
 delete mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php
 create mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NullContentEncoder.php
 delete mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Grammar.php
 delete mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php
 delete mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php
 create mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/IdGenerator.php
 delete mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Message.php
 delete mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php
 delete mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php
 delete mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/SignedMessage.php
 create mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/EightBitMimeHandler.php
 create mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/SmtpUtf8Handler.php
 delete mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php
 delete mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php
 delete mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php
 delete mode 100644 lib/swiftmailer/swiftmailer/lib/classes/Swift/Validate.php
 delete mode 100644 lib/swiftmailer/swiftmailer/lib/swift_init.php
 delete mode 100644 lib/swiftmailer/swiftmailer/lib/swift_required_pear.php
 delete mode 100644 lib/swiftmailer/swiftmailer/phpunit.xml.dist
 create mode 100644 lib/symfony/polyfill-iconv/Iconv.php
 create mode 100644 lib/symfony/polyfill-iconv/LICENSE
 create mode 100644 lib/symfony/polyfill-iconv/README.md
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.big5.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp037.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp1006.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp1026.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp424.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp437.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp500.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp737.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp775.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp850.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp852.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp855.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp856.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp857.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp860.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp861.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp862.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp863.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp864.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp865.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp866.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp869.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp874.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp875.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp932.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp936.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp949.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.cp950.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-1.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-10.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-11.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-13.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-14.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-15.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-16.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-2.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-3.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-4.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-5.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-6.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-7.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-8.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-9.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.koi8-r.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.koi8-u.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.us-ascii.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.windows-1250.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.windows-1251.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.windows-1252.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.windows-1253.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.windows-1254.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.windows-1255.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.windows-1256.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.windows-1257.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/from.windows-1258.php
 create mode 100644 lib/symfony/polyfill-iconv/Resources/charset/translit.php
 create mode 100644 lib/symfony/polyfill-iconv/bootstrap.php
 create mode 100644 lib/symfony/polyfill-iconv/composer.json
 create mode 100644 lib/symfony/polyfill-intl-idn/Idn.php
 create mode 100644 lib/symfony/polyfill-intl-idn/Info.php
 create mode 100644 lib/symfony/polyfill-intl-idn/LICENSE
 create mode 100644 lib/symfony/polyfill-intl-idn/README.md
 create mode 100644 lib/symfony/polyfill-intl-idn/Resources/unidata/DisallowedRanges.php
 create mode 100644 lib/symfony/polyfill-intl-idn/Resources/unidata/Regex.php
 create mode 100644 lib/symfony/polyfill-intl-idn/Resources/unidata/deviation.php
 create mode 100644 lib/symfony/polyfill-intl-idn/Resources/unidata/disallowed.php
 create mode 100644 lib/symfony/polyfill-intl-idn/Resources/unidata/disallowed_STD3_mapped.php
 create mode 100644 lib/symfony/polyfill-intl-idn/Resources/unidata/disallowed_STD3_valid.php
 create mode 100644 lib/symfony/polyfill-intl-idn/Resources/unidata/ignored.php
 create mode 100644 lib/symfony/polyfill-intl-idn/Resources/unidata/mapped.php
 create mode 100644 lib/symfony/polyfill-intl-idn/Resources/unidata/virama.php
 create mode 100644 lib/symfony/polyfill-intl-idn/bootstrap.php
 create mode 100644 lib/symfony/polyfill-intl-idn/composer.json
 create mode 100644 lib/symfony/polyfill-intl-normalizer/LICENSE
 create mode 100644 lib/symfony/polyfill-intl-normalizer/Normalizer.php
 create mode 100644 lib/symfony/polyfill-intl-normalizer/README.md
 create mode 100644 lib/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php
 create mode 100644 lib/symfony/polyfill-intl-normalizer/Resources/unidata/canonicalComposition.php
 create mode 100644 lib/symfony/polyfill-intl-normalizer/Resources/unidata/canonicalDecomposition.php
 create mode 100644 lib/symfony/polyfill-intl-normalizer/Resources/unidata/combiningClass.php
 create mode 100644 lib/symfony/polyfill-intl-normalizer/Resources/unidata/compatibilityDecomposition.php
 create mode 100644 lib/symfony/polyfill-intl-normalizer/bootstrap.php
 create mode 100644 lib/symfony/polyfill-intl-normalizer/composer.json
 create mode 100644 lib/symfony/polyfill-php72/LICENSE
 create mode 100644 lib/symfony/polyfill-php72/Php72.php
 create mode 100644 lib/symfony/polyfill-php72/README.md
 create mode 100644 lib/symfony/polyfill-php72/bootstrap.php
 create mode 100644 lib/symfony/polyfill-php72/composer.json

diff --git a/composer.json b/composer.json
index 50fa493a4..6612b101b 100644
--- a/composer.json
+++ b/composer.json
@@ -15,7 +15,7 @@
     "pear/archive_tar": "~1.4.14",
     "pelago/emogrifier": "~3.1.0",
     "scssphp/scssphp": "~1.10.2",
-    "swiftmailer/swiftmailer": "5.4.12",
+    "swiftmailer/swiftmailer": "~6.3.0",
     "symfony/console": "~3.4.47",
     "symfony/dotenv": "~3.4.47",
     "symfony/framework-bundle": "~3.4.47",
diff --git a/composer.lock b/composer.lock
index 28df02e52..7e7def5f1 100644
--- a/composer.lock
+++ b/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": "8187e0bd608a597a5151a468aa1f4c7a",
+    "content-hash": "781e902cab2de8cfdfefbb4a62cc1b01",
     "packages": [
         {
             "name": "combodo/tcpdf",
@@ -84,6 +84,138 @@
             ],
             "time": "2022-03-10T14:36:39+00:00"
         },
+        {
+            "name": "doctrine/lexer",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/lexer.git",
+                "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8",
+                "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
+            "homepage": "https://www.doctrine-project.org/projects/lexer.html",
+            "keywords": [
+                "annotations",
+                "docblock",
+                "lexer",
+                "parser",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/lexer/issues",
+                "source": "https://github.com/doctrine/lexer/tree/1.0.2"
+            },
+            "time": "2019-06-08T11:03:04+00:00"
+        },
+        {
+            "name": "egulias/email-validator",
+            "version": "2.1.25",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/egulias/EmailValidator.git",
+                "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4",
+                "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/lexer": "^1.0.1",
+                "php": ">=5.5",
+                "symfony/polyfill-intl-idn": "^1.10"
+            },
+            "require-dev": {
+                "dominicsayers/isemail": "^3.0.7",
+                "phpunit/phpunit": "^4.8.36|^7.5.15",
+                "satooshi/php-coveralls": "^1.0.1"
+            },
+            "suggest": {
+                "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Egulias\\EmailValidator\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Eduardo Gulias Davis"
+                }
+            ],
+            "description": "A library for validating emails against several RFCs",
+            "homepage": "https://github.com/egulias/EmailValidator",
+            "keywords": [
+                "email",
+                "emailvalidation",
+                "emailvalidator",
+                "validation",
+                "validator"
+            ],
+            "support": {
+                "issues": "https://github.com/egulias/EmailValidator/issues",
+                "source": "https://github.com/egulias/EmailValidator/tree/2.1.25"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/egulias",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-12-29T14:50:06+00:00"
+        },
         {
             "name": "nikic/php-parser",
             "version": "v4.13.2",
@@ -759,29 +891,36 @@
         },
         {
             "name": "swiftmailer/swiftmailer",
-            "version": "v5.4.12",
+            "version": "v6.3.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "181b89f18a90f8925ef805f950d47a7190e9b950"
+                "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/181b89f18a90f8925ef805f950d47a7190e9b950",
-                "reference": "181b89f18a90f8925ef805f950d47a7190e9b950",
+                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c",
+                "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "egulias/email-validator": "^2.0|^3.1",
+                "php": ">=7.0.0",
+                "symfony/polyfill-iconv": "^1.0",
+                "symfony/polyfill-intl-idn": "^1.10",
+                "symfony/polyfill-mbstring": "^1.0"
             },
             "require-dev": {
-                "mockery/mockery": "~0.9.1",
-                "symfony/phpunit-bridge": "~3.2"
+                "mockery/mockery": "^1.0",
+                "symfony/phpunit-bridge": "^4.4|^5.4"
+            },
+            "suggest": {
+                "ext-intl": "Needed to support internationalized email addresses"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.4-dev"
+                    "dev-master": "6.2-dev"
                 }
             },
             "autoload": {
@@ -809,7 +948,22 @@
                 "mail",
                 "mailer"
             ],
-            "time": "2018-07-31T09:26:32+00:00"
+            "support": {
+                "issues": "https://github.com/swiftmailer/swiftmailer/issues",
+                "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/swiftmailer/swiftmailer",
+                    "type": "tidelift"
+                }
+            ],
+            "abandoned": "symfony/mailer",
+            "time": "2021-10-18T15:26:12+00:00"
         },
         {
             "name": "symfony/cache",
@@ -2056,6 +2210,258 @@
             ],
             "time": "2020-10-23T09:01:57+00:00"
         },
+        {
+            "name": "symfony/polyfill-iconv",
+            "version": "v1.19.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-iconv.git",
+                "reference": "085241787d52fa6f7a774fd034135fef0cfd5496"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/085241787d52fa6f7a774fd034135fef0cfd5496",
+                "reference": "085241787d52fa6f7a774fd034135fef0cfd5496",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-iconv": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Iconv\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Iconv extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "iconv",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-iconv/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-23T09:01:57+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-idn",
+            "version": "v1.19.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-idn.git",
+                "reference": "4ad5115c0f5d5172a9fe8147675ec6de266d8826"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/4ad5115c0f5d5172a9fe8147675ec6de266d8826",
+                "reference": "4ad5115c0f5d5172a9fe8147675ec6de266d8826",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "symfony/polyfill-intl-normalizer": "^1.10",
+                "symfony/polyfill-php70": "^1.10",
+                "symfony/polyfill-php72": "^1.10"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Laurent Bassin",
+                    "email": "laurent@bassin.info"
+                },
+                {
+                    "name": "Trevor Rowbotham",
+                    "email": "trevor.rowbotham@pm.me"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "idn",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-21T09:57:48+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-normalizer",
+            "version": "v1.19.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "8db0ae7936b42feb370840cf24de1a144fb0ef27"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8db0ae7936b42feb370840cf24de1a144fb0ef27",
+                "reference": "8db0ae7936b42feb370840cf24de1a144fb0ef27",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's Normalizer class and related functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "intl",
+                "normalizer",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-23T09:01:57+00:00"
+        },
         {
             "name": "symfony/polyfill-mbstring",
             "version": "v1.19.0",
@@ -2293,6 +2699,82 @@
             ],
             "time": "2020-10-23T09:01:57+00:00"
         },
+        {
+            "name": "symfony/polyfill-php72",
+            "version": "v1.19.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php72.git",
+                "reference": "beecef6b463b06954638f02378f52496cb84bacc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/beecef6b463b06954638f02378f52496cb84bacc",
+                "reference": "beecef6b463b06954638f02378f52496cb84bacc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php72\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2020-10-23T09:01:57+00:00"
+        },
         {
             "name": "symfony/polyfill-util",
             "version": "v1.19.0",
diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index 6949d28f6..b2e6f9507 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -234,7 +234,73 @@ return array(
     'DisplayableNode' => $baseDir . '/core/displayablegraph.class.inc.php',
     'DisplayableRedundancyNode' => $baseDir . '/core/displayablegraph.class.inc.php',
     'DivisionByZeroError' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/DivisionByZeroError.php',
+    'Doctrine\\Common\\Lexer\\AbstractLexer' => $vendorDir . '/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php',
     'EMail' => $baseDir . '/core/email.class.inc.php',
+    'Egulias\\EmailValidator\\EmailLexer' => $vendorDir . '/egulias/email-validator/src/EmailLexer.php',
+    'Egulias\\EmailValidator\\EmailParser' => $vendorDir . '/egulias/email-validator/src/EmailParser.php',
+    'Egulias\\EmailValidator\\EmailValidator' => $vendorDir . '/egulias/email-validator/src/EmailValidator.php',
+    'Egulias\\EmailValidator\\Exception\\AtextAfterCFWS' => $vendorDir . '/egulias/email-validator/src/Exception/AtextAfterCFWS.php',
+    'Egulias\\EmailValidator\\Exception\\CRLFAtTheEnd' => $vendorDir . '/egulias/email-validator/src/Exception/CRLFAtTheEnd.php',
+    'Egulias\\EmailValidator\\Exception\\CRLFX2' => $vendorDir . '/egulias/email-validator/src/Exception/CRLFX2.php',
+    'Egulias\\EmailValidator\\Exception\\CRNoLF' => $vendorDir . '/egulias/email-validator/src/Exception/CRNoLF.php',
+    'Egulias\\EmailValidator\\Exception\\CharNotAllowed' => $vendorDir . '/egulias/email-validator/src/Exception/CharNotAllowed.php',
+    'Egulias\\EmailValidator\\Exception\\CommaInDomain' => $vendorDir . '/egulias/email-validator/src/Exception/CommaInDomain.php',
+    'Egulias\\EmailValidator\\Exception\\ConsecutiveAt' => $vendorDir . '/egulias/email-validator/src/Exception/ConsecutiveAt.php',
+    'Egulias\\EmailValidator\\Exception\\ConsecutiveDot' => $vendorDir . '/egulias/email-validator/src/Exception/ConsecutiveDot.php',
+    'Egulias\\EmailValidator\\Exception\\DomainAcceptsNoMail' => $vendorDir . '/egulias/email-validator/src/Exception/DomainAcceptsNoMail.php',
+    'Egulias\\EmailValidator\\Exception\\DomainHyphened' => $vendorDir . '/egulias/email-validator/src/Exception/DomainHyphened.php',
+    'Egulias\\EmailValidator\\Exception\\DotAtEnd' => $vendorDir . '/egulias/email-validator/src/Exception/DotAtEnd.php',
+    'Egulias\\EmailValidator\\Exception\\DotAtStart' => $vendorDir . '/egulias/email-validator/src/Exception/DotAtStart.php',
+    'Egulias\\EmailValidator\\Exception\\ExpectingAT' => $vendorDir . '/egulias/email-validator/src/Exception/ExpectingAT.php',
+    'Egulias\\EmailValidator\\Exception\\ExpectingATEXT' => $vendorDir . '/egulias/email-validator/src/Exception/ExpectingATEXT.php',
+    'Egulias\\EmailValidator\\Exception\\ExpectingCTEXT' => $vendorDir . '/egulias/email-validator/src/Exception/ExpectingCTEXT.php',
+    'Egulias\\EmailValidator\\Exception\\ExpectingDTEXT' => $vendorDir . '/egulias/email-validator/src/Exception/ExpectingDTEXT.php',
+    'Egulias\\EmailValidator\\Exception\\ExpectingDomainLiteralClose' => $vendorDir . '/egulias/email-validator/src/Exception/ExpectingDomainLiteralClose.php',
+    'Egulias\\EmailValidator\\Exception\\ExpectingQPair' => $vendorDir . '/egulias/email-validator/src/Exception/ExpectingQPair.php',
+    'Egulias\\EmailValidator\\Exception\\InvalidEmail' => $vendorDir . '/egulias/email-validator/src/Exception/InvalidEmail.php',
+    'Egulias\\EmailValidator\\Exception\\LocalOrReservedDomain' => $vendorDir . '/egulias/email-validator/src/Exception/LocalOrReservedDomain.php',
+    'Egulias\\EmailValidator\\Exception\\NoDNSRecord' => $vendorDir . '/egulias/email-validator/src/Exception/NoDNSRecord.php',
+    'Egulias\\EmailValidator\\Exception\\NoDomainPart' => $vendorDir . '/egulias/email-validator/src/Exception/NoDomainPart.php',
+    'Egulias\\EmailValidator\\Exception\\NoLocalPart' => $vendorDir . '/egulias/email-validator/src/Exception/NoLocalPart.php',
+    'Egulias\\EmailValidator\\Exception\\UnclosedComment' => $vendorDir . '/egulias/email-validator/src/Exception/UnclosedComment.php',
+    'Egulias\\EmailValidator\\Exception\\UnclosedQuotedString' => $vendorDir . '/egulias/email-validator/src/Exception/UnclosedQuotedString.php',
+    'Egulias\\EmailValidator\\Exception\\UnopenedComment' => $vendorDir . '/egulias/email-validator/src/Exception/UnopenedComment.php',
+    'Egulias\\EmailValidator\\Parser\\DomainPart' => $vendorDir . '/egulias/email-validator/src/Parser/DomainPart.php',
+    'Egulias\\EmailValidator\\Parser\\LocalPart' => $vendorDir . '/egulias/email-validator/src/Parser/LocalPart.php',
+    'Egulias\\EmailValidator\\Parser\\Parser' => $vendorDir . '/egulias/email-validator/src/Parser/Parser.php',
+    'Egulias\\EmailValidator\\Validation\\DNSCheckValidation' => $vendorDir . '/egulias/email-validator/src/Validation/DNSCheckValidation.php',
+    'Egulias\\EmailValidator\\Validation\\EmailValidation' => $vendorDir . '/egulias/email-validator/src/Validation/EmailValidation.php',
+    'Egulias\\EmailValidator\\Validation\\Error\\RFCWarnings' => $vendorDir . '/egulias/email-validator/src/Validation/Error/RFCWarnings.php',
+    'Egulias\\EmailValidator\\Validation\\Error\\SpoofEmail' => $vendorDir . '/egulias/email-validator/src/Validation/Error/SpoofEmail.php',
+    'Egulias\\EmailValidator\\Validation\\Exception\\EmptyValidationList' => $vendorDir . '/egulias/email-validator/src/Validation/Exception/EmptyValidationList.php',
+    'Egulias\\EmailValidator\\Validation\\MultipleErrors' => $vendorDir . '/egulias/email-validator/src/Validation/MultipleErrors.php',
+    'Egulias\\EmailValidator\\Validation\\MultipleValidationWithAnd' => $vendorDir . '/egulias/email-validator/src/Validation/MultipleValidationWithAnd.php',
+    'Egulias\\EmailValidator\\Validation\\NoRFCWarningsValidation' => $vendorDir . '/egulias/email-validator/src/Validation/NoRFCWarningsValidation.php',
+    'Egulias\\EmailValidator\\Validation\\RFCValidation' => $vendorDir . '/egulias/email-validator/src/Validation/RFCValidation.php',
+    'Egulias\\EmailValidator\\Validation\\SpoofCheckValidation' => $vendorDir . '/egulias/email-validator/src/Validation/SpoofCheckValidation.php',
+    'Egulias\\EmailValidator\\Warning\\AddressLiteral' => $vendorDir . '/egulias/email-validator/src/Warning/AddressLiteral.php',
+    'Egulias\\EmailValidator\\Warning\\CFWSNearAt' => $vendorDir . '/egulias/email-validator/src/Warning/CFWSNearAt.php',
+    'Egulias\\EmailValidator\\Warning\\CFWSWithFWS' => $vendorDir . '/egulias/email-validator/src/Warning/CFWSWithFWS.php',
+    'Egulias\\EmailValidator\\Warning\\Comment' => $vendorDir . '/egulias/email-validator/src/Warning/Comment.php',
+    'Egulias\\EmailValidator\\Warning\\DeprecatedComment' => $vendorDir . '/egulias/email-validator/src/Warning/DeprecatedComment.php',
+    'Egulias\\EmailValidator\\Warning\\DomainLiteral' => $vendorDir . '/egulias/email-validator/src/Warning/DomainLiteral.php',
+    'Egulias\\EmailValidator\\Warning\\DomainTooLong' => $vendorDir . '/egulias/email-validator/src/Warning/DomainTooLong.php',
+    'Egulias\\EmailValidator\\Warning\\EmailTooLong' => $vendorDir . '/egulias/email-validator/src/Warning/EmailTooLong.php',
+    'Egulias\\EmailValidator\\Warning\\IPV6BadChar' => $vendorDir . '/egulias/email-validator/src/Warning/IPV6BadChar.php',
+    'Egulias\\EmailValidator\\Warning\\IPV6ColonEnd' => $vendorDir . '/egulias/email-validator/src/Warning/IPV6ColonEnd.php',
+    'Egulias\\EmailValidator\\Warning\\IPV6ColonStart' => $vendorDir . '/egulias/email-validator/src/Warning/IPV6ColonStart.php',
+    'Egulias\\EmailValidator\\Warning\\IPV6Deprecated' => $vendorDir . '/egulias/email-validator/src/Warning/IPV6Deprecated.php',
+    'Egulias\\EmailValidator\\Warning\\IPV6DoubleColon' => $vendorDir . '/egulias/email-validator/src/Warning/IPV6DoubleColon.php',
+    'Egulias\\EmailValidator\\Warning\\IPV6GroupCount' => $vendorDir . '/egulias/email-validator/src/Warning/IPV6GroupCount.php',
+    'Egulias\\EmailValidator\\Warning\\IPV6MaxGroups' => $vendorDir . '/egulias/email-validator/src/Warning/IPV6MaxGroups.php',
+    'Egulias\\EmailValidator\\Warning\\LabelTooLong' => $vendorDir . '/egulias/email-validator/src/Warning/LabelTooLong.php',
+    'Egulias\\EmailValidator\\Warning\\LocalTooLong' => $vendorDir . '/egulias/email-validator/src/Warning/LocalTooLong.php',
+    'Egulias\\EmailValidator\\Warning\\NoDNSMXRecord' => $vendorDir . '/egulias/email-validator/src/Warning/NoDNSMXRecord.php',
+    'Egulias\\EmailValidator\\Warning\\ObsoleteDTEXT' => $vendorDir . '/egulias/email-validator/src/Warning/ObsoleteDTEXT.php',
+    'Egulias\\EmailValidator\\Warning\\QuotedPart' => $vendorDir . '/egulias/email-validator/src/Warning/QuotedPart.php',
+    'Egulias\\EmailValidator\\Warning\\QuotedString' => $vendorDir . '/egulias/email-validator/src/Warning/QuotedString.php',
+    'Egulias\\EmailValidator\\Warning\\TLD' => $vendorDir . '/egulias/email-validator/src/Warning/TLD.php',
+    'Egulias\\EmailValidator\\Warning\\Warning' => $vendorDir . '/egulias/email-validator/src/Warning/Warning.php',
     'Error' => $vendorDir . '/symfony/polyfill-php70/Resources/stubs/Error.php',
     'ErrorPage' => $baseDir . '/application/errorpage.class.inc.php',
     'Event' => $baseDir . '/core/event.class.inc.php',
@@ -321,6 +387,7 @@ return array(
     'NewObjectMenuNode' => $baseDir . '/application/menunode.class.inc.php',
     'NewsroomProviderBase' => $baseDir . '/application/newsroomprovider.class.inc.php',
     'NiceWebPage' => $baseDir . '/application/nicewebpage.class.inc.php',
+    'Normalizer' => $vendorDir . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
     'OQLActualClassTreeResolver' => $baseDir . '/core/oqlactualclasstreeresolver.class.inc.php',
     'OQLClassNode' => $baseDir . '/core/oqlclassnode.class.inc.php',
     'OQLClassTreeBuilder' => $baseDir . '/core/oqlclasstreebuilder.class.inc.php',
@@ -1744,9 +1811,16 @@ return array(
     'Symfony\\Component\\Yaml\\Yaml' => $vendorDir . '/symfony/yaml/Yaml.php',
     'Symfony\\Polyfill\\Apcu\\Apcu' => $vendorDir . '/symfony/polyfill-apcu/Apcu.php',
     'Symfony\\Polyfill\\Ctype\\Ctype' => $vendorDir . '/symfony/polyfill-ctype/Ctype.php',
+    'Symfony\\Polyfill\\Iconv\\Iconv' => $vendorDir . '/symfony/polyfill-iconv/Iconv.php',
+    'Symfony\\Polyfill\\Intl\\Idn\\Idn' => $vendorDir . '/symfony/polyfill-intl-idn/Idn.php',
+    'Symfony\\Polyfill\\Intl\\Idn\\Info' => $vendorDir . '/symfony/polyfill-intl-idn/Info.php',
+    'Symfony\\Polyfill\\Intl\\Idn\\Resources\\unidata\\DisallowedRanges' => $vendorDir . '/symfony/polyfill-intl-idn/Resources/unidata/DisallowedRanges.php',
+    'Symfony\\Polyfill\\Intl\\Idn\\Resources\\unidata\\Regex' => $vendorDir . '/symfony/polyfill-intl-idn/Resources/unidata/Regex.php',
+    'Symfony\\Polyfill\\Intl\\Normalizer\\Normalizer' => $vendorDir . '/symfony/polyfill-intl-normalizer/Normalizer.php',
     'Symfony\\Polyfill\\Mbstring\\Mbstring' => $vendorDir . '/symfony/polyfill-mbstring/Mbstring.php',
     'Symfony\\Polyfill\\Php56\\Php56' => $vendorDir . '/symfony/polyfill-php56/Php56.php',
     'Symfony\\Polyfill\\Php70\\Php70' => $vendorDir . '/symfony/polyfill-php70/Php70.php',
+    'Symfony\\Polyfill\\Php72\\Php72' => $vendorDir . '/symfony/polyfill-php72/Php72.php',
     'Symfony\\Polyfill\\Util\\Binary' => $vendorDir . '/symfony/polyfill-util/Binary.php',
     'Symfony\\Polyfill\\Util\\BinaryNoFuncOverload' => $vendorDir . '/symfony/polyfill-util/BinaryNoFuncOverload.php',
     'Symfony\\Polyfill\\Util\\BinaryOnFuncOverload' => $vendorDir . '/symfony/polyfill-util/BinaryOnFuncOverload.php',
diff --git a/lib/composer/autoload_files.php b/lib/composer/autoload_files.php
index 6706671aa..4e28b93b7 100644
--- a/lib/composer/autoload_files.php
+++ b/lib/composer/autoload_files.php
@@ -7,11 +7,15 @@ $baseDir = dirname($vendorDir);
 
 return array(
     '320cde22f66dd4f5d3fd621d3e88b98f' => $vendorDir . '/symfony/polyfill-ctype/bootstrap.php',
-    '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
     '5255c38a0faeba867671b61dfda6d864' => $vendorDir . '/paragonie/random_compat/lib/random.php',
+    '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => $vendorDir . '/symfony/polyfill-mbstring/bootstrap.php',
     '023d27dca8066ef29e6739335ea73bad' => $vendorDir . '/symfony/polyfill-php70/bootstrap.php',
     'bd9634f2d41831496de0d3dfe4c94881' => $vendorDir . '/symfony/polyfill-php56/bootstrap.php',
+    'e69f7f6ee287b969198c3c9d6777bd38' => $vendorDir . '/symfony/polyfill-intl-normalizer/bootstrap.php',
+    '25072dd6e2470089de65ae7bf11d3109' => $vendorDir . '/symfony/polyfill-php72/bootstrap.php',
+    'f598d06aa772fa33d905e87be6398fb1' => $vendorDir . '/symfony/polyfill-intl-idn/bootstrap.php',
     '32dcc8afd4335739640db7d200c1971d' => $vendorDir . '/symfony/polyfill-apcu/bootstrap.php',
+    'def43f6c87e4f8dfd0c9e1b1bab14fe8' => $vendorDir . '/symfony/polyfill-iconv/bootstrap.php',
     '667aeda72477189d0494fecd327c3641' => $vendorDir . '/symfony/var-dumper/Resources/functions/dump.php',
     '2c102faa651ef8ea5874edb585946bce' => $vendorDir . '/swiftmailer/swiftmailer/lib/swift_required.php',
 );
diff --git a/lib/composer/autoload_psr4.php b/lib/composer/autoload_psr4.php
index 596febb62..7d6039aea 100644
--- a/lib/composer/autoload_psr4.php
+++ b/lib/composer/autoload_psr4.php
@@ -8,9 +8,13 @@ $baseDir = dirname($vendorDir);
 return array(
     'Twig\\' => array($vendorDir . '/twig/twig/src'),
     'Symfony\\Polyfill\\Util\\' => array($vendorDir . '/symfony/polyfill-util'),
+    'Symfony\\Polyfill\\Php72\\' => array($vendorDir . '/symfony/polyfill-php72'),
     'Symfony\\Polyfill\\Php70\\' => array($vendorDir . '/symfony/polyfill-php70'),
     'Symfony\\Polyfill\\Php56\\' => array($vendorDir . '/symfony/polyfill-php56'),
     'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'),
+    'Symfony\\Polyfill\\Intl\\Normalizer\\' => array($vendorDir . '/symfony/polyfill-intl-normalizer'),
+    'Symfony\\Polyfill\\Intl\\Idn\\' => array($vendorDir . '/symfony/polyfill-intl-idn'),
+    'Symfony\\Polyfill\\Iconv\\' => array($vendorDir . '/symfony/polyfill-iconv'),
     'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'),
     'Symfony\\Polyfill\\Apcu\\' => array($vendorDir . '/symfony/polyfill-apcu'),
     'Symfony\\Component\\Yaml\\' => array($vendorDir . '/symfony/yaml'),
@@ -41,4 +45,6 @@ return array(
     'Psr\\Cache\\' => array($vendorDir . '/psr/cache/src'),
     'PhpParser\\' => array($vendorDir . '/nikic/php-parser/lib/PhpParser'),
     'Pelago\\' => array($vendorDir . '/pelago/emogrifier/src'),
+    'Egulias\\EmailValidator\\' => array($vendorDir . '/egulias/email-validator/src'),
+    'Doctrine\\Common\\Lexer\\' => array($vendorDir . '/doctrine/lexer/lib/Doctrine/Common/Lexer'),
 );
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index 0cdbd54c9..0e1856fcf 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -8,11 +8,15 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
 {
     public static $files = array (
         '320cde22f66dd4f5d3fd621d3e88b98f' => __DIR__ . '/..' . '/symfony/polyfill-ctype/bootstrap.php',
-        '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
         '5255c38a0faeba867671b61dfda6d864' => __DIR__ . '/..' . '/paragonie/random_compat/lib/random.php',
+        '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
         '023d27dca8066ef29e6739335ea73bad' => __DIR__ . '/..' . '/symfony/polyfill-php70/bootstrap.php',
         'bd9634f2d41831496de0d3dfe4c94881' => __DIR__ . '/..' . '/symfony/polyfill-php56/bootstrap.php',
+        'e69f7f6ee287b969198c3c9d6777bd38' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/bootstrap.php',
+        '25072dd6e2470089de65ae7bf11d3109' => __DIR__ . '/..' . '/symfony/polyfill-php72/bootstrap.php',
+        'f598d06aa772fa33d905e87be6398fb1' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/bootstrap.php',
         '32dcc8afd4335739640db7d200c1971d' => __DIR__ . '/..' . '/symfony/polyfill-apcu/bootstrap.php',
+        'def43f6c87e4f8dfd0c9e1b1bab14fe8' => __DIR__ . '/..' . '/symfony/polyfill-iconv/bootstrap.php',
         '667aeda72477189d0494fecd327c3641' => __DIR__ . '/..' . '/symfony/var-dumper/Resources/functions/dump.php',
         '2c102faa651ef8ea5874edb585946bce' => __DIR__ . '/..' . '/swiftmailer/swiftmailer/lib/swift_required.php',
     );
@@ -25,9 +29,13 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'S' => 
         array (
             'Symfony\\Polyfill\\Util\\' => 22,
+            'Symfony\\Polyfill\\Php72\\' => 23,
             'Symfony\\Polyfill\\Php70\\' => 23,
             'Symfony\\Polyfill\\Php56\\' => 23,
             'Symfony\\Polyfill\\Mbstring\\' => 26,
+            'Symfony\\Polyfill\\Intl\\Normalizer\\' => 33,
+            'Symfony\\Polyfill\\Intl\\Idn\\' => 26,
+            'Symfony\\Polyfill\\Iconv\\' => 23,
             'Symfony\\Polyfill\\Ctype\\' => 23,
             'Symfony\\Polyfill\\Apcu\\' => 22,
             'Symfony\\Component\\Yaml\\' => 23,
@@ -62,6 +70,14 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
             'PhpParser\\' => 10,
             'Pelago\\' => 7,
         ),
+        'E' => 
+        array (
+            'Egulias\\EmailValidator\\' => 23,
+        ),
+        'D' => 
+        array (
+            'Doctrine\\Common\\Lexer\\' => 22,
+        ),
     );
 
     public static $prefixDirsPsr4 = array (
@@ -73,6 +89,10 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         array (
             0 => __DIR__ . '/..' . '/symfony/polyfill-util',
         ),
+        'Symfony\\Polyfill\\Php72\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/polyfill-php72',
+        ),
         'Symfony\\Polyfill\\Php70\\' => 
         array (
             0 => __DIR__ . '/..' . '/symfony/polyfill-php70',
@@ -85,6 +105,18 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         array (
             0 => __DIR__ . '/..' . '/symfony/polyfill-mbstring',
         ),
+        'Symfony\\Polyfill\\Intl\\Normalizer\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer',
+        ),
+        'Symfony\\Polyfill\\Intl\\Idn\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/polyfill-intl-idn',
+        ),
+        'Symfony\\Polyfill\\Iconv\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/symfony/polyfill-iconv',
+        ),
         'Symfony\\Polyfill\\Ctype\\' => 
         array (
             0 => __DIR__ . '/..' . '/symfony/polyfill-ctype',
@@ -205,6 +237,14 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         array (
             0 => __DIR__ . '/..' . '/pelago/emogrifier/src',
         ),
+        'Egulias\\EmailValidator\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/egulias/email-validator/src',
+        ),
+        'Doctrine\\Common\\Lexer\\' => 
+        array (
+            0 => __DIR__ . '/..' . '/doctrine/lexer/lib/Doctrine/Common/Lexer',
+        ),
     );
 
     public static $prefixesPsr0 = array (
@@ -464,7 +504,73 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'DisplayableNode' => __DIR__ . '/../..' . '/core/displayablegraph.class.inc.php',
         'DisplayableRedundancyNode' => __DIR__ . '/../..' . '/core/displayablegraph.class.inc.php',
         'DivisionByZeroError' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/DivisionByZeroError.php',
+        'Doctrine\\Common\\Lexer\\AbstractLexer' => __DIR__ . '/..' . '/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php',
         'EMail' => __DIR__ . '/../..' . '/core/email.class.inc.php',
+        'Egulias\\EmailValidator\\EmailLexer' => __DIR__ . '/..' . '/egulias/email-validator/src/EmailLexer.php',
+        'Egulias\\EmailValidator\\EmailParser' => __DIR__ . '/..' . '/egulias/email-validator/src/EmailParser.php',
+        'Egulias\\EmailValidator\\EmailValidator' => __DIR__ . '/..' . '/egulias/email-validator/src/EmailValidator.php',
+        'Egulias\\EmailValidator\\Exception\\AtextAfterCFWS' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/AtextAfterCFWS.php',
+        'Egulias\\EmailValidator\\Exception\\CRLFAtTheEnd' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/CRLFAtTheEnd.php',
+        'Egulias\\EmailValidator\\Exception\\CRLFX2' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/CRLFX2.php',
+        'Egulias\\EmailValidator\\Exception\\CRNoLF' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/CRNoLF.php',
+        'Egulias\\EmailValidator\\Exception\\CharNotAllowed' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/CharNotAllowed.php',
+        'Egulias\\EmailValidator\\Exception\\CommaInDomain' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/CommaInDomain.php',
+        'Egulias\\EmailValidator\\Exception\\ConsecutiveAt' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/ConsecutiveAt.php',
+        'Egulias\\EmailValidator\\Exception\\ConsecutiveDot' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/ConsecutiveDot.php',
+        'Egulias\\EmailValidator\\Exception\\DomainAcceptsNoMail' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/DomainAcceptsNoMail.php',
+        'Egulias\\EmailValidator\\Exception\\DomainHyphened' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/DomainHyphened.php',
+        'Egulias\\EmailValidator\\Exception\\DotAtEnd' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/DotAtEnd.php',
+        'Egulias\\EmailValidator\\Exception\\DotAtStart' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/DotAtStart.php',
+        'Egulias\\EmailValidator\\Exception\\ExpectingAT' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/ExpectingAT.php',
+        'Egulias\\EmailValidator\\Exception\\ExpectingATEXT' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/ExpectingATEXT.php',
+        'Egulias\\EmailValidator\\Exception\\ExpectingCTEXT' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/ExpectingCTEXT.php',
+        'Egulias\\EmailValidator\\Exception\\ExpectingDTEXT' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/ExpectingDTEXT.php',
+        'Egulias\\EmailValidator\\Exception\\ExpectingDomainLiteralClose' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/ExpectingDomainLiteralClose.php',
+        'Egulias\\EmailValidator\\Exception\\ExpectingQPair' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/ExpectingQPair.php',
+        'Egulias\\EmailValidator\\Exception\\InvalidEmail' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/InvalidEmail.php',
+        'Egulias\\EmailValidator\\Exception\\LocalOrReservedDomain' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/LocalOrReservedDomain.php',
+        'Egulias\\EmailValidator\\Exception\\NoDNSRecord' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/NoDNSRecord.php',
+        'Egulias\\EmailValidator\\Exception\\NoDomainPart' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/NoDomainPart.php',
+        'Egulias\\EmailValidator\\Exception\\NoLocalPart' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/NoLocalPart.php',
+        'Egulias\\EmailValidator\\Exception\\UnclosedComment' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/UnclosedComment.php',
+        'Egulias\\EmailValidator\\Exception\\UnclosedQuotedString' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/UnclosedQuotedString.php',
+        'Egulias\\EmailValidator\\Exception\\UnopenedComment' => __DIR__ . '/..' . '/egulias/email-validator/src/Exception/UnopenedComment.php',
+        'Egulias\\EmailValidator\\Parser\\DomainPart' => __DIR__ . '/..' . '/egulias/email-validator/src/Parser/DomainPart.php',
+        'Egulias\\EmailValidator\\Parser\\LocalPart' => __DIR__ . '/..' . '/egulias/email-validator/src/Parser/LocalPart.php',
+        'Egulias\\EmailValidator\\Parser\\Parser' => __DIR__ . '/..' . '/egulias/email-validator/src/Parser/Parser.php',
+        'Egulias\\EmailValidator\\Validation\\DNSCheckValidation' => __DIR__ . '/..' . '/egulias/email-validator/src/Validation/DNSCheckValidation.php',
+        'Egulias\\EmailValidator\\Validation\\EmailValidation' => __DIR__ . '/..' . '/egulias/email-validator/src/Validation/EmailValidation.php',
+        'Egulias\\EmailValidator\\Validation\\Error\\RFCWarnings' => __DIR__ . '/..' . '/egulias/email-validator/src/Validation/Error/RFCWarnings.php',
+        'Egulias\\EmailValidator\\Validation\\Error\\SpoofEmail' => __DIR__ . '/..' . '/egulias/email-validator/src/Validation/Error/SpoofEmail.php',
+        'Egulias\\EmailValidator\\Validation\\Exception\\EmptyValidationList' => __DIR__ . '/..' . '/egulias/email-validator/src/Validation/Exception/EmptyValidationList.php',
+        'Egulias\\EmailValidator\\Validation\\MultipleErrors' => __DIR__ . '/..' . '/egulias/email-validator/src/Validation/MultipleErrors.php',
+        'Egulias\\EmailValidator\\Validation\\MultipleValidationWithAnd' => __DIR__ . '/..' . '/egulias/email-validator/src/Validation/MultipleValidationWithAnd.php',
+        'Egulias\\EmailValidator\\Validation\\NoRFCWarningsValidation' => __DIR__ . '/..' . '/egulias/email-validator/src/Validation/NoRFCWarningsValidation.php',
+        'Egulias\\EmailValidator\\Validation\\RFCValidation' => __DIR__ . '/..' . '/egulias/email-validator/src/Validation/RFCValidation.php',
+        'Egulias\\EmailValidator\\Validation\\SpoofCheckValidation' => __DIR__ . '/..' . '/egulias/email-validator/src/Validation/SpoofCheckValidation.php',
+        'Egulias\\EmailValidator\\Warning\\AddressLiteral' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/AddressLiteral.php',
+        'Egulias\\EmailValidator\\Warning\\CFWSNearAt' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/CFWSNearAt.php',
+        'Egulias\\EmailValidator\\Warning\\CFWSWithFWS' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/CFWSWithFWS.php',
+        'Egulias\\EmailValidator\\Warning\\Comment' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/Comment.php',
+        'Egulias\\EmailValidator\\Warning\\DeprecatedComment' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/DeprecatedComment.php',
+        'Egulias\\EmailValidator\\Warning\\DomainLiteral' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/DomainLiteral.php',
+        'Egulias\\EmailValidator\\Warning\\DomainTooLong' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/DomainTooLong.php',
+        'Egulias\\EmailValidator\\Warning\\EmailTooLong' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/EmailTooLong.php',
+        'Egulias\\EmailValidator\\Warning\\IPV6BadChar' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/IPV6BadChar.php',
+        'Egulias\\EmailValidator\\Warning\\IPV6ColonEnd' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/IPV6ColonEnd.php',
+        'Egulias\\EmailValidator\\Warning\\IPV6ColonStart' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/IPV6ColonStart.php',
+        'Egulias\\EmailValidator\\Warning\\IPV6Deprecated' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/IPV6Deprecated.php',
+        'Egulias\\EmailValidator\\Warning\\IPV6DoubleColon' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/IPV6DoubleColon.php',
+        'Egulias\\EmailValidator\\Warning\\IPV6GroupCount' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/IPV6GroupCount.php',
+        'Egulias\\EmailValidator\\Warning\\IPV6MaxGroups' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/IPV6MaxGroups.php',
+        'Egulias\\EmailValidator\\Warning\\LabelTooLong' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/LabelTooLong.php',
+        'Egulias\\EmailValidator\\Warning\\LocalTooLong' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/LocalTooLong.php',
+        'Egulias\\EmailValidator\\Warning\\NoDNSMXRecord' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/NoDNSMXRecord.php',
+        'Egulias\\EmailValidator\\Warning\\ObsoleteDTEXT' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/ObsoleteDTEXT.php',
+        'Egulias\\EmailValidator\\Warning\\QuotedPart' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/QuotedPart.php',
+        'Egulias\\EmailValidator\\Warning\\QuotedString' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/QuotedString.php',
+        'Egulias\\EmailValidator\\Warning\\TLD' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/TLD.php',
+        'Egulias\\EmailValidator\\Warning\\Warning' => __DIR__ . '/..' . '/egulias/email-validator/src/Warning/Warning.php',
         'Error' => __DIR__ . '/..' . '/symfony/polyfill-php70/Resources/stubs/Error.php',
         'ErrorPage' => __DIR__ . '/../..' . '/application/errorpage.class.inc.php',
         'Event' => __DIR__ . '/../..' . '/core/event.class.inc.php',
@@ -551,6 +657,7 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'NewObjectMenuNode' => __DIR__ . '/../..' . '/application/menunode.class.inc.php',
         'NewsroomProviderBase' => __DIR__ . '/../..' . '/application/newsroomprovider.class.inc.php',
         'NiceWebPage' => __DIR__ . '/../..' . '/application/nicewebpage.class.inc.php',
+        'Normalizer' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php',
         'OQLActualClassTreeResolver' => __DIR__ . '/../..' . '/core/oqlactualclasstreeresolver.class.inc.php',
         'OQLClassNode' => __DIR__ . '/../..' . '/core/oqlclassnode.class.inc.php',
         'OQLClassTreeBuilder' => __DIR__ . '/../..' . '/core/oqlclasstreebuilder.class.inc.php',
@@ -1974,9 +2081,16 @@ class ComposerStaticInit0018331147de7601e7552f7da8e3bb8b
         'Symfony\\Component\\Yaml\\Yaml' => __DIR__ . '/..' . '/symfony/yaml/Yaml.php',
         'Symfony\\Polyfill\\Apcu\\Apcu' => __DIR__ . '/..' . '/symfony/polyfill-apcu/Apcu.php',
         'Symfony\\Polyfill\\Ctype\\Ctype' => __DIR__ . '/..' . '/symfony/polyfill-ctype/Ctype.php',
+        'Symfony\\Polyfill\\Iconv\\Iconv' => __DIR__ . '/..' . '/symfony/polyfill-iconv/Iconv.php',
+        'Symfony\\Polyfill\\Intl\\Idn\\Idn' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/Idn.php',
+        'Symfony\\Polyfill\\Intl\\Idn\\Info' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/Info.php',
+        'Symfony\\Polyfill\\Intl\\Idn\\Resources\\unidata\\DisallowedRanges' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/Resources/unidata/DisallowedRanges.php',
+        'Symfony\\Polyfill\\Intl\\Idn\\Resources\\unidata\\Regex' => __DIR__ . '/..' . '/symfony/polyfill-intl-idn/Resources/unidata/Regex.php',
+        'Symfony\\Polyfill\\Intl\\Normalizer\\Normalizer' => __DIR__ . '/..' . '/symfony/polyfill-intl-normalizer/Normalizer.php',
         'Symfony\\Polyfill\\Mbstring\\Mbstring' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/Mbstring.php',
         'Symfony\\Polyfill\\Php56\\Php56' => __DIR__ . '/..' . '/symfony/polyfill-php56/Php56.php',
         'Symfony\\Polyfill\\Php70\\Php70' => __DIR__ . '/..' . '/symfony/polyfill-php70/Php70.php',
+        'Symfony\\Polyfill\\Php72\\Php72' => __DIR__ . '/..' . '/symfony/polyfill-php72/Php72.php',
         'Symfony\\Polyfill\\Util\\Binary' => __DIR__ . '/..' . '/symfony/polyfill-util/Binary.php',
         'Symfony\\Polyfill\\Util\\BinaryNoFuncOverload' => __DIR__ . '/..' . '/symfony/polyfill-util/BinaryNoFuncOverload.php',
         'Symfony\\Polyfill\\Util\\BinaryOnFuncOverload' => __DIR__ . '/..' . '/symfony/polyfill-util/BinaryOnFuncOverload.php',
diff --git a/lib/composer/installed.json b/lib/composer/installed.json
index 46bd25c1f..12bcf5f89 100644
--- a/lib/composer/installed.json
+++ b/lib/composer/installed.json
@@ -81,6 +81,144 @@
             ],
             "install-path": "../combodo/tcpdf"
         },
+        {
+            "name": "doctrine/lexer",
+            "version": "1.0.2",
+            "version_normalized": "1.0.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/lexer.git",
+                "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/1febd6c3ef84253d7c815bed85fc622ad207a9f8",
+                "reference": "1febd6c3ef84253d7c815bed85fc622ad207a9f8",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.5"
+            },
+            "time": "2019-06-08T11:03:04+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Roman Borschel",
+                    "email": "roman@code-factory.org"
+                },
+                {
+                    "name": "Guilherme Blanco",
+                    "email": "guilhermeblanco@gmail.com"
+                },
+                {
+                    "name": "Johannes Schmitt",
+                    "email": "schmittjoh@gmail.com"
+                }
+            ],
+            "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
+            "homepage": "https://www.doctrine-project.org/projects/lexer.html",
+            "keywords": [
+                "annotations",
+                "docblock",
+                "lexer",
+                "parser",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/lexer/issues",
+                "source": "https://github.com/doctrine/lexer/tree/1.0.2"
+            },
+            "install-path": "../doctrine/lexer"
+        },
+        {
+            "name": "egulias/email-validator",
+            "version": "2.1.25",
+            "version_normalized": "2.1.25.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/egulias/EmailValidator.git",
+                "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/0dbf5d78455d4d6a41d186da50adc1122ec066f4",
+                "reference": "0dbf5d78455d4d6a41d186da50adc1122ec066f4",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/lexer": "^1.0.1",
+                "php": ">=5.5",
+                "symfony/polyfill-intl-idn": "^1.10"
+            },
+            "require-dev": {
+                "dominicsayers/isemail": "^3.0.7",
+                "phpunit/phpunit": "^4.8.36|^7.5.15",
+                "satooshi/php-coveralls": "^1.0.1"
+            },
+            "suggest": {
+                "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
+            },
+            "time": "2020-12-29T14:50:06+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-4": {
+                    "Egulias\\EmailValidator\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Eduardo Gulias Davis"
+                }
+            ],
+            "description": "A library for validating emails against several RFCs",
+            "homepage": "https://github.com/egulias/EmailValidator",
+            "keywords": [
+                "email",
+                "emailvalidation",
+                "emailvalidator",
+                "validation",
+                "validator"
+            ],
+            "support": {
+                "issues": "https://github.com/egulias/EmailValidator/issues",
+                "source": "https://github.com/egulias/EmailValidator/tree/2.1.25"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/egulias",
+                    "type": "github"
+                }
+            ],
+            "install-path": "../egulias/email-validator"
+        },
         {
             "name": "nikic/php-parser",
             "version": "v4.13.2",
@@ -792,31 +930,38 @@
         },
         {
             "name": "swiftmailer/swiftmailer",
-            "version": "v5.4.12",
-            "version_normalized": "5.4.12.0",
+            "version": "v6.3.0",
+            "version_normalized": "6.3.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/swiftmailer/swiftmailer.git",
-                "reference": "181b89f18a90f8925ef805f950d47a7190e9b950"
+                "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/181b89f18a90f8925ef805f950d47a7190e9b950",
-                "reference": "181b89f18a90f8925ef805f950d47a7190e9b950",
+                "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/8a5d5072dca8f48460fce2f4131fcc495eec654c",
+                "reference": "8a5d5072dca8f48460fce2f4131fcc495eec654c",
                 "shasum": ""
             },
             "require": {
-                "php": ">=5.3.3"
+                "egulias/email-validator": "^2.0|^3.1",
+                "php": ">=7.0.0",
+                "symfony/polyfill-iconv": "^1.0",
+                "symfony/polyfill-intl-idn": "^1.10",
+                "symfony/polyfill-mbstring": "^1.0"
             },
             "require-dev": {
-                "mockery/mockery": "~0.9.1",
-                "symfony/phpunit-bridge": "~3.2"
+                "mockery/mockery": "^1.0",
+                "symfony/phpunit-bridge": "^4.4|^5.4"
             },
-            "time": "2018-07-31T09:26:32+00:00",
+            "suggest": {
+                "ext-intl": "Needed to support internationalized email addresses"
+            },
+            "time": "2021-10-18T15:26:12+00:00",
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "5.4-dev"
+                    "dev-master": "6.2-dev"
                 }
             },
             "installation-source": "dist",
@@ -845,6 +990,21 @@
                 "mail",
                 "mailer"
             ],
+            "support": {
+                "issues": "https://github.com/swiftmailer/swiftmailer/issues",
+                "source": "https://github.com/swiftmailer/swiftmailer/tree/v6.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/swiftmailer/swiftmailer",
+                    "type": "tidelift"
+                }
+            ],
+            "abandoned": "symfony/mailer",
             "install-path": "../swiftmailer/swiftmailer"
         },
         {
@@ -2140,6 +2300,267 @@
             ],
             "install-path": "../symfony/polyfill-ctype"
         },
+        {
+            "name": "symfony/polyfill-iconv",
+            "version": "v1.19.0",
+            "version_normalized": "1.19.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-iconv.git",
+                "reference": "085241787d52fa6f7a774fd034135fef0cfd5496"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/085241787d52fa6f7a774fd034135fef0cfd5496",
+                "reference": "085241787d52fa6f7a774fd034135fef0cfd5496",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-iconv": "For best performance"
+            },
+            "time": "2020-10-23T09:01:57+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Iconv\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Iconv extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "iconv",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-iconv/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../symfony/polyfill-iconv"
+        },
+        {
+            "name": "symfony/polyfill-intl-idn",
+            "version": "v1.19.0",
+            "version_normalized": "1.19.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-idn.git",
+                "reference": "4ad5115c0f5d5172a9fe8147675ec6de266d8826"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/4ad5115c0f5d5172a9fe8147675ec6de266d8826",
+                "reference": "4ad5115c0f5d5172a9fe8147675ec6de266d8826",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "symfony/polyfill-intl-normalizer": "^1.10",
+                "symfony/polyfill-php70": "^1.10",
+                "symfony/polyfill-php72": "^1.10"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "time": "2020-10-21T09:57:48+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Idn\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Laurent Bassin",
+                    "email": "laurent@bassin.info"
+                },
+                {
+                    "name": "Trevor Rowbotham",
+                    "email": "trevor.rowbotham@pm.me"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "idn",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../symfony/polyfill-intl-idn"
+        },
+        {
+            "name": "symfony/polyfill-intl-normalizer",
+            "version": "v1.19.0",
+            "version_normalized": "1.19.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "8db0ae7936b42feb370840cf24de1a144fb0ef27"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/8db0ae7936b42feb370840cf24de1a144fb0ef27",
+                "reference": "8db0ae7936b42feb370840cf24de1a144fb0ef27",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "time": "2020-10-23T09:01:57+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's Normalizer class and related functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "intl",
+                "normalizer",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../symfony/polyfill-intl-normalizer"
+        },
         {
             "name": "symfony/polyfill-mbstring",
             "version": "v1.19.0",
@@ -2386,6 +2807,85 @@
             ],
             "install-path": "../symfony/polyfill-php70"
         },
+        {
+            "name": "symfony/polyfill-php72",
+            "version": "v1.19.0",
+            "version_normalized": "1.19.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php72.git",
+                "reference": "beecef6b463b06954638f02378f52496cb84bacc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/beecef6b463b06954638f02378f52496cb84bacc",
+                "reference": "beecef6b463b06954638f02378f52496cb84bacc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "time": "2020-10-23T09:01:57+00:00",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.19-dev"
+                },
+                "thanks": {
+                    "name": "symfony/polyfill",
+                    "url": "https://github.com/symfony/polyfill"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php72\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php72/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "install-path": "../symfony/polyfill-php72"
+        },
         {
             "name": "symfony/polyfill-util",
             "version": "v1.19.0",
diff --git a/lib/composer/installed.php b/lib/composer/installed.php
index f46000ad9..9eda3ec76 100644
--- a/lib/composer/installed.php
+++ b/lib/composer/installed.php
@@ -5,7 +5,7 @@
         'type' => 'project',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => 'a5ce09c4396a111c9c22aeb83fd5eefd1a55fb8f',
+        'reference' => '8c60e05b1a1d7e135bcf0cbf0d1bf337a623ff15',
         'name' => '__root__',
         'dev' => true,
     ),
@@ -16,7 +16,7 @@
             'type' => 'project',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => 'a5ce09c4396a111c9c22aeb83fd5eefd1a55fb8f',
+            'reference' => '8c60e05b1a1d7e135bcf0cbf0d1bf337a623ff15',
             'dev_requirement' => false,
         ),
         'combodo/tcpdf' => array(
@@ -28,6 +28,24 @@
             'reference' => '0e31c013ccd000aa6762e9186778aa6e259ac8e8',
             'dev_requirement' => false,
         ),
+        'doctrine/lexer' => array(
+            'pretty_version' => '1.0.2',
+            'version' => '1.0.2.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../doctrine/lexer',
+            'aliases' => array(),
+            'reference' => '1febd6c3ef84253d7c815bed85fc622ad207a9f8',
+            'dev_requirement' => false,
+        ),
+        'egulias/email-validator' => array(
+            'pretty_version' => '2.1.25',
+            'version' => '2.1.25.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../egulias/email-validator',
+            'aliases' => array(),
+            'reference' => '0dbf5d78455d4d6a41d186da50adc1122ec066f4',
+            'dev_requirement' => false,
+        ),
         'nikic/php-parser' => array(
             'pretty_version' => 'v4.13.2',
             'version' => '4.13.2.0',
@@ -167,12 +185,12 @@
             'dev_requirement' => false,
         ),
         'swiftmailer/swiftmailer' => array(
-            'pretty_version' => 'v5.4.12',
-            'version' => '5.4.12.0',
+            'pretty_version' => 'v6.3.0',
+            'version' => '6.3.0.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../swiftmailer/swiftmailer',
             'aliases' => array(),
-            'reference' => '181b89f18a90f8925ef805f950d47a7190e9b950',
+            'reference' => '8a5d5072dca8f48460fce2f4131fcc495eec654c',
             'dev_requirement' => false,
         ),
         'symfony/cache' => array(
@@ -319,6 +337,33 @@
             'reference' => 'aed596913b70fae57be53d86faa2e9ef85a2297b',
             'dev_requirement' => false,
         ),
+        'symfony/polyfill-iconv' => array(
+            'pretty_version' => 'v1.19.0',
+            'version' => '1.19.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/polyfill-iconv',
+            'aliases' => array(),
+            'reference' => '085241787d52fa6f7a774fd034135fef0cfd5496',
+            'dev_requirement' => false,
+        ),
+        'symfony/polyfill-intl-idn' => array(
+            'pretty_version' => 'v1.19.0',
+            'version' => '1.19.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/polyfill-intl-idn',
+            'aliases' => array(),
+            'reference' => '4ad5115c0f5d5172a9fe8147675ec6de266d8826',
+            'dev_requirement' => false,
+        ),
+        'symfony/polyfill-intl-normalizer' => array(
+            'pretty_version' => 'v1.19.0',
+            'version' => '1.19.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/polyfill-intl-normalizer',
+            'aliases' => array(),
+            'reference' => '8db0ae7936b42feb370840cf24de1a144fb0ef27',
+            'dev_requirement' => false,
+        ),
         'symfony/polyfill-mbstring' => array(
             'pretty_version' => 'v1.19.0',
             'version' => '1.19.0.0',
@@ -346,6 +391,15 @@
             'reference' => '3fe414077251a81a1b15b1c709faf5c2fbae3d4e',
             'dev_requirement' => false,
         ),
+        'symfony/polyfill-php72' => array(
+            'pretty_version' => 'v1.19.0',
+            'version' => '1.19.0.0',
+            'type' => 'library',
+            'install_path' => __DIR__ . '/../symfony/polyfill-php72',
+            'aliases' => array(),
+            'reference' => 'beecef6b463b06954638f02378f52496cb84bacc',
+            'dev_requirement' => false,
+        ),
         'symfony/polyfill-util' => array(
             'pretty_version' => 'v1.19.0',
             'version' => '1.19.0.0',
diff --git a/lib/doctrine/lexer/.doctrine-project.json b/lib/doctrine/lexer/.doctrine-project.json
new file mode 100644
index 000000000..01ccb7780
--- /dev/null
+++ b/lib/doctrine/lexer/.doctrine-project.json
@@ -0,0 +1,17 @@
+{
+    "active": true,
+    "name": "Lexer",
+    "slug": "lexer",
+    "docsSlug": "doctrine-lexer",
+    "versions": [
+        {
+            "name": "master",
+            "branchName": "master",
+            "slug": "latest",
+            "aliases": [
+                "current",
+                "stable"
+            ]
+        }
+    ]
+}
diff --git a/lib/doctrine/lexer/.github/FUNDING.yml b/lib/doctrine/lexer/.github/FUNDING.yml
new file mode 100644
index 000000000..e081a97a2
--- /dev/null
+++ b/lib/doctrine/lexer/.github/FUNDING.yml
@@ -0,0 +1,3 @@
+patreon: phpdoctrine
+tidelift: packagist/doctrine%2Flexer
+custom: https://www.doctrine-project.org/sponsorship.html
diff --git a/lib/doctrine/lexer/.gitignore b/lib/doctrine/lexer/.gitignore
new file mode 100644
index 000000000..7579f7431
--- /dev/null
+++ b/lib/doctrine/lexer/.gitignore
@@ -0,0 +1,2 @@
+vendor
+composer.lock
diff --git a/lib/doctrine/lexer/LICENSE b/lib/doctrine/lexer/LICENSE
new file mode 100644
index 000000000..e8fdec4af
--- /dev/null
+++ b/lib/doctrine/lexer/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2006-2018 Doctrine Project
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/lib/doctrine/lexer/README.md b/lib/doctrine/lexer/README.md
new file mode 100644
index 000000000..3a74c1c31
--- /dev/null
+++ b/lib/doctrine/lexer/README.md
@@ -0,0 +1,7 @@
+# Doctrine Lexer
+
+Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.
+
+This lexer is used in Doctrine Annotations and in Doctrine ORM (DQL).
+
+https://www.doctrine-project.org/projects/lexer.html
diff --git a/lib/doctrine/lexer/composer.json b/lib/doctrine/lexer/composer.json
new file mode 100644
index 000000000..6ea83543a
--- /dev/null
+++ b/lib/doctrine/lexer/composer.json
@@ -0,0 +1,36 @@
+{
+    "name": "doctrine/lexer",
+    "type": "library",
+    "description": "PHP Doctrine Lexer parser library that can be used in Top-Down, Recursive Descent Parsers.",
+    "keywords": [
+        "php",
+        "parser",
+        "lexer",
+        "annotations",
+        "docblock"
+    ],
+    "homepage": "https://www.doctrine-project.org/projects/lexer.html",
+    "license": "MIT",
+    "authors": [
+        {"name": "Guilherme Blanco", "email": "guilhermeblanco@gmail.com"},
+        {"name": "Roman Borschel", "email": "roman@code-factory.org"},
+        {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
+    ],
+    "require": {
+        "php": ">=5.3.2"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^4.5"
+    },
+    "autoload": {
+        "psr-4": { "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer" }
+    },
+    "autoload-dev": {
+        "psr-4": { "Doctrine\\Tests\\": "tests/Doctrine" }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    }
+}
diff --git a/lib/doctrine/lexer/docs/en/dql-parser.rst b/lib/doctrine/lexer/docs/en/dql-parser.rst
new file mode 100644
index 000000000..c7d581da2
--- /dev/null
+++ b/lib/doctrine/lexer/docs/en/dql-parser.rst
@@ -0,0 +1,294 @@
+DQL Lexer
+=========
+
+Here is a more complicated example from the Doctrine ORM project.
+The ``Doctrine\ORM\Query\Lexer`` implementation for DQL looks something
+like the following:
+
+.. code-block:: php
+
+    use Doctrine\Common\Lexer\AbstractLexer;
+
+    class Lexer extends AbstractLexer
+    {
+        // All tokens that are not valid identifiers must be < 100
+        public const T_NONE              = 1;
+        public const T_INTEGER           = 2;
+        public const T_STRING            = 3;
+        public const T_INPUT_PARAMETER   = 4;
+        public const T_FLOAT             = 5;
+        public const T_CLOSE_PARENTHESIS = 6;
+        public const T_OPEN_PARENTHESIS  = 7;
+        public const T_COMMA             = 8;
+        public const T_DIVIDE            = 9;
+        public const T_DOT               = 10;
+        public const T_EQUALS            = 11;
+        public const T_GREATER_THAN      = 12;
+        public const T_LOWER_THAN        = 13;
+        public const T_MINUS             = 14;
+        public const T_MULTIPLY          = 15;
+        public const T_NEGATE            = 16;
+        public const T_PLUS              = 17;
+        public const T_OPEN_CURLY_BRACE  = 18;
+        public const T_CLOSE_CURLY_BRACE = 19;
+
+        // All tokens that are identifiers or keywords that could be considered as identifiers should be >= 100
+        public const T_ALIASED_NAME         = 100;
+        public const T_FULLY_QUALIFIED_NAME = 101;
+        public const T_IDENTIFIER           = 102;
+
+        // All keyword tokens should be >= 200
+        public const T_ALL      = 200;
+        public const T_AND      = 201;
+        public const T_ANY      = 202;
+        public const T_AS       = 203;
+        public const T_ASC      = 204;
+        public const T_AVG      = 205;
+        public const T_BETWEEN  = 206;
+        public const T_BOTH     = 207;
+        public const T_BY       = 208;
+        public const T_CASE     = 209;
+        public const T_COALESCE = 210;
+        public const T_COUNT    = 211;
+        public const T_DELETE   = 212;
+        public const T_DESC     = 213;
+        public const T_DISTINCT = 214;
+        public const T_ELSE     = 215;
+        public const T_EMPTY    = 216;
+        public const T_END      = 217;
+        public const T_ESCAPE   = 218;
+        public const T_EXISTS   = 219;
+        public const T_FALSE    = 220;
+        public const T_FROM     = 221;
+        public const T_GROUP    = 222;
+        public const T_HAVING   = 223;
+        public const T_HIDDEN   = 224;
+        public const T_IN       = 225;
+        public const T_INDEX    = 226;
+        public const T_INNER    = 227;
+        public const T_INSTANCE = 228;
+        public const T_IS       = 229;
+        public const T_JOIN     = 230;
+        public const T_LEADING  = 231;
+        public const T_LEFT     = 232;
+        public const T_LIKE     = 233;
+        public const T_MAX      = 234;
+        public const T_MEMBER   = 235;
+        public const T_MIN      = 236;
+        public const T_NEW      = 237;
+        public const T_NOT      = 238;
+        public const T_NULL     = 239;
+        public const T_NULLIF   = 240;
+        public const T_OF       = 241;
+        public const T_OR       = 242;
+        public const T_ORDER    = 243;
+        public const T_OUTER    = 244;
+        public const T_PARTIAL  = 245;
+        public const T_SELECT   = 246;
+        public const T_SET      = 247;
+        public const T_SOME     = 248;
+        public const T_SUM      = 249;
+        public const T_THEN     = 250;
+        public const T_TRAILING = 251;
+        public const T_TRUE     = 252;
+        public const T_UPDATE   = 253;
+        public const T_WHEN     = 254;
+        public const T_WHERE    = 255;
+        public const T_WITH     = 256;
+
+        /**
+         * Creates a new query scanner object.
+         *
+         * @param string $input A query string.
+         */
+        public function __construct($input)
+        {
+            $this->setInput($input);
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        protected function getCatchablePatterns()
+        {
+            return [
+                '[a-z_][a-z0-9_]*\:[a-z_][a-z0-9_]*(?:\\\[a-z_][a-z0-9_]*)*', // aliased name
+                '[a-z_\\\][a-z0-9_]*(?:\\\[a-z_][a-z0-9_]*)*', // identifier or qualified name
+                '(?:[0-9]+(?:[\.][0-9]+)*)(?:e[+-]?[0-9]+)?', // numbers
+                "'(?:[^']|'')*'", // quoted strings
+                '\?[0-9]*|:[a-z_][a-z0-9_]*', // parameters
+            ];
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        protected function getNonCatchablePatterns()
+        {
+            return ['\s+', '(.)'];
+        }
+
+        /**
+         * {@inheritdoc}
+         */
+        protected function getType(&$value)
+        {
+            $type = self::T_NONE;
+
+            switch (true) {
+                // Recognize numeric values
+                case (is_numeric($value)):
+                    if (strpos($value, '.') !== false || stripos($value, 'e') !== false) {
+                        return self::T_FLOAT;
+                    }
+
+                    return self::T_INTEGER;
+
+                // Recognize quoted strings
+                case ($value[0] === "'"):
+                    $value = str_replace("''", "'", substr($value, 1, strlen($value) - 2));
+
+                    return self::T_STRING;
+
+                // Recognize identifiers, aliased or qualified names
+                case (ctype_alpha($value[0]) || $value[0] === '_' || $value[0] === '\\'):
+                    $name = 'Doctrine\ORM\Query\Lexer::T_' . strtoupper($value);
+
+                    if (defined($name)) {
+                        $type = constant($name);
+
+                        if ($type > 100) {
+                            return $type;
+                        }
+                    }
+
+                    if (strpos($value, ':') !== false) {
+                        return self::T_ALIASED_NAME;
+                    }
+
+                    if (strpos($value, '\\') !== false) {
+                        return self::T_FULLY_QUALIFIED_NAME;
+                    }
+
+                    return self::T_IDENTIFIER;
+
+                // Recognize input parameters
+                case ($value[0] === '?' || $value[0] === ':'):
+                    return self::T_INPUT_PARAMETER;
+
+                // Recognize symbols
+                case ($value === '.'):
+                    return self::T_DOT;
+                case ($value === ','):
+                    return self::T_COMMA;
+                case ($value === '('):
+                    return self::T_OPEN_PARENTHESIS;
+                case ($value === ')'):
+                    return self::T_CLOSE_PARENTHESIS;
+                case ($value === '='):
+                    return self::T_EQUALS;
+                case ($value === '>'):
+                    return self::T_GREATER_THAN;
+                case ($value === '<'):
+                    return self::T_LOWER_THAN;
+                case ($value === '+'):
+                    return self::T_PLUS;
+                case ($value === '-'):
+                    return self::T_MINUS;
+                case ($value === '*'):
+                    return self::T_MULTIPLY;
+                case ($value === '/'):
+                    return self::T_DIVIDE;
+                case ($value === '!'):
+                    return self::T_NEGATE;
+                case ($value === '{'):
+                    return self::T_OPEN_CURLY_BRACE;
+                case ($value === '}'):
+                    return self::T_CLOSE_CURLY_BRACE;
+
+                // Default
+                default:
+                    // Do nothing
+            }
+
+            return $type;
+        }
+    }
+
+This is roughly what the DQL Parser looks like that uses the above
+Lexer implementation:
+
+.. note::
+
+    You can see the full implementation `here <https://github.com/doctrine/doctrine2/blob/master/lib/Doctrine/ORM/Query/Parser.php>`_.
+
+.. code-block:: php
+
+    class Parser
+    {
+        private $lexer;
+
+        public function __construct($dql)
+        {
+            $this->lexer = new Lexer();
+            $this->lexer->setInput($dql);
+        }
+
+        // ...
+
+        public function getAST()
+        {
+            // Parse & build AST
+            $AST = $this->QueryLanguage();
+
+            // ...
+
+            return $AST;
+        }
+
+        public function QueryLanguage()
+        {
+            $this->lexer->moveNext();
+
+            switch ($this->lexer->lookahead['type']) {
+                case Lexer::T_SELECT:
+                    $statement = $this->SelectStatement();
+                    break;
+                case Lexer::T_UPDATE:
+                    $statement = $this->UpdateStatement();
+                    break;
+                case Lexer::T_DELETE:
+                    $statement = $this->DeleteStatement();
+                    break;
+                default:
+                    $this->syntaxError('SELECT, UPDATE or DELETE');
+                    break;
+            }
+
+            // Check for end of string
+            if ($this->lexer->lookahead !== null) {
+                $this->syntaxError('end of string');
+            }
+
+            return $statement;
+        }
+
+        // ...
+    }
+
+Now the AST is used to transform the DQL query in to portable SQL for whatever relational
+database you are using!
+
+.. code-block:: php
+
+    $parser = new Parser('SELECT u FROM User u');
+    $AST = $parser->getAST(); // returns \Doctrine\ORM\Query\AST\SelectStatement
+
+What is an AST?
+===============
+
+AST stands for `Abstract syntax tree <http://en.wikipedia.org/wiki/Abstract_syntax_tree>`_.
+In computer science, an abstract syntax tree (AST), or just syntax tree, is a
+tree representation of the abstract syntactic structure of source code written
+in a programming language. Each node of the tree denotes a construct occurring in
+the source code.
diff --git a/lib/doctrine/lexer/docs/en/index.rst b/lib/doctrine/lexer/docs/en/index.rst
new file mode 100644
index 000000000..2aa985be1
--- /dev/null
+++ b/lib/doctrine/lexer/docs/en/index.rst
@@ -0,0 +1,53 @@
+Introduction
+============
+
+Doctrine Lexer is a library that can be used in Top-Down, Recursive
+Descent Parsers. This lexer is used in Doctrine Annotations and in
+Doctrine ORM (DQL).
+
+To write your own parser you just need to extend ``Doctrine\Common\Lexer\AbstractLexer``
+and implement the following three abstract methods.
+
+.. code-block:: php
+
+    /**
+     * Lexical catchable patterns.
+     *
+     * @return array
+     */
+    abstract protected function getCatchablePatterns();
+
+    /**
+     * Lexical non-catchable patterns.
+     *
+     * @return array
+     */
+    abstract protected function getNonCatchablePatterns();
+
+    /**
+     * Retrieve token type. Also processes the token value if necessary.
+     *
+     * @param string $value
+     * @return integer
+     */
+    abstract protected function getType(&$value);
+
+These methods define the `lexical <http://en.wikipedia.org/wiki/Lexical_analysis>`_
+catchable and non-catchable patterns and a method for returning the
+type of a token and filtering the value if necessary.
+
+The Lexer is responsible for giving you an API to walk across a
+string one character at a time and analyze the type of each character, value and position of
+each token in the string. The low level API of the lexer is pretty simple:
+
+- ``setInput($input)`` - Sets the input data to be tokenized. The Lexer is immediately reset and the new input tokenized.
+- ``reset()`` - Resets the lexer.
+- ``resetPeek()`` - Resets the peek pointer to 0.
+- ``resetPosition($position = 0)`` - Resets the lexer position on the input to the given position.
+- ``isNextToken($token)`` - Checks whether a given token matches the current lookahead.
+- ``isNextTokenAny(array $tokens)`` - Checks whether any of the given tokens matches the current lookahead.
+- ``moveNext()`` - Moves to the next token in the input string.
+- ``skipUntil($type)`` - Tells the lexer to skip input tokens until it sees a token with the given value.
+- ``isA($value, $token)`` - Checks if given value is identical to the given token.
+- ``peek()`` - Moves the lookahead token forward.
+- ``glimpse()`` - Peeks at the next token, returns it and immediately resets the peek.
diff --git a/lib/doctrine/lexer/docs/en/sidebar.rst b/lib/doctrine/lexer/docs/en/sidebar.rst
new file mode 100644
index 000000000..9b04e2447
--- /dev/null
+++ b/lib/doctrine/lexer/docs/en/sidebar.rst
@@ -0,0 +1,6 @@
+.. toctree::
+    :depth: 3
+
+    index
+    simple-parser-example
+    dql-parser
diff --git a/lib/doctrine/lexer/docs/en/simple-parser-example.rst b/lib/doctrine/lexer/docs/en/simple-parser-example.rst
new file mode 100644
index 000000000..ac142421d
--- /dev/null
+++ b/lib/doctrine/lexer/docs/en/simple-parser-example.rst
@@ -0,0 +1,102 @@
+Simple Parser Example
+=====================
+
+Extend the ``Doctrine\Common\Lexer\AbstractLexer`` class and implement
+the ``getCatchablePatterns``, ``getNonCatchablePatterns``, and ``getType``
+methods. Here is a very simple example lexer implementation named ``CharacterTypeLexer``.
+It tokenizes a string to ``T_UPPER``, ``T_LOWER`` and``T_NUMBER`` tokens:
+
+.. code-block:: php
+    <?php
+
+    use Doctrine\Common\Lexer\AbstractLexer;
+
+    class CharacterTypeLexer extends AbstractLexer
+    {
+        const T_UPPER =  1;
+        const T_LOWER =  2;
+        const T_NUMBER = 3;
+
+        protected function getCatchablePatterns()
+        {
+            return array(
+                '[a-bA-Z0-9]',
+            );
+        }
+
+        protected function getNonCatchablePatterns()
+        {
+            return array();
+        }
+
+        protected function getType(&$value)
+        {
+            if (is_numeric($value)) {
+                return self::T_NUMBER;
+            }
+
+            if (strtoupper($value) === $value) {
+                return self::T_UPPER;
+            }
+
+            if (strtolower($value) === $value) {
+                return self::T_LOWER;
+            }
+        }
+    }
+
+Use ``CharacterTypeLexer`` to extract an array of upper case characters:
+
+.. code-block:: php
+    <?php
+
+    class UpperCaseCharacterExtracter
+    {
+        private $lexer;
+
+        public function __construct(CharacterTypeLexer $lexer)
+        {
+            $this->lexer = $lexer;
+        }
+
+        public function getUpperCaseCharacters($string)
+        {
+            $this->lexer->setInput($string);
+            $this->lexer->moveNext();
+
+            $upperCaseChars = array();
+            while (true) {
+                if (!$this->lexer->lookahead) {
+                    break;
+                }
+
+                $this->lexer->moveNext();
+
+                if ($this->lexer->token['type'] === CharacterTypeLexer::T_UPPER) {
+                    $upperCaseChars[] = $this->lexer->token['value'];
+                }
+            }
+
+            return $upperCaseChars;
+        }
+    }
+
+    $upperCaseCharacterExtractor = new UpperCaseCharacterExtracter(new CharacterTypeLexer());
+    $upperCaseCharacters = $upperCaseCharacterExtractor->getUpperCaseCharacters('1aBcdEfgHiJ12');
+
+    print_r($upperCaseCharacters);
+
+The variable ``$upperCaseCharacters`` contains all of the upper case
+characters:
+
+.. code-block:: php
+    Array
+    (
+        [0] => B
+        [1] => E
+        [2] => H
+        [3] => J
+    )
+
+This is a simple example but it should demonstrate the low level API
+that can be used to build more complex parsers.
diff --git a/lib/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php b/lib/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
new file mode 100644
index 000000000..317ff69d6
--- /dev/null
+++ b/lib/doctrine/lexer/lib/Doctrine/Common/Lexer/AbstractLexer.php
@@ -0,0 +1,332 @@
+<?php
+/*
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the MIT license. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+namespace Doctrine\Common\Lexer;
+
+/**
+ * Base class for writing simple lexers, i.e. for creating small DSLs.
+ *
+ * @since  2.0
+ * @author Guilherme Blanco <guilhermeblanco@hotmail.com>
+ * @author Jonathan Wage <jonwage@gmail.com>
+ * @author Roman Borschel <roman@code-factory.org>
+ */
+abstract class AbstractLexer
+{
+    /**
+     * Lexer original input string.
+     *
+     * @var string
+     */
+    private $input;
+
+    /**
+     * Array of scanned tokens.
+     *
+     * Each token is an associative array containing three items:
+     *  - 'value'    : the string value of the token in the input string
+     *  - 'type'     : the type of the token (identifier, numeric, string, input
+     *                 parameter, none)
+     *  - 'position' : the position of the token in the input string
+     *
+     * @var array
+     */
+    private $tokens = array();
+
+    /**
+     * Current lexer position in input string.
+     *
+     * @var integer
+     */
+    private $position = 0;
+
+    /**
+     * Current peek of current lexer position.
+     *
+     * @var integer
+     */
+    private $peek = 0;
+
+    /**
+     * The next token in the input.
+     *
+     * @var array
+     */
+    public $lookahead;
+
+    /**
+     * The last matched/seen token.
+     *
+     * @var array
+     */
+    public $token;
+
+    /**
+     * Sets the input data to be tokenized.
+     *
+     * The Lexer is immediately reset and the new input tokenized.
+     * Any unprocessed tokens from any previous input are lost.
+     *
+     * @param string $input The input to be tokenized.
+     *
+     * @return void
+     */
+    public function setInput($input)
+    {
+        $this->input  = $input;
+        $this->tokens = array();
+
+        $this->reset();
+        $this->scan($input);
+    }
+
+    /**
+     * Resets the lexer.
+     *
+     * @return void
+     */
+    public function reset()
+    {
+        $this->lookahead = null;
+        $this->token = null;
+        $this->peek = 0;
+        $this->position = 0;
+    }
+
+    /**
+     * Resets the peek pointer to 0.
+     *
+     * @return void
+     */
+    public function resetPeek()
+    {
+        $this->peek = 0;
+    }
+
+    /**
+     * Resets the lexer position on the input to the given position.
+     *
+     * @param integer $position Position to place the lexical scanner.
+     *
+     * @return void
+     */
+    public function resetPosition($position = 0)
+    {
+        $this->position = $position;
+    }
+
+    /**
+     * Retrieve the original lexer's input until a given position.
+     *
+     * @param integer $position
+     *
+     * @return string
+     */
+    public function getInputUntilPosition($position)
+    {
+        return substr($this->input, 0, $position);
+    }
+
+    /**
+     * Checks whether a given token matches the current lookahead.
+     *
+     * @param integer|string $token
+     *
+     * @return boolean
+     */
+    public function isNextToken($token)
+    {
+        return null !== $this->lookahead && $this->lookahead['type'] === $token;
+    }
+
+    /**
+     * Checks whether any of the given tokens matches the current lookahead.
+     *
+     * @param array $tokens
+     *
+     * @return boolean
+     */
+    public function isNextTokenAny(array $tokens)
+    {
+        return null !== $this->lookahead && in_array($this->lookahead['type'], $tokens, true);
+    }
+
+    /**
+     * Moves to the next token in the input string.
+     *
+     * @return boolean
+     */
+    public function moveNext()
+    {
+        $this->peek = 0;
+        $this->token = $this->lookahead;
+        $this->lookahead = (isset($this->tokens[$this->position]))
+            ? $this->tokens[$this->position++] : null;
+
+        return $this->lookahead !== null;
+    }
+
+    /**
+     * Tells the lexer to skip input tokens until it sees a token with the given value.
+     *
+     * @param string $type The token type to skip until.
+     *
+     * @return void
+     */
+    public function skipUntil($type)
+    {
+        while ($this->lookahead !== null && $this->lookahead['type'] !== $type) {
+            $this->moveNext();
+        }
+    }
+
+    /**
+     * Checks if given value is identical to the given token.
+     *
+     * @param mixed   $value
+     * @param integer $token
+     *
+     * @return boolean
+     */
+    public function isA($value, $token)
+    {
+        return $this->getType($value) === $token;
+    }
+
+    /**
+     * Moves the lookahead token forward.
+     *
+     * @return array|null The next token or NULL if there are no more tokens ahead.
+     */
+    public function peek()
+    {
+        if (isset($this->tokens[$this->position + $this->peek])) {
+            return $this->tokens[$this->position + $this->peek++];
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Peeks at the next token, returns it and immediately resets the peek.
+     *
+     * @return array|null The next token or NULL if there are no more tokens ahead.
+     */
+    public function glimpse()
+    {
+        $peek = $this->peek();
+        $this->peek = 0;
+        return $peek;
+    }
+
+    /**
+     * Scans the input string for tokens.
+     *
+     * @param string $input A query string.
+     *
+     * @return void
+     */
+    protected function scan($input)
+    {
+        static $regex;
+
+        if ( ! isset($regex)) {
+            $regex = sprintf(
+                '/(%s)|%s/%s',
+                implode(')|(', $this->getCatchablePatterns()),
+                implode('|', $this->getNonCatchablePatterns()),
+                $this->getModifiers()
+            );
+        }
+
+        $flags = PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_OFFSET_CAPTURE;
+        $matches = preg_split($regex, $input, -1, $flags);
+
+        if (false === $matches) {
+            // Work around https://bugs.php.net/78122
+            $matches = array(array($input, 0));
+        }
+
+        foreach ($matches as $match) {
+            // Must remain before 'value' assignment since it can change content
+            $type = $this->getType($match[0]);
+
+            $this->tokens[] = array(
+                'value' => $match[0],
+                'type'  => $type,
+                'position' => $match[1],
+            );
+        }
+    }
+
+    /**
+     * Gets the literal for a given token.
+     *
+     * @param integer $token
+     *
+     * @return string
+     */
+    public function getLiteral($token)
+    {
+        $className = get_class($this);
+        $reflClass = new \ReflectionClass($className);
+        $constants = $reflClass->getConstants();
+
+        foreach ($constants as $name => $value) {
+            if ($value === $token) {
+                return $className . '::' . $name;
+            }
+        }
+
+        return $token;
+    }
+
+    /**
+     * Regex modifiers
+     *
+     * @return string
+     */
+    protected function getModifiers()
+    {
+        return 'i';
+    }
+
+    /**
+     * Lexical catchable patterns.
+     *
+     * @return array
+     */
+    abstract protected function getCatchablePatterns();
+
+    /**
+     * Lexical non-catchable patterns.
+     *
+     * @return array
+     */
+    abstract protected function getNonCatchablePatterns();
+
+    /**
+     * Retrieve token type. Also processes the token value if necessary.
+     *
+     * @param string $value
+     *
+     * @return integer
+     */
+    abstract protected function getType(&$value);
+}
diff --git a/lib/doctrine/lexer/phpunit.xml.dist b/lib/doctrine/lexer/phpunit.xml.dist
new file mode 100644
index 000000000..d0a184669
--- /dev/null
+++ b/lib/doctrine/lexer/phpunit.xml.dist
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- https://phpunit.de/manual/current/en/appendixes.configuration.html -->
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.8/phpunit.xsd"
+         backupGlobals="false"
+         colors="true"
+         bootstrap="vendor/autoload.php"
+         convertNoticesToExceptions="true"
+>
+    <php>
+        <ini name="error_reporting" value="-1" />
+    </php>
+
+    <testsuites>
+        <testsuite name="Doctrine lexer Test Suite">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+
+    <filter>
+        <whitelist>
+            <directory suffix=".php">lib/Doctrine</directory>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/lib/doctrine/lexer/tests/Doctrine/Common/Lexer/AbstractLexerTest.php b/lib/doctrine/lexer/tests/Doctrine/Common/Lexer/AbstractLexerTest.php
new file mode 100644
index 000000000..8a2a4e49c
--- /dev/null
+++ b/lib/doctrine/lexer/tests/Doctrine/Common/Lexer/AbstractLexerTest.php
@@ -0,0 +1,268 @@
+<?php
+
+namespace Doctrine\Tests\Common\Lexer;
+
+class AbstractLexerTest extends \PHPUnit_Framework_TestCase
+{
+    /**
+     * @var ConcreteLexer
+     */
+    private $concreteLexer;
+
+    public function setUp()
+    {
+        $this->concreteLexer = new ConcreteLexer();
+    }
+
+    public function dataProvider()
+    {
+        return array(
+            array(
+                'price=10',
+                array(
+                    array(
+                        'value' => 'price',
+                        'type' => 'string',
+                        'position' => 0,
+                    ),
+                    array(
+                        'value' => '=',
+                        'type' => 'operator',
+                        'position' => 5,
+                    ),
+                    array(
+                        'value' => 10,
+                        'type' => 'int',
+                        'position' => 6,
+                    ),
+                ),
+            ),
+        );
+    }
+
+    public function testResetPeek()
+    {
+        $expectedTokens = array(
+            array(
+                'value' => 'price',
+                'type' => 'string',
+                'position' => 0,
+            ),
+            array(
+                'value' => '=',
+                'type' => 'operator',
+                'position' => 5,
+            ),
+            array(
+                'value' => 10,
+                'type' => 'int',
+                'position' => 6,
+            ),
+        );
+
+        $this->concreteLexer->setInput('price=10');
+
+        $this->assertEquals($expectedTokens[0], $this->concreteLexer->peek());
+        $this->assertEquals($expectedTokens[1], $this->concreteLexer->peek());
+        $this->concreteLexer->resetPeek();
+        $this->assertEquals($expectedTokens[0], $this->concreteLexer->peek());
+    }
+
+    public function testResetPosition()
+    {
+        $expectedTokens = array(
+            array(
+                'value' => 'price',
+                'type' => 'string',
+                'position' => 0,
+            ),
+            array(
+                'value' => '=',
+                'type' => 'operator',
+                'position' => 5,
+            ),
+            array(
+                'value' => 10,
+                'type' => 'int',
+                'position' => 6,
+            ),
+        );
+
+        $this->concreteLexer->setInput('price=10');
+        $this->assertNull($this->concreteLexer->lookahead);
+
+        $this->assertTrue($this->concreteLexer->moveNext());
+        $this->assertEquals($expectedTokens[0], $this->concreteLexer->lookahead);
+
+        $this->assertTrue($this->concreteLexer->moveNext());
+        $this->assertEquals($expectedTokens[1], $this->concreteLexer->lookahead);
+
+        $this->concreteLexer->resetPosition(0);
+
+        $this->assertTrue($this->concreteLexer->moveNext());
+        $this->assertEquals($expectedTokens[0], $this->concreteLexer->lookahead);
+    }
+
+    /**
+     * @dataProvider dataProvider
+     *
+     * @param $input
+     * @param $expectedTokens
+     */
+    public function testMoveNext($input, $expectedTokens)
+    {
+        $this->concreteLexer->setInput($input);
+        $this->assertNull($this->concreteLexer->lookahead);
+
+        for ($i = 0; $i < count($expectedTokens); $i++) {
+            $this->assertTrue($this->concreteLexer->moveNext());
+            $this->assertEquals($expectedTokens[$i], $this->concreteLexer->lookahead);
+        }
+
+        $this->assertFalse($this->concreteLexer->moveNext());
+        $this->assertNull($this->concreteLexer->lookahead);
+    }
+
+    public function testSkipUntil()
+    {
+        $this->concreteLexer->setInput('price=10');
+
+        $this->assertTrue($this->concreteLexer->moveNext());
+        $this->concreteLexer->skipUntil('operator');
+
+        $this->assertEquals(
+            array(
+                'value' => '=',
+                'type' => 'operator',
+                'position' => 5,
+            ),
+            $this->concreteLexer->lookahead
+        );
+    }
+
+    public function testUtf8Mismatch()
+    {
+        $this->concreteLexer->setInput("\xE9=10");
+
+        $this->assertTrue($this->concreteLexer->moveNext());
+
+        $this->assertEquals(
+            array(
+                'value' => "\xE9=10",
+                'type' => 'string',
+                'position' => 0,
+            ),
+            $this->concreteLexer->lookahead
+        );
+    }
+
+    /**
+     * @dataProvider dataProvider
+     *
+     * @param $input
+     * @param $expectedTokens
+     */
+    public function testPeek($input, $expectedTokens)
+    {
+        $this->concreteLexer->setInput($input);
+        foreach ($expectedTokens as $expectedToken) {
+            $this->assertEquals($expectedToken, $this->concreteLexer->peek());
+        }
+
+        $this->assertNull($this->concreteLexer->peek());
+    }
+
+    /**
+     * @dataProvider dataProvider
+     *
+     * @param $input
+     * @param $expectedTokens
+     */
+    public function testGlimpse($input, $expectedTokens)
+    {
+        $this->concreteLexer->setInput($input);
+
+        foreach ($expectedTokens as $expectedToken) {
+            $this->assertEquals($expectedToken, $this->concreteLexer->glimpse());
+            $this->concreteLexer->moveNext();
+        }
+
+        $this->assertNull($this->concreteLexer->peek());
+    }
+
+    public function inputUntilPositionDataProvider()
+    {
+        return array(
+            array('price=10', 5, 'price'),
+        );
+    }
+
+    /**
+     * @dataProvider inputUntilPositionDataProvider
+     *
+     * @param $input
+     * @param $position
+     * @param $expectedInput
+     */
+    public function testGetInputUntilPosition($input, $position, $expectedInput)
+    {
+        $this->concreteLexer->setInput($input);
+
+        $this->assertSame($expectedInput, $this->concreteLexer->getInputUntilPosition($position));
+    }
+
+    /**
+     * @dataProvider dataProvider
+     *
+     * @param $input
+     * @param $expectedTokens
+     */
+    public function testIsNextToken($input, $expectedTokens)
+    {
+        $this->concreteLexer->setInput($input);
+
+        $this->concreteLexer->moveNext();
+        for ($i = 0; $i < count($expectedTokens); $i++) {
+            $this->assertTrue($this->concreteLexer->isNextToken($expectedTokens[$i]['type']));
+            $this->concreteLexer->moveNext();
+        }
+    }
+
+    /**
+     * @dataProvider dataProvider
+     *
+     * @param $input
+     * @param $expectedTokens
+     */
+    public function testIsNextTokenAny($input, $expectedTokens)
+    {
+        $allTokenTypes = array_map(function ($token) {
+            return $token['type'];
+        }, $expectedTokens);
+
+        $this->concreteLexer->setInput($input);
+
+        $this->concreteLexer->moveNext();
+        for ($i = 0; $i < count($expectedTokens); $i++) {
+            $this->assertTrue($this->concreteLexer->isNextTokenAny(array($expectedTokens[$i]['type'])));
+            $this->assertTrue($this->concreteLexer->isNextTokenAny($allTokenTypes));
+            $this->concreteLexer->moveNext();
+        }
+    }
+
+    public function testGetLiteral()
+    {
+        $this->assertSame('Doctrine\Tests\Common\Lexer\ConcreteLexer::INT', $this->concreteLexer->getLiteral('int'));
+        $this->assertSame('fake_token', $this->concreteLexer->getLiteral('fake_token'));
+    }
+
+    public function testIsA()
+    {
+        $this->assertTrue($this->concreteLexer->isA(11, 'int'));
+        $this->assertTrue($this->concreteLexer->isA(1.1, 'int'));
+        $this->assertTrue($this->concreteLexer->isA('=', 'operator'));
+        $this->assertTrue($this->concreteLexer->isA('>', 'operator'));
+        $this->assertTrue($this->concreteLexer->isA('<', 'operator'));
+        $this->assertTrue($this->concreteLexer->isA('fake_text', 'string'));
+    }
+}
diff --git a/lib/doctrine/lexer/tests/Doctrine/Common/Lexer/ConcreteLexer.php b/lib/doctrine/lexer/tests/Doctrine/Common/Lexer/ConcreteLexer.php
new file mode 100644
index 000000000..ed4d153d1
--- /dev/null
+++ b/lib/doctrine/lexer/tests/Doctrine/Common/Lexer/ConcreteLexer.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Doctrine\Tests\Common\Lexer;
+
+use Doctrine\Common\Lexer\AbstractLexer;
+
+class ConcreteLexer extends AbstractLexer
+{
+    const INT = 'int';
+
+    protected function getCatchablePatterns()
+    {
+        return array(
+            '=|<|>',
+            '[a-z]+',
+            '\d+',
+        );
+    }
+
+    protected function getNonCatchablePatterns()
+    {
+        return array(
+            '\s+',
+            '(.)',
+        );
+    }
+
+    protected function getType(&$value)
+    {
+        if (is_numeric($value)) {
+            $value = (int)$value;
+
+            return 'int';
+        }
+        if (in_array($value, array('=', '<', '>'))) {
+            return 'operator';
+        }
+        if (is_string($value)) {
+            return 'string';
+        }
+
+        return;
+    }
+
+    protected function getModifiers()
+    {
+        return parent::getModifiers().'u';
+    }
+}
diff --git a/lib/egulias/email-validator/LICENSE b/lib/egulias/email-validator/LICENSE
new file mode 100644
index 000000000..c34d2c197
--- /dev/null
+++ b/lib/egulias/email-validator/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2013-2016 Eduardo Gulias Davis
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/lib/egulias/email-validator/composer.json b/lib/egulias/email-validator/composer.json
new file mode 100644
index 000000000..a275696ab
--- /dev/null
+++ b/lib/egulias/email-validator/composer.json
@@ -0,0 +1,38 @@
+{
+  "name":         "egulias/email-validator",
+  "description":  "A library for validating emails against several RFCs",
+  "homepage":     "https://github.com/egulias/EmailValidator",
+  "keywords":     ["email", "validation", "validator", "emailvalidation", "emailvalidator"],
+  "license":      "MIT",
+  "authors": [
+    {"name": "Eduardo Gulias Davis"}
+  ],
+  "extra": {
+    "branch-alias": {
+      "dev-master": "2.1.x-dev"
+    }
+  },
+  "require": {
+    "php": ">=5.5",
+    "doctrine/lexer": "^1.0.1",
+    "symfony/polyfill-intl-idn": "^1.10"
+  },
+  "require-dev": {
+    "dominicsayers/isemail": "^3.0.7",
+    "phpunit/phpunit": "^4.8.36|^7.5.15",
+    "satooshi/php-coveralls": "^1.0.1"
+  },
+  "suggest": {
+    "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation"
+  },
+  "autoload": {
+    "psr-4": {
+      "Egulias\\EmailValidator\\": "src"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "Egulias\\EmailValidator\\Tests\\": "tests"
+    }
+  }
+}
diff --git a/lib/egulias/email-validator/src/EmailLexer.php b/lib/egulias/email-validator/src/EmailLexer.php
new file mode 100644
index 000000000..59dcd5876
--- /dev/null
+++ b/lib/egulias/email-validator/src/EmailLexer.php
@@ -0,0 +1,283 @@
+<?php
+
+namespace Egulias\EmailValidator;
+
+use Doctrine\Common\Lexer\AbstractLexer;
+
+class EmailLexer extends AbstractLexer
+{
+    //ASCII values
+    const C_DEL              = 127;
+    const C_NUL              = 0;
+    const S_AT               = 64;
+    const S_BACKSLASH        = 92;
+    const S_DOT              = 46;
+    const S_DQUOTE           = 34;
+    const S_SQUOTE           = 39;
+    const S_BACKTICK         = 96;
+    const S_OPENPARENTHESIS  = 49;
+    const S_CLOSEPARENTHESIS = 261;
+    const S_OPENBRACKET      = 262;
+    const S_CLOSEBRACKET     = 263;
+    const S_HYPHEN           = 264;
+    const S_COLON            = 265;
+    const S_DOUBLECOLON      = 266;
+    const S_SP               = 267;
+    const S_HTAB             = 268;
+    const S_CR               = 269;
+    const S_LF               = 270;
+    const S_IPV6TAG          = 271;
+    const S_LOWERTHAN        = 272;
+    const S_GREATERTHAN      = 273;
+    const S_COMMA            = 274;
+    const S_SEMICOLON        = 275;
+    const S_OPENQBRACKET     = 276;
+    const S_CLOSEQBRACKET    = 277;
+    const S_SLASH            = 278;
+    const S_EMPTY            = null;
+    const GENERIC            = 300;
+    const CRLF               = 301;
+    const INVALID            = 302;
+    const ASCII_INVALID_FROM = 127;
+    const ASCII_INVALID_TO   = 199;
+
+    /**
+     * US-ASCII visible characters not valid for atext (@link http://tools.ietf.org/html/rfc5322#section-3.2.3)
+     *
+     * @var array
+     */
+    protected $charValue = array(
+        '('    => self::S_OPENPARENTHESIS,
+        ')'    => self::S_CLOSEPARENTHESIS,
+        '<'    => self::S_LOWERTHAN,
+        '>'    => self::S_GREATERTHAN,
+        '['    => self::S_OPENBRACKET,
+        ']'    => self::S_CLOSEBRACKET,
+        ':'    => self::S_COLON,
+        ';'    => self::S_SEMICOLON,
+        '@'    => self::S_AT,
+        '\\'   => self::S_BACKSLASH,
+        '/'    => self::S_SLASH,
+        ','    => self::S_COMMA,
+        '.'    => self::S_DOT,
+        "'"    => self::S_SQUOTE,
+        "`"    => self::S_BACKTICK,
+        '"'    => self::S_DQUOTE,
+        '-'    => self::S_HYPHEN,
+        '::'   => self::S_DOUBLECOLON,
+        ' '    => self::S_SP,
+        "\t"   => self::S_HTAB,
+        "\r"   => self::S_CR,
+        "\n"   => self::S_LF,
+        "\r\n" => self::CRLF,
+        'IPv6' => self::S_IPV6TAG,
+        '{'    => self::S_OPENQBRACKET,
+        '}'    => self::S_CLOSEQBRACKET,
+        ''     => self::S_EMPTY,
+        '\0'   => self::C_NUL,
+    );
+
+    /**
+     * @var bool
+     */
+    protected $hasInvalidTokens = false;
+
+    /**
+     * @var array
+     *
+     * @psalm-var array{value:string, type:null|int, position:int}|array<empty, empty>
+     */
+    protected $previous = [];
+
+    /**
+     * The last matched/seen token.
+     *
+     * @var array
+     *
+     * @psalm-var array{value:string, type:null|int, position:int}
+     */
+    public $token;
+
+    /**
+     * The next token in the input.
+     *
+     * @var array|null
+     */
+    public $lookahead;
+
+    /**
+     * @psalm-var array{value:'', type:null, position:0}
+     */
+    private static $nullToken = [
+        'value' => '',
+        'type' => null,
+        'position' => 0,
+    ];
+
+    public function __construct()
+    {
+        $this->previous = $this->token = self::$nullToken;
+        $this->lookahead = null;
+    }
+
+    /**
+     * @return void
+     */
+    public function reset()
+    {
+        $this->hasInvalidTokens = false;
+        parent::reset();
+        $this->previous = $this->token = self::$nullToken;
+    }
+
+    /**
+     * @return bool
+     */
+    public function hasInvalidTokens()
+    {
+        return $this->hasInvalidTokens;
+    }
+
+    /**
+     * @param int $type
+     * @throws \UnexpectedValueException
+     * @return boolean
+     *
+     * @psalm-suppress InvalidScalarArgument
+     */
+    public function find($type)
+    {
+        $search = clone $this;
+        $search->skipUntil($type);
+
+        if (!$search->lookahead) {
+            throw new \UnexpectedValueException($type . ' not found');
+        }
+        return true;
+    }
+
+    /**
+     * getPrevious
+     *
+     * @return array
+     */
+    public function getPrevious()
+    {
+        return $this->previous;
+    }
+
+    /**
+     * moveNext
+     *
+     * @return boolean
+     */
+    public function moveNext()
+    {
+        $this->previous = $this->token;
+        $hasNext = parent::moveNext();
+        $this->token = $this->token ?: self::$nullToken;
+
+        return $hasNext;
+    }
+
+    /**
+     * Lexical catchable patterns.
+     *
+     * @return string[]
+     */
+    protected function getCatchablePatterns()
+    {
+        return array(
+            '[a-zA-Z_]+[46]?', //ASCII and domain literal
+            '[^\x00-\x7F]',  //UTF-8
+            '[0-9]+',
+            '\r\n',
+            '::',
+            '\s+?',
+            '.',
+            );
+    }
+
+    /**
+     * Lexical non-catchable patterns.
+     *
+     * @return string[]
+     */
+    protected function getNonCatchablePatterns()
+    {
+        return array('[\xA0-\xff]+');
+    }
+
+    /**
+     * Retrieve token type. Also processes the token value if necessary.
+     *
+     * @param string $value
+     * @throws \InvalidArgumentException
+     * @return integer
+     */
+    protected function getType(&$value)
+    {
+        if ($this->isNullType($value)) {
+            return self::C_NUL;
+        }
+
+        if ($this->isValid($value)) {
+            return $this->charValue[$value];
+        }
+
+        if ($this->isUTF8Invalid($value)) {
+            $this->hasInvalidTokens = true;
+            return self::INVALID;
+        }
+
+        return  self::GENERIC;
+    }
+
+    /**
+     * @param string $value
+     *
+     * @return bool
+     */
+    protected function isValid($value)
+    {
+        if (isset($this->charValue[$value])) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $value
+     * @return bool
+     */
+    protected function isNullType($value)
+    {
+        if ($value === "\0") {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @param string $value
+     * @return bool
+     */
+    protected function isUTF8Invalid($value)
+    {
+        if (preg_match('/\p{Cc}+/u', $value)) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return string
+     */
+    protected function getModifiers()
+    {
+        return 'iu';
+    }
+}
diff --git a/lib/egulias/email-validator/src/EmailParser.php b/lib/egulias/email-validator/src/EmailParser.php
new file mode 100644
index 000000000..6b7bad669
--- /dev/null
+++ b/lib/egulias/email-validator/src/EmailParser.php
@@ -0,0 +1,137 @@
+<?php
+
+namespace Egulias\EmailValidator;
+
+use Egulias\EmailValidator\Exception\ExpectingATEXT;
+use Egulias\EmailValidator\Exception\NoLocalPart;
+use Egulias\EmailValidator\Parser\DomainPart;
+use Egulias\EmailValidator\Parser\LocalPart;
+use Egulias\EmailValidator\Warning\EmailTooLong;
+
+/**
+ * EmailParser
+ *
+ * @author Eduardo Gulias Davis <me@egulias.com>
+ */
+class EmailParser
+{
+    const EMAIL_MAX_LENGTH = 254;
+
+    /**
+     * @var array
+     */
+    protected $warnings = [];
+
+    /**
+     * @var string
+     */
+    protected $domainPart = '';
+
+    /**
+     * @var string
+     */
+    protected $localPart = '';
+    /**
+     * @var EmailLexer
+     */
+    protected $lexer;
+
+    /**
+     * @var LocalPart
+     */
+    protected $localPartParser;
+
+    /**
+     * @var DomainPart
+     */
+    protected $domainPartParser;
+
+    public function __construct(EmailLexer $lexer)
+    {
+        $this->lexer = $lexer;
+        $this->localPartParser = new LocalPart($this->lexer);
+        $this->domainPartParser = new DomainPart($this->lexer);
+    }
+
+    /**
+     * @param string $str
+     * @return array
+     */
+    public function parse($str)
+    {
+        $this->lexer->setInput($str);
+
+        if (!$this->hasAtToken()) {
+            throw new NoLocalPart();
+        }
+
+
+        $this->localPartParser->parse($str);
+        $this->domainPartParser->parse($str);
+
+        $this->setParts($str);
+
+        if ($this->lexer->hasInvalidTokens()) {
+            throw new ExpectingATEXT();
+        }
+
+        return array('local' => $this->localPart, 'domain' => $this->domainPart);
+    }
+
+    /**
+     * @return Warning\Warning[]
+     */
+    public function getWarnings()
+    {
+        $localPartWarnings = $this->localPartParser->getWarnings();
+        $domainPartWarnings = $this->domainPartParser->getWarnings();
+        $this->warnings = array_merge($localPartWarnings, $domainPartWarnings);
+
+        $this->addLongEmailWarning($this->localPart, $this->domainPart);
+
+        return $this->warnings;
+    }
+
+    /**
+     * @return string
+     */
+    public function getParsedDomainPart()
+    {
+        return $this->domainPart;
+    }
+
+    /**
+     * @param string $email
+     */
+    protected function setParts($email)
+    {
+        $parts = explode('@', $email);
+        $this->domainPart = $this->domainPartParser->getDomainPart();
+        $this->localPart = $parts[0];
+    }
+
+    /**
+     * @return bool
+     */
+    protected function hasAtToken()
+    {
+        $this->lexer->moveNext();
+        $this->lexer->moveNext();
+        if ($this->lexer->token['type'] === EmailLexer::S_AT) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @param string $localPart
+     * @param string $parsedDomainPart
+     */
+    protected function addLongEmailWarning($localPart, $parsedDomainPart)
+    {
+        if (strlen($localPart . '@' . $parsedDomainPart) > self::EMAIL_MAX_LENGTH) {
+            $this->warnings[EmailTooLong::CODE] = new EmailTooLong();
+        }
+    }
+}
diff --git a/lib/egulias/email-validator/src/EmailValidator.php b/lib/egulias/email-validator/src/EmailValidator.php
new file mode 100644
index 000000000..a30f21dcd
--- /dev/null
+++ b/lib/egulias/email-validator/src/EmailValidator.php
@@ -0,0 +1,67 @@
+<?php
+
+namespace Egulias\EmailValidator;
+
+use Egulias\EmailValidator\Exception\InvalidEmail;
+use Egulias\EmailValidator\Validation\EmailValidation;
+
+class EmailValidator
+{
+    /**
+     * @var EmailLexer
+     */
+    private $lexer;
+
+    /**
+     * @var Warning\Warning[]
+     */
+    protected $warnings = [];
+
+    /**
+     * @var InvalidEmail|null
+     */
+    protected $error;
+
+    public function __construct()
+    {
+        $this->lexer = new EmailLexer();
+    }
+
+    /**
+     * @param string          $email
+     * @param EmailValidation $emailValidation
+     * @return bool
+     */
+    public function isValid($email, EmailValidation $emailValidation)
+    {
+        $isValid = $emailValidation->isValid($email, $this->lexer);
+        $this->warnings = $emailValidation->getWarnings();
+        $this->error = $emailValidation->getError();
+
+        return $isValid;
+    }
+
+    /**
+     * @return boolean
+     */
+    public function hasWarnings()
+    {
+        return !empty($this->warnings);
+    }
+
+    /**
+     * @return array
+     */
+    public function getWarnings()
+    {
+        return $this->warnings;
+    }
+
+    /**
+     * @return InvalidEmail|null
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Exception/AtextAfterCFWS.php b/lib/egulias/email-validator/src/Exception/AtextAfterCFWS.php
new file mode 100644
index 000000000..97f41a2ca
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/AtextAfterCFWS.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class AtextAfterCFWS extends InvalidEmail
+{
+    const CODE = 133;
+    const REASON = "ATEXT found after CFWS";
+}
diff --git a/lib/egulias/email-validator/src/Exception/CRLFAtTheEnd.php b/lib/egulias/email-validator/src/Exception/CRLFAtTheEnd.php
new file mode 100644
index 000000000..ec23bc718
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/CRLFAtTheEnd.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class CRLFAtTheEnd extends InvalidEmail
+{
+    const CODE = 149;
+    const REASON = "CRLF at the end";
+}
diff --git a/lib/egulias/email-validator/src/Exception/CRLFX2.php b/lib/egulias/email-validator/src/Exception/CRLFX2.php
new file mode 100644
index 000000000..6bd377ee7
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/CRLFX2.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class CRLFX2 extends InvalidEmail
+{
+    const CODE = 148;
+    const REASON = "Folding whitespace CR LF found twice";
+}
diff --git a/lib/egulias/email-validator/src/Exception/CRNoLF.php b/lib/egulias/email-validator/src/Exception/CRNoLF.php
new file mode 100644
index 000000000..9c9f73944
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/CRNoLF.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class CRNoLF extends InvalidEmail
+{
+    const CODE = 150;
+    const REASON = "Missing LF after CR";
+}
diff --git a/lib/egulias/email-validator/src/Exception/CharNotAllowed.php b/lib/egulias/email-validator/src/Exception/CharNotAllowed.php
new file mode 100644
index 000000000..ea20ce591
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/CharNotAllowed.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class CharNotAllowed extends InvalidEmail
+{
+    const CODE = 201;
+    const REASON = "Non allowed character in domain";
+}
diff --git a/lib/egulias/email-validator/src/Exception/CommaInDomain.php b/lib/egulias/email-validator/src/Exception/CommaInDomain.php
new file mode 100644
index 000000000..e9245d966
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/CommaInDomain.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class CommaInDomain extends InvalidEmail
+{
+    const CODE = 200;
+    const REASON = "Comma ',' is not allowed in domain part";
+}
diff --git a/lib/egulias/email-validator/src/Exception/ConsecutiveAt.php b/lib/egulias/email-validator/src/Exception/ConsecutiveAt.php
new file mode 100644
index 000000000..165ff57a9
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/ConsecutiveAt.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class ConsecutiveAt extends InvalidEmail
+{
+    const CODE = 128;
+    const REASON = "Consecutive AT";
+}
diff --git a/lib/egulias/email-validator/src/Exception/ConsecutiveDot.php b/lib/egulias/email-validator/src/Exception/ConsecutiveDot.php
new file mode 100644
index 000000000..949af3b59
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/ConsecutiveDot.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class ConsecutiveDot extends InvalidEmail
+{
+    const CODE = 132;
+    const REASON = "Consecutive DOT";
+}
diff --git a/lib/egulias/email-validator/src/Exception/DomainAcceptsNoMail.php b/lib/egulias/email-validator/src/Exception/DomainAcceptsNoMail.php
new file mode 100644
index 000000000..40a99705c
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/DomainAcceptsNoMail.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class DomainAcceptsNoMail extends InvalidEmail
+{
+    const CODE = 154;
+    const REASON = 'Domain accepts no mail (Null MX, RFC7505)';
+}
\ No newline at end of file
diff --git a/lib/egulias/email-validator/src/Exception/DomainHyphened.php b/lib/egulias/email-validator/src/Exception/DomainHyphened.php
new file mode 100644
index 000000000..6f5868603
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/DomainHyphened.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class DomainHyphened extends InvalidEmail
+{
+    const CODE = 144;
+    const REASON = "Hyphen found in domain";
+}
diff --git a/lib/egulias/email-validator/src/Exception/DotAtEnd.php b/lib/egulias/email-validator/src/Exception/DotAtEnd.php
new file mode 100644
index 000000000..05ade77d0
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/DotAtEnd.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class DotAtEnd extends InvalidEmail
+{
+    const CODE = 142;
+    const REASON = "Dot at the end";
+}
diff --git a/lib/egulias/email-validator/src/Exception/DotAtStart.php b/lib/egulias/email-validator/src/Exception/DotAtStart.php
new file mode 100644
index 000000000..7772df7f8
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/DotAtStart.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class DotAtStart extends InvalidEmail
+{
+    const CODE = 141;
+    const REASON = "Found DOT at start";
+}
diff --git a/lib/egulias/email-validator/src/Exception/ExpectingAT.php b/lib/egulias/email-validator/src/Exception/ExpectingAT.php
new file mode 100644
index 000000000..36d633c1a
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/ExpectingAT.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class ExpectingAT extends InvalidEmail
+{
+    const CODE = 202;
+    const REASON = "Expecting AT '@' ";
+}
diff --git a/lib/egulias/email-validator/src/Exception/ExpectingATEXT.php b/lib/egulias/email-validator/src/Exception/ExpectingATEXT.php
new file mode 100644
index 000000000..095d9db74
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/ExpectingATEXT.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class ExpectingATEXT extends InvalidEmail
+{
+    const CODE = 137;
+    const REASON = "Expecting ATEXT";
+}
diff --git a/lib/egulias/email-validator/src/Exception/ExpectingCTEXT.php b/lib/egulias/email-validator/src/Exception/ExpectingCTEXT.php
new file mode 100644
index 000000000..63b870a4a
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/ExpectingCTEXT.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class ExpectingCTEXT extends InvalidEmail
+{
+    const CODE = 139;
+    const REASON = "Expecting CTEXT";
+}
diff --git a/lib/egulias/email-validator/src/Exception/ExpectingDTEXT.php b/lib/egulias/email-validator/src/Exception/ExpectingDTEXT.php
new file mode 100644
index 000000000..6a5bb9bfe
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/ExpectingDTEXT.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class ExpectingDTEXT extends InvalidEmail
+{
+    const CODE = 129;
+    const REASON = "Expected DTEXT";
+}
diff --git a/lib/egulias/email-validator/src/Exception/ExpectingDomainLiteralClose.php b/lib/egulias/email-validator/src/Exception/ExpectingDomainLiteralClose.php
new file mode 100644
index 000000000..81aad4277
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/ExpectingDomainLiteralClose.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class ExpectingDomainLiteralClose extends InvalidEmail
+{
+    const CODE = 137;
+    const REASON = "Closing bracket ']' for domain literal not found";
+}
diff --git a/lib/egulias/email-validator/src/Exception/ExpectingQPair.php b/lib/egulias/email-validator/src/Exception/ExpectingQPair.php
new file mode 100644
index 000000000..a738eeb62
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/ExpectingQPair.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class ExpectingQPair extends InvalidEmail
+{
+    const CODE = 136;
+    const REASON = "Expecting QPAIR";
+}
diff --git a/lib/egulias/email-validator/src/Exception/InvalidEmail.php b/lib/egulias/email-validator/src/Exception/InvalidEmail.php
new file mode 100644
index 000000000..1c0218e9e
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/InvalidEmail.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+abstract class InvalidEmail extends \InvalidArgumentException
+{
+    const REASON = "Invalid email";
+    const CODE = 0;
+
+    public function __construct()
+    {
+        parent::__construct(static::REASON, static::CODE);
+    }
+}
diff --git a/lib/egulias/email-validator/src/Exception/LocalOrReservedDomain.php b/lib/egulias/email-validator/src/Exception/LocalOrReservedDomain.php
new file mode 100644
index 000000000..695b05a46
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/LocalOrReservedDomain.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class LocalOrReservedDomain extends InvalidEmail
+{
+    const CODE = 153;
+    const REASON = 'Local, mDNS or reserved domain (RFC2606, RFC6762)';
+}
\ No newline at end of file
diff --git a/lib/egulias/email-validator/src/Exception/NoDNSRecord.php b/lib/egulias/email-validator/src/Exception/NoDNSRecord.php
new file mode 100644
index 000000000..0aa5fa789
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/NoDNSRecord.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class NoDNSRecord extends InvalidEmail
+{
+    const CODE = 5;
+    const REASON = 'No MX or A DSN record was found for this email';
+}
diff --git a/lib/egulias/email-validator/src/Exception/NoDomainPart.php b/lib/egulias/email-validator/src/Exception/NoDomainPart.php
new file mode 100644
index 000000000..05a2604c0
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/NoDomainPart.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class NoDomainPart extends InvalidEmail
+{
+    const CODE = 131;
+    const REASON = "No Domain part";
+}
diff --git a/lib/egulias/email-validator/src/Exception/NoLocalPart.php b/lib/egulias/email-validator/src/Exception/NoLocalPart.php
new file mode 100644
index 000000000..07c14b844
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/NoLocalPart.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class NoLocalPart extends InvalidEmail
+{
+    const CODE = 130;
+    const REASON = "No local part";
+}
diff --git a/lib/egulias/email-validator/src/Exception/UnclosedComment.php b/lib/egulias/email-validator/src/Exception/UnclosedComment.php
new file mode 100644
index 000000000..86b2b0962
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/UnclosedComment.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class UnclosedComment extends InvalidEmail
+{
+    const CODE = 146;
+    const REASON = "No closing comment token found";
+}
diff --git a/lib/egulias/email-validator/src/Exception/UnclosedQuotedString.php b/lib/egulias/email-validator/src/Exception/UnclosedQuotedString.php
new file mode 100644
index 000000000..730a39dd3
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/UnclosedQuotedString.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class UnclosedQuotedString extends InvalidEmail
+{
+    const CODE = 145;
+    const REASON = "Unclosed quoted string";
+}
diff --git a/lib/egulias/email-validator/src/Exception/UnopenedComment.php b/lib/egulias/email-validator/src/Exception/UnopenedComment.php
new file mode 100644
index 000000000..cff12d925
--- /dev/null
+++ b/lib/egulias/email-validator/src/Exception/UnopenedComment.php
@@ -0,0 +1,9 @@
+<?php
+
+namespace Egulias\EmailValidator\Exception;
+
+class UnopenedComment extends InvalidEmail
+{
+    const CODE = 152;
+    const REASON = "No opening comment token found";
+}
diff --git a/lib/egulias/email-validator/src/Parser/DomainPart.php b/lib/egulias/email-validator/src/Parser/DomainPart.php
new file mode 100644
index 000000000..4dadba8af
--- /dev/null
+++ b/lib/egulias/email-validator/src/Parser/DomainPart.php
@@ -0,0 +1,443 @@
+<?php
+
+namespace Egulias\EmailValidator\Parser;
+
+use Egulias\EmailValidator\EmailLexer;
+use Egulias\EmailValidator\Exception\CharNotAllowed;
+use Egulias\EmailValidator\Exception\CommaInDomain;
+use Egulias\EmailValidator\Exception\ConsecutiveAt;
+use Egulias\EmailValidator\Exception\CRLFAtTheEnd;
+use Egulias\EmailValidator\Exception\CRNoLF;
+use Egulias\EmailValidator\Exception\DomainHyphened;
+use Egulias\EmailValidator\Exception\DotAtEnd;
+use Egulias\EmailValidator\Exception\DotAtStart;
+use Egulias\EmailValidator\Exception\ExpectingATEXT;
+use Egulias\EmailValidator\Exception\ExpectingDomainLiteralClose;
+use Egulias\EmailValidator\Exception\ExpectingDTEXT;
+use Egulias\EmailValidator\Exception\NoDomainPart;
+use Egulias\EmailValidator\Exception\UnopenedComment;
+use Egulias\EmailValidator\Warning\AddressLiteral;
+use Egulias\EmailValidator\Warning\CFWSWithFWS;
+use Egulias\EmailValidator\Warning\DeprecatedComment;
+use Egulias\EmailValidator\Warning\DomainLiteral;
+use Egulias\EmailValidator\Warning\DomainTooLong;
+use Egulias\EmailValidator\Warning\IPV6BadChar;
+use Egulias\EmailValidator\Warning\IPV6ColonEnd;
+use Egulias\EmailValidator\Warning\IPV6ColonStart;
+use Egulias\EmailValidator\Warning\IPV6Deprecated;
+use Egulias\EmailValidator\Warning\IPV6DoubleColon;
+use Egulias\EmailValidator\Warning\IPV6GroupCount;
+use Egulias\EmailValidator\Warning\IPV6MaxGroups;
+use Egulias\EmailValidator\Warning\LabelTooLong;
+use Egulias\EmailValidator\Warning\ObsoleteDTEXT;
+use Egulias\EmailValidator\Warning\TLD;
+
+class DomainPart extends Parser
+{
+    const DOMAIN_MAX_LENGTH = 254;
+    const LABEL_MAX_LENGTH = 63;
+
+    /**
+     * @var string
+     */
+    protected $domainPart = '';
+
+    public function parse($domainPart)
+    {
+        $this->lexer->moveNext();
+
+        $this->performDomainStartChecks();
+
+        $domain = $this->doParseDomainPart();
+
+        $prev = $this->lexer->getPrevious();
+        $length = strlen($domain);
+
+        if ($prev['type'] === EmailLexer::S_DOT) {
+            throw new DotAtEnd();
+        }
+        if ($prev['type'] === EmailLexer::S_HYPHEN) {
+            throw new DomainHyphened();
+        }
+        if ($length > self::DOMAIN_MAX_LENGTH) {
+            $this->warnings[DomainTooLong::CODE] = new DomainTooLong();
+        }
+        if ($prev['type'] === EmailLexer::S_CR) {
+            throw new CRLFAtTheEnd();
+        }
+        $this->domainPart = $domain;
+    }
+
+    private function performDomainStartChecks()
+    {
+        $this->checkInvalidTokensAfterAT();
+        $this->checkEmptyDomain();
+
+        if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
+            $this->warnings[DeprecatedComment::CODE] = new DeprecatedComment();
+            $this->parseDomainComments();
+        }
+    }
+
+    private function checkEmptyDomain()
+    {
+        $thereIsNoDomain = $this->lexer->token['type'] === EmailLexer::S_EMPTY ||
+            ($this->lexer->token['type'] === EmailLexer::S_SP &&
+            !$this->lexer->isNextToken(EmailLexer::GENERIC));
+
+        if ($thereIsNoDomain) {
+            throw new NoDomainPart();
+        }
+    }
+
+    private function checkInvalidTokensAfterAT()
+    {
+        if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
+            throw new DotAtStart();
+        }
+        if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN) {
+            throw new DomainHyphened();
+        }
+    }
+
+    /**
+     * @return string
+     */
+    public function getDomainPart()
+    {
+        return $this->domainPart;
+    }
+
+    /**
+     * @param string $addressLiteral
+     * @param int $maxGroups
+     */
+    public function checkIPV6Tag($addressLiteral, $maxGroups = 8)
+    {
+        $prev = $this->lexer->getPrevious();
+        if ($prev['type'] === EmailLexer::S_COLON) {
+            $this->warnings[IPV6ColonEnd::CODE] = new IPV6ColonEnd();
+        }
+
+        $IPv6       = substr($addressLiteral, 5);
+        //Daniel Marschall's new IPv6 testing strategy
+        $matchesIP  = explode(':', $IPv6);
+        $groupCount = count($matchesIP);
+        $colons     = strpos($IPv6, '::');
+
+        if (count(preg_grep('/^[0-9A-Fa-f]{0,4}$/', $matchesIP, PREG_GREP_INVERT)) !== 0) {
+            $this->warnings[IPV6BadChar::CODE] = new IPV6BadChar();
+        }
+
+        if ($colons === false) {
+            // We need exactly the right number of groups
+            if ($groupCount !== $maxGroups) {
+                $this->warnings[IPV6GroupCount::CODE] = new IPV6GroupCount();
+            }
+            return;
+        }
+
+        if ($colons !== strrpos($IPv6, '::')) {
+            $this->warnings[IPV6DoubleColon::CODE] = new IPV6DoubleColon();
+            return;
+        }
+
+        if ($colons === 0 || $colons === (strlen($IPv6) - 2)) {
+            // RFC 4291 allows :: at the start or end of an address
+            //with 7 other groups in addition
+            ++$maxGroups;
+        }
+
+        if ($groupCount > $maxGroups) {
+            $this->warnings[IPV6MaxGroups::CODE] = new IPV6MaxGroups();
+        } elseif ($groupCount === $maxGroups) {
+            $this->warnings[IPV6Deprecated::CODE] = new IPV6Deprecated();
+        }
+    }
+
+    /**
+     * @return string
+     */
+    protected function doParseDomainPart()
+    {
+        $domain = '';
+        $label = '';
+        $openedParenthesis = 0;
+        do {
+            $prev = $this->lexer->getPrevious();
+
+            $this->checkNotAllowedChars($this->lexer->token);
+
+            if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
+                $this->parseComments();
+                $openedParenthesis += $this->getOpenedParenthesis();
+                $this->lexer->moveNext();
+                $tmpPrev = $this->lexer->getPrevious();
+                if ($tmpPrev['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
+                    $openedParenthesis--;
+                }
+            }
+            if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
+                if ($openedParenthesis === 0) {
+                    throw new UnopenedComment();
+                } else {
+                    $openedParenthesis--;
+                }
+            }
+
+            $this->checkConsecutiveDots();
+            $this->checkDomainPartExceptions($prev);
+
+            if ($this->hasBrackets()) {
+                $this->parseDomainLiteral();
+            }
+
+            if ($this->lexer->token['type'] === EmailLexer::S_DOT) {
+                $this->checkLabelLength($label);
+                $label = '';
+            } else {
+                $label .= $this->lexer->token['value'];
+            }
+
+            if ($this->isFWS()) {
+                $this->parseFWS();
+            }
+
+            $domain .= $this->lexer->token['value'];
+            $this->lexer->moveNext();
+            if ($this->lexer->token['type'] === EmailLexer::S_SP) {
+                throw new CharNotAllowed();
+            }
+        } while (null !== $this->lexer->token['type']);
+
+        $this->checkLabelLength($label);
+
+        return $domain;
+    }
+
+    private function checkNotAllowedChars(array $token)
+    {
+        $notAllowed = [EmailLexer::S_BACKSLASH => true, EmailLexer::S_SLASH=> true];
+        if (isset($notAllowed[$token['type']])) {
+            throw new CharNotAllowed();
+        }
+    }
+
+    /**
+     * @return string|false
+     */
+    protected function parseDomainLiteral()
+    {
+        if ($this->lexer->isNextToken(EmailLexer::S_COLON)) {
+            $this->warnings[IPV6ColonStart::CODE] = new IPV6ColonStart();
+        }
+        if ($this->lexer->isNextToken(EmailLexer::S_IPV6TAG)) {
+            $lexer = clone $this->lexer;
+            $lexer->moveNext();
+            if ($lexer->isNextToken(EmailLexer::S_DOUBLECOLON)) {
+                $this->warnings[IPV6ColonStart::CODE] = new IPV6ColonStart();
+            }
+        }
+
+        return $this->doParseDomainLiteral();
+    }
+
+    /**
+     * @return string|false
+     */
+    protected function doParseDomainLiteral()
+    {
+        $IPv6TAG = false;
+        $addressLiteral = '';
+        do {
+            if ($this->lexer->token['type'] === EmailLexer::C_NUL) {
+                throw new ExpectingDTEXT();
+            }
+
+            if ($this->lexer->token['type'] === EmailLexer::INVALID ||
+                $this->lexer->token['type'] === EmailLexer::C_DEL   ||
+                $this->lexer->token['type'] === EmailLexer::S_LF
+            ) {
+                $this->warnings[ObsoleteDTEXT::CODE] = new ObsoleteDTEXT();
+            }
+
+            if ($this->lexer->isNextTokenAny(array(EmailLexer::S_OPENQBRACKET, EmailLexer::S_OPENBRACKET))) {
+                throw new ExpectingDTEXT();
+            }
+
+            if ($this->lexer->isNextTokenAny(
+                array(EmailLexer::S_HTAB, EmailLexer::S_SP, $this->lexer->token['type'] === EmailLexer::CRLF)
+            )) {
+                $this->warnings[CFWSWithFWS::CODE] = new CFWSWithFWS();
+                $this->parseFWS();
+            }
+
+            if ($this->lexer->isNextToken(EmailLexer::S_CR)) {
+                throw new CRNoLF();
+            }
+
+            if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH) {
+                $this->warnings[ObsoleteDTEXT::CODE] = new ObsoleteDTEXT();
+                $addressLiteral .= $this->lexer->token['value'];
+                $this->lexer->moveNext();
+                $this->validateQuotedPair();
+            }
+            if ($this->lexer->token['type'] === EmailLexer::S_IPV6TAG) {
+                $IPv6TAG = true;
+            }
+            if ($this->lexer->token['type'] === EmailLexer::S_CLOSEQBRACKET) {
+                break;
+            }
+
+            $addressLiteral .= $this->lexer->token['value'];
+
+        } while ($this->lexer->moveNext());
+
+        $addressLiteral = str_replace('[', '', $addressLiteral);
+        $addressLiteral = $this->checkIPV4Tag($addressLiteral);
+
+        if (false === $addressLiteral) {
+            return $addressLiteral;
+        }
+
+        if (!$IPv6TAG) {
+            $this->warnings[DomainLiteral::CODE] = new DomainLiteral();
+            return $addressLiteral;
+        }
+
+        $this->warnings[AddressLiteral::CODE] = new AddressLiteral();
+
+        $this->checkIPV6Tag($addressLiteral);
+
+        return $addressLiteral;
+    }
+
+    /**
+     * @param string $addressLiteral
+     *
+     * @return string|false
+     */
+    protected function checkIPV4Tag($addressLiteral)
+    {
+        $matchesIP  = array();
+
+        // Extract IPv4 part from the end of the address-literal (if there is one)
+        if (preg_match(
+            '/\\b(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/',
+            $addressLiteral,
+            $matchesIP
+        ) > 0
+        ) {
+            $index = strrpos($addressLiteral, $matchesIP[0]);
+            if ($index === 0) {
+                $this->warnings[AddressLiteral::CODE] = new AddressLiteral();
+                return false;
+            }
+            // Convert IPv4 part to IPv6 format for further testing
+            $addressLiteral = substr($addressLiteral, 0, (int) $index) . '0:0';
+        }
+
+        return $addressLiteral;
+    }
+
+    protected function checkDomainPartExceptions(array $prev)
+    {
+        $invalidDomainTokens = array(
+            EmailLexer::S_DQUOTE => true,
+            EmailLexer::S_SQUOTE => true,
+            EmailLexer::S_BACKTICK => true,
+            EmailLexer::S_SEMICOLON => true,
+            EmailLexer::S_GREATERTHAN => true,
+            EmailLexer::S_LOWERTHAN => true,
+        );
+
+        if (isset($invalidDomainTokens[$this->lexer->token['type']])) {
+            throw new ExpectingATEXT();
+        }
+
+        if ($this->lexer->token['type'] === EmailLexer::S_COMMA) {
+            throw new CommaInDomain();
+        }
+
+        if ($this->lexer->token['type'] === EmailLexer::S_AT) {
+            throw new ConsecutiveAt();
+        }
+
+        if ($this->lexer->token['type'] === EmailLexer::S_OPENQBRACKET && $prev['type'] !== EmailLexer::S_AT) {
+            throw new ExpectingATEXT();
+        }
+
+        if ($this->lexer->token['type'] === EmailLexer::S_HYPHEN && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
+            throw new DomainHyphened();
+        }
+
+        if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH
+            && $this->lexer->isNextToken(EmailLexer::GENERIC)) {
+            throw new ExpectingATEXT();
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    protected function hasBrackets()
+    {
+        if ($this->lexer->token['type'] !== EmailLexer::S_OPENBRACKET) {
+            return false;
+        }
+
+        try {
+            $this->lexer->find(EmailLexer::S_CLOSEBRACKET);
+        } catch (\RuntimeException $e) {
+            throw new ExpectingDomainLiteralClose();
+        }
+
+        return true;
+    }
+
+    /**
+     * @param string $label
+     */
+    protected function checkLabelLength($label)
+    {
+        if ($this->isLabelTooLong($label)) {
+            $this->warnings[LabelTooLong::CODE] = new LabelTooLong();
+        }
+    }
+
+    /**
+     * @param string $label
+     * @return bool
+     */
+    private function isLabelTooLong($label)
+    {
+        if (preg_match('/[^\x00-\x7F]/', $label)) {
+            idn_to_ascii($label, IDNA_DEFAULT, INTL_IDNA_VARIANT_UTS46, $idnaInfo);
+
+            return (bool) ($idnaInfo['errors'] & IDNA_ERROR_LABEL_TOO_LONG);
+        }
+
+        return strlen($label) > self::LABEL_MAX_LENGTH;
+    }
+
+    protected function parseDomainComments()
+    {
+        $this->isUnclosedComment();
+        while (!$this->lexer->isNextToken(EmailLexer::S_CLOSEPARENTHESIS)) {
+            $this->warnEscaping();
+            $this->lexer->moveNext();
+        }
+
+        $this->lexer->moveNext();
+        if ($this->lexer->isNextToken(EmailLexer::S_DOT)) {
+            throw new ExpectingATEXT();
+        }
+    }
+
+    protected function addTLDWarnings()
+    {
+        if ($this->warnings[DomainLiteral::CODE]) {
+            $this->warnings[TLD::CODE] = new TLD();
+        }
+    }
+}
diff --git a/lib/egulias/email-validator/src/Parser/LocalPart.php b/lib/egulias/email-validator/src/Parser/LocalPart.php
new file mode 100644
index 000000000..3c21f34ac
--- /dev/null
+++ b/lib/egulias/email-validator/src/Parser/LocalPart.php
@@ -0,0 +1,145 @@
+<?php
+
+namespace Egulias\EmailValidator\Parser;
+
+use Egulias\EmailValidator\Exception\DotAtEnd;
+use Egulias\EmailValidator\Exception\DotAtStart;
+use Egulias\EmailValidator\EmailLexer;
+use Egulias\EmailValidator\Exception\ExpectingAT;
+use Egulias\EmailValidator\Exception\ExpectingATEXT;
+use Egulias\EmailValidator\Exception\UnclosedQuotedString;
+use Egulias\EmailValidator\Exception\UnopenedComment;
+use Egulias\EmailValidator\Warning\CFWSWithFWS;
+use Egulias\EmailValidator\Warning\LocalTooLong;
+
+class LocalPart extends Parser
+{
+    public function parse($localPart)
+    {
+        $parseDQuote = true;
+        $closingQuote = false;
+        $openedParenthesis = 0;
+        $totalLength = 0;
+
+        while ($this->lexer->token['type'] !== EmailLexer::S_AT && null !== $this->lexer->token['type']) {
+            if ($this->lexer->token['type'] === EmailLexer::S_DOT && null === $this->lexer->getPrevious()['type']) {
+                throw new DotAtStart();
+            }
+
+            $closingQuote = $this->checkDQUOTE($closingQuote);
+            if ($closingQuote && $parseDQuote) {
+                $parseDQuote = $this->parseDoubleQuote();
+            }
+
+            if ($this->lexer->token['type'] === EmailLexer::S_OPENPARENTHESIS) {
+                $this->parseComments();
+                $openedParenthesis += $this->getOpenedParenthesis();
+            }
+
+            if ($this->lexer->token['type'] === EmailLexer::S_CLOSEPARENTHESIS) {
+                if ($openedParenthesis === 0) {
+                    throw new UnopenedComment();
+                }
+
+                $openedParenthesis--;
+            }
+
+            $this->checkConsecutiveDots();
+
+            if ($this->lexer->token['type'] === EmailLexer::S_DOT &&
+                $this->lexer->isNextToken(EmailLexer::S_AT)
+            ) {
+                throw new DotAtEnd();
+            }
+
+            $this->warnEscaping();
+            $this->isInvalidToken($this->lexer->token, $closingQuote);
+
+            if ($this->isFWS()) {
+                $this->parseFWS();
+            }
+
+            $totalLength += strlen($this->lexer->token['value']);
+            $this->lexer->moveNext();
+        }
+
+        if ($totalLength > LocalTooLong::LOCAL_PART_LENGTH) {
+            $this->warnings[LocalTooLong::CODE] = new LocalTooLong();
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    protected function parseDoubleQuote()
+    {
+        $parseAgain = true;
+        $special = array(
+            EmailLexer::S_CR => true,
+            EmailLexer::S_HTAB => true,
+            EmailLexer::S_LF => true
+        );
+
+        $invalid = array(
+            EmailLexer::C_NUL => true,
+            EmailLexer::S_HTAB => true,
+            EmailLexer::S_CR => true,
+            EmailLexer::S_LF => true
+        );
+        $setSpecialsWarning = true;
+
+        $this->lexer->moveNext();
+
+        while ($this->lexer->token['type'] !== EmailLexer::S_DQUOTE && null !== $this->lexer->token['type']) {
+            $parseAgain = false;
+            if (isset($special[$this->lexer->token['type']]) && $setSpecialsWarning) {
+                $this->warnings[CFWSWithFWS::CODE] = new CFWSWithFWS();
+                $setSpecialsWarning = false;
+            }
+            if ($this->lexer->token['type'] === EmailLexer::S_BACKSLASH && $this->lexer->isNextToken(EmailLexer::S_DQUOTE)) {
+                $this->lexer->moveNext();
+            }
+
+            $this->lexer->moveNext();
+
+            if (!$this->escaped() && isset($invalid[$this->lexer->token['type']])) {
+                throw new ExpectingATEXT();
+            }
+        }
+
+        $prev = $this->lexer->getPrevious();
+
+        if ($prev['type'] === EmailLexer::S_BACKSLASH) {
+            if (!$this->checkDQUOTE(false)) {
+                throw new UnclosedQuotedString();
+            }
+        }
+
+        if (!$this->lexer->isNextToken(EmailLexer::S_AT) && $prev['type'] !== EmailLexer::S_BACKSLASH) {
+            throw new ExpectingAT();
+        }
+
+        return $parseAgain;
+    }
+
+    /**
+     * @param bool $closingQuote
+     */
+    protected function isInvalidToken(array $token, $closingQuote)
+    {
+        $forbidden = array(
+            EmailLexer::S_COMMA,
+            EmailLexer::S_CLOSEBRACKET,
+            EmailLexer::S_OPENBRACKET,
+            EmailLexer::S_GREATERTHAN,
+            EmailLexer::S_LOWERTHAN,
+            EmailLexer::S_COLON,
+            EmailLexer::S_SEMICOLON,
+            EmailLexer::INVALID
+        );
+
+        if (in_array($token['type'], $forbidden) && !$closingQuote) {
+            throw new ExpectingATEXT();
+        }
+    }
+}
diff --git a/lib/egulias/email-validator/src/Parser/Parser.php b/lib/egulias/email-validator/src/Parser/Parser.php
new file mode 100644
index 000000000..ccdc93889
--- /dev/null
+++ b/lib/egulias/email-validator/src/Parser/Parser.php
@@ -0,0 +1,249 @@
+<?php
+
+namespace Egulias\EmailValidator\Parser;
+
+use Egulias\EmailValidator\EmailLexer;
+use Egulias\EmailValidator\Exception\AtextAfterCFWS;
+use Egulias\EmailValidator\Exception\ConsecutiveDot;
+use Egulias\EmailValidator\Exception\CRLFAtTheEnd;
+use Egulias\EmailValidator\Exception\CRLFX2;
+use Egulias\EmailValidator\Exception\CRNoLF;
+use Egulias\EmailValidator\Exception\ExpectingQPair;
+use Egulias\EmailValidator\Exception\ExpectingATEXT;
+use Egulias\EmailValidator\Exception\ExpectingCTEXT;
+use Egulias\EmailValidator\Exception\UnclosedComment;
+use Egulias\EmailValidator\Exception\UnclosedQuotedString;
+use Egulias\EmailValidator\Warning\CFWSNearAt;
+use Egulias\EmailValidator\Warning\CFWSWithFWS;
+use Egulias\EmailValidator\Warning\Comment;
+use Egulias\EmailValidator\Warning\QuotedPart;
+use Egulias\EmailValidator\Warning\QuotedString;
+
+abstract class Parser
+{
+    /**
+     * @var array
+     */
+    protected $warnings = [];
+
+    /**
+     * @var EmailLexer
+     */
+    protected $lexer;
+
+    /**
+     * @var int
+     */
+    protected $openedParenthesis = 0;
+
+    public function __construct(EmailLexer $lexer)
+    {
+        $this->lexer = $lexer;
+    }
+
+    /**
+     * @return \Egulias\EmailValidator\Warning\Warning[]
+     */
+    public function getWarnings()
+    {
+        return $this->warnings;
+    }
+
+    /**
+     * @param string $str
+     */
+    abstract public function parse($str);
+
+    /** @return int */
+    public function getOpenedParenthesis()
+    {
+        return $this->openedParenthesis;
+    }
+
+    /**
+     * validateQuotedPair
+     */
+    protected function validateQuotedPair()
+    {
+        if (!($this->lexer->token['type'] === EmailLexer::INVALID
+            || $this->lexer->token['type'] === EmailLexer::C_DEL)) {
+            throw new ExpectingQPair();
+        }
+
+        $this->warnings[QuotedPart::CODE] =
+            new QuotedPart($this->lexer->getPrevious()['type'], $this->lexer->token['type']);
+    }
+
+    protected function parseComments()
+    {
+        $this->openedParenthesis = 1;
+        $this->isUnclosedComment();
+        $this->warnings[Comment::CODE] = new Comment();
+        while (!$this->lexer->isNextToken(EmailLexer::S_CLOSEPARENTHESIS)) {
+            if ($this->lexer->isNextToken(EmailLexer::S_OPENPARENTHESIS)) {
+                $this->openedParenthesis++;
+            }
+            $this->warnEscaping();
+            $this->lexer->moveNext();
+        }
+
+        $this->lexer->moveNext();
+        if ($this->lexer->isNextTokenAny(array(EmailLexer::GENERIC, EmailLexer::S_EMPTY))) {
+            throw new ExpectingATEXT();
+        }
+
+        if ($this->lexer->isNextToken(EmailLexer::S_AT)) {
+            $this->warnings[CFWSNearAt::CODE] = new CFWSNearAt();
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isUnclosedComment()
+    {
+        try {
+            $this->lexer->find(EmailLexer::S_CLOSEPARENTHESIS);
+            return true;
+        } catch (\RuntimeException $e) {
+            throw new UnclosedComment();
+        }
+    }
+
+    protected function parseFWS()
+    {
+        $previous = $this->lexer->getPrevious();
+
+        $this->checkCRLFInFWS();
+
+        if ($this->lexer->token['type'] === EmailLexer::S_CR) {
+            throw new CRNoLF();
+        }
+
+        if ($this->lexer->isNextToken(EmailLexer::GENERIC) && $previous['type']  !== EmailLexer::S_AT) {
+            throw new AtextAfterCFWS();
+        }
+
+        if ($this->lexer->token['type'] === EmailLexer::S_LF || $this->lexer->token['type'] === EmailLexer::C_NUL) {
+            throw new ExpectingCTEXT();
+        }
+
+        if ($this->lexer->isNextToken(EmailLexer::S_AT) || $previous['type']  === EmailLexer::S_AT) {
+            $this->warnings[CFWSNearAt::CODE] = new CFWSNearAt();
+        } else {
+            $this->warnings[CFWSWithFWS::CODE] = new CFWSWithFWS();
+        }
+    }
+
+    protected function checkConsecutiveDots()
+    {
+        if ($this->lexer->token['type'] === EmailLexer::S_DOT && $this->lexer->isNextToken(EmailLexer::S_DOT)) {
+            throw new ConsecutiveDot();
+        }
+    }
+
+    /**
+     * @return bool
+     */
+    protected function isFWS()
+    {
+        if ($this->escaped()) {
+            return false;
+        }
+
+        if ($this->lexer->token['type'] === EmailLexer::S_SP ||
+            $this->lexer->token['type'] === EmailLexer::S_HTAB ||
+            $this->lexer->token['type'] === EmailLexer::S_CR ||
+            $this->lexer->token['type'] === EmailLexer::S_LF ||
+            $this->lexer->token['type'] === EmailLexer::CRLF
+        ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function escaped()
+    {
+        $previous = $this->lexer->getPrevious();
+
+        if ($previous && $previous['type'] === EmailLexer::S_BACKSLASH
+            &&
+            $this->lexer->token['type'] !== EmailLexer::GENERIC
+        ) {
+            return true;
+        }
+
+        return false;
+    }
+
+    /**
+     * @return bool
+     */
+    protected function warnEscaping()
+    {
+        if ($this->lexer->token['type'] !== EmailLexer::S_BACKSLASH) {
+            return false;
+        }
+
+        if ($this->lexer->isNextToken(EmailLexer::GENERIC)) {
+            throw new ExpectingATEXT();
+        }
+
+        if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB, EmailLexer::C_DEL))) {
+            return false;
+        }
+
+        $this->warnings[QuotedPart::CODE] =
+            new QuotedPart($this->lexer->getPrevious()['type'], $this->lexer->token['type']);
+        return true;
+
+    }
+
+    /**
+     * @param bool $hasClosingQuote
+     *
+     * @return bool
+     */
+    protected function checkDQUOTE($hasClosingQuote)
+    {
+        if ($this->lexer->token['type'] !== EmailLexer::S_DQUOTE) {
+            return $hasClosingQuote;
+        }
+        if ($hasClosingQuote) {
+            return $hasClosingQuote;
+        }
+        $previous = $this->lexer->getPrevious();
+        if ($this->lexer->isNextToken(EmailLexer::GENERIC) && $previous['type'] === EmailLexer::GENERIC) {
+            throw new ExpectingATEXT();
+        }
+
+        try {
+            $this->lexer->find(EmailLexer::S_DQUOTE);
+            $hasClosingQuote = true;
+        } catch (\Exception $e) {
+            throw new UnclosedQuotedString();
+        }
+        $this->warnings[QuotedString::CODE] = new QuotedString($previous['value'], $this->lexer->token['value']);
+
+        return $hasClosingQuote;
+    }
+
+    protected function checkCRLFInFWS()
+    {
+        if ($this->lexer->token['type'] !== EmailLexer::CRLF) {
+            return;
+        }
+
+        if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB))) {
+            throw new CRLFX2();
+        }
+
+        if (!$this->lexer->isNextTokenAny(array(EmailLexer::S_SP, EmailLexer::S_HTAB))) {
+            throw new CRLFAtTheEnd();
+        }
+    }
+}
diff --git a/lib/egulias/email-validator/src/Validation/DNSCheckValidation.php b/lib/egulias/email-validator/src/Validation/DNSCheckValidation.php
new file mode 100644
index 000000000..491082a59
--- /dev/null
+++ b/lib/egulias/email-validator/src/Validation/DNSCheckValidation.php
@@ -0,0 +1,166 @@
+<?php
+
+namespace Egulias\EmailValidator\Validation;
+
+use Egulias\EmailValidator\EmailLexer;
+use Egulias\EmailValidator\Exception\InvalidEmail;
+use Egulias\EmailValidator\Exception\LocalOrReservedDomain;
+use Egulias\EmailValidator\Exception\DomainAcceptsNoMail;
+use Egulias\EmailValidator\Warning\NoDNSMXRecord;
+use Egulias\EmailValidator\Exception\NoDNSRecord;
+
+class DNSCheckValidation implements EmailValidation
+{
+    /**
+     * @var array
+     */
+    private $warnings = [];
+
+    /**
+     * @var InvalidEmail|null
+     */
+    private $error;
+
+    /**
+     * @var array
+     */
+    private $mxRecords = [];
+
+
+    public function __construct()
+    {
+        if (!function_exists('idn_to_ascii')) {
+            throw new \LogicException(sprintf('The %s class requires the Intl extension.', __CLASS__));
+        }
+    }
+
+    public function isValid($email, EmailLexer $emailLexer)
+    {
+        // use the input to check DNS if we cannot extract something similar to a domain
+        $host = $email;
+
+        // Arguable pattern to extract the domain. Not aiming to validate the domain nor the email
+        if (false !== $lastAtPos = strrpos($email, '@')) {
+            $host = substr($email, $lastAtPos + 1);
+        }
+
+        // Get the domain parts
+        $hostParts = explode('.', $host);
+
+        // Reserved Top Level DNS Names (https://tools.ietf.org/html/rfc2606#section-2),
+        // mDNS and private DNS Namespaces (https://tools.ietf.org/html/rfc6762#appendix-G)
+        $reservedTopLevelDnsNames = [
+            // Reserved Top Level DNS Names
+            'test',
+            'example',
+            'invalid',
+            'localhost',
+
+            // mDNS
+            'local',
+
+            // Private DNS Namespaces
+            'intranet',
+            'internal',
+            'private',
+            'corp',
+            'home',
+            'lan',
+        ];
+
+        $isLocalDomain = count($hostParts) <= 1;
+        $isReservedTopLevel = in_array($hostParts[(count($hostParts) - 1)], $reservedTopLevelDnsNames, true);
+
+        // Exclude reserved top level DNS names
+        if ($isLocalDomain || $isReservedTopLevel) {
+            $this->error = new LocalOrReservedDomain();
+            return false;
+        }
+
+        return $this->checkDns($host);
+    }
+
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    public function getWarnings()
+    {
+        return $this->warnings;
+    }
+
+    /**
+     * @param string $host
+     *
+     * @return bool
+     */
+    protected function checkDns($host)
+    {
+        $variant = INTL_IDNA_VARIANT_UTS46;
+
+        $host = rtrim(idn_to_ascii($host, IDNA_DEFAULT, $variant), '.') . '.';
+
+        return $this->validateDnsRecords($host);
+    }
+
+
+    /**
+     * Validate the DNS records for given host.
+     *
+     * @param string $host A set of DNS records in the format returned by dns_get_record.
+     *
+     * @return bool True on success.
+     */
+    private function validateDnsRecords($host)
+    {
+        // Get all MX, A and AAAA DNS records for host
+        // Using @ as workaround to fix https://bugs.php.net/bug.php?id=73149
+        $dnsRecords = @dns_get_record($host, DNS_MX + DNS_A + DNS_AAAA);
+
+
+        // No MX, A or AAAA DNS records
+        if (empty($dnsRecords)) {
+            $this->error = new NoDNSRecord();
+            return false;
+        }
+
+        // For each DNS record
+        foreach ($dnsRecords as $dnsRecord) {
+            if (!$this->validateMXRecord($dnsRecord)) {
+                return false;
+            }
+        }
+
+        // No MX records (fallback to A or AAAA records)
+        if (empty($this->mxRecords)) {
+            $this->warnings[NoDNSMXRecord::CODE] = new NoDNSMXRecord();
+        }
+
+        return true;
+    }
+
+    /**
+     * Validate an MX record
+     *
+     * @param array $dnsRecord Given DNS record.
+     *
+     * @return bool True if valid.
+     */
+    private function validateMxRecord($dnsRecord)
+    {
+        if ($dnsRecord['type'] !== 'MX') {
+            return true;
+        }
+
+        // "Null MX" record indicates the domain accepts no mail (https://tools.ietf.org/html/rfc7505)
+        if (empty($dnsRecord['target']) || $dnsRecord['target'] === '.') {
+            $this->error = new DomainAcceptsNoMail();
+            return false;
+        }
+
+        $this->mxRecords[] = $dnsRecord;
+
+        return true;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Validation/EmailValidation.php b/lib/egulias/email-validator/src/Validation/EmailValidation.php
new file mode 100644
index 000000000..d5a015be5
--- /dev/null
+++ b/lib/egulias/email-validator/src/Validation/EmailValidation.php
@@ -0,0 +1,34 @@
+<?php
+
+namespace Egulias\EmailValidator\Validation;
+
+use Egulias\EmailValidator\EmailLexer;
+use Egulias\EmailValidator\Exception\InvalidEmail;
+use Egulias\EmailValidator\Warning\Warning;
+
+interface EmailValidation
+{
+    /**
+     * Returns true if the given email is valid.
+     *
+     * @param string     $email      The email you want to validate.
+     * @param EmailLexer $emailLexer The email lexer.
+     *
+     * @return bool
+     */
+    public function isValid($email, EmailLexer $emailLexer);
+
+    /**
+     * Returns the validation error.
+     *
+     * @return InvalidEmail|null
+     */
+    public function getError();
+
+    /**
+     * Returns the validation warnings.
+     *
+     * @return Warning[]
+     */
+    public function getWarnings();
+}
diff --git a/lib/egulias/email-validator/src/Validation/Error/RFCWarnings.php b/lib/egulias/email-validator/src/Validation/Error/RFCWarnings.php
new file mode 100644
index 000000000..7f2256d60
--- /dev/null
+++ b/lib/egulias/email-validator/src/Validation/Error/RFCWarnings.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Egulias\EmailValidator\Validation\Error;
+
+use Egulias\EmailValidator\Exception\InvalidEmail;
+
+class RFCWarnings extends InvalidEmail
+{
+    const CODE = 997;
+    const REASON = 'Warnings were found.';
+}
diff --git a/lib/egulias/email-validator/src/Validation/Error/SpoofEmail.php b/lib/egulias/email-validator/src/Validation/Error/SpoofEmail.php
new file mode 100644
index 000000000..8c92cb5ae
--- /dev/null
+++ b/lib/egulias/email-validator/src/Validation/Error/SpoofEmail.php
@@ -0,0 +1,11 @@
+<?php
+
+namespace Egulias\EmailValidator\Validation\Error;
+
+use Egulias\EmailValidator\Exception\InvalidEmail;
+
+class SpoofEmail extends InvalidEmail
+{
+    const CODE = 998;
+    const REASON = "The email contains mixed UTF8 chars that makes it suspicious";
+}
diff --git a/lib/egulias/email-validator/src/Validation/Exception/EmptyValidationList.php b/lib/egulias/email-validator/src/Validation/Exception/EmptyValidationList.php
new file mode 100644
index 000000000..ee7c41aa0
--- /dev/null
+++ b/lib/egulias/email-validator/src/Validation/Exception/EmptyValidationList.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace Egulias\EmailValidator\Validation\Exception;
+
+use Exception;
+
+class EmptyValidationList extends \InvalidArgumentException
+{
+    /**
+    * @param int $code
+    */
+    public function __construct($code = 0, Exception $previous = null)
+    {
+        parent::__construct("Empty validation list is not allowed", $code, $previous);
+    }
+}
diff --git a/lib/egulias/email-validator/src/Validation/MultipleErrors.php b/lib/egulias/email-validator/src/Validation/MultipleErrors.php
new file mode 100644
index 000000000..3be597326
--- /dev/null
+++ b/lib/egulias/email-validator/src/Validation/MultipleErrors.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace Egulias\EmailValidator\Validation;
+
+use Egulias\EmailValidator\Exception\InvalidEmail;
+
+class MultipleErrors extends InvalidEmail
+{
+    const CODE = 999;
+    const REASON = "Accumulated errors for multiple validations";
+    /**
+     * @var InvalidEmail[]
+     */
+    private $errors = [];
+
+    /**
+     * @param InvalidEmail[] $errors
+     */
+    public function __construct(array $errors)
+    {
+        $this->errors = $errors;
+        parent::__construct();
+    }
+
+    /**
+     * @return InvalidEmail[]
+     */
+    public function getErrors()
+    {
+        return $this->errors;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Validation/MultipleValidationWithAnd.php b/lib/egulias/email-validator/src/Validation/MultipleValidationWithAnd.php
new file mode 100644
index 000000000..feb224023
--- /dev/null
+++ b/lib/egulias/email-validator/src/Validation/MultipleValidationWithAnd.php
@@ -0,0 +1,124 @@
+<?php
+
+namespace Egulias\EmailValidator\Validation;
+
+use Egulias\EmailValidator\EmailLexer;
+use Egulias\EmailValidator\Validation\Exception\EmptyValidationList;
+
+class MultipleValidationWithAnd implements EmailValidation
+{
+    /**
+     * If one of validations gets failure skips all succeeding validation.
+     * This means MultipleErrors will only contain a single error which first found.
+     */
+    const STOP_ON_ERROR = 0;
+
+    /**
+     * All of validations will be invoked even if one of them got failure.
+     * So MultipleErrors will contain all causes.
+     */
+    const ALLOW_ALL_ERRORS = 1;
+
+    /**
+     * @var EmailValidation[]
+     */
+    private $validations = [];
+
+    /**
+     * @var array
+     */
+    private $warnings = [];
+
+    /**
+     * @var MultipleErrors|null
+     */
+    private $error;
+
+    /**
+     * @var int
+     */
+    private $mode;
+
+    /**
+     * @param EmailValidation[] $validations The validations.
+     * @param int               $mode        The validation mode (one of the constants).
+     */
+    public function __construct(array $validations, $mode = self::ALLOW_ALL_ERRORS)
+    {
+        if (count($validations) == 0) {
+            throw new EmptyValidationList();
+        }
+
+        $this->validations = $validations;
+        $this->mode = $mode;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isValid($email, EmailLexer $emailLexer)
+    {
+        $result = true;
+        $errors = [];
+        foreach ($this->validations as $validation) {
+            $emailLexer->reset();
+            $validationResult = $validation->isValid($email, $emailLexer);
+            $result = $result && $validationResult;
+            $this->warnings = array_merge($this->warnings, $validation->getWarnings());
+            $errors = $this->addNewError($validation->getError(), $errors);
+
+            if ($this->shouldStop($result)) {
+                break;
+            }
+        }
+
+        if (!empty($errors)) {
+            $this->error = new MultipleErrors($errors);
+        }
+
+        return $result;
+    }
+
+    /**
+     * @param \Egulias\EmailValidator\Exception\InvalidEmail|null $possibleError
+     * @param \Egulias\EmailValidator\Exception\InvalidEmail[] $errors
+     *
+     * @return \Egulias\EmailValidator\Exception\InvalidEmail[]
+     */
+    private function addNewError($possibleError, array $errors)
+    {
+        if (null !== $possibleError) {
+            $errors[] = $possibleError;
+        }
+
+        return $errors;
+    }
+
+    /**
+     * @param bool $result
+     *
+     * @return bool
+     */
+    private function shouldStop($result)
+    {
+        return !$result && $this->mode === self::STOP_ON_ERROR;
+    }
+
+    /**
+     * Returns the validation errors.
+     *
+     * @return MultipleErrors|null
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getWarnings()
+    {
+        return $this->warnings;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Validation/NoRFCWarningsValidation.php b/lib/egulias/email-validator/src/Validation/NoRFCWarningsValidation.php
new file mode 100644
index 000000000..6b31e5440
--- /dev/null
+++ b/lib/egulias/email-validator/src/Validation/NoRFCWarningsValidation.php
@@ -0,0 +1,41 @@
+<?php
+
+namespace Egulias\EmailValidator\Validation;
+
+use Egulias\EmailValidator\EmailLexer;
+use Egulias\EmailValidator\Exception\InvalidEmail;
+use Egulias\EmailValidator\Validation\Error\RFCWarnings;
+
+class NoRFCWarningsValidation extends RFCValidation
+{
+    /**
+     * @var InvalidEmail|null
+     */
+    private $error;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function isValid($email, EmailLexer $emailLexer)
+    {
+        if (!parent::isValid($email, $emailLexer)) {
+            return false;
+        }
+
+        if (empty($this->getWarnings())) {
+            return true;
+        }
+
+        $this->error = new RFCWarnings();
+
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getError()
+    {
+        return $this->error ?: parent::getError();
+    }
+}
diff --git a/lib/egulias/email-validator/src/Validation/RFCValidation.php b/lib/egulias/email-validator/src/Validation/RFCValidation.php
new file mode 100644
index 000000000..8781e0b62
--- /dev/null
+++ b/lib/egulias/email-validator/src/Validation/RFCValidation.php
@@ -0,0 +1,49 @@
+<?php
+
+namespace Egulias\EmailValidator\Validation;
+
+use Egulias\EmailValidator\EmailLexer;
+use Egulias\EmailValidator\EmailParser;
+use Egulias\EmailValidator\Exception\InvalidEmail;
+
+class RFCValidation implements EmailValidation
+{
+    /**
+     * @var EmailParser|null
+     */
+    private $parser;
+
+    /**
+     * @var array
+     */
+    private $warnings = [];
+
+    /**
+     * @var InvalidEmail|null
+     */
+    private $error;
+
+    public function isValid($email, EmailLexer $emailLexer)
+    {
+        $this->parser = new EmailParser($emailLexer);
+        try {
+            $this->parser->parse((string)$email);
+        } catch (InvalidEmail $invalid) {
+            $this->error = $invalid;
+            return false;
+        }
+
+        $this->warnings = $this->parser->getWarnings();
+        return true;
+    }
+
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    public function getWarnings()
+    {
+        return $this->warnings;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Validation/SpoofCheckValidation.php b/lib/egulias/email-validator/src/Validation/SpoofCheckValidation.php
new file mode 100644
index 000000000..e10bfabd9
--- /dev/null
+++ b/lib/egulias/email-validator/src/Validation/SpoofCheckValidation.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Egulias\EmailValidator\Validation;
+
+use Egulias\EmailValidator\EmailLexer;
+use Egulias\EmailValidator\Exception\InvalidEmail;
+use Egulias\EmailValidator\Validation\Error\SpoofEmail;
+use \Spoofchecker;
+
+class SpoofCheckValidation implements EmailValidation
+{
+    /**
+     * @var InvalidEmail|null
+     */
+    private $error;
+
+    public function __construct()
+    {
+        if (!extension_loaded('intl')) {
+            throw new \LogicException(sprintf('The %s class requires the Intl extension.', __CLASS__));
+        }
+    }
+
+    /**
+     * @psalm-suppress InvalidArgument
+     */
+    public function isValid($email, EmailLexer $emailLexer)
+    {
+        $checker = new Spoofchecker();
+        $checker->setChecks(Spoofchecker::SINGLE_SCRIPT);
+
+        if ($checker->isSuspicious($email)) {
+            $this->error = new SpoofEmail();
+        }
+
+        return $this->error === null;
+    }
+
+    /**
+     * @return InvalidEmail|null
+     */
+    public function getError()
+    {
+        return $this->error;
+    }
+
+    public function getWarnings()
+    {
+        return [];
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/AddressLiteral.php b/lib/egulias/email-validator/src/Warning/AddressLiteral.php
new file mode 100644
index 000000000..77e70f7f5
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/AddressLiteral.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class AddressLiteral extends Warning
+{
+    const CODE = 12;
+
+    public function __construct()
+    {
+        $this->message = 'Address literal in domain part';
+        $this->rfcNumber = 5321;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/CFWSNearAt.php b/lib/egulias/email-validator/src/Warning/CFWSNearAt.php
new file mode 100644
index 000000000..be43bbe6f
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/CFWSNearAt.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class CFWSNearAt extends Warning
+{
+    const CODE = 49;
+
+    public function __construct()
+    {
+        $this->message = "Deprecated folding white space near @";
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/CFWSWithFWS.php b/lib/egulias/email-validator/src/Warning/CFWSWithFWS.php
new file mode 100644
index 000000000..dea3450ec
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/CFWSWithFWS.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class CFWSWithFWS extends Warning
+{
+    const CODE = 18;
+
+    public function __construct()
+    {
+        $this->message = 'Folding whites space followed by folding white space';
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/Comment.php b/lib/egulias/email-validator/src/Warning/Comment.php
new file mode 100644
index 000000000..704c2908b
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/Comment.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class Comment extends Warning
+{
+    const CODE = 17;
+
+    public function __construct()
+    {
+        $this->message = "Comments found in this email";
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/DeprecatedComment.php b/lib/egulias/email-validator/src/Warning/DeprecatedComment.php
new file mode 100644
index 000000000..ad43bd7c9
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/DeprecatedComment.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class DeprecatedComment extends Warning
+{
+    const CODE = 37;
+
+    public function __construct()
+    {
+        $this->message = 'Deprecated comments';
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/DomainLiteral.php b/lib/egulias/email-validator/src/Warning/DomainLiteral.php
new file mode 100644
index 000000000..6f36b5e29
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/DomainLiteral.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class DomainLiteral extends Warning
+{
+    const CODE = 70;
+
+    public function __construct()
+    {
+        $this->message = 'Domain Literal';
+        $this->rfcNumber = 5322;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/DomainTooLong.php b/lib/egulias/email-validator/src/Warning/DomainTooLong.php
new file mode 100644
index 000000000..61ff17a76
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/DomainTooLong.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class DomainTooLong extends Warning
+{
+    const CODE = 255;
+
+    public function __construct()
+    {
+        $this->message = 'Domain is too long, exceeds 255 chars';
+        $this->rfcNumber = 5322;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/EmailTooLong.php b/lib/egulias/email-validator/src/Warning/EmailTooLong.php
new file mode 100644
index 000000000..497309dbb
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/EmailTooLong.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+use Egulias\EmailValidator\EmailParser;
+
+class EmailTooLong extends Warning
+{
+    const CODE = 66;
+
+    public function __construct()
+    {
+        $this->message = 'Email is too long, exceeds ' . EmailParser::EMAIL_MAX_LENGTH;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/IPV6BadChar.php b/lib/egulias/email-validator/src/Warning/IPV6BadChar.php
new file mode 100644
index 000000000..ba2fcc01b
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/IPV6BadChar.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class IPV6BadChar extends Warning
+{
+    const CODE = 74;
+
+    public function __construct()
+    {
+        $this->message = 'Bad char in IPV6 domain literal';
+        $this->rfcNumber = 5322;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/IPV6ColonEnd.php b/lib/egulias/email-validator/src/Warning/IPV6ColonEnd.php
new file mode 100644
index 000000000..41afa78c6
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/IPV6ColonEnd.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class IPV6ColonEnd extends Warning
+{
+    const CODE = 77;
+
+    public function __construct()
+    {
+        $this->message = ':: found at the end of the domain literal';
+        $this->rfcNumber = 5322;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/IPV6ColonStart.php b/lib/egulias/email-validator/src/Warning/IPV6ColonStart.php
new file mode 100644
index 000000000..1bf754e30
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/IPV6ColonStart.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class IPV6ColonStart extends Warning
+{
+    const CODE = 76;
+
+    public function __construct()
+    {
+        $this->message = ':: found at the start of the domain literal';
+        $this->rfcNumber = 5322;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/IPV6Deprecated.php b/lib/egulias/email-validator/src/Warning/IPV6Deprecated.php
new file mode 100644
index 000000000..d752caaa1
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/IPV6Deprecated.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class IPV6Deprecated extends Warning
+{
+    const CODE = 13;
+
+    public function __construct()
+    {
+        $this->message = 'Deprecated form of IPV6';
+        $this->rfcNumber = 5321;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/IPV6DoubleColon.php b/lib/egulias/email-validator/src/Warning/IPV6DoubleColon.php
new file mode 100644
index 000000000..4f8239499
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/IPV6DoubleColon.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class IPV6DoubleColon extends Warning
+{
+    const CODE = 73;
+
+    public function __construct()
+    {
+        $this->message = 'Double colon found after IPV6 tag';
+        $this->rfcNumber = 5322;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/IPV6GroupCount.php b/lib/egulias/email-validator/src/Warning/IPV6GroupCount.php
new file mode 100644
index 000000000..a59d317f2
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/IPV6GroupCount.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class IPV6GroupCount extends Warning
+{
+    const CODE = 72;
+
+    public function __construct()
+    {
+        $this->message = 'Group count is not IPV6 valid';
+        $this->rfcNumber = 5322;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/IPV6MaxGroups.php b/lib/egulias/email-validator/src/Warning/IPV6MaxGroups.php
new file mode 100644
index 000000000..936274c13
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/IPV6MaxGroups.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class IPV6MaxGroups extends Warning
+{
+    const CODE = 75;
+
+    public function __construct()
+    {
+        $this->message = 'Reached the maximum number of IPV6 groups allowed';
+        $this->rfcNumber = 5321;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/LabelTooLong.php b/lib/egulias/email-validator/src/Warning/LabelTooLong.php
new file mode 100644
index 000000000..daf07f408
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/LabelTooLong.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class LabelTooLong extends Warning
+{
+    const CODE = 63;
+
+    public function __construct()
+    {
+        $this->message = 'Label too long';
+        $this->rfcNumber = 5322;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/LocalTooLong.php b/lib/egulias/email-validator/src/Warning/LocalTooLong.php
new file mode 100644
index 000000000..0d08d8b35
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/LocalTooLong.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class LocalTooLong extends Warning
+{
+    const CODE = 64;
+    const LOCAL_PART_LENGTH = 64;
+
+    public function __construct()
+    {
+        $this->message = 'Local part is too long, exceeds 64 chars (octets)';
+        $this->rfcNumber = 5322;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/NoDNSMXRecord.php b/lib/egulias/email-validator/src/Warning/NoDNSMXRecord.php
new file mode 100644
index 000000000..b3c21a1f3
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/NoDNSMXRecord.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class NoDNSMXRecord extends Warning
+{
+    const CODE = 6;
+
+    public function __construct()
+    {
+        $this->message = 'No MX DSN record was found for this email';
+        $this->rfcNumber = 5321;
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/ObsoleteDTEXT.php b/lib/egulias/email-validator/src/Warning/ObsoleteDTEXT.php
new file mode 100644
index 000000000..10f19e334
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/ObsoleteDTEXT.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class ObsoleteDTEXT extends Warning
+{
+    const CODE = 71;
+
+    public function __construct()
+    {
+        $this->rfcNumber = 5322;
+        $this->message = 'Obsolete DTEXT in domain literal';
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/QuotedPart.php b/lib/egulias/email-validator/src/Warning/QuotedPart.php
new file mode 100644
index 000000000..36a4265a5
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/QuotedPart.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class QuotedPart extends Warning
+{
+    const CODE = 36;
+
+    /**
+     * @param scalar $prevToken
+     * @param scalar $postToken
+     */
+    public function __construct($prevToken, $postToken)
+    {
+        $this->message = "Deprecated Quoted String found between $prevToken and $postToken";
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/QuotedString.php b/lib/egulias/email-validator/src/Warning/QuotedString.php
new file mode 100644
index 000000000..817e4e84b
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/QuotedString.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class QuotedString extends Warning
+{
+    const CODE = 11;
+
+    /**
+     * @param scalar $prevToken
+     * @param scalar $postToken
+     */
+    public function __construct($prevToken, $postToken)
+    {
+        $this->message = "Quoted String found between $prevToken and $postToken";
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/TLD.php b/lib/egulias/email-validator/src/Warning/TLD.php
new file mode 100644
index 000000000..2338b9f44
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/TLD.php
@@ -0,0 +1,13 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+class TLD extends Warning
+{
+    const CODE = 9;
+
+    public function __construct()
+    {
+        $this->message = "RFC5321, TLD";
+    }
+}
diff --git a/lib/egulias/email-validator/src/Warning/Warning.php b/lib/egulias/email-validator/src/Warning/Warning.php
new file mode 100644
index 000000000..a2ee7b0de
--- /dev/null
+++ b/lib/egulias/email-validator/src/Warning/Warning.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace Egulias\EmailValidator\Warning;
+
+abstract class Warning
+{
+    const CODE = 0;
+
+    /**
+     * @var string
+     */
+    protected $message = '';
+
+    /**
+     * @var int
+     */
+    protected $rfcNumber = 0;
+
+    /**
+     * @return string
+     */
+    public function message()
+    {
+        return $this->message;
+    }
+
+    /**
+     * @return int
+     */
+    public function code()
+    {
+        return static::CODE;
+    }
+
+    /**
+     * @return int
+     */
+    public function RFCNumber()
+    {
+        return $this->rfcNumber;
+    }
+
+    public function __toString()
+    {
+        return $this->message() . " rfc: " .  $this->rfcNumber . "interal code: " . static::CODE;
+    }
+}
diff --git a/lib/swiftmailer/swiftmailer/.gitattributes b/lib/swiftmailer/swiftmailer/.gitattributes
index 33b8efdb8..dc96281b6 100644
--- a/lib/swiftmailer/swiftmailer/.gitattributes
+++ b/lib/swiftmailer/swiftmailer/.gitattributes
@@ -5,5 +5,7 @@
 *.priv -crlf
 *.txt -crlf
 
-# ignore /notes in the git-generated distributed .zip archive
-/notes export-ignore
+# ignore directories in the git-generated distributed .zip archive
+/doc/notes export-ignore
+/tests export-ignore
+/phpunit.xml.dist export-ignore
diff --git a/lib/swiftmailer/swiftmailer/.gitignore b/lib/swiftmailer/swiftmailer/.gitignore
index 20d389a1c..a911ddf65 100644
--- a/lib/swiftmailer/swiftmailer/.gitignore
+++ b/lib/swiftmailer/swiftmailer/.gitignore
@@ -1,5 +1,6 @@
 /.php_cs.cache
 /.phpunit
+/.phpunit.result.cache
 /build/*
 /composer.lock
 /phpunit.xml
diff --git a/lib/swiftmailer/swiftmailer/.php_cs.dist b/lib/swiftmailer/swiftmailer/.php_cs.dist
index f18d65d42..563b48b90 100644
--- a/lib/swiftmailer/swiftmailer/.php_cs.dist
+++ b/lib/swiftmailer/swiftmailer/.php_cs.dist
@@ -1,15 +1,21 @@
 <?php
 
 return PhpCsFixer\Config::create()
-    ->setRules(array(
+    ->setRules([
         '@Symfony' => true,
         '@Symfony:risky' => true,
-        'array_syntax' => array('syntax' => 'long'),
+        '@PHPUnit75Migration:risky' => true,
+        'php_unit_dedicate_assert' => ['target' => '5.6'],
+        'array_syntax' => ['syntax' => 'short'],
+        'php_unit_fqcn_annotation' => true,
         'no_unreachable_default_argument_value' => false,
-        'braces' => array('allow_single_line_closure' => true),
+        'braces' => ['allow_single_line_closure' => true],
         'heredoc_to_nowdoc' => false,
-        'phpdoc_annotation_without_dot' => false,
-    ))
+        'ordered_imports' => true,
+        'phpdoc_types_order' => ['null_adjustment' => 'always_last', 'sort_algorithm' => 'none'],
+        'native_function_invocation' => ['include' => ['@compiler_optimized'], 'scope' => 'all'],
+        'fopen_flags' => false,
+    ])
     ->setRiskyAllowed(true)
     ->setFinder(PhpCsFixer\Finder::create()->in(__DIR__))
 ;
diff --git a/lib/swiftmailer/swiftmailer/.travis.yml b/lib/swiftmailer/swiftmailer/.travis.yml
deleted file mode 100644
index fc24d05e8..000000000
--- a/lib/swiftmailer/swiftmailer/.travis.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-language: php
-
-sudo: false
-
-before_script:
-    - cp tests/acceptance.conf.php.default tests/acceptance.conf.php
-    - cp tests/smoke.conf.php.default tests/smoke.conf.php
-    - composer self-update
-    - composer update --no-interaction --prefer-source
-    - gem install mime-types -v 2.99.1
-    - gem install mailcatcher
-    - mailcatcher --smtp-port 4456
-
-script: ./vendor/bin/simple-phpunit
-
-matrix:
-    include:
-        - php: 5.3
-        - php: 5.4
-        - php: 5.5
-        - php: 5.6
-        - php: 7.0
-        - php: 7.1
-        - php: hhvm
-    allow_failures:
-        - php: hhvm
-    fast_finish: true
-
-cache:
-    directories:
-        - .phpunit
diff --git a/lib/swiftmailer/swiftmailer/CHANGES b/lib/swiftmailer/swiftmailer/CHANGES
index 3532ec2dc..a7ffa0025 100644
--- a/lib/swiftmailer/swiftmailer/CHANGES
+++ b/lib/swiftmailer/swiftmailer/CHANGES
@@ -1,21 +1,125 @@
 Changelog
 =========
 
-5.4.12 (2018-07-31)
--------------------
+**Swiftmailer will stop being maintained at the end of November 2021.**
 
- * fixed typo
+Please, move to Symfony Mailer at your earliest convenience.
+Symfony Mailer is the next evolution of Swiftmailer.
+It provides the same features with support for modern PHP code and support for third-party providers.
+See https://symfony.com/doc/current/mailer.html for more information.
 
-5.4.11 (2018-07-31)
--------------------
+6.3.0 (2021-10-18)
+------------------
 
- * fixed startTLS support for PHP 5.6-
+ * Fix support for PHP 8.1
 
-5.4.10 (2018-07-27)
--------------------
+6.2.7 (2021-03-09)
+------------------
 
+ * Allow egulias/email-validator 3.1+
+
+6.2.6 (2021-03-05)
+------------------
+
+ * Fix Bcc support
+
+6.2.5 (2021-01-12)
+------------------
+
+ * Don't trust properties at destruct time
+ * Remove invalid PHPDocs param in EventDispatcher interface
+ * Bump license year
+ * Removes PHP version from README
+
+6.2.4 (2020-12-08)
+------------------
+
+ * Prevent flushing of the bubble queue when event handler raises another event
+ * Add support for PHP 8
+ * Code cleanups
+
+6.2.3 (2019-11-12)
+------------------
+
+ * no changes
+
+6.2.2 (2019-11-12)
+------------------
+
+ * fixed compat with PHP 7.4
+ * fixed error message when connecting to a stream raises an error before connect()
+
+6.2.1 (2019-04-21)
+------------------
+
+ * reverted "deprecated Swift_CharacterStream_ArrayCharacterStream and Swift_CharacterStream_NgCharacterStream in favor of Swift_CharacterStream_CharacterStream"
+
+6.2.0 (2019-03-10)
+------------------
+
+ * added support for symfony/polyfill-intl-dn
+ * deprecated Swift_CharacterStream_ArrayCharacterStream and Swift_CharacterStream_NgCharacterStream in favor of Swift_CharacterStream_CharacterStream
+
+6.1.3 (2018-09-11)
+------------------
+
+ * added auto-start to the SMTP transport when sending a message
+ * tweaked error message when the response from an SMTP server is empty
+ * fixed missing property in Swift_Mime_IdGenerator
+ * exposed original body content type with Swift_Mime_SimpleMimeEntity::getBodyContentType()
+ * fixed typo in variable name in Swift_AddressEncoder_IdnAddressEncoder
+ * fixed return type in MessageLogger
+ * fixed missing property addressEncoder in SimpleHeaderFactory class
+
+6.1.2 (2018-07-13)
+------------------
+
+ * handled recipient errors when pipelining
+
+6.1.1 (2018-07-04)
+------------------
+
+ * removed hard dependency on an IDN encoder
+
+6.1.0 (2018-07-02)
+------------------
+
+ * added address encoder exceptions during send
+ * added support for bubbling up authenticator error messages
+ * added support for non-ASCII email addresses
+ * introduced new dependencies: transport.smtphandlers and transport.authhandlers
+ * deprecated Swift_Signers_OpenDKIMSigner; use Swift_Signers_DKIMSigner instead
+ * added support for SMTP pipelining
+ * added Swift_Transport_Esmtp_EightBitMimeHandler
  * fixed startTLS only allowed tls1.0, now allowed: tls1.0, tls1.1, tls1.2
 
+6.0.2 (2017-09-30)
+------------------
+
+ * fixed DecoratorPlugin
+ * removed usage of getmypid()
+
+6.0.1 (2017-05-20)
+------------------
+
+ * fixed BC break that can be avoided easily
+
+6.0.0 (2017-05-19)
+------------------
+
+ * added Swift_Transport::ping()
+ * removed Swift_Mime_HeaderFactory, Swift_Mime_HeaderSet, Swift_Mime_Message, Swift_Mime_MimeEntity,
+   and Swift_Mime_ParameterizedHeader interfaces
+ * removed Swift_MailTransport and Swift_Transport_MailTransport
+ * removed Swift_Encoding
+ * removed the Swift_Transport_MailInvoker interface and Swift_Transport_SimpleMailInvoker class
+ * removed the Swift_SignedMessage class
+ * removed newInstance() methods everywhere
+ * methods operating on Date header now use DateTimeImmutable object instead of Unix timestamp;
+   Swift_Mime_Headers_DateHeader::getTimestamp()/setTimestamp() renamed to getDateTime()/setDateTime()
+ * bumped minimum version to PHP 7.0
+ * removed Swift_Validate and replaced by egulias/email-validator
+
 5.4.9 (2018-01-23)
 ------------------
 
diff --git a/lib/swiftmailer/swiftmailer/LICENSE b/lib/swiftmailer/swiftmailer/LICENSE
index 485f1d6d6..ab720772e 100644
--- a/lib/swiftmailer/swiftmailer/LICENSE
+++ b/lib/swiftmailer/swiftmailer/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2016 Fabien Potencier
+Copyright (c) 2013-2021 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/lib/swiftmailer/swiftmailer/README b/lib/swiftmailer/swiftmailer/README
deleted file mode 100644
index 52c075758..000000000
--- a/lib/swiftmailer/swiftmailer/README
+++ /dev/null
@@ -1,15 +0,0 @@
-Swift Mailer
-------------
-
-Swift Mailer is a component based mailing solution for PHP 5.
-It is released under the MIT license.
-
-Homepage:      https://swiftmailer.symfony.com/
-Documentation: https://swiftmailer.symfony.com/docs/introduction.html
-Bugs:          https://github.com/swiftmailer/swiftmailer/issues
-Repository:    https://github.com/swiftmailer/swiftmailer
-
-Swift Mailer is highly object-oriented by design and lends itself
-to use in complex web application with a great deal of flexibility.
-
-For full details on usage, see the documentation.
diff --git a/lib/swiftmailer/swiftmailer/README.md b/lib/swiftmailer/swiftmailer/README.md
new file mode 100644
index 000000000..788d7223b
--- /dev/null
+++ b/lib/swiftmailer/swiftmailer/README.md
@@ -0,0 +1,25 @@
+Swift Mailer
+------------
+
+**Swiftmailer will stop being maintained at the end of November 2021.**
+
+Please, move to [Symfony Mailer](https://symfony.com/doc/current/mailer.html) at your earliest convenience.
+[Symfony Mailer](https://symfony.com/doc/current/mailer.html) is the next evolution of Swiftmailer.
+It provides the same features with support for modern PHP code and support for third-party providers.
+
+Swift Mailer is a component based mailing solution for PHP.
+It is released under the MIT license.
+
+Swift Mailer is highly object-oriented by design and lends itself
+to use in complex web application with a great deal of flexibility.
+
+For full details on usage, read the [documentation](https://swiftmailer.symfony.com/docs/introduction.html).
+
+Sponsors
+--------
+
+<div>
+    <a href="https://blackfire.io/docs/introduction?utm_source=swiftmailer&utm_medium=github_readme&utm_campaign=logo">
+        <img src="https://static.blackfire.io/assets/intemporals/logo/png/blackfire-io_secondary_horizontal_transparent.png?1" width="255px" alt="Blackfire.io">
+    </a>
+</div>
diff --git a/lib/swiftmailer/swiftmailer/VERSION b/lib/swiftmailer/swiftmailer/VERSION
deleted file mode 100644
index 82a2d1d04..000000000
--- a/lib/swiftmailer/swiftmailer/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-Swift-5.4.12
diff --git a/lib/swiftmailer/swiftmailer/composer.json b/lib/swiftmailer/swiftmailer/composer.json
index 44a1050fa..546b3a1e7 100644
--- a/lib/swiftmailer/swiftmailer/composer.json
+++ b/lib/swiftmailer/swiftmailer/composer.json
@@ -15,23 +15,30 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3"
+        "php": ">=7.0.0",
+        "egulias/email-validator": "^2.0|^3.1",
+        "symfony/polyfill-iconv": "^1.0",
+        "symfony/polyfill-mbstring": "^1.0",
+        "symfony/polyfill-intl-idn": "^1.10"
     },
     "require-dev": {
-        "mockery/mockery": "~0.9.1",
-        "symfony/phpunit-bridge": "~3.2"
+        "mockery/mockery": "^1.0",
+        "symfony/phpunit-bridge": "^4.4|^5.4"
+    },
+    "suggest": {
+        "ext-intl": "Needed to support internationalized email addresses"
     },
     "autoload": {
         "files": ["lib/swift_required.php"]
     },
     "autoload-dev": {
-        "psr-0": {
-            "Swift_": "tests/unit"
-        }
+        "psr-0": { "Swift_": "tests/unit" }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "5.4-dev"
+            "dev-master": "6.2-dev"
         }
-    }
+    },
+    "minimum-stability": "dev",
+    "prefer-stable": true
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift.php
index 82c381b73..51b19c9cb 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift.php
@@ -11,16 +11,14 @@
 /**
  * General utility class in Swift Mailer, not to be instantiated.
  *
- *
  * @author Chris Corbyn
  */
 abstract class Swift
 {
-    /** Swift Mailer Version number generated during dist release process */
-    const VERSION = '@SWIFT_VERSION_NUMBER@';
+    const VERSION = '6.3.0';
 
     public static $initialized = false;
-    public static $inits = array();
+    public static $inits = [];
 
     /**
      * Registers an initializer callable that will be called the first time
@@ -58,7 +56,7 @@ abstract class Swift
         if (self::$inits && !self::$initialized) {
             self::$initialized = true;
             foreach (self::$inits as $init) {
-                call_user_func($init);
+                \call_user_func($init);
             }
         }
     }
@@ -75,6 +73,6 @@ abstract class Swift
         if (null !== $callable) {
             self::$inits[] = $callable;
         }
-        spl_autoload_register(array('Swift', 'autoload'));
+        spl_autoload_register(['Swift', 'autoload']);
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder.php
new file mode 100644
index 000000000..a1704ffb4
--- /dev/null
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder.php
@@ -0,0 +1,25 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Email address encoder.
+ *
+ * @author Christian Schmidt
+ */
+interface Swift_AddressEncoder
+{
+    /**
+     * Encodes an email address.
+     *
+     * @throws Swift_AddressEncoderException if the email cannot be represented in
+     *                                       the encoding implemented by this class
+     */
+    public function encodeString(string $address): string;
+}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/IdnAddressEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/IdnAddressEncoder.php
new file mode 100644
index 000000000..a373ef9d5
--- /dev/null
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/IdnAddressEncoder.php
@@ -0,0 +1,50 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An IDN email address encoder.
+ *
+ * Encodes the domain part of an address using IDN. This is compatible will all
+ * SMTP servers.
+ *
+ * This encoder does not support email addresses with non-ASCII characters in
+ * local-part (the substring before @). To send to such addresses, use
+ * Swift_AddressEncoder_Utf8AddressEncoder together with
+ * Swift_Transport_Esmtp_SmtpUtf8Handler. Your outbound SMTP server must support
+ * the SMTPUTF8 extension.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_AddressEncoder_IdnAddressEncoder implements Swift_AddressEncoder
+{
+    /**
+     * Encodes the domain part of an address using IDN.
+     *
+     * @throws Swift_AddressEncoderException If local-part contains non-ASCII characters
+     */
+    public function encodeString(string $address): string
+    {
+        $i = strrpos($address, '@');
+        if (false !== $i) {
+            $local = substr($address, 0, $i);
+            $domain = substr($address, $i + 1);
+
+            if (preg_match('/[^\x00-\x7F]/', $local)) {
+                throw new Swift_AddressEncoderException('Non-ASCII characters not supported in local-part', $address);
+            }
+
+            if (preg_match('/[^\x00-\x7F]/', $domain)) {
+                $address = sprintf('%s@%s', $local, idn_to_ascii($domain, 0, INTL_IDNA_VARIANT_UTS46));
+            }
+        }
+
+        return $address;
+    }
+}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/Utf8AddressEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/Utf8AddressEncoder.php
new file mode 100644
index 000000000..1b4543056
--- /dev/null
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoder/Utf8AddressEncoder.php
@@ -0,0 +1,36 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * A UTF-8 email address encoder.
+ *
+ * Returns the email address verbatimly in UTF-8 as permitted by RFC 6531 and
+ * RFC 6532. It supports addresses containing non-ASCII characters in both
+ * local-part and domain (i.e. on both sides of @).
+ *
+ * This encoder must be used together with Swift_Transport_Esmtp_SmtpUtf8Handler
+ * and requires that the outbound SMTP server supports the SMTPUTF8 extension.
+ *
+ * If your outbound SMTP server does not support SMTPUTF8, use
+ * Swift_AddressEncoder_IdnAddressEncoder instead. This allows sending to email
+ * addresses with non-ASCII characters in the domain, but not in local-part.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_AddressEncoder_Utf8AddressEncoder implements Swift_AddressEncoder
+{
+    /**
+     * Returns the address verbatimly.
+     */
+    public function encodeString(string $address): string
+    {
+        return $address;
+    }
+}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoderException.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoderException.php
new file mode 100644
index 000000000..9b405476b
--- /dev/null
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/AddressEncoderException.php
@@ -0,0 +1,32 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * AddressEncoderException when the specified email address is in a format that
+ * cannot be encoded by a given address encoder.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_AddressEncoderException extends Swift_RfcComplianceException
+{
+    protected $address;
+
+    public function __construct(string $message, string $address)
+    {
+        parent::__construct($message);
+
+        $this->address = $address;
+    }
+
+    public function getAddress(): string
+    {
+        return $this->address;
+    }
+}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php
index a95bccfdf..7a1420f79 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Attachment.php
@@ -9,7 +9,7 @@
  */
 
 /**
- * Attachment class for attaching files to a {@link Swift_Mime_Message}.
+ * Attachment class for attaching files to a {@link Swift_Mime_SimpleMessage}.
  *
  * @author Chris Corbyn
  */
@@ -26,31 +26,14 @@ class Swift_Attachment extends Swift_Mime_Attachment
      */
     public function __construct($data = null, $filename = null, $contentType = null)
     {
-        call_user_func_array(
-            array($this, 'Swift_Mime_Attachment::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Mime_Attachment::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('mime.attachment')
             );
 
-        $this->setBody($data);
+        $this->setBody($data, $contentType);
         $this->setFilename($filename);
-        if ($contentType) {
-            $this->setContentType($contentType);
-        }
-    }
-
-    /**
-     * Create a new Attachment.
-     *
-     * @param string|Swift_OutputByteStream $data
-     * @param string                        $filename
-     * @param string                        $contentType
-     *
-     * @return Swift_Mime_Attachment
-     */
-    public static function newInstance($data = null, $filename = null, $contentType = null)
-    {
-        return new self($data, $filename, $contentType);
     }
 
     /**
@@ -59,13 +42,13 @@ class Swift_Attachment extends Swift_Mime_Attachment
      * @param string $path
      * @param string $contentType optional
      *
-     * @return Swift_Mime_Attachment
+     * @return self
      */
     public static function fromPath($path, $contentType = null)
     {
-        return self::newInstance()->setFile(
+        return (new self())->setFile(
             new Swift_ByteStream_FileByteStream($path),
             $contentType
-            );
+        );
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
index a7b0e3a62..3a69c15f1 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/AbstractFilterableInputStream.php
@@ -18,48 +18,47 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
     /**
      * Write sequence.
      */
-    protected $_sequence = 0;
+    protected $sequence = 0;
 
     /**
      * StreamFilters.
      *
      * @var Swift_StreamFilter[]
      */
-    private $_filters = array();
+    private $filters = [];
 
     /**
      * A buffer for writing.
      */
-    private $_writeBuffer = '';
+    private $writeBuffer = '';
 
     /**
      * Bound streams.
      *
      * @var Swift_InputByteStream[]
      */
-    private $_mirrors = array();
+    private $mirrors = [];
 
     /**
      * Commit the given bytes to the storage medium immediately.
      *
      * @param string $bytes
      */
-    abstract protected function _commit($bytes);
+    abstract protected function doCommit($bytes);
 
     /**
      * Flush any buffers/content with immediate effect.
      */
-    abstract protected function _flush();
+    abstract protected function flush();
 
     /**
      * Add a StreamFilter to this InputByteStream.
      *
-     * @param Swift_StreamFilter $filter
-     * @param string             $key
+     * @param string $key
      */
     public function addFilter(Swift_StreamFilter $filter, $key)
     {
-        $this->_filters[$key] = $filter;
+        $this->filters[$key] = $filter;
     }
 
     /**
@@ -69,7 +68,7 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      */
     public function removeFilter($key)
     {
-        unset($this->_filters[$key]);
+        unset($this->filters[$key]);
     }
 
     /**
@@ -83,15 +82,15 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      */
     public function write($bytes)
     {
-        $this->_writeBuffer .= $bytes;
-        foreach ($this->_filters as $filter) {
-            if ($filter->shouldBuffer($this->_writeBuffer)) {
+        $this->writeBuffer .= $bytes;
+        foreach ($this->filters as $filter) {
+            if ($filter->shouldBuffer($this->writeBuffer)) {
                 return;
             }
         }
-        $this->_doWrite($this->_writeBuffer);
+        $this->doWrite($this->writeBuffer);
 
-        return ++$this->_sequence;
+        return ++$this->sequence;
     }
 
     /**
@@ -102,7 +101,7 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      */
     public function commit()
     {
-        $this->_doWrite($this->_writeBuffer);
+        $this->doWrite($this->writeBuffer);
     }
 
     /**
@@ -110,12 +109,10 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function bind(Swift_InputByteStream $is)
     {
-        $this->_mirrors[] = $is;
+        $this->mirrors[] = $is;
     }
 
     /**
@@ -124,17 +121,15 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function unbind(Swift_InputByteStream $is)
     {
-        foreach ($this->_mirrors as $k => $stream) {
+        foreach ($this->mirrors as $k => $stream) {
             if ($is === $stream) {
-                if ($this->_writeBuffer !== '') {
-                    $stream->write($this->_writeBuffer);
+                if ('' !== $this->writeBuffer) {
+                    $stream->write($this->writeBuffer);
                 }
-                unset($this->_mirrors[$k]);
+                unset($this->mirrors[$k]);
             }
         }
     }
@@ -147,20 +142,20 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
      */
     public function flushBuffers()
     {
-        if ($this->_writeBuffer !== '') {
-            $this->_doWrite($this->_writeBuffer);
+        if ('' !== $this->writeBuffer) {
+            $this->doWrite($this->writeBuffer);
         }
-        $this->_flush();
+        $this->flush();
 
-        foreach ($this->_mirrors as $stream) {
+        foreach ($this->mirrors as $stream) {
             $stream->flushBuffers();
         }
     }
 
     /** Run $bytes through all filters */
-    private function _filter($bytes)
+    private function filter($bytes)
     {
-        foreach ($this->_filters as $filter) {
+        foreach ($this->filters as $filter) {
             $bytes = $filter->filter($bytes);
         }
 
@@ -168,14 +163,14 @@ abstract class Swift_ByteStream_AbstractFilterableInputStream implements Swift_I
     }
 
     /** Just write the bytes to the stream */
-    private function _doWrite($bytes)
+    private function doWrite($bytes)
     {
-        $this->_commit($this->_filter($bytes));
+        $this->doCommit($this->filter($bytes));
 
-        foreach ($this->_mirrors as $stream) {
+        foreach ($this->mirrors as $stream) {
             $stream->write($bytes);
         }
 
-        $this->_writeBuffer = '';
+        $this->writeBuffer = '';
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
index ef05a6d5e..4f3dcc377 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/ArrayByteStream.php
@@ -11,7 +11,7 @@
 /**
  * Allows reading and writing of bytes to and from an array.
  *
- * @author Chris Corbyn
+ * @author     Chris Corbyn
  */
 class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_OutputByteStream
 {
@@ -20,28 +20,28 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      *
      * @var string[]
      */
-    private $_array = array();
+    private $array = [];
 
     /**
      * The size of the stack.
      *
      * @var int
      */
-    private $_arraySize = 0;
+    private $arraySize = 0;
 
     /**
      * The internal pointer offset.
      *
      * @var int
      */
-    private $_offset = 0;
+    private $offset = 0;
 
     /**
      * Bound streams.
      *
      * @var Swift_InputByteStream[]
      */
-    private $_mirrors = array();
+    private $mirrors = [];
 
     /**
      * Create a new ArrayByteStream.
@@ -52,13 +52,13 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      */
     public function __construct($stack = null)
     {
-        if (is_array($stack)) {
-            $this->_array = $stack;
-            $this->_arraySize = count($stack);
-        } elseif (is_string($stack)) {
+        if (\is_array($stack)) {
+            $this->array = $stack;
+            $this->arraySize = \count($stack);
+        } elseif (\is_string($stack)) {
             $this->write($stack);
         } else {
-            $this->_array = array();
+            $this->array = [];
         }
     }
 
@@ -76,16 +76,16 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      */
     public function read($length)
     {
-        if ($this->_offset == $this->_arraySize) {
+        if ($this->offset == $this->arraySize) {
             return false;
         }
 
         // Don't use array slice
-        $end = $length + $this->_offset;
-        $end = $this->_arraySize < $end ? $this->_arraySize : $end;
+        $end = $length + $this->offset;
+        $end = $this->arraySize < $end ? $this->arraySize : $end;
         $ret = '';
-        for (; $this->_offset < $end; ++$this->_offset) {
-            $ret .= $this->_array[$this->_offset];
+        for (; $this->offset < $end; ++$this->offset) {
+            $ret .= $this->array[$this->offset];
         }
 
         return $ret;
@@ -100,11 +100,11 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
     {
         $to_add = str_split($bytes);
         foreach ($to_add as $value) {
-            $this->_array[] = $value;
+            $this->array[] = $value;
         }
-        $this->_arraySize = count($this->_array);
+        $this->arraySize = \count($this->array);
 
-        foreach ($this->_mirrors as $stream) {
+        foreach ($this->mirrors as $stream) {
             $stream->write($bytes);
         }
     }
@@ -121,12 +121,10 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function bind(Swift_InputByteStream $is)
     {
-        $this->_mirrors[] = $is;
+        $this->mirrors[] = $is;
     }
 
     /**
@@ -135,14 +133,12 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function unbind(Swift_InputByteStream $is)
     {
-        foreach ($this->_mirrors as $k => $stream) {
+        foreach ($this->mirrors as $k => $stream) {
             if ($is === $stream) {
-                unset($this->_mirrors[$k]);
+                unset($this->mirrors[$k]);
             }
         }
     }
@@ -156,13 +152,13 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      */
     public function setReadPointer($byteOffset)
     {
-        if ($byteOffset > $this->_arraySize) {
-            $byteOffset = $this->_arraySize;
+        if ($byteOffset > $this->arraySize) {
+            $byteOffset = $this->arraySize;
         } elseif ($byteOffset < 0) {
             $byteOffset = 0;
         }
 
-        $this->_offset = $byteOffset;
+        $this->offset = $byteOffset;
     }
 
     /**
@@ -171,11 +167,11 @@ class Swift_ByteStream_ArrayByteStream implements Swift_InputByteStream, Swift_O
      */
     public function flushBuffers()
     {
-        $this->_offset = 0;
-        $this->_array = array();
-        $this->_arraySize = 0;
+        $this->offset = 0;
+        $this->array = [];
+        $this->arraySize = 0;
 
-        foreach ($this->_mirrors as $stream) {
+        foreach ($this->mirrors as $stream) {
             $stream->flushBuffers();
         }
     }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
index 9ed852310..f6391219e 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/FileByteStream.php
@@ -11,30 +11,27 @@
 /**
  * Allows reading and writing of bytes to and from a file.
  *
- * @author Chris Corbyn
+ * @author     Chris Corbyn
  */
 class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterableInputStream implements Swift_FileStream
 {
     /** The internal pointer offset */
-    private $_offset = 0;
+    private $offset = 0;
 
     /** The path to the file */
-    private $_path;
+    private $path;
 
     /** The mode this file is opened in for writing */
-    private $_mode;
+    private $mode;
 
     /** A lazy-loaded resource handle for reading the file */
-    private $_reader;
+    private $reader;
 
     /** A lazy-loaded resource handle for writing the file */
-    private $_writer;
-
-    /** If magic_quotes_runtime is on, this will be true */
-    private $_quotes = false;
+    private $writer;
 
     /** If stream is seekable true/false, or null if not known */
-    private $_seekable = null;
+    private $seekable = null;
 
     /**
      * Create a new FileByteStream for $path.
@@ -47,12 +44,8 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
         if (empty($path)) {
             throw new Swift_IoException('The path cannot be empty');
         }
-        $this->_path = $path;
-        $this->_mode = $writable ? 'w+b' : 'rb';
-
-        if (function_exists('get_magic_quotes_runtime') && @get_magic_quotes_runtime() == 1) {
-            $this->_quotes = true;
-        }
+        $this->path = $path;
+        $this->mode = $writable ? 'w+b' : 'rb';
     }
 
     /**
@@ -62,7 +55,7 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
      */
     public function getPath()
     {
-        return $this->_path;
+        return $this->path;
     }
 
     /**
@@ -75,27 +68,21 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
      *
      * @param int $length
      *
-     * @throws Swift_IoException
-     *
      * @return string|bool
+     *
+     * @throws Swift_IoException
      */
     public function read($length)
     {
-        $fp = $this->_getReadHandle();
+        $fp = $this->getReadHandle();
         if (!feof($fp)) {
-            if ($this->_quotes) {
-                ini_set('magic_quotes_runtime', 0);
-            }
             $bytes = fread($fp, $length);
-            if ($this->_quotes) {
-                ini_set('magic_quotes_runtime', 1);
-            }
-            $this->_offset = ftell($fp);
+            $this->offset = ftell($fp);
 
             // If we read one byte after reaching the end of the file
             // feof() will return false and an empty string is returned
-            if ($bytes === '' && feof($fp)) {
-                $this->_resetReadHandle();
+            if ((false === $bytes || '' === $bytes) && feof($fp)) {
+                $this->resetReadHandle();
 
                 return false;
             }
@@ -103,7 +90,7 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
             return $bytes;
         }
 
-        $this->_resetReadHandle();
+        $this->resetReadHandle();
 
         return false;
     }
@@ -117,108 +104,104 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
      */
     public function setReadPointer($byteOffset)
     {
-        if (isset($this->_reader)) {
-            $this->_seekReadStreamToPosition($byteOffset);
+        if (isset($this->reader)) {
+            $this->seekReadStreamToPosition($byteOffset);
         }
-        $this->_offset = $byteOffset;
+        $this->offset = $byteOffset;
     }
 
     /** Just write the bytes to the file */
-    protected function _commit($bytes)
+    protected function doCommit($bytes)
     {
-        fwrite($this->_getWriteHandle(), $bytes);
-        $this->_resetReadHandle();
+        fwrite($this->getWriteHandle(), $bytes);
+        $this->resetReadHandle();
     }
 
     /** Not used */
-    protected function _flush()
+    protected function flush()
     {
     }
 
     /** Get the resource for reading */
-    private function _getReadHandle()
+    private function getReadHandle()
     {
-        if (!isset($this->_reader)) {
-            $pointer = @fopen($this->_path, 'rb');
+        if (!isset($this->reader)) {
+            $pointer = @fopen($this->path, 'rb');
             if (!$pointer) {
-                throw new Swift_IoException(
-                    'Unable to open file for reading ['.$this->_path.']'
-                );
+                throw new Swift_IoException('Unable to open file for reading ['.$this->path.']');
             }
-            $this->_reader = $pointer;
-            if ($this->_offset != 0) {
-                $this->_getReadStreamSeekableStatus();
-                $this->_seekReadStreamToPosition($this->_offset);
+            $this->reader = $pointer;
+            if (0 != $this->offset) {
+                $this->getReadStreamSeekableStatus();
+                $this->seekReadStreamToPosition($this->offset);
             }
         }
 
-        return $this->_reader;
+        return $this->reader;
     }
 
     /** Get the resource for writing */
-    private function _getWriteHandle()
+    private function getWriteHandle()
     {
-        if (!isset($this->_writer)) {
-            if (!$this->_writer = fopen($this->_path, $this->_mode)) {
-                throw new Swift_IoException(
-                    'Unable to open file for writing ['.$this->_path.']'
-                );
+        if (!isset($this->writer)) {
+            if (!$this->writer = fopen($this->path, $this->mode)) {
+                throw new Swift_IoException('Unable to open file for writing ['.$this->path.']');
             }
         }
 
-        return $this->_writer;
+        return $this->writer;
     }
 
     /** Force a reload of the resource for reading */
-    private function _resetReadHandle()
+    private function resetReadHandle()
     {
-        if (isset($this->_reader)) {
-            fclose($this->_reader);
-            $this->_reader = null;
+        if (isset($this->reader)) {
+            fclose($this->reader);
+            $this->reader = null;
         }
     }
 
     /** Check if ReadOnly Stream is seekable */
-    private function _getReadStreamSeekableStatus()
+    private function getReadStreamSeekableStatus()
     {
-        $metas = stream_get_meta_data($this->_reader);
-        $this->_seekable = $metas['seekable'];
+        $metas = stream_get_meta_data($this->reader);
+        $this->seekable = $metas['seekable'];
     }
 
     /** Streams in a readOnly stream ensuring copy if needed */
-    private function _seekReadStreamToPosition($offset)
+    private function seekReadStreamToPosition($offset)
     {
-        if ($this->_seekable === null) {
-            $this->_getReadStreamSeekableStatus();
+        if (null === $this->seekable) {
+            $this->getReadStreamSeekableStatus();
         }
-        if ($this->_seekable === false) {
-            $currentPos = ftell($this->_reader);
+        if (false === $this->seekable) {
+            $currentPos = ftell($this->reader);
             if ($currentPos < $offset) {
                 $toDiscard = $offset - $currentPos;
-                fread($this->_reader, $toDiscard);
+                fread($this->reader, $toDiscard);
 
                 return;
             }
-            $this->_copyReadStream();
+            $this->copyReadStream();
         }
-        fseek($this->_reader, $offset, SEEK_SET);
+        fseek($this->reader, $offset, SEEK_SET);
     }
 
     /** Copy a readOnly Stream to ensure seekability */
-    private function _copyReadStream()
+    private function copyReadStream()
     {
         if ($tmpFile = fopen('php://temp/maxmemory:4096', 'w+b')) {
             /* We have opened a php:// Stream Should work without problem */
-        } elseif (function_exists('sys_get_temp_dir') && is_writable(sys_get_temp_dir()) && ($tmpFile = tmpfile())) {
+        } elseif (\function_exists('sys_get_temp_dir') && is_writable(sys_get_temp_dir()) && ($tmpFile = tmpfile())) {
             /* We have opened a tmpfile */
         } else {
             throw new Swift_IoException('Unable to copy the file to make it seekable, sys_temp_dir is not writable, php://memory not available');
         }
-        $currentPos = ftell($this->_reader);
-        fclose($this->_reader);
-        $source = fopen($this->_path, 'rb');
+        $currentPos = ftell($this->reader);
+        fclose($this->reader);
+        $source = fopen($this->path, 'rb');
         if (!$source) {
-            throw new Swift_IoException('Unable to open file for copying ['.$this->_path.']');
+            throw new Swift_IoException('Unable to open file for copying ['.$this->path.']');
         }
         fseek($tmpFile, 0, SEEK_SET);
         while (!feof($source)) {
@@ -226,6 +209,6 @@ class Swift_ByteStream_FileByteStream extends Swift_ByteStream_AbstractFilterabl
         }
         fseek($tmpFile, $currentPos, SEEK_SET);
         fclose($source);
-        $this->_reader = $tmpFile;
+        $this->reader = $tmpFile;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
index 1c9a80c03..0dc61909d 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/ByteStream/TemporaryFileByteStream.php
@@ -17,7 +17,7 @@ class Swift_ByteStream_TemporaryFileByteStream extends Swift_ByteStream_FileByte
     {
         $filePath = tempnam(sys_get_temp_dir(), 'FileByteStream');
 
-        if ($filePath === false) {
+        if (false === $filePath) {
             throw new Swift_IoException('Failed to retrieve temporary file name.');
         }
 
@@ -26,7 +26,7 @@ class Swift_ByteStream_TemporaryFileByteStream extends Swift_ByteStream_FileByte
 
     public function getContent()
     {
-        if (($content = file_get_contents($this->getPath())) === false) {
+        if (false === ($content = file_get_contents($this->getPath()))) {
             throw new Swift_IoException('Failed to get temporary file content.');
         }
 
@@ -39,4 +39,14 @@ class Swift_ByteStream_TemporaryFileByteStream extends Swift_ByteStream_FileByte
             @unlink($this->getPath());
         }
     }
+
+    public function __sleep()
+    {
+        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
+    }
+
+    public function __wakeup()
+    {
+        throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
+    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
index 6a18e1dd1..3e055afd9 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/GenericFixedWidthReader.php
@@ -11,8 +11,8 @@
 /**
  * Provides fixed-width byte sizes for reading fixed-width character sets.
  *
- * @author Chris Corbyn
- * @author Xavier De Cock <xdecock@gmail.com>
+ * @author     Chris Corbyn
+ * @author     Xavier De Cock <xdecock@gmail.com>
  */
 class Swift_CharacterReader_GenericFixedWidthReader implements Swift_CharacterReader
 {
@@ -21,7 +21,7 @@ class Swift_CharacterReader_GenericFixedWidthReader implements Swift_CharacterRe
      *
      * @var int
      */
-    private $_width;
+    private $width;
 
     /**
      * Creates a new GenericFixedWidthReader using $width bytes per character.
@@ -30,7 +30,7 @@ class Swift_CharacterReader_GenericFixedWidthReader implements Swift_CharacterRe
      */
     public function __construct($width)
     {
-        $this->_width = $width;
+        $this->width = $width;
     }
 
     /**
@@ -45,13 +45,13 @@ class Swift_CharacterReader_GenericFixedWidthReader implements Swift_CharacterRe
      */
     public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
     {
-        $strlen = strlen($string);
+        $strlen = \strlen($string);
         // % and / are CPU intensive, so, maybe find a better way
-        $ignored = $strlen % $this->_width;
+        $ignored = $strlen % $this->width;
         $ignoredChars = $ignored ? substr($string, -$ignored) : '';
-        $currentMap = $this->_width;
+        $currentMap = $this->width;
 
-        return ($strlen - $ignored) / $this->_width;
+        return ($strlen - $ignored) / $this->width;
     }
 
     /**
@@ -80,7 +80,7 @@ class Swift_CharacterReader_GenericFixedWidthReader implements Swift_CharacterRe
      */
     public function validateByteSequence($bytes, $size)
     {
-        $needed = $this->_width - $size;
+        $needed = $this->width - $size;
 
         return $needed > -1 ? $needed : -1;
     }
@@ -92,6 +92,6 @@ class Swift_CharacterReader_GenericFixedWidthReader implements Swift_CharacterRe
      */
     public function getInitialByteSize()
     {
-        return $this->_width;
+        return $this->width;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
index 67da48f6c..ffc05f716 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/UsAsciiReader.php
@@ -27,7 +27,7 @@ class Swift_CharacterReader_UsAsciiReader implements Swift_CharacterReader
      */
     public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
     {
-        $strlen = strlen($string);
+        $strlen = \strlen($string);
         $ignoredChars = '';
         for ($i = 0; $i < $strlen; ++$i) {
             if ($string[$i] > "\x07F") {
@@ -65,7 +65,7 @@ class Swift_CharacterReader_UsAsciiReader implements Swift_CharacterReader
     public function validateByteSequence($bytes, $size)
     {
         $byte = reset($bytes);
-        if (1 == count($bytes) && $byte >= 0x00 && $byte <= 0x7F) {
+        if (1 == \count($bytes) && $byte >= 0x00 && $byte <= 0x7F) {
             return 0;
         }
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
index 22746bd85..da37e0da9 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReader/Utf8Reader.php
@@ -17,8 +17,8 @@
 class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
 {
     /** Pre-computed for optimization */
-    private static $length_map = array(
-        // N=0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F,
+    private static $length_map = [
+        // N=0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F
         1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x0N
         1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x1N
         1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // 0x2N
@@ -34,10 +34,10 @@ class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
         2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 0xCN
         2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // 0xDN
         3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, // 0xEN
-        4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 0, 0,  // 0xFN
-    );
+        4, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 6, 6, 0, 0, // 0xFN
+    ];
 
-    private static $s_length_map = array(
+    private static $s_length_map = [
         "\x00" => 1, "\x01" => 1, "\x02" => 1, "\x03" => 1, "\x04" => 1, "\x05" => 1, "\x06" => 1, "\x07" => 1,
         "\x08" => 1, "\x09" => 1, "\x0a" => 1, "\x0b" => 1, "\x0c" => 1, "\x0d" => 1, "\x0e" => 1, "\x0f" => 1,
         "\x10" => 1, "\x11" => 1, "\x12" => 1, "\x13" => 1, "\x14" => 1, "\x15" => 1, "\x16" => 1, "\x17" => 1,
@@ -70,7 +70,7 @@ class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
         "\xe8" => 3, "\xe9" => 3, "\xea" => 3, "\xeb" => 3, "\xec" => 3, "\xed" => 3, "\xee" => 3, "\xef" => 3,
         "\xf0" => 4, "\xf1" => 4, "\xf2" => 4, "\xf3" => 4, "\xf4" => 4, "\xf5" => 4, "\xf6" => 4, "\xf7" => 4,
         "\xf8" => 5, "\xf9" => 5, "\xfa" => 5, "\xfb" => 5, "\xfc" => 6, "\xfd" => 6, "\xfe" => 0, "\xff" => 0,
-     );
+     ];
 
     /**
      * Returns the complete character map.
@@ -85,22 +85,22 @@ class Swift_CharacterReader_Utf8Reader implements Swift_CharacterReader
     public function getCharPositions($string, $startOffset, &$currentMap, &$ignoredChars)
     {
         if (!isset($currentMap['i']) || !isset($currentMap['p'])) {
-            $currentMap['p'] = $currentMap['i'] = array();
+            $currentMap['p'] = $currentMap['i'] = [];
         }
 
-        $strlen = strlen($string);
-        $charPos = count($currentMap['p']);
+        $strlen = \strlen($string);
+        $charPos = \count($currentMap['p']);
         $foundChars = 0;
         $invalid = false;
         for ($i = 0; $i < $strlen; ++$i) {
             $char = $string[$i];
             $size = self::$s_length_map[$char];
-            if ($size == 0) {
+            if (0 == $size) {
                 /* char is invalid, we must wait for a resync */
                 $invalid = true;
                 continue;
             } else {
-                if ($invalid == true) {
+                if (true === $invalid) {
                     /* We mark the chars as invalid and start a new char */
                     $currentMap['p'][$charPos + $foundChars] = $startOffset + $i;
                     $currentMap['i'][$charPos + $foundChars] = true;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
index 9171a0bac..86900894a 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterReaderFactory/SimpleCharacterReaderFactory.php
@@ -20,14 +20,14 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory implements Swift
      *
      * @var array
      */
-    private static $_map = array();
+    private static $map = [];
 
     /**
      * Factories which have already been loaded.
      *
      * @var Swift_CharacterReaderFactory[]
      */
-    private static $_loaded = array();
+    private static $loaded = [];
 
     /**
      * Creates a new CharacterReaderFactory.
@@ -44,54 +44,54 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory implements Swift
 
     public function init()
     {
-        if (count(self::$_map) > 0) {
+        if (\count(self::$map) > 0) {
             return;
         }
 
         $prefix = 'Swift_CharacterReader_';
 
-        $singleByte = array(
+        $singleByte = [
             'class' => $prefix.'GenericFixedWidthReader',
-            'constructor' => array(1),
-            );
+            'constructor' => [1],
+            ];
 
-        $doubleByte = array(
+        $doubleByte = [
             'class' => $prefix.'GenericFixedWidthReader',
-            'constructor' => array(2),
-            );
+            'constructor' => [2],
+            ];
 
-        $fourBytes = array(
+        $fourBytes = [
             'class' => $prefix.'GenericFixedWidthReader',
-            'constructor' => array(4),
-            );
+            'constructor' => [4],
+            ];
 
         // Utf-8
-        self::$_map['utf-?8'] = array(
+        self::$map['utf-?8'] = [
             'class' => $prefix.'Utf8Reader',
-            'constructor' => array(),
-            );
+            'constructor' => [],
+            ];
 
         //7-8 bit charsets
-        self::$_map['(us-)?ascii'] = $singleByte;
-        self::$_map['(iso|iec)-?8859-?[0-9]+'] = $singleByte;
-        self::$_map['windows-?125[0-9]'] = $singleByte;
-        self::$_map['cp-?[0-9]+'] = $singleByte;
-        self::$_map['ansi'] = $singleByte;
-        self::$_map['macintosh'] = $singleByte;
-        self::$_map['koi-?7'] = $singleByte;
-        self::$_map['koi-?8-?.+'] = $singleByte;
-        self::$_map['mik'] = $singleByte;
-        self::$_map['(cork|t1)'] = $singleByte;
-        self::$_map['v?iscii'] = $singleByte;
+        self::$map['(us-)?ascii'] = $singleByte;
+        self::$map['(iso|iec)-?8859-?[0-9]+'] = $singleByte;
+        self::$map['windows-?125[0-9]'] = $singleByte;
+        self::$map['cp-?[0-9]+'] = $singleByte;
+        self::$map['ansi'] = $singleByte;
+        self::$map['macintosh'] = $singleByte;
+        self::$map['koi-?7'] = $singleByte;
+        self::$map['koi-?8-?.+'] = $singleByte;
+        self::$map['mik'] = $singleByte;
+        self::$map['(cork|t1)'] = $singleByte;
+        self::$map['v?iscii'] = $singleByte;
 
         //16 bits
-        self::$_map['(ucs-?2|utf-?16)'] = $doubleByte;
+        self::$map['(ucs-?2|utf-?16)'] = $doubleByte;
 
         //32 bits
-        self::$_map['(ucs-?4|utf-?32)'] = $fourBytes;
+        self::$map['(ucs-?4|utf-?32)'] = $fourBytes;
 
         // Fallback
-        self::$_map['.*'] = $singleByte;
+        self::$map['.*'] = $singleByte;
     }
 
     /**
@@ -103,21 +103,21 @@ class Swift_CharacterReaderFactory_SimpleCharacterReaderFactory implements Swift
      */
     public function getReaderFor($charset)
     {
-        $charset = trim(strtolower($charset));
-        foreach (self::$_map as $pattern => $spec) {
+        $charset = strtolower(trim($charset ?? ''));
+        foreach (self::$map as $pattern => $spec) {
             $re = '/^'.$pattern.'$/D';
             if (preg_match($re, $charset)) {
-                if (!array_key_exists($pattern, self::$_loaded)) {
+                if (!\array_key_exists($pattern, self::$loaded)) {
                     $reflector = new ReflectionClass($spec['class']);
                     if ($reflector->getConstructor()) {
                         $reader = $reflector->newInstanceArgs($spec['constructor']);
                     } else {
                         $reader = $reflector->newInstance();
                     }
-                    self::$_loaded[$pattern] = $reader;
+                    self::$loaded[$pattern] = $reader;
                 }
 
-                return self::$_loaded[$pattern];
+                return self::$loaded[$pattern];
             }
         }
     }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream.php
index 717924f5d..c9d8a078e 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream.php
@@ -28,8 +28,6 @@ interface Swift_CharacterStream
 
     /**
      * Set the CharacterReaderFactory for multi charset support.
-     *
-     * @param Swift_CharacterReaderFactory $factory
      */
     public function setCharacterReaderFactory(Swift_CharacterReaderFactory $factory);
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
index 7213a40d7..5c2869455 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/ArrayCharacterStream.php
@@ -16,28 +16,28 @@
 class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStream
 {
     /** A map of byte values and their respective characters */
-    private static $_charMap;
+    private static $charMap;
 
     /** A map of characters and their derivative byte values */
-    private static $_byteMap;
+    private static $byteMap;
 
     /** The char reader (lazy-loaded) for the current charset */
-    private $_charReader;
+    private $charReader;
 
     /** A factory for creating CharacterReader instances */
-    private $_charReaderFactory;
+    private $charReaderFactory;
 
     /** The character set this stream is using */
-    private $_charset;
+    private $charset;
 
     /** Array of characters */
-    private $_array = array();
+    private $array = [];
 
     /** Size of the array of character */
-    private $_array_size = array();
+    private $array_size = [];
 
     /** The current character offset in the stream */
-    private $_offset = 0;
+    private $offset = 0;
 
     /**
      * Create a new CharacterStream with the given $chars, if set.
@@ -47,7 +47,7 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
      */
     public function __construct(Swift_CharacterReaderFactory $factory, $charset)
     {
-        self::_initializeMaps();
+        self::initializeMaps();
         $this->setCharacterReaderFactory($factory);
         $this->setCharacterSet($charset);
     }
@@ -59,18 +59,16 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
      */
     public function setCharacterSet($charset)
     {
-        $this->_charset = $charset;
-        $this->_charReader = null;
+        $this->charset = $charset;
+        $this->charReader = null;
     }
 
     /**
      * Set the CharacterReaderFactory for multi charset support.
-     *
-     * @param Swift_CharacterReaderFactory $factory
      */
     public function setCharacterReaderFactory(Swift_CharacterReaderFactory $factory)
     {
-        $this->_charReaderFactory = $factory;
+        $this->charReaderFactory = $factory;
     }
 
     /**
@@ -80,28 +78,28 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
      */
     public function importByteStream(Swift_OutputByteStream $os)
     {
-        if (!isset($this->_charReader)) {
-            $this->_charReader = $this->_charReaderFactory
-                ->getReaderFor($this->_charset);
+        if (!isset($this->charReader)) {
+            $this->charReader = $this->charReaderFactory
+                ->getReaderFor($this->charset);
         }
 
-        $startLength = $this->_charReader->getInitialByteSize();
+        $startLength = $this->charReader->getInitialByteSize();
         while (false !== $bytes = $os->read($startLength)) {
-            $c = array();
-            for ($i = 0, $len = strlen($bytes); $i < $len; ++$i) {
-                $c[] = self::$_byteMap[$bytes[$i]];
+            $c = [];
+            for ($i = 0, $len = \strlen($bytes); $i < $len; ++$i) {
+                $c[] = self::$byteMap[$bytes[$i]];
             }
-            $size = count($c);
-            $need = $this->_charReader
+            $size = \count($c);
+            $need = $this->charReader
                 ->validateByteSequence($c, $size);
             if ($need > 0 &&
                 false !== $bytes = $os->read($need)) {
-                for ($i = 0, $len = strlen($bytes); $i < $len; ++$i) {
-                    $c[] = self::$_byteMap[$bytes[$i]];
+                for ($i = 0, $len = \strlen($bytes); $i < $len; ++$i) {
+                    $c[] = self::$byteMap[$bytes[$i]];
                 }
             }
-            $this->_array[] = $c;
-            ++$this->_array_size;
+            $this->array[] = $c;
+            ++$this->array_size;
         }
     }
 
@@ -127,20 +125,20 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
      */
     public function read($length)
     {
-        if ($this->_offset == $this->_array_size) {
+        if ($this->offset == $this->array_size) {
             return false;
         }
 
         // Don't use array slice
-        $arrays = array();
-        $end = $length + $this->_offset;
-        for ($i = $this->_offset; $i < $end; ++$i) {
-            if (!isset($this->_array[$i])) {
+        $arrays = [];
+        $end = $length + $this->offset;
+        for ($i = $this->offset; $i < $end; ++$i) {
+            if (!isset($this->array[$i])) {
                 break;
             }
-            $arrays[] = $this->_array[$i];
+            $arrays[] = $this->array[$i];
         }
-        $this->_offset += $i - $this->_offset; // Limit function calls
+        $this->offset += $i - $this->offset; // Limit function calls
         $chars = false;
         foreach ($arrays as $array) {
             $chars .= implode('', array_map('chr', $array));
@@ -159,20 +157,20 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
      */
     public function readBytes($length)
     {
-        if ($this->_offset == $this->_array_size) {
+        if ($this->offset == $this->array_size) {
             return false;
         }
-        $arrays = array();
-        $end = $length + $this->_offset;
-        for ($i = $this->_offset; $i < $end; ++$i) {
-            if (!isset($this->_array[$i])) {
+        $arrays = [];
+        $end = $length + $this->offset;
+        for ($i = $this->offset; $i < $end; ++$i) {
+            if (!isset($this->array[$i])) {
                 break;
             }
-            $arrays[] = $this->_array[$i];
+            $arrays[] = $this->array[$i];
         }
-        $this->_offset += ($i - $this->_offset); // Limit function calls
+        $this->offset += ($i - $this->offset); // Limit function calls
 
-        return call_user_func_array('array_merge', $arrays);
+        return array_merge(...$arrays);
     }
 
     /**
@@ -182,31 +180,31 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
      */
     public function write($chars)
     {
-        if (!isset($this->_charReader)) {
-            $this->_charReader = $this->_charReaderFactory->getReaderFor(
-                $this->_charset);
+        if (!isset($this->charReader)) {
+            $this->charReader = $this->charReaderFactory->getReaderFor(
+                $this->charset);
         }
 
-        $startLength = $this->_charReader->getInitialByteSize();
+        $startLength = $this->charReader->getInitialByteSize();
 
         $fp = fopen('php://memory', 'w+b');
         fwrite($fp, $chars);
         unset($chars);
         fseek($fp, 0, SEEK_SET);
 
-        $buffer = array(0);
+        $buffer = [0];
         $buf_pos = 1;
         $buf_len = 1;
         $has_datas = true;
         do {
-            $bytes = array();
+            $bytes = [];
             // Buffer Filing
             if ($buf_len - $buf_pos < $startLength) {
                 $buf = array_splice($buffer, $buf_pos);
-                $new = $this->_reloadBuffer($fp, 100);
+                $new = $this->reloadBuffer($fp, 100);
                 if ($new) {
                     $buffer = array_merge($buf, $new);
-                    $buf_len = count($buffer);
+                    $buf_len = \count($buffer);
                     $buf_pos = 0;
                 } else {
                     $has_datas = false;
@@ -218,23 +216,23 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
                     ++$size;
                     $bytes[] = $buffer[$buf_pos++];
                 }
-                $need = $this->_charReader->validateByteSequence(
+                $need = $this->charReader->validateByteSequence(
                     $bytes, $size);
                 if ($need > 0) {
                     if ($buf_len - $buf_pos < $need) {
-                        $new = $this->_reloadBuffer($fp, $need);
+                        $new = $this->reloadBuffer($fp, $need);
 
                         if ($new) {
                             $buffer = array_merge($buffer, $new);
-                            $buf_len = count($buffer);
+                            $buf_len = \count($buffer);
                         }
                     }
                     for ($i = 0; $i < $need && isset($buffer[$buf_pos]); ++$i) {
                         $bytes[] = $buffer[$buf_pos++];
                     }
                 }
-                $this->_array[] = $bytes;
-                ++$this->_array_size;
+                $this->array[] = $bytes;
+                ++$this->array_size;
             }
         } while ($has_datas);
 
@@ -248,12 +246,12 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
      */
     public function setPointer($charOffset)
     {
-        if ($charOffset > $this->_array_size) {
-            $charOffset = $this->_array_size;
+        if ($charOffset > $this->array_size) {
+            $charOffset = $this->array_size;
         } elseif ($charOffset < 0) {
             $charOffset = 0;
         }
-        $this->_offset = $charOffset;
+        $this->offset = $charOffset;
     }
 
     /**
@@ -261,17 +259,17 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
      */
     public function flushContents()
     {
-        $this->_offset = 0;
-        $this->_array = array();
-        $this->_array_size = 0;
+        $this->offset = 0;
+        $this->array = [];
+        $this->array_size = 0;
     }
 
-    private function _reloadBuffer($fp, $len)
+    private function reloadBuffer($fp, $len)
     {
-        if (!feof($fp) && ($bytes = fread($fp, $len)) !== false) {
-            $buf = array();
-            for ($i = 0, $len = strlen($bytes); $i < $len; ++$i) {
-                $buf[] = self::$_byteMap[$bytes[$i]];
+        if (!feof($fp) && false !== ($bytes = fread($fp, $len))) {
+            $buf = [];
+            for ($i = 0, $len = \strlen($bytes); $i < $len; ++$i) {
+                $buf[] = self::$byteMap[$bytes[$i]];
             }
 
             return $buf;
@@ -280,14 +278,14 @@ class Swift_CharacterStream_ArrayCharacterStream implements Swift_CharacterStrea
         return false;
     }
 
-    private static function _initializeMaps()
+    private static function initializeMaps()
     {
-        if (!isset(self::$_charMap)) {
-            self::$_charMap = array();
+        if (!isset(self::$charMap)) {
+            self::$charMap = [];
             for ($byte = 0; $byte < 256; ++$byte) {
-                self::$_charMap[$byte] = chr($byte);
+                self::$charMap[$byte] = \chr($byte);
             }
-            self::$_byteMap = array_flip(self::$_charMap);
+            self::$byteMap = array_flip(self::$charMap);
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
index 58bd140fd..7578dda9c 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/CharacterStream/NgCharacterStream.php
@@ -11,7 +11,7 @@
 /**
  * A CharacterStream implementation which stores characters in an internal array.
  *
- * @author Xavier De Cock <xdecock@gmail.com>
+ * @author     Xavier De Cock <xdecock@gmail.com>
  */
 class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
 {
@@ -20,69 +20,68 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
      *
      * @var Swift_CharacterReader
      */
-    private $_charReader;
+    private $charReader;
 
     /**
      * A factory for creating CharacterReader instances.
      *
      * @var Swift_CharacterReaderFactory
      */
-    private $_charReaderFactory;
+    private $charReaderFactory;
 
     /**
      * The character set this stream is using.
      *
      * @var string
      */
-    private $_charset;
+    private $charset;
 
     /**
      * The data's stored as-is.
      *
      * @var string
      */
-    private $_datas = '';
+    private $datas = '';
 
     /**
      * Number of bytes in the stream.
      *
      * @var int
      */
-    private $_datasSize = 0;
+    private $datasSize = 0;
 
     /**
      * Map.
      *
      * @var mixed
      */
-    private $_map;
+    private $map;
 
     /**
      * Map Type.
      *
      * @var int
      */
-    private $_mapType = 0;
+    private $mapType = 0;
 
     /**
      * Number of characters in the stream.
      *
      * @var int
      */
-    private $_charCount = 0;
+    private $charCount = 0;
 
     /**
      * Position in the stream.
      *
      * @var int
      */
-    private $_currentPos = 0;
+    private $currentPos = 0;
 
     /**
      * Constructor.
      *
-     * @param Swift_CharacterReaderFactory $factory
-     * @param string                       $charset
+     * @param string $charset
      */
     public function __construct(Swift_CharacterReaderFactory $factory, $charset)
     {
@@ -99,19 +98,17 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
      */
     public function setCharacterSet($charset)
     {
-        $this->_charset = $charset;
-        $this->_charReader = null;
-        $this->_mapType = 0;
+        $this->charset = $charset;
+        $this->charReader = null;
+        $this->mapType = 0;
     }
 
     /**
      * Set the CharacterReaderFactory for multi charset support.
-     *
-     * @param Swift_CharacterReaderFactory $factory
      */
     public function setCharacterReaderFactory(Swift_CharacterReaderFactory $factory)
     {
-        $this->_charReaderFactory = $factory;
+        $this->charReaderFactory = $factory;
     }
 
     /**
@@ -119,17 +116,15 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
      */
     public function flushContents()
     {
-        $this->_datas = null;
-        $this->_map = null;
-        $this->_charCount = 0;
-        $this->_currentPos = 0;
-        $this->_datasSize = 0;
+        $this->datas = null;
+        $this->map = null;
+        $this->charCount = 0;
+        $this->currentPos = 0;
+        $this->datasSize = 0;
     }
 
     /**
      * @see Swift_CharacterStream::importByteStream()
-     *
-     * @param Swift_OutputByteStream $os
      */
     public function importByteStream(Swift_OutputByteStream $os)
     {
@@ -161,49 +156,49 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
      */
     public function read($length)
     {
-        if ($this->_currentPos >= $this->_charCount) {
+        if ($this->currentPos >= $this->charCount) {
             return false;
         }
         $ret = false;
-        $length = $this->_currentPos + $length > $this->_charCount ? $this->_charCount - $this->_currentPos : $length;
-        switch ($this->_mapType) {
+        $length = ($this->currentPos + $length > $this->charCount) ? $this->charCount - $this->currentPos : $length;
+        switch ($this->mapType) {
             case Swift_CharacterReader::MAP_TYPE_FIXED_LEN:
-                $len = $length * $this->_map;
-                $ret = substr($this->_datas,
-                        $this->_currentPos * $this->_map,
+                $len = $length * $this->map;
+                $ret = substr($this->datas,
+                        $this->currentPos * $this->map,
                         $len);
-                $this->_currentPos += $length;
+                $this->currentPos += $length;
                 break;
 
             case Swift_CharacterReader::MAP_TYPE_INVALID:
                 $ret = '';
-                for (; $this->_currentPos < $length; ++$this->_currentPos) {
-                    if (isset($this->_map[$this->_currentPos])) {
+                for (; $this->currentPos < $length; ++$this->currentPos) {
+                    if (isset($this->map[$this->currentPos])) {
                         $ret .= '?';
                     } else {
-                        $ret .= $this->_datas[$this->_currentPos];
+                        $ret .= $this->datas[$this->currentPos];
                     }
                 }
                 break;
 
             case Swift_CharacterReader::MAP_TYPE_POSITIONS:
-                $end = $this->_currentPos + $length;
-                $end = $end > $this->_charCount ? $this->_charCount : $end;
+                $end = $this->currentPos + $length;
+                $end = $end > $this->charCount ? $this->charCount : $end;
                 $ret = '';
                 $start = 0;
-                if ($this->_currentPos > 0) {
-                    $start = $this->_map['p'][$this->_currentPos - 1];
+                if ($this->currentPos > 0) {
+                    $start = $this->map['p'][$this->currentPos - 1];
                 }
                 $to = $start;
-                for (; $this->_currentPos < $end; ++$this->_currentPos) {
-                    if (isset($this->_map['i'][$this->_currentPos])) {
-                        $ret .= substr($this->_datas, $start, $to - $start).'?';
-                        $start = $this->_map['p'][$this->_currentPos];
+                for (; $this->currentPos < $end; ++$this->currentPos) {
+                    if (isset($this->map['i'][$this->currentPos])) {
+                        $ret .= substr($this->datas, $start, $to - $start).'?';
+                        $start = $this->map['p'][$this->currentPos];
                     } else {
-                        $to = $this->_map['p'][$this->_currentPos];
+                        $to = $this->map['p'][$this->currentPos];
                     }
                 }
-                $ret .= substr($this->_datas, $start, $to - $start);
+                $ret .= substr($this->datas, $start, $to - $start);
                 break;
         }
 
@@ -220,7 +215,7 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
     public function readBytes($length)
     {
         $read = $this->read($length);
-        if ($read !== false) {
+        if (false !== $read) {
             $ret = array_map('ord', str_split($read, 1));
 
             return $ret;
@@ -236,10 +231,10 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
      */
     public function setPointer($charOffset)
     {
-        if ($this->_charCount < $charOffset) {
-            $charOffset = $this->_charCount;
+        if ($this->charCount < $charOffset) {
+            $charOffset = $this->charCount;
         }
-        $this->_currentPos = $charOffset;
+        $this->currentPos = $charOffset;
     }
 
     /**
@@ -249,19 +244,19 @@ class Swift_CharacterStream_NgCharacterStream implements Swift_CharacterStream
      */
     public function write($chars)
     {
-        if (!isset($this->_charReader)) {
-            $this->_charReader = $this->_charReaderFactory->getReaderFor(
-                $this->_charset);
-            $this->_map = array();
-            $this->_mapType = $this->_charReader->getMapType();
+        if (!isset($this->charReader)) {
+            $this->charReader = $this->charReaderFactory->getReaderFor(
+                $this->charset);
+            $this->map = [];
+            $this->mapType = $this->charReader->getMapType();
         }
         $ignored = '';
-        $this->_datas .= $chars;
-        $this->_charCount += $this->_charReader->getCharPositions(substr($this->_datas, $this->_datasSize), $this->_datasSize, $this->_map, $ignored);
-        if ($ignored !== false) {
-            $this->_datasSize = strlen($this->_datas) - strlen($ignored);
+        $this->datas .= $chars;
+        $this->charCount += $this->charReader->getCharPositions(substr($this->datas, $this->datasSize), $this->datasSize, $this->map, $ignored);
+        if (false !== $ignored) {
+            $this->datasSize = \strlen($this->datas) - \strlen($ignored);
         } else {
-            $this->_datasSize = strlen($this->_datas);
+            $this->datasSize = \strlen($this->datas);
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/ConfigurableSpool.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/ConfigurableSpool.php
index 4ae5bacfc..a711bac47 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/ConfigurableSpool.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/ConfigurableSpool.php
@@ -16,10 +16,10 @@
 abstract class Swift_ConfigurableSpool implements Swift_Spool
 {
     /** The maximum number of messages to send per flush */
-    private $_message_limit;
+    private $message_limit;
 
     /** The time limit per flush */
-    private $_time_limit;
+    private $time_limit;
 
     /**
      * Sets the maximum number of messages to send per flush.
@@ -28,7 +28,7 @@ abstract class Swift_ConfigurableSpool implements Swift_Spool
      */
     public function setMessageLimit($limit)
     {
-        $this->_message_limit = (int) $limit;
+        $this->message_limit = (int) $limit;
     }
 
     /**
@@ -38,7 +38,7 @@ abstract class Swift_ConfigurableSpool implements Swift_Spool
      */
     public function getMessageLimit()
     {
-        return $this->_message_limit;
+        return $this->message_limit;
     }
 
     /**
@@ -48,7 +48,7 @@ abstract class Swift_ConfigurableSpool implements Swift_Spool
      */
     public function setTimeLimit($limit)
     {
-        $this->_time_limit = (int) $limit;
+        $this->time_limit = (int) $limit;
     }
 
     /**
@@ -58,6 +58,6 @@ abstract class Swift_ConfigurableSpool implements Swift_Spool
      */
     public function getTimeLimit()
     {
-        return $this->_time_limit;
+        return $this->time_limit;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php
index befec9ac0..3cc885ec0 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/DependencyContainer.php
@@ -11,30 +11,33 @@
 /**
  * Dependency Injection container.
  *
- * @author Chris Corbyn
+ * @author  Chris Corbyn
  */
 class Swift_DependencyContainer
 {
     /** Constant for literal value types */
-    const TYPE_VALUE = 0x0001;
+    const TYPE_VALUE = 0x00001;
 
     /** Constant for new instance types */
-    const TYPE_INSTANCE = 0x0010;
+    const TYPE_INSTANCE = 0x00010;
 
     /** Constant for shared instance types */
-    const TYPE_SHARED = 0x0100;
+    const TYPE_SHARED = 0x00100;
 
     /** Constant for aliases */
-    const TYPE_ALIAS = 0x1000;
+    const TYPE_ALIAS = 0x01000;
+
+    /** Constant for arrays */
+    const TYPE_ARRAY = 0x10000;
 
     /** Singleton instance */
-    private static $_instance = null;
+    private static $instance = null;
 
     /** The data container */
-    private $_store = array();
+    private $store = [];
 
     /** The current endpoint in the data container */
-    private $_endPoint;
+    private $endPoint;
 
     /**
      * Constructor should not be used.
@@ -52,11 +55,11 @@ class Swift_DependencyContainer
      */
     public static function getInstance()
     {
-        if (!isset(self::$_instance)) {
-            self::$_instance = new self();
+        if (!isset(self::$instance)) {
+            self::$instance = new self();
         }
 
-        return self::$_instance;
+        return self::$instance;
     }
 
     /**
@@ -66,7 +69,7 @@ class Swift_DependencyContainer
      */
     public function listItems()
     {
-        return array_keys($this->_store);
+        return array_keys($this->store);
     }
 
     /**
@@ -80,8 +83,8 @@ class Swift_DependencyContainer
      */
     public function has($itemName)
     {
-        return array_key_exists($itemName, $this->_store)
-            && isset($this->_store[$itemName]['lookupType']);
+        return \array_key_exists($itemName, $this->store)
+            && isset($this->store[$itemName]['lookupType']);
     }
 
     /**
@@ -91,27 +94,27 @@ class Swift_DependencyContainer
      *
      * @param string $itemName
      *
-     * @throws Swift_DependencyException If the dependency is not found
-     *
      * @return mixed
+     *
+     * @throws Swift_DependencyException If the dependency is not found
      */
     public function lookup($itemName)
     {
         if (!$this->has($itemName)) {
-            throw new Swift_DependencyException(
-                'Cannot lookup dependency "'.$itemName.'" since it is not registered.'
-                );
+            throw new Swift_DependencyException('Cannot lookup dependency "'.$itemName.'" since it is not registered.');
         }
 
-        switch ($this->_store[$itemName]['lookupType']) {
+        switch ($this->store[$itemName]['lookupType']) {
             case self::TYPE_ALIAS:
-                return $this->_createAlias($itemName);
+                return $this->createAlias($itemName);
             case self::TYPE_VALUE:
-                return $this->_getValue($itemName);
+                return $this->getValue($itemName);
             case self::TYPE_INSTANCE:
-                return $this->_createNewInstance($itemName);
+                return $this->createNewInstance($itemName);
             case self::TYPE_SHARED:
-                return $this->_createSharedInstance($itemName);
+                return $this->createSharedInstance($itemName);
+            case self::TYPE_ARRAY:
+                return $this->createDependenciesFor($itemName);
         }
     }
 
@@ -124,9 +127,9 @@ class Swift_DependencyContainer
      */
     public function createDependenciesFor($itemName)
     {
-        $args = array();
-        if (isset($this->_store[$itemName]['args'])) {
-            $args = $this->_resolveArgs($this->_store[$itemName]['args']);
+        $args = [];
+        if (isset($this->store[$itemName]['args'])) {
+            $args = $this->resolveArgs($this->store[$itemName]['args']);
         }
 
         return $args;
@@ -147,8 +150,8 @@ class Swift_DependencyContainer
      */
     public function register($itemName)
     {
-        $this->_store[$itemName] = array();
-        $this->_endPoint = &$this->_store[$itemName];
+        $this->store[$itemName] = [];
+        $this->endPoint = &$this->store[$itemName];
 
         return $this;
     }
@@ -164,7 +167,7 @@ class Swift_DependencyContainer
      */
     public function asValue($value)
     {
-        $endPoint = &$this->_getEndPoint();
+        $endPoint = &$this->getEndPoint();
         $endPoint['lookupType'] = self::TYPE_VALUE;
         $endPoint['value'] = $value;
 
@@ -180,7 +183,7 @@ class Swift_DependencyContainer
      */
     public function asAliasOf($lookup)
     {
-        $endPoint = &$this->_getEndPoint();
+        $endPoint = &$this->getEndPoint();
         $endPoint['lookupType'] = self::TYPE_ALIAS;
         $endPoint['ref'] = $lookup;
 
@@ -202,7 +205,7 @@ class Swift_DependencyContainer
      */
     public function asNewInstanceOf($className)
     {
-        $endPoint = &$this->_getEndPoint();
+        $endPoint = &$this->getEndPoint();
         $endPoint['lookupType'] = self::TYPE_INSTANCE;
         $endPoint['className'] = $className;
 
@@ -220,13 +223,28 @@ class Swift_DependencyContainer
      */
     public function asSharedInstanceOf($className)
     {
-        $endPoint = &$this->_getEndPoint();
+        $endPoint = &$this->getEndPoint();
         $endPoint['lookupType'] = self::TYPE_SHARED;
         $endPoint['className'] = $className;
 
         return $this;
     }
 
+    /**
+     * Specify the previously registered item as array of dependencies.
+     *
+     * {@link register()} must be called before this will work.
+     *
+     * @return $this
+     */
+    public function asArray()
+    {
+        $endPoint = &$this->getEndPoint();
+        $endPoint['lookupType'] = self::TYPE_ARRAY;
+
+        return $this;
+    }
+
     /**
      * Specify a list of injected dependencies for the previously registered item.
      *
@@ -234,14 +252,12 @@ class Swift_DependencyContainer
      *
      * @see addConstructorValue(), addConstructorLookup()
      *
-     * @param array $lookups
-     *
      * @return $this
      */
     public function withDependencies(array $lookups)
     {
-        $endPoint = &$this->_getEndPoint();
-        $endPoint['args'] = array();
+        $endPoint = &$this->getEndPoint();
+        $endPoint['args'] = [];
         foreach ($lookups as $lookup) {
             $this->addConstructorLookup($lookup);
         }
@@ -261,11 +277,11 @@ class Swift_DependencyContainer
      */
     public function addConstructorValue($value)
     {
-        $endPoint = &$this->_getEndPoint();
+        $endPoint = &$this->getEndPoint();
         if (!isset($endPoint['args'])) {
-            $endPoint['args'] = array();
+            $endPoint['args'] = [];
         }
-        $endPoint['args'][] = array('type' => 'value', 'item' => $value);
+        $endPoint['args'][] = ['type' => 'value', 'item' => $value];
 
         return $this;
     }
@@ -282,31 +298,31 @@ class Swift_DependencyContainer
      */
     public function addConstructorLookup($lookup)
     {
-        $endPoint = &$this->_getEndPoint();
-        if (!isset($this->_endPoint['args'])) {
-            $endPoint['args'] = array();
+        $endPoint = &$this->getEndPoint();
+        if (!isset($this->endPoint['args'])) {
+            $endPoint['args'] = [];
         }
-        $endPoint['args'][] = array('type' => 'lookup', 'item' => $lookup);
+        $endPoint['args'][] = ['type' => 'lookup', 'item' => $lookup];
 
         return $this;
     }
 
     /** Get the literal value with $itemName */
-    private function _getValue($itemName)
+    private function getValue($itemName)
     {
-        return $this->_store[$itemName]['value'];
+        return $this->store[$itemName]['value'];
     }
 
     /** Resolve an alias to another item */
-    private function _createAlias($itemName)
+    private function createAlias($itemName)
     {
-        return $this->lookup($this->_store[$itemName]['ref']);
+        return $this->lookup($this->store[$itemName]['ref']);
     }
 
     /** Create a fresh instance of $itemName */
-    private function _createNewInstance($itemName)
+    private function createNewInstance($itemName)
     {
-        $reflector = new ReflectionClass($this->_store[$itemName]['className']);
+        $reflector = new ReflectionClass($this->store[$itemName]['className']);
         if ($reflector->getConstructor()) {
             return $reflector->newInstanceArgs(
                 $this->createDependenciesFor($itemName)
@@ -317,35 +333,33 @@ class Swift_DependencyContainer
     }
 
     /** Create and register a shared instance of $itemName */
-    private function _createSharedInstance($itemName)
+    private function createSharedInstance($itemName)
     {
-        if (!isset($this->_store[$itemName]['instance'])) {
-            $this->_store[$itemName]['instance'] = $this->_createNewInstance($itemName);
+        if (!isset($this->store[$itemName]['instance'])) {
+            $this->store[$itemName]['instance'] = $this->createNewInstance($itemName);
         }
 
-        return $this->_store[$itemName]['instance'];
+        return $this->store[$itemName]['instance'];
     }
 
     /** Get the current endpoint in the store */
-    private function &_getEndPoint()
+    private function &getEndPoint()
     {
-        if (!isset($this->_endPoint)) {
-            throw new BadMethodCallException(
-                'Component must first be registered by calling register()'
-                );
+        if (!isset($this->endPoint)) {
+            throw new BadMethodCallException('Component must first be registered by calling register()');
         }
 
-        return $this->_endPoint;
+        return $this->endPoint;
     }
 
     /** Get an argument list with dependencies resolved */
-    private function _resolveArgs(array $args)
+    private function resolveArgs(array $args)
     {
-        $resolved = array();
+        $resolved = [];
         foreach ($args as $argDefinition) {
             switch ($argDefinition['type']) {
                 case 'lookup':
-                    $resolved[] = $this->_lookupRecursive($argDefinition['item']);
+                    $resolved[] = $this->lookupRecursive($argDefinition['item']);
                     break;
                 case 'value':
                     $resolved[] = $argDefinition['item'];
@@ -357,12 +371,12 @@ class Swift_DependencyContainer
     }
 
     /** Resolve a single dependency with an collections */
-    private function _lookupRecursive($item)
+    private function lookupRecursive($item)
     {
-        if (is_array($item)) {
-            $collection = array();
+        if (\is_array($item)) {
+            $collection = [];
             foreach ($item as $k => $v) {
-                $collection[$k] = $this->_lookupRecursive($v);
+                $collection[$k] = $this->lookupRecursive($v);
             }
 
             return $collection;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/EmbeddedFile.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/EmbeddedFile.php
index d8c72ad4d..30fc68ab0 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/EmbeddedFile.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/EmbeddedFile.php
@@ -26,8 +26,8 @@ class Swift_EmbeddedFile extends Swift_Mime_EmbeddedFile
      */
     public function __construct($data = null, $filename = null, $contentType = null)
     {
-        call_user_func_array(
-            array($this, 'Swift_Mime_EmbeddedFile::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Mime_EmbeddedFile::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('mime.embeddedfile')
             );
@@ -39,20 +39,6 @@ class Swift_EmbeddedFile extends Swift_Mime_EmbeddedFile
         }
     }
 
-    /**
-     * Create a new EmbeddedFile.
-     *
-     * @param string|Swift_OutputByteStream $data
-     * @param string                        $filename
-     * @param string                        $contentType
-     *
-     * @return Swift_Mime_EmbeddedFile
-     */
-    public static function newInstance($data = null, $filename = null, $contentType = null)
-    {
-        return new self($data, $filename, $contentType);
-    }
-
     /**
      * Create a new EmbeddedFile from a filesystem path.
      *
@@ -62,8 +48,6 @@ class Swift_EmbeddedFile extends Swift_Mime_EmbeddedFile
      */
     public static function fromPath($path)
     {
-        return self::newInstance()->setFile(
-            new Swift_ByteStream_FileByteStream($path)
-            );
+        return (new self())->setFile(new Swift_ByteStream_FileByteStream($path));
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
index 0e7b2a1b0..b1eedaa05 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Base64Encoder.php
@@ -34,7 +34,7 @@ class Swift_Encoder_Base64Encoder implements Swift_Encoder
             $maxLineLength = 76;
         }
 
-        $encodedString = base64_encode($string);
+        $encodedString = base64_encode($string ?? '');
         $firstLine = '';
 
         if (0 != $firstLineOffset) {
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
index edec10c51..f078d6d7c 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/QpEncoder.php
@@ -13,7 +13,7 @@
  *
  * Possibly the most accurate RFC 2045 QP implementation found in PHP.
  *
- * @author Chris Corbyn
+ * @author     Chris Corbyn
  */
 class Swift_Encoder_QpEncoder implements Swift_Encoder
 {
@@ -22,21 +22,21 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      *
      * @var Swift_CharacterStream
      */
-    protected $_charStream;
+    protected $charStream;
 
     /**
      * A filter used if input should be canonicalized.
      *
      * @var Swift_StreamFilter
      */
-    protected $_filter;
+    protected $filter;
 
     /**
      * Pre-computed QP for HUGE optimization.
      *
      * @var string[]
      */
-    protected static $_qpMap = array(
+    protected static $qpMap = [
         0 => '=00', 1 => '=01', 2 => '=02', 3 => '=03', 4 => '=04',
         5 => '=05', 6 => '=06', 7 => '=07', 8 => '=08', 9 => '=09',
         10 => '=0A', 11 => '=0B', 12 => '=0C', 13 => '=0D', 14 => '=0E',
@@ -89,16 +89,16 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
         245 => '=F5', 246 => '=F6', 247 => '=F7', 248 => '=F8', 249 => '=F9',
         250 => '=FA', 251 => '=FB', 252 => '=FC', 253 => '=FD', 254 => '=FE',
         255 => '=FF',
-        );
+        ];
 
-    protected static $_safeMapShare = array();
+    protected static $safeMapShare = [];
 
     /**
      * A map of non-encoded ascii characters.
      *
      * @var string[]
      */
-    protected $_safeMap = array();
+    protected $safeMap = [];
 
     /**
      * Creates a new QpEncoder for the given CharacterStream.
@@ -108,41 +108,41 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      */
     public function __construct(Swift_CharacterStream $charStream, Swift_StreamFilter $filter = null)
     {
-        $this->_charStream = $charStream;
-        if (!isset(self::$_safeMapShare[$this->getSafeMapShareId()])) {
+        $this->charStream = $charStream;
+        if (!isset(self::$safeMapShare[$this->getSafeMapShareId()])) {
             $this->initSafeMap();
-            self::$_safeMapShare[$this->getSafeMapShareId()] = $this->_safeMap;
+            self::$safeMapShare[$this->getSafeMapShareId()] = $this->safeMap;
         } else {
-            $this->_safeMap = self::$_safeMapShare[$this->getSafeMapShareId()];
+            $this->safeMap = self::$safeMapShare[$this->getSafeMapShareId()];
         }
-        $this->_filter = $filter;
+        $this->filter = $filter;
     }
 
     public function __sleep()
     {
-        return array('_charStream', '_filter');
+        return ['charStream', 'filter'];
     }
 
     public function __wakeup()
     {
-        if (!isset(self::$_safeMapShare[$this->getSafeMapShareId()])) {
+        if (!isset(self::$safeMapShare[$this->getSafeMapShareId()])) {
             $this->initSafeMap();
-            self::$_safeMapShare[$this->getSafeMapShareId()] = $this->_safeMap;
+            self::$safeMapShare[$this->getSafeMapShareId()] = $this->safeMap;
         } else {
-            $this->_safeMap = self::$_safeMapShare[$this->getSafeMapShareId()];
+            $this->safeMap = self::$safeMapShare[$this->getSafeMapShareId()];
         }
     }
 
     protected function getSafeMapShareId()
     {
-        return get_class($this);
+        return static::class;
     }
 
     protected function initSafeMap()
     {
         foreach (array_merge(
-            array(0x09, 0x20), range(0x21, 0x3C), range(0x3E, 0x7E)) as $byte) {
-            $this->_safeMap[$byte] = chr($byte);
+            [0x09, 0x20], range(0x21, 0x3C), range(0x3E, 0x7E)) as $byte) {
+            $this->safeMap[$byte] = \chr($byte);
         }
     }
 
@@ -153,9 +153,9 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      * If the first line needs to be shorter, indicate the difference with
      * $firstLineOffset.
      *
-     * @param string $string           to encode
-     * @param int    $firstLineOffset, optional
-     * @param int    $maxLineLength,   optional 0 indicates the default of 76 chars
+     * @param string $string          to encode
+     * @param int    $firstLineOffset optional
+     * @param int    $maxLineLength   optional 0 indicates the default of 76 chars
      *
      * @return string
      */
@@ -167,25 +167,25 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
 
         $thisLineLength = $maxLineLength - $firstLineOffset;
 
-        $lines = array();
+        $lines = [];
         $lNo = 0;
         $lines[$lNo] = '';
         $currentLine = &$lines[$lNo++];
         $size = $lineLen = 0;
 
-        $this->_charStream->flushContents();
-        $this->_charStream->importString($string);
+        $this->charStream->flushContents();
+        $this->charStream->importString($string);
 
         // Fetching more than 4 chars at one is slower, as is fetching fewer bytes
         // Conveniently 4 chars is the UTF-8 safe number since UTF-8 has up to 6
         // bytes per char and (6 * 4 * 3 = 72 chars per line) * =NN is 3 bytes
-        while (false !== $bytes = $this->_nextSequence()) {
+        while (false !== $bytes = $this->nextSequence()) {
             // If we're filtering the input
-            if (isset($this->_filter)) {
+            if (isset($this->filter)) {
                 // If we can't filter because we need more bytes
-                while ($this->_filter->shouldBuffer($bytes)) {
+                while ($this->filter->shouldBuffer($bytes)) {
                     // Then collect bytes into the buffer
-                    if (false === $moreBytes = $this->_nextSequence(1)) {
+                    if (false === $moreBytes = $this->nextSequence(1)) {
                         break;
                     }
 
@@ -194,13 +194,13 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
                     }
                 }
                 // And filter them
-                $bytes = $this->_filter->filter($bytes);
+                $bytes = $this->filter->filter($bytes);
             }
 
-            $enc = $this->_encodeByteSequence($bytes, $size);
+            $enc = $this->encodeByteSequence($bytes, $size);
 
             $i = strpos($enc, '=0D=0A');
-            $newLineLength = $lineLen + ($i === false ? $size : $i);
+            $newLineLength = $lineLen + (false === $i ? $size : $i);
 
             if ($currentLine && $newLineLength >= $thisLineLength) {
                 $lines[$lNo] = '';
@@ -211,7 +211,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
 
             $currentLine .= $enc;
 
-            if ($i === false) {
+            if (false === $i) {
                 $lineLen += $size;
             } else {
                 // 6 is the length of '=0D=0A'.
@@ -219,7 +219,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
             }
         }
 
-        return $this->_standardize(implode("=\r\n", $lines));
+        return $this->standardize(implode("=\r\n", $lines));
     }
 
     /**
@@ -229,7 +229,7 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      */
     public function charsetChanged($charset)
     {
-        $this->_charStream->setCharacterSet($charset);
+        $this->charStream->setCharacterSet($charset);
     }
 
     /**
@@ -240,16 +240,16 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      *
      * @return string
      */
-    protected function _encodeByteSequence(array $bytes, &$size)
+    protected function encodeByteSequence(array $bytes, &$size)
     {
         $ret = '';
         $size = 0;
         foreach ($bytes as $b) {
-            if (isset($this->_safeMap[$b])) {
-                $ret .= $this->_safeMap[$b];
+            if (isset($this->safeMap[$b])) {
+                $ret .= $this->safeMap[$b];
                 ++$size;
             } else {
-                $ret .= self::$_qpMap[$b];
+                $ret .= self::$qpMap[$b];
                 $size += 3;
             }
         }
@@ -264,9 +264,9 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      *
      * @return int[]
      */
-    protected function _nextSequence($size = 4)
+    protected function nextSequence($size = 4)
     {
-        return $this->_charStream->readBytes($size);
+        return $this->charStream->readBytes($size);
     }
 
     /**
@@ -276,15 +276,15 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      *
      * @return string
      */
-    protected function _standardize($string)
+    protected function standardize($string)
     {
-        $string = str_replace(array("\t=0D=0A", ' =0D=0A', '=0D=0A'),
-            array("=09\r\n", "=20\r\n", "\r\n"), $string
+        $string = str_replace(["\t=0D=0A", ' =0D=0A', '=0D=0A'],
+            ["=09\r\n", "=20\r\n", "\r\n"], $string
             );
-        switch ($end = ord(substr($string, -1))) {
+        switch ($end = \ord(substr($string, -1))) {
             case 0x09:
             case 0x20:
-                $string = substr_replace($string, self::$_qpMap[$end], -1);
+                $string = substr_replace($string, self::$qpMap[$end], -1);
         }
 
         return $string;
@@ -295,6 +295,6 @@ class Swift_Encoder_QpEncoder implements Swift_Encoder
      */
     public function __clone()
     {
-        $this->_charStream = clone $this->_charStream;
+        $this->charStream = clone $this->charStream;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
index b0215e883..7eac36813 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoder/Rfc2231Encoder.php
@@ -20,16 +20,14 @@ class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
      *
      * @var Swift_CharacterStream
      */
-    private $_charStream;
+    private $charStream;
 
     /**
      * Creates a new Rfc2231Encoder using the given character stream instance.
-     *
-     * @param Swift_CharacterStream
      */
     public function __construct(Swift_CharacterStream $charStream)
     {
-        $this->_charStream = $charStream;
+        $this->charStream = $charStream;
     }
 
     /**
@@ -44,7 +42,7 @@ class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        $lines = array();
+        $lines = [];
         $lineCount = 0;
         $lines[] = '';
         $currentLine = &$lines[$lineCount++];
@@ -53,15 +51,15 @@ class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
             $maxLineLength = 75;
         }
 
-        $this->_charStream->flushContents();
-        $this->_charStream->importString($string);
+        $this->charStream->flushContents();
+        $this->charStream->importString($string);
 
         $thisLineLength = $maxLineLength - $firstLineOffset;
 
-        while (false !== $char = $this->_charStream->read(4)) {
+        while (false !== $char = $this->charStream->read(4)) {
             $encodedChar = rawurlencode($char);
-            if (0 != strlen($currentLine)
-                && strlen($currentLine.$encodedChar) > $thisLineLength) {
+            if (0 != \strlen($currentLine)
+                && \strlen($currentLine.$encodedChar) > $thisLineLength) {
                 $lines[] = '';
                 $currentLine = &$lines[$lineCount++];
                 $thisLineLength = $maxLineLength;
@@ -79,7 +77,7 @@ class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
      */
     public function charsetChanged($charset)
     {
-        $this->_charStream->setCharacterSet($charset);
+        $this->charStream->setCharacterSet($charset);
     }
 
     /**
@@ -87,6 +85,6 @@ class Swift_Encoder_Rfc2231Encoder implements Swift_Encoder
      */
     public function __clone()
     {
-        $this->_charStream = clone $this->_charStream;
+        $this->charStream = clone $this->charStream;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php
deleted file mode 100644
index 245878706..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Encoding.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Provides quick access to each encoding type.
- *
- * @author Chris Corbyn
- */
-class Swift_Encoding
-{
-    /**
-     * Get the Encoder that provides 7-bit encoding.
-     *
-     * @return Swift_Mime_ContentEncoder
-     */
-    public static function get7BitEncoding()
-    {
-        return self::_lookup('mime.7bitcontentencoder');
-    }
-
-    /**
-     * Get the Encoder that provides 8-bit encoding.
-     *
-     * @return Swift_Mime_ContentEncoder
-     */
-    public static function get8BitEncoding()
-    {
-        return self::_lookup('mime.8bitcontentencoder');
-    }
-
-    /**
-     * Get the Encoder that provides Quoted-Printable (QP) encoding.
-     *
-     * @return Swift_Mime_ContentEncoder
-     */
-    public static function getQpEncoding()
-    {
-        return self::_lookup('mime.qpcontentencoder');
-    }
-
-    /**
-     * Get the Encoder that provides Base64 encoding.
-     *
-     * @return Swift_Mime_ContentEncoder
-     */
-    public static function getBase64Encoding()
-    {
-        return self::_lookup('mime.base64contentencoder');
-    }
-
-    private static function _lookup($key)
-    {
-        return Swift_DependencyContainer::getInstance()->lookup($key);
-    }
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
index 674e6b5e4..18994c184 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandEvent.php
@@ -20,27 +20,26 @@ class Swift_Events_CommandEvent extends Swift_Events_EventObject
      *
      * @var string
      */
-    private $_command;
+    private $command;
 
     /**
      * An array of codes which a successful response will contain.
      *
      * @var int[]
      */
-    private $_successCodes = array();
+    private $successCodes = [];
 
     /**
      * Create a new CommandEvent for $source with $command.
      *
-     * @param Swift_Transport $source
-     * @param string          $command
-     * @param array           $successCodes
+     * @param string $command
+     * @param array  $successCodes
      */
-    public function __construct(Swift_Transport $source, $command, $successCodes = array())
+    public function __construct(Swift_Transport $source, $command, $successCodes = [])
     {
         parent::__construct($source);
-        $this->_command = $command;
-        $this->_successCodes = $successCodes;
+        $this->command = $command;
+        $this->successCodes = $successCodes;
     }
 
     /**
@@ -50,7 +49,7 @@ class Swift_Events_CommandEvent extends Swift_Events_EventObject
      */
     public function getCommand()
     {
-        return $this->_command;
+        return $this->command;
     }
 
     /**
@@ -60,6 +59,6 @@ class Swift_Events_CommandEvent extends Swift_Events_EventObject
      */
     public function getSuccessCodes()
     {
-        return $this->_successCodes;
+        return $this->successCodes;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandListener.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandListener.php
index 7545404e7..b158eab46 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandListener.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/CommandListener.php
@@ -17,8 +17,6 @@ interface Swift_Events_CommandListener extends Swift_Events_EventListener
 {
     /**
      * Invoked immediately following a command being sent.
-     *
-     * @param Swift_Events_CommandEvent $evt
      */
     public function commandSent(Swift_Events_CommandEvent $evt);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
index aac36aaa7..df25a1248 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventDispatcher.php
@@ -18,30 +18,25 @@ interface Swift_Events_EventDispatcher
     /**
      * Create a new SendEvent for $source and $message.
      *
-     * @param Swift_Transport $source
-     * @param Swift_Mime_Message
-     *
      * @return Swift_Events_SendEvent
      */
-    public function createSendEvent(Swift_Transport $source, Swift_Mime_Message $message);
+    public function createSendEvent(Swift_Transport $source, Swift_Mime_SimpleMessage $message);
 
     /**
      * Create a new CommandEvent for $source and $command.
      *
-     * @param Swift_Transport $source
-     * @param string          $command      That will be executed
-     * @param array           $successCodes That are needed
+     * @param string $command      That will be executed
+     * @param array  $successCodes That are needed
      *
      * @return Swift_Events_CommandEvent
      */
-    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = array());
+    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = []);
 
     /**
      * Create a new ResponseEvent for $source and $response.
      *
-     * @param Swift_Transport $source
-     * @param string          $response
-     * @param bool            $valid    If the response is valid
+     * @param string $response
+     * @param bool   $valid    If the response is valid
      *
      * @return Swift_Events_ResponseEvent
      */
@@ -50,8 +45,6 @@ interface Swift_Events_EventDispatcher
     /**
      * Create a new TransportChangeEvent for $source.
      *
-     * @param Swift_Transport $source
-     *
      * @return Swift_Events_TransportChangeEvent
      */
     public function createTransportChangeEvent(Swift_Transport $source);
@@ -59,25 +52,19 @@ interface Swift_Events_EventDispatcher
     /**
      * Create a new TransportExceptionEvent for $source.
      *
-     * @param Swift_Transport          $source
-     * @param Swift_TransportException $ex
-     *
      * @return Swift_Events_TransportExceptionEvent
      */
     public function createTransportExceptionEvent(Swift_Transport $source, Swift_TransportException $ex);
 
     /**
      * Bind an event listener to this dispatcher.
-     *
-     * @param Swift_Events_EventListener $listener
      */
     public function bindEventListener(Swift_Events_EventListener $listener);
 
     /**
      * Dispatch the given Event to all suitable listeners.
      *
-     * @param Swift_Events_EventObject $evt
-     * @param string                   $target method
+     * @param string $target method
      */
     public function dispatchEvent(Swift_Events_EventObject $evt, $target);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php
index 90694a9a6..24a11f44e 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/EventObject.php
@@ -16,10 +16,10 @@
 class Swift_Events_EventObject implements Swift_Events_Event
 {
     /** The source of this Event */
-    private $_source;
+    private $source;
 
     /** The state of this Event (should it bubble up the stack?) */
-    private $_bubbleCancelled = false;
+    private $bubbleCancelled = false;
 
     /**
      * Create a new EventObject originating at $source.
@@ -28,7 +28,7 @@ class Swift_Events_EventObject implements Swift_Events_Event
      */
     public function __construct($source)
     {
-        $this->_source = $source;
+        $this->source = $source;
     }
 
     /**
@@ -38,17 +38,15 @@ class Swift_Events_EventObject implements Swift_Events_Event
      */
     public function getSource()
     {
-        return $this->_source;
+        return $this->source;
     }
 
     /**
      * Prevent this Event from bubbling any further up the stack.
-     *
-     * @param bool $cancel, optional
      */
     public function cancelBubble($cancel = true)
     {
-        $this->_bubbleCancelled = $cancel;
+        $this->bubbleCancelled = $cancel;
     }
 
     /**
@@ -58,6 +56,6 @@ class Swift_Events_EventObject implements Swift_Events_Event
      */
     public function bubbleCancelled()
     {
-        return $this->_bubbleCancelled;
+        return $this->bubbleCancelled;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
index 2e92ba940..ff7c37116 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseEvent.php
@@ -20,27 +20,26 @@ class Swift_Events_ResponseEvent extends Swift_Events_EventObject
      *
      * @var bool
      */
-    private $_valid;
+    private $valid;
 
     /**
      * The response received from the server.
      *
      * @var string
      */
-    private $_response;
+    private $response;
 
     /**
      * Create a new ResponseEvent for $source and $response.
      *
-     * @param Swift_Transport $source
-     * @param string          $response
-     * @param bool            $valid
+     * @param string $response
+     * @param bool   $valid
      */
     public function __construct(Swift_Transport $source, $response, $valid = false)
     {
         parent::__construct($source);
-        $this->_response = $response;
-        $this->_valid = $valid;
+        $this->response = $response;
+        $this->valid = $valid;
     }
 
     /**
@@ -50,7 +49,7 @@ class Swift_Events_ResponseEvent extends Swift_Events_EventObject
      */
     public function getResponse()
     {
-        return $this->_response;
+        return $this->response;
     }
 
     /**
@@ -60,6 +59,6 @@ class Swift_Events_ResponseEvent extends Swift_Events_EventObject
      */
     public function isValid()
     {
-        return $this->_valid;
+        return $this->valid;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseListener.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
index c40919d21..85115a338 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/ResponseListener.php
@@ -17,8 +17,6 @@ interface Swift_Events_ResponseListener extends Swift_Events_EventListener
 {
     /**
      * Invoked immediately following a response coming back.
-     *
-     * @param Swift_Events_ResponseEvent $evt
      */
     public function responseReceived(Swift_Events_ResponseEvent $evt);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php
index 10da8080f..a435691e0 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendEvent.php
@@ -33,35 +33,32 @@ class Swift_Events_SendEvent extends Swift_Events_EventObject
     /**
      * The Message being sent.
      *
-     * @var Swift_Mime_Message
+     * @var Swift_Mime_SimpleMessage
      */
-    private $_message;
+    private $message;
 
     /**
      * Any recipients which failed after sending.
      *
      * @var string[]
      */
-    private $_failedRecipients = array();
+    private $failedRecipients = [];
 
     /**
      * The overall result as a bitmask from the class constants.
      *
      * @var int
      */
-    private $_result;
+    private $result;
 
     /**
      * Create a new SendEvent for $source and $message.
-     *
-     * @param Swift_Transport    $source
-     * @param Swift_Mime_Message $message
      */
-    public function __construct(Swift_Transport $source, Swift_Mime_Message $message)
+    public function __construct(Swift_Transport $source, Swift_Mime_SimpleMessage $message)
     {
         parent::__construct($source);
-        $this->_message = $message;
-        $this->_result = self::RESULT_PENDING;
+        $this->message = $message;
+        $this->result = self::RESULT_PENDING;
     }
 
     /**
@@ -77,11 +74,11 @@ class Swift_Events_SendEvent extends Swift_Events_EventObject
     /**
      * Get the Message being sent.
      *
-     * @return Swift_Mime_Message
+     * @return Swift_Mime_SimpleMessage
      */
     public function getMessage()
     {
-        return $this->_message;
+        return $this->message;
     }
 
     /**
@@ -91,7 +88,7 @@ class Swift_Events_SendEvent extends Swift_Events_EventObject
      */
     public function setFailedRecipients($recipients)
     {
-        $this->_failedRecipients = $recipients;
+        $this->failedRecipients = $recipients;
     }
 
     /**
@@ -101,7 +98,7 @@ class Swift_Events_SendEvent extends Swift_Events_EventObject
      */
     public function getFailedRecipients()
     {
-        return $this->_failedRecipients;
+        return $this->failedRecipients;
     }
 
     /**
@@ -111,7 +108,7 @@ class Swift_Events_SendEvent extends Swift_Events_EventObject
      */
     public function setResult($result)
     {
-        $this->_result = $result;
+        $this->result = $result;
     }
 
     /**
@@ -124,6 +121,6 @@ class Swift_Events_SendEvent extends Swift_Events_EventObject
      */
     public function getResult()
     {
-        return $this->_result;
+        return $this->result;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendListener.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendListener.php
index d922e1bfa..f7bf55ef5 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendListener.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SendListener.php
@@ -17,15 +17,11 @@ interface Swift_Events_SendListener extends Swift_Events_EventListener
 {
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt);
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
index e8aca752f..6557103c9 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/SimpleEventDispatcher.php
@@ -16,37 +16,31 @@
 class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
 {
     /** A map of event types to their associated listener types */
-    private $_eventMap = array();
+    private $eventMap = [];
 
     /** Event listeners bound to this dispatcher */
-    private $_listeners = array();
-
-    /** Listeners queued to have an Event bubbled up the stack to them */
-    private $_bubbleQueue = array();
+    private $listeners = [];
 
     /**
      * Create a new EventDispatcher.
      */
     public function __construct()
     {
-        $this->_eventMap = array(
+        $this->eventMap = [
             'Swift_Events_CommandEvent' => 'Swift_Events_CommandListener',
             'Swift_Events_ResponseEvent' => 'Swift_Events_ResponseListener',
             'Swift_Events_SendEvent' => 'Swift_Events_SendListener',
             'Swift_Events_TransportChangeEvent' => 'Swift_Events_TransportChangeListener',
             'Swift_Events_TransportExceptionEvent' => 'Swift_Events_TransportExceptionListener',
-            );
+            ];
     }
 
     /**
      * Create a new SendEvent for $source and $message.
      *
-     * @param Swift_Transport $source
-     * @param Swift_Mime_Message
-     *
      * @return Swift_Events_SendEvent
      */
-    public function createSendEvent(Swift_Transport $source, Swift_Mime_Message $message)
+    public function createSendEvent(Swift_Transport $source, Swift_Mime_SimpleMessage $message)
     {
         return new Swift_Events_SendEvent($source, $message);
     }
@@ -54,13 +48,12 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Create a new CommandEvent for $source and $command.
      *
-     * @param Swift_Transport $source
-     * @param string          $command      That will be executed
-     * @param array           $successCodes That are needed
+     * @param string $command      That will be executed
+     * @param array  $successCodes That are needed
      *
      * @return Swift_Events_CommandEvent
      */
-    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = array())
+    public function createCommandEvent(Swift_Transport $source, $command, $successCodes = [])
     {
         return new Swift_Events_CommandEvent($source, $command, $successCodes);
     }
@@ -68,9 +61,8 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Create a new ResponseEvent for $source and $response.
      *
-     * @param Swift_Transport $source
-     * @param string          $response
-     * @param bool            $valid    If the response is valid
+     * @param string $response
+     * @param bool   $valid    If the response is valid
      *
      * @return Swift_Events_ResponseEvent
      */
@@ -82,8 +74,6 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Create a new TransportChangeEvent for $source.
      *
-     * @param Swift_Transport $source
-     *
      * @return Swift_Events_TransportChangeEvent
      */
     public function createTransportChangeEvent(Swift_Transport $source)
@@ -94,9 +84,6 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
     /**
      * Create a new TransportExceptionEvent for $source.
      *
-     * @param Swift_Transport          $source
-     * @param Swift_TransportException $ex
-     *
      * @return Swift_Events_TransportExceptionEvent
      */
     public function createTransportExceptionEvent(Swift_Transport $source, Swift_TransportException $ex)
@@ -106,51 +93,50 @@ class Swift_Events_SimpleEventDispatcher implements Swift_Events_EventDispatcher
 
     /**
      * Bind an event listener to this dispatcher.
-     *
-     * @param Swift_Events_EventListener $listener
      */
     public function bindEventListener(Swift_Events_EventListener $listener)
     {
-        foreach ($this->_listeners as $l) {
+        foreach ($this->listeners as $l) {
             // Already loaded
             if ($l === $listener) {
                 return;
             }
         }
-        $this->_listeners[] = $listener;
+        $this->listeners[] = $listener;
     }
 
     /**
      * Dispatch the given Event to all suitable listeners.
      *
-     * @param Swift_Events_EventObject $evt
-     * @param string                   $target method
+     * @param string $target method
      */
     public function dispatchEvent(Swift_Events_EventObject $evt, $target)
     {
-        $this->_prepareBubbleQueue($evt);
-        $this->_bubble($evt, $target);
+        $bubbleQueue = $this->prepareBubbleQueue($evt);
+        $this->bubble($bubbleQueue, $evt, $target);
     }
 
     /** Queue listeners on a stack ready for $evt to be bubbled up it */
-    private function _prepareBubbleQueue(Swift_Events_EventObject $evt)
+    private function prepareBubbleQueue(Swift_Events_EventObject $evt)
     {
-        $this->_bubbleQueue = array();
-        $evtClass = get_class($evt);
-        foreach ($this->_listeners as $listener) {
-            if (array_key_exists($evtClass, $this->_eventMap)
-                && ($listener instanceof $this->_eventMap[$evtClass])) {
-                $this->_bubbleQueue[] = $listener;
+        $bubbleQueue = [];
+        $evtClass = \get_class($evt);
+        foreach ($this->listeners as $listener) {
+            if (\array_key_exists($evtClass, $this->eventMap)
+                && ($listener instanceof $this->eventMap[$evtClass])) {
+                $bubbleQueue[] = $listener;
             }
         }
+
+        return $bubbleQueue;
     }
 
     /** Bubble $evt up the stack calling $target() on each listener */
-    private function _bubble(Swift_Events_EventObject $evt, $target)
+    private function bubble(array &$bubbleQueue, Swift_Events_EventObject $evt, $target)
     {
-        if (!$evt->bubbleCancelled() && $listener = array_shift($this->_bubbleQueue)) {
+        if (!$evt->bubbleCancelled() && $listener = array_shift($bubbleQueue)) {
             $listener->$target($evt);
-            $this->_bubble($evt, $target);
+            $this->bubble($bubbleQueue, $evt, $target);
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
index 253165de8..4a7492bc5 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportChangeListener.php
@@ -17,29 +17,21 @@ interface Swift_Events_TransportChangeListener extends Swift_Events_EventListene
 {
     /**
      * Invoked just before a Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt);
 
     /**
      * Invoked immediately after the Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function transportStarted(Swift_Events_TransportChangeEvent $evt);
 
     /**
      * Invoked just before a Transport is stopped.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStopped(Swift_Events_TransportChangeEvent $evt);
 
     /**
      * Invoked immediately after the Transport is stopped.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function transportStopped(Swift_Events_TransportChangeEvent $evt);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
index f87154fb9..df442cc70 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionEvent.php
@@ -20,18 +20,15 @@ class Swift_Events_TransportExceptionEvent extends Swift_Events_EventObject
      *
      * @var Swift_TransportException
      */
-    private $_exception;
+    private $exception;
 
     /**
      * Create a new TransportExceptionEvent for $transport.
-     *
-     * @param Swift_Transport          $transport
-     * @param Swift_TransportException $ex
      */
     public function __construct(Swift_Transport $transport, Swift_TransportException $ex)
     {
         parent::__construct($transport);
-        $this->_exception = $ex;
+        $this->exception = $ex;
     }
 
     /**
@@ -41,6 +38,6 @@ class Swift_Events_TransportExceptionEvent extends Swift_Events_EventObject
      */
     public function getException()
     {
-        return $this->_exception;
+        return $this->exception;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
index cc3c09937..ad80eb01d 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Events/TransportExceptionListener.php
@@ -17,8 +17,6 @@ interface Swift_Events_TransportExceptionListener extends Swift_Events_EventList
 {
     /**
      * Invoked as a TransportException is thrown in the Transport system.
-     *
-     * @param Swift_Events_TransportExceptionEvent $evt
      */
     public function exceptionThrown(Swift_Events_TransportExceptionEvent $evt);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php
index 9951c5977..af0be9179 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/FailoverTransport.php
@@ -20,26 +20,14 @@ class Swift_FailoverTransport extends Swift_Transport_FailoverTransport
      *
      * @param Swift_Transport[] $transports
      */
-    public function __construct($transports = array())
+    public function __construct($transports = [])
     {
-        call_user_func_array(
-            array($this, 'Swift_Transport_FailoverTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_FailoverTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.failover')
             );
 
         $this->setTransports($transports);
     }
-
-    /**
-     * Create a new FailoverTransport instance.
-     *
-     * @param Swift_Transport[] $transports
-     *
-     * @return self
-     */
-    public static function newInstance($transports = array())
-    {
-        return new self($transports);
-    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php
index c82c5dbf1..7af8471c9 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/FileSpool.php
@@ -17,14 +17,14 @@
 class Swift_FileSpool extends Swift_ConfigurableSpool
 {
     /** The spool directory */
-    private $_path;
+    private $path;
 
     /**
      * File WriteRetry Limit.
      *
      * @var int
      */
-    private $_retryLimit = 10;
+    private $retryLimit = 10;
 
     /**
      * Create a new FileSpool.
@@ -35,11 +35,11 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
      */
     public function __construct($path)
     {
-        $this->_path = $path;
+        $this->path = $path;
 
-        if (!file_exists($this->_path)) {
-            if (!mkdir($this->_path, 0777, true)) {
-                throw new Swift_IoException(sprintf('Unable to create path "%s".', $this->_path));
+        if (!file_exists($this->path)) {
+            if (!mkdir($this->path, 0777, true)) {
+                throw new Swift_IoException(sprintf('Unable to create path "%s".', $this->path));
             }
         }
     }
@@ -77,25 +77,25 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
      */
     public function setRetryLimit($limit)
     {
-        $this->_retryLimit = $limit;
+        $this->retryLimit = $limit;
     }
 
     /**
      * Queues a message.
      *
-     * @param Swift_Mime_Message $message The message to store
+     * @param Swift_Mime_SimpleMessage $message The message to store
      *
      * @throws Swift_IoException
      *
      * @return bool
      */
-    public function queueMessage(Swift_Mime_Message $message)
+    public function queueMessage(Swift_Mime_SimpleMessage $message)
     {
         $ser = serialize($message);
-        $fileName = $this->_path.'/'.$this->getRandomString(10);
-        for ($i = 0; $i < $this->_retryLimit; ++$i) {
+        $fileName = $this->path.'/'.$this->getRandomString(10);
+        for ($i = 0; $i < $this->retryLimit; ++$i) {
             /* We try an exclusive creation of the file. This is an atomic operation, it avoid locking mechanism */
-            $fp = @fopen($fileName.'.message', 'x');
+            $fp = @fopen($fileName.'.message', 'xb');
             if (false !== $fp) {
                 if (false === fwrite($fp, $ser)) {
                     return false;
@@ -108,7 +108,7 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
             }
         }
 
-        throw new Swift_IoException(sprintf('Unable to create a file for enqueuing Message in "%s".', $this->_path));
+        throw new Swift_IoException(sprintf('Unable to create a file for enqueuing Message in "%s".', $this->path));
     }
 
     /**
@@ -118,10 +118,10 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
      */
     public function recover($timeout = 900)
     {
-        foreach (new DirectoryIterator($this->_path) as $file) {
+        foreach (new DirectoryIterator($this->path) as $file) {
             $file = $file->getRealPath();
 
-            if (substr($file, -16) == '.message.sending') {
+            if ('.message.sending' == substr($file, -16)) {
                 $lockedtime = filectime($file);
                 if ((time() - $lockedtime) > $timeout) {
                     rename($file, substr($file, 0, -8));
@@ -140,12 +140,12 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
      */
     public function flushQueue(Swift_Transport $transport, &$failedRecipients = null)
     {
-        $directoryIterator = new DirectoryIterator($this->_path);
+        $directoryIterator = new DirectoryIterator($this->path);
 
         /* Start the transport only if there are queued files to send */
         if (!$transport->isStarted()) {
             foreach ($directoryIterator as $file) {
-                if (substr($file->getRealPath(), -8) == '.message') {
+                if ('.message' == substr($file->getRealPath(), -8)) {
                     $transport->start();
                     break;
                 }
@@ -158,7 +158,7 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
         foreach ($directoryIterator as $file) {
             $file = $file->getRealPath();
 
-            if (substr($file, -8) != '.message') {
+            if ('.message' != substr($file, -8)) {
                 continue;
             }
 
@@ -198,9 +198,9 @@ class Swift_FileSpool extends Swift_ConfigurableSpool
         // This string MUST stay FS safe, avoid special chars
         $base = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-';
         $ret = '';
-        $strlen = strlen($base);
+        $strlen = \strlen($base);
         for ($i = 0; $i < $count; ++$i) {
-            $ret .= $base[((int) rand(0, $strlen - 1))];
+            $ret .= $base[random_int(0, $strlen - 1)];
         }
 
         return $ret;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Filterable.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Filterable.php
index 6b75b5274..efa1b1def 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Filterable.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Filterable.php
@@ -18,8 +18,7 @@ interface Swift_Filterable
     /**
      * Add a new StreamFilter, referenced by $key.
      *
-     * @param Swift_StreamFilter $filter
-     * @param string             $key
+     * @param string $key
      */
     public function addFilter(Swift_StreamFilter $filter, $key);
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/IdGenerator.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/IdGenerator.php
new file mode 100644
index 000000000..c845d85e3
--- /dev/null
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/IdGenerator.php
@@ -0,0 +1,22 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Message ID generator.
+ */
+interface Swift_IdGenerator
+{
+    /**
+     * Returns a globally unique string to use for Message-ID or Content-ID.
+     *
+     * @return string
+     */
+    public function generateId();
+}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Image.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Image.php
index 4213ee27e..34c253547 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Image.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Image.php
@@ -29,20 +29,6 @@ class Swift_Image extends Swift_EmbeddedFile
         parent::__construct($data, $filename, $contentType);
     }
 
-    /**
-     * Create a new Image.
-     *
-     * @param string|Swift_OutputByteStream $data
-     * @param string                        $filename
-     * @param string                        $contentType
-     *
-     * @return self
-     */
-    public static function newInstance($data = null, $filename = null, $contentType = null)
-    {
-        return new self($data, $filename, $contentType);
-    }
-
     /**
      * Create a new Image from a filesystem path.
      *
@@ -52,6 +38,6 @@ class Swift_Image extends Swift_EmbeddedFile
      */
     public static function fromPath($path)
     {
-        return self::newInstance()->setFile(new Swift_ByteStream_FileByteStream($path));
+        return (new self())->setFile(new Swift_ByteStream_FileByteStream($path));
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php
index 56efc7593..379a5a178 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/InputByteStream.php
@@ -52,7 +52,7 @@ interface Swift_InputByteStream
      *
      * @param Swift_InputByteStream $is
      */
-    public function bind(Swift_InputByteStream $is);
+    public function bind(self $is);
 
     /**
      * Remove an already bound stream.
@@ -63,7 +63,7 @@ interface Swift_InputByteStream
      *
      * @param Swift_InputByteStream $is
      */
-    public function unbind(Swift_InputByteStream $is);
+    public function unbind(self $is);
 
     /**
      * Flush the contents of the stream (empty it) and set the internal pointer
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/IoException.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/IoException.php
index c405f352b..5452bd416 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/IoException.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/IoException.php
@@ -18,9 +18,8 @@ class Swift_IoException extends Swift_SwiftException
     /**
      * Create a new IoException with $message.
      *
-     * @param string    $message
-     * @param int       $code
-     * @param Exception $previous
+     * @param string $message
+     * @param int    $code
      */
     public function __construct($message, $code = 0, Exception $previous = null)
     {
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache.php
index cd6f786df..87f6a0742 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache.php
@@ -38,10 +38,9 @@ interface Swift_KeyCache
      *
      * @see MODE_WRITE, MODE_APPEND
      *
-     * @param string                 $nsKey
-     * @param string                 $itemKey
-     * @param Swift_OutputByteStream $os
-     * @param int                    $mode
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param int    $mode
      */
     public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode);
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
index b37f07f74..e8fef1c95 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/ArrayKeyCache.php
@@ -20,24 +20,22 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      *
      * @var array
      */
-    private $_contents = array();
+    private $contents = [];
 
     /**
      * An InputStream for cloning.
      *
      * @var Swift_KeyCache_KeyCacheInputStream
      */
-    private $_stream;
+    private $stream;
 
     /**
      * Create a new ArrayKeyCache with the given $stream for cloning to make
      * InputByteStreams.
-     *
-     * @param Swift_KeyCache_KeyCacheInputStream $stream
      */
     public function __construct(Swift_KeyCache_KeyCacheInputStream $stream)
     {
-        $this->_stream = $stream;
+        $this->stream = $stream;
     }
 
     /**
@@ -52,22 +50,19 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      */
     public function setString($nsKey, $itemKey, $string, $mode)
     {
-        $this->_prepareCache($nsKey);
+        $this->prepareCache($nsKey);
         switch ($mode) {
             case self::MODE_WRITE:
-                $this->_contents[$nsKey][$itemKey] = $string;
+                $this->contents[$nsKey][$itemKey] = $string;
                 break;
             case self::MODE_APPEND:
                 if (!$this->hasKey($nsKey, $itemKey)) {
-                    $this->_contents[$nsKey][$itemKey] = '';
+                    $this->contents[$nsKey][$itemKey] = '';
                 }
-                $this->_contents[$nsKey][$itemKey] .= $string;
+                $this->contents[$nsKey][$itemKey] .= $string;
                 break;
             default:
-                throw new Swift_SwiftException(
-                    'Invalid mode ['.$mode.'] used to set nsKey='.
-                    $nsKey.', itemKey='.$itemKey
-                    );
+                throw new Swift_SwiftException('Invalid mode ['.$mode.'] used to set nsKey='.$nsKey.', itemKey='.$itemKey);
         }
     }
 
@@ -76,30 +71,27 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      *
      * @see MODE_WRITE, MODE_APPEND
      *
-     * @param string                 $nsKey
-     * @param string                 $itemKey
-     * @param Swift_OutputByteStream $os
-     * @param int                    $mode
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param int    $mode
      */
     public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode)
     {
-        $this->_prepareCache($nsKey);
+        $this->prepareCache($nsKey);
         switch ($mode) {
             case self::MODE_WRITE:
                 $this->clearKey($nsKey, $itemKey);
+                // no break
             case self::MODE_APPEND:
                 if (!$this->hasKey($nsKey, $itemKey)) {
-                    $this->_contents[$nsKey][$itemKey] = '';
+                    $this->contents[$nsKey][$itemKey] = '';
                 }
                 while (false !== $bytes = $os->read(8192)) {
-                    $this->_contents[$nsKey][$itemKey] .= $bytes;
+                    $this->contents[$nsKey][$itemKey] .= $bytes;
                 }
                 break;
             default:
-                throw new Swift_SwiftException(
-                    'Invalid mode ['.$mode.'] used to set nsKey='.
-                    $nsKey.', itemKey='.$itemKey
-                    );
+                throw new Swift_SwiftException('Invalid mode ['.$mode.'] used to set nsKey='.$nsKey.', itemKey='.$itemKey);
         }
     }
 
@@ -108,15 +100,14 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      *
      * NOTE: The stream will always write in append mode.
      *
-     * @param string                $nsKey
-     * @param string                $itemKey
-     * @param Swift_InputByteStream $writeThrough
+     * @param string $nsKey
+     * @param string $itemKey
      *
      * @return Swift_InputByteStream
      */
     public function getInputByteStream($nsKey, $itemKey, Swift_InputByteStream $writeThrough = null)
     {
-        $is = clone $this->_stream;
+        $is = clone $this->stream;
         $is->setKeyCache($this);
         $is->setNsKey($nsKey);
         $is->setItemKey($itemKey);
@@ -137,9 +128,9 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      */
     public function getString($nsKey, $itemKey)
     {
-        $this->_prepareCache($nsKey);
+        $this->prepareCache($nsKey);
         if ($this->hasKey($nsKey, $itemKey)) {
-            return $this->_contents[$nsKey][$itemKey];
+            return $this->contents[$nsKey][$itemKey];
         }
     }
 
@@ -152,7 +143,7 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      */
     public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is)
     {
-        $this->_prepareCache($nsKey);
+        $this->prepareCache($nsKey);
         $is->write($this->getString($nsKey, $itemKey));
     }
 
@@ -166,9 +157,9 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      */
     public function hasKey($nsKey, $itemKey)
     {
-        $this->_prepareCache($nsKey);
+        $this->prepareCache($nsKey);
 
-        return array_key_exists($itemKey, $this->_contents[$nsKey]);
+        return \array_key_exists($itemKey, $this->contents[$nsKey]);
     }
 
     /**
@@ -179,7 +170,7 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      */
     public function clearKey($nsKey, $itemKey)
     {
-        unset($this->_contents[$nsKey][$itemKey]);
+        unset($this->contents[$nsKey][$itemKey]);
     }
 
     /**
@@ -189,7 +180,7 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      */
     public function clearAll($nsKey)
     {
-        unset($this->_contents[$nsKey]);
+        unset($this->contents[$nsKey]);
     }
 
     /**
@@ -197,10 +188,10 @@ class Swift_KeyCache_ArrayKeyCache implements Swift_KeyCache
      *
      * @param string $nsKey
      */
-    private function _prepareCache($nsKey)
+    private function prepareCache($nsKey)
     {
-        if (!array_key_exists($nsKey, $this->_contents)) {
-            $this->_contents[$nsKey] = array();
+        if (!\array_key_exists($nsKey, $this->contents)) {
+            $this->contents[$nsKey] = [];
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
index 453f50a15..33b6367cb 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/DiskKeyCache.php
@@ -29,44 +29,32 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      *
      * @var Swift_KeyCache_KeyCacheInputStream
      */
-    private $_stream;
+    private $stream;
 
     /**
      * A path to write to.
      *
      * @var string
      */
-    private $_path;
+    private $path;
 
     /**
      * Stored keys.
      *
      * @var array
      */
-    private $_keys = array();
-
-    /**
-     * Will be true if magic_quotes_runtime is turned on.
-     *
-     * @var bool
-     */
-    private $_quotes = false;
+    private $keys = [];
 
     /**
      * Create a new DiskKeyCache with the given $stream for cloning to make
      * InputByteStreams, and the given $path to save to.
      *
-     * @param Swift_KeyCache_KeyCacheInputStream $stream
-     * @param string                             $path   to save to
+     * @param string $path to save to
      */
     public function __construct(Swift_KeyCache_KeyCacheInputStream $stream, $path)
     {
-        $this->_stream = $stream;
-        $this->_path = $path;
-
-        if (function_exists('get_magic_quotes_runtime') && @get_magic_quotes_runtime() == 1) {
-            $this->_quotes = true;
-        }
+        $this->stream = $stream;
+        $this->path = $path;
     }
 
     /**
@@ -83,23 +71,20 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      */
     public function setString($nsKey, $itemKey, $string, $mode)
     {
-        $this->_prepareCache($nsKey);
+        $this->prepareCache($nsKey);
         switch ($mode) {
             case self::MODE_WRITE:
-                $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START);
+                $fp = $this->getHandle($nsKey, $itemKey, self::POSITION_START);
                 break;
             case self::MODE_APPEND:
-                $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_END);
+                $fp = $this->getHandle($nsKey, $itemKey, self::POSITION_END);
                 break;
             default:
-                throw new Swift_SwiftException(
-                    'Invalid mode ['.$mode.'] used to set nsKey='.
-                    $nsKey.', itemKey='.$itemKey
-                    );
+                throw new Swift_SwiftException('Invalid mode ['.$mode.'] used to set nsKey='.$nsKey.', itemKey='.$itemKey);
                 break;
         }
         fwrite($fp, $string);
-        $this->_freeHandle($nsKey, $itemKey);
+        $this->freeHandle($nsKey, $itemKey);
     }
 
     /**
@@ -107,34 +92,30 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      *
      * @see MODE_WRITE, MODE_APPEND
      *
-     * @param string                 $nsKey
-     * @param string                 $itemKey
-     * @param Swift_OutputByteStream $os
-     * @param int                    $mode
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param int    $mode
      *
      * @throws Swift_IoException
      */
     public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode)
     {
-        $this->_prepareCache($nsKey);
+        $this->prepareCache($nsKey);
         switch ($mode) {
             case self::MODE_WRITE:
-                $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START);
+                $fp = $this->getHandle($nsKey, $itemKey, self::POSITION_START);
                 break;
             case self::MODE_APPEND:
-                $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_END);
+                $fp = $this->getHandle($nsKey, $itemKey, self::POSITION_END);
                 break;
             default:
-                throw new Swift_SwiftException(
-                    'Invalid mode ['.$mode.'] used to set nsKey='.
-                    $nsKey.', itemKey='.$itemKey
-                    );
+                throw new Swift_SwiftException('Invalid mode ['.$mode.'] used to set nsKey='.$nsKey.', itemKey='.$itemKey);
                 break;
         }
         while (false !== $bytes = $os->read(8192)) {
             fwrite($fp, $bytes);
         }
-        $this->_freeHandle($nsKey, $itemKey);
+        $this->freeHandle($nsKey, $itemKey);
     }
 
     /**
@@ -142,15 +123,14 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      *
      * NOTE: The stream will always write in append mode.
      *
-     * @param string                $nsKey
-     * @param string                $itemKey
-     * @param Swift_InputByteStream $writeThrough
+     * @param string $nsKey
+     * @param string $itemKey
      *
      * @return Swift_InputByteStream
      */
     public function getInputByteStream($nsKey, $itemKey, Swift_InputByteStream $writeThrough = null)
     {
-        $is = clone $this->_stream;
+        $is = clone $this->stream;
         $is->setKeyCache($this);
         $is->setNsKey($nsKey);
         $is->setItemKey($itemKey);
@@ -173,20 +153,14 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      */
     public function getString($nsKey, $itemKey)
     {
-        $this->_prepareCache($nsKey);
+        $this->prepareCache($nsKey);
         if ($this->hasKey($nsKey, $itemKey)) {
-            $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START);
-            if ($this->_quotes) {
-                ini_set('magic_quotes_runtime', 0);
-            }
+            $fp = $this->getHandle($nsKey, $itemKey, self::POSITION_START);
             $str = '';
             while (!feof($fp) && false !== $bytes = fread($fp, 8192)) {
                 $str .= $bytes;
             }
-            if ($this->_quotes) {
-                ini_set('magic_quotes_runtime', 1);
-            }
-            $this->_freeHandle($nsKey, $itemKey);
+            $this->freeHandle($nsKey, $itemKey);
 
             return $str;
         }
@@ -202,17 +176,11 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
     public function exportToByteStream($nsKey, $itemKey, Swift_InputByteStream $is)
     {
         if ($this->hasKey($nsKey, $itemKey)) {
-            $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_START);
-            if ($this->_quotes) {
-                ini_set('magic_quotes_runtime', 0);
-            }
+            $fp = $this->getHandle($nsKey, $itemKey, self::POSITION_START);
             while (!feof($fp) && false !== $bytes = fread($fp, 8192)) {
                 $is->write($bytes);
             }
-            if ($this->_quotes) {
-                ini_set('magic_quotes_runtime', 1);
-            }
-            $this->_freeHandle($nsKey, $itemKey);
+            $this->freeHandle($nsKey, $itemKey);
         }
     }
 
@@ -226,7 +194,7 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      */
     public function hasKey($nsKey, $itemKey)
     {
-        return is_file($this->_path.'/'.$nsKey.'/'.$itemKey);
+        return is_file($this->path.'/'.$nsKey.'/'.$itemKey);
     }
 
     /**
@@ -238,8 +206,8 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
     public function clearKey($nsKey, $itemKey)
     {
         if ($this->hasKey($nsKey, $itemKey)) {
-            $this->_freeHandle($nsKey, $itemKey);
-            unlink($this->_path.'/'.$nsKey.'/'.$itemKey);
+            $this->freeHandle($nsKey, $itemKey);
+            unlink($this->path.'/'.$nsKey.'/'.$itemKey);
         }
     }
 
@@ -250,14 +218,14 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      */
     public function clearAll($nsKey)
     {
-        if (array_key_exists($nsKey, $this->_keys)) {
-            foreach ($this->_keys[$nsKey] as $itemKey => $null) {
+        if (\array_key_exists($nsKey, $this->keys)) {
+            foreach ($this->keys[$nsKey] as $itemKey => $null) {
                 $this->clearKey($nsKey, $itemKey);
             }
-            if (is_dir($this->_path.'/'.$nsKey)) {
-                rmdir($this->_path.'/'.$nsKey);
+            if (is_dir($this->path.'/'.$nsKey)) {
+                rmdir($this->path.'/'.$nsKey);
             }
-            unset($this->_keys[$nsKey]);
+            unset($this->keys[$nsKey]);
         }
     }
 
@@ -266,14 +234,14 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      *
      * @param string $nsKey
      */
-    private function _prepareCache($nsKey)
+    private function prepareCache($nsKey)
     {
-        $cacheDir = $this->_path.'/'.$nsKey;
+        $cacheDir = $this->path.'/'.$nsKey;
         if (!is_dir($cacheDir)) {
             if (!mkdir($cacheDir)) {
                 throw new Swift_IoException('Failed to create cache directory '.$cacheDir);
             }
-            $this->_keys[$nsKey] = array();
+            $this->keys[$nsKey] = [];
         }
     }
 
@@ -286,27 +254,27 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      *
      * @return resource
      */
-    private function _getHandle($nsKey, $itemKey, $position)
+    private function getHandle($nsKey, $itemKey, $position)
     {
-        if (!isset($this->_keys[$nsKey][$itemKey])) {
+        if (!isset($this->keys[$nsKey][$itemKey])) {
             $openMode = $this->hasKey($nsKey, $itemKey) ? 'r+b' : 'w+b';
-            $fp = fopen($this->_path.'/'.$nsKey.'/'.$itemKey, $openMode);
-            $this->_keys[$nsKey][$itemKey] = $fp;
+            $fp = fopen($this->path.'/'.$nsKey.'/'.$itemKey, $openMode);
+            $this->keys[$nsKey][$itemKey] = $fp;
         }
         if (self::POSITION_START == $position) {
-            fseek($this->_keys[$nsKey][$itemKey], 0, SEEK_SET);
+            fseek($this->keys[$nsKey][$itemKey], 0, SEEK_SET);
         } elseif (self::POSITION_END == $position) {
-            fseek($this->_keys[$nsKey][$itemKey], 0, SEEK_END);
+            fseek($this->keys[$nsKey][$itemKey], 0, SEEK_END);
         }
 
-        return $this->_keys[$nsKey][$itemKey];
+        return $this->keys[$nsKey][$itemKey];
     }
 
-    private function _freeHandle($nsKey, $itemKey)
+    private function freeHandle($nsKey, $itemKey)
     {
-        $fp = $this->_getHandle($nsKey, $itemKey, self::POSITION_CURRENT);
+        $fp = $this->getHandle($nsKey, $itemKey, self::POSITION_CURRENT);
         fclose($fp);
-        $this->_keys[$nsKey][$itemKey] = null;
+        $this->keys[$nsKey][$itemKey] = null;
     }
 
     /**
@@ -314,8 +282,13 @@ class Swift_KeyCache_DiskKeyCache implements Swift_KeyCache
      */
     public function __destruct()
     {
-        foreach ($this->_keys as $nsKey => $null) {
+        foreach ($this->keys as $nsKey => $null) {
             $this->clearAll($nsKey);
         }
     }
+
+    public function __wakeup()
+    {
+        $this->keys = [];
+    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
index af80bdca6..be2dbba0c 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/KeyCacheInputStream.php
@@ -17,8 +17,6 @@ interface Swift_KeyCache_KeyCacheInputStream extends Swift_InputByteStream
 {
     /**
      * Set the KeyCache to wrap.
-     *
-     * @param Swift_KeyCache $keyCache
      */
     public function setKeyCache(Swift_KeyCache $keyCache);
 
@@ -38,8 +36,6 @@ interface Swift_KeyCache_KeyCacheInputStream extends Swift_InputByteStream
 
     /**
      * Specify a stream to write through for each write().
-     *
-     * @param Swift_InputByteStream $is
      */
     public function setWriteThroughStream(Swift_InputByteStream $is);
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
index 4efe78564..957b1b2a0 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/NullKeyCache.php
@@ -34,10 +34,9 @@ class Swift_KeyCache_NullKeyCache implements Swift_KeyCache
      *
      * @see MODE_WRITE, MODE_APPEND
      *
-     * @param string                 $nsKey
-     * @param string                 $itemKey
-     * @param Swift_OutputByteStream $os
-     * @param int                    $mode
+     * @param string $nsKey
+     * @param string $itemKey
+     * @param int    $mode
      */
     public function importFromByteStream($nsKey, $itemKey, Swift_OutputByteStream $os, $mode)
     {
@@ -48,9 +47,8 @@ class Swift_KeyCache_NullKeyCache implements Swift_KeyCache
      *
      * NOTE: The stream will always write in append mode.
      *
-     * @param string                $nsKey
-     * @param string                $itemKey
-     * @param Swift_InputByteStream $writeThrough
+     * @param string $nsKey
+     * @param string $itemKey
      *
      * @return Swift_InputByteStream
      */
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
index b00d458a6..03bab481e 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/KeyCache/SimpleKeyCacheInputStream.php
@@ -16,35 +16,31 @@
 class Swift_KeyCache_SimpleKeyCacheInputStream implements Swift_KeyCache_KeyCacheInputStream
 {
     /** The KeyCache being written to */
-    private $_keyCache;
+    private $keyCache;
 
     /** The nsKey of the KeyCache being written to */
-    private $_nsKey;
+    private $nsKey;
 
     /** The itemKey of the KeyCache being written to */
-    private $_itemKey;
+    private $itemKey;
 
     /** A stream to write through on each write() */
-    private $_writeThrough = null;
+    private $writeThrough = null;
 
     /**
      * Set the KeyCache to wrap.
-     *
-     * @param Swift_KeyCache $keyCache
      */
     public function setKeyCache(Swift_KeyCache $keyCache)
     {
-        $this->_keyCache = $keyCache;
+        $this->keyCache = $keyCache;
     }
 
     /**
      * Specify a stream to write through for each write().
-     *
-     * @param Swift_InputByteStream $is
      */
     public function setWriteThroughStream(Swift_InputByteStream $is)
     {
-        $this->_writeThrough = $is;
+        $this->writeThrough = $is;
     }
 
     /**
@@ -55,14 +51,14 @@ class Swift_KeyCache_SimpleKeyCacheInputStream implements Swift_KeyCache_KeyCach
      */
     public function write($bytes, Swift_InputByteStream $is = null)
     {
-        $this->_keyCache->setString(
-            $this->_nsKey, $this->_itemKey, $bytes, Swift_KeyCache::MODE_APPEND
+        $this->keyCache->setString(
+            $this->nsKey, $this->itemKey, $bytes, Swift_KeyCache::MODE_APPEND
             );
         if (isset($is)) {
             $is->write($bytes);
         }
-        if (isset($this->_writeThrough)) {
-            $this->_writeThrough->write($bytes);
+        if (isset($this->writeThrough)) {
+            $this->writeThrough->write($bytes);
         }
     }
 
@@ -93,7 +89,7 @@ class Swift_KeyCache_SimpleKeyCacheInputStream implements Swift_KeyCache_KeyCach
      */
     public function flushBuffers()
     {
-        $this->_keyCache->clearKey($this->_nsKey, $this->_itemKey);
+        $this->keyCache->clearKey($this->nsKey, $this->itemKey);
     }
 
     /**
@@ -103,7 +99,7 @@ class Swift_KeyCache_SimpleKeyCacheInputStream implements Swift_KeyCache_KeyCach
      */
     public function setNsKey($nsKey)
     {
-        $this->_nsKey = $nsKey;
+        $this->nsKey = $nsKey;
     }
 
     /**
@@ -113,7 +109,7 @@ class Swift_KeyCache_SimpleKeyCacheInputStream implements Swift_KeyCache_KeyCach
      */
     public function setItemKey($itemKey)
     {
-        $this->_itemKey = $itemKey;
+        $this->itemKey = $itemKey;
     }
 
     /**
@@ -122,6 +118,6 @@ class Swift_KeyCache_SimpleKeyCacheInputStream implements Swift_KeyCache_KeyCach
      */
     public function __clone()
     {
-        $this->_writeThrough = null;
+        $this->writeThrough = null;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
index e151b8a9c..244b5f602 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/LoadBalancedTransport.php
@@ -20,26 +20,14 @@ class Swift_LoadBalancedTransport extends Swift_Transport_LoadBalancedTransport
      *
      * @param array $transports
      */
-    public function __construct($transports = array())
+    public function __construct($transports = [])
     {
-        call_user_func_array(
-            array($this, 'Swift_Transport_LoadBalancedTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_LoadBalancedTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.loadbalanced')
             );
 
         $this->setTransports($transports);
     }
-
-    /**
-     * Create a new LoadBalancedTransport instance.
-     *
-     * @param array $transports
-     *
-     * @return self
-     */
-    public static function newInstance($transports = array())
-    {
-        return new self($transports);
-    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php
deleted file mode 100644
index 18556989a..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/MailTransport.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Sends Messages using the mail() function.
- *
- * @author Chris Corbyn
- *
- * @deprecated since 5.4.5 (to be removed in 6.0)
- */
-class Swift_MailTransport extends Swift_Transport_MailTransport
-{
-    /**
-     * Create a new MailTransport, optionally specifying $extraParams.
-     *
-     * @param string $extraParams
-     */
-    public function __construct($extraParams = '-f%s')
-    {
-        call_user_func_array(
-            array($this, 'Swift_Transport_MailTransport::__construct'),
-            Swift_DependencyContainer::getInstance()
-                ->createDependenciesFor('transport.mail')
-            );
-
-        $this->setExtraParams($extraParams);
-    }
-
-    /**
-     * Create a new MailTransport instance.
-     *
-     * @param string $extraParams To be passed to mail()
-     *
-     * @return self
-     */
-    public static function newInstance($extraParams = '-f%s')
-    {
-        return new self($extraParams);
-    }
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php
index 8314fe8fc..57630074c 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mailer.php
@@ -16,28 +16,14 @@
 class Swift_Mailer
 {
     /** The Transport used to send messages */
-    private $_transport;
+    private $transport;
 
     /**
      * Create a new Mailer using $transport for delivery.
-     *
-     * @param Swift_Transport $transport
      */
     public function __construct(Swift_Transport $transport)
     {
-        $this->_transport = $transport;
-    }
-
-    /**
-     * Create a new Mailer instance.
-     *
-     * @param Swift_Transport $transport
-     *
-     * @return self
-     */
-    public static function newInstance(Swift_Transport $transport)
-    {
-        return new self($transport);
+        $this->transport = $transport;
     }
 
     /**
@@ -66,23 +52,23 @@ class Swift_Mailer
      * The return value is the number of recipients who were accepted for
      * delivery.
      *
-     * @param Swift_Mime_Message $message
-     * @param array              $failedRecipients An array of failures by-reference
+     * @param array $failedRecipients An array of failures by-reference
      *
      * @return int The number of successful recipients. Can be 0 which indicates failure
      */
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
         $failedRecipients = (array) $failedRecipients;
 
-        if (!$this->_transport->isStarted()) {
-            $this->_transport->start();
+        // FIXME: to be removed in 7.0 (as transport must now start itself on send)
+        if (!$this->transport->isStarted()) {
+            $this->transport->start();
         }
 
         $sent = 0;
 
         try {
-            $sent = $this->_transport->send($message, $failedRecipients);
+            $sent = $this->transport->send($message, $failedRecipients);
         } catch (Swift_RfcComplianceException $e) {
             foreach ($message->getTo() as $address => $name) {
                 $failedRecipients[] = $address;
@@ -94,12 +80,10 @@ class Swift_Mailer
 
     /**
      * Register a plugin using a known unique key (e.g. myPlugin).
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
-        $this->_transport->registerPlugin($plugin);
+        $this->transport->registerPlugin($plugin);
     }
 
     /**
@@ -109,6 +93,6 @@ class Swift_Mailer
      */
     public function getTransport()
     {
-        return $this->_transport;
+        return $this->transport;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
index e3e6cad05..19aa82a9c 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mailer/ArrayRecipientIterator.php
@@ -20,16 +20,14 @@ class Swift_Mailer_ArrayRecipientIterator implements Swift_Mailer_RecipientItera
      *
      * @var array
      */
-    private $_recipients = array();
+    private $recipients = [];
 
     /**
      * Create a new ArrayRecipientIterator from $recipients.
-     *
-     * @param array $recipients
      */
     public function __construct(array $recipients)
     {
-        $this->_recipients = $recipients;
+        $this->recipients = $recipients;
     }
 
     /**
@@ -39,7 +37,7 @@ class Swift_Mailer_ArrayRecipientIterator implements Swift_Mailer_RecipientItera
      */
     public function hasNext()
     {
-        return !empty($this->_recipients);
+        return !empty($this->recipients);
     }
 
     /**
@@ -50,6 +48,6 @@ class Swift_Mailer_ArrayRecipientIterator implements Swift_Mailer_RecipientItera
      */
     public function nextRecipient()
     {
-        return array_splice($this->_recipients, 0, 1);
+        return array_splice($this->recipients, 0, 1);
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php
index 2cafb6751..e3b0894d8 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/MemorySpool.php
@@ -15,7 +15,7 @@
  */
 class Swift_MemorySpool implements Swift_Spool
 {
-    protected $messages = array();
+    protected $messages = [];
     private $flushRetries = 3;
 
     /**
@@ -53,11 +53,11 @@ class Swift_MemorySpool implements Swift_Spool
     /**
      * Stores a message in the queue.
      *
-     * @param Swift_Mime_Message $message The message to store
+     * @param Swift_Mime_SimpleMessage $message The message to store
      *
      * @return bool Whether the operation has succeeded
      */
-    public function queueMessage(Swift_Mime_Message $message)
+    public function queueMessage(Swift_Mime_SimpleMessage $message)
     {
         //clone the message to make sure it is not changed while in the queue
         $this->messages[] = clone $message;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Message.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
index 242cbf314..5c5834e23 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Message.php
@@ -18,17 +18,17 @@ class Swift_Message extends Swift_Mime_SimpleMessage
     /**
      * @var Swift_Signers_HeaderSigner[]
      */
-    private $headerSigners = array();
+    private $headerSigners = [];
 
     /**
      * @var Swift_Signers_BodySigner[]
      */
-    private $bodySigners = array();
+    private $bodySigners = [];
 
     /**
      * @var array
      */
-    private $savedMessage = array();
+    private $savedMessage = [];
 
     /**
      * Create a new Message.
@@ -42,8 +42,8 @@ class Swift_Message extends Swift_Mime_SimpleMessage
      */
     public function __construct($subject = null, $body = null, $contentType = null, $charset = null)
     {
-        call_user_func_array(
-            array($this, 'Swift_Mime_SimpleMessage::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Mime_SimpleMessage::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('mime.message')
             );
@@ -60,21 +60,6 @@ class Swift_Message extends Swift_Mime_SimpleMessage
         }
     }
 
-    /**
-     * Create a new Message.
-     *
-     * @param string $subject
-     * @param string $body
-     * @param string $contentType
-     * @param string $charset
-     *
-     * @return $this
-     */
-    public static function newInstance($subject = null, $body = null, $contentType = null, $charset = null)
-    {
-        return new self($subject, $body, $contentType, $charset);
-    }
-
     /**
      * Add a MimePart to this Message.
      *
@@ -86,13 +71,11 @@ class Swift_Message extends Swift_Mime_SimpleMessage
      */
     public function addPart($body, $contentType = null, $charset = null)
     {
-        return $this->attach(Swift_MimePart::newInstance($body, $contentType, $charset)->setEncoder($this->getEncoder()));
+        return $this->attach((new Swift_MimePart($body, $contentType, $charset))->setEncoder($this->getEncoder()));
     }
 
     /**
-     * Detach a signature handler from a message.
-     *
-     * @param Swift_Signer $signer
+     * Attach a new signature handler to the message.
      *
      * @return $this
      */
@@ -108,9 +91,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
     }
 
     /**
-     * Attach a new signature handler to the message.
-     *
-     * @param Swift_Signer $signer
+     * Detach a signature handler from a message.
      *
      * @return $this
      */
@@ -137,6 +118,19 @@ class Swift_Message extends Swift_Mime_SimpleMessage
         return $this;
     }
 
+    /**
+     * Clear all signature handlers attached to the message.
+     *
+     * @return $this
+     */
+    public function clearSigners()
+    {
+        $this->headerSigners = [];
+        $this->bodySigners = [];
+
+        return $this;
+    }
+
     /**
      * Get this message as a complete string.
      *
@@ -161,8 +155,6 @@ class Swift_Message extends Swift_Mime_SimpleMessage
 
     /**
      * Write this message to a {@link Swift_InputByteStream}.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function toByteStream(Swift_InputByteStream $is)
     {
@@ -205,7 +197,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
             $signer->setHeaders($this->getHeaders());
 
             $signer->startBody();
-            $this->_bodyToByteStream($signer);
+            $this->bodyToByteStream($signer);
             $signer->endBody();
 
             $signer->addSignature($this->getHeaders());
@@ -217,24 +209,22 @@ class Swift_Message extends Swift_Mime_SimpleMessage
      */
     protected function saveMessage()
     {
-        $this->savedMessage = array('headers' => array());
+        $this->savedMessage = ['headers' => []];
         $this->savedMessage['body'] = $this->getBody();
         $this->savedMessage['children'] = $this->getChildren();
-        if (count($this->savedMessage['children']) > 0 && $this->getBody() != '') {
-            $this->setChildren(array_merge(array($this->_becomeMimePart()), $this->savedMessage['children']));
+        if (\count($this->savedMessage['children']) > 0 && '' != $this->getBody()) {
+            $this->setChildren(array_merge([$this->becomeMimePart()], $this->savedMessage['children']));
             $this->setBody('');
         }
     }
 
     /**
      * save the original headers.
-     *
-     * @param array $altered
      */
     protected function saveHeaders(array $altered)
     {
         foreach ($altered as $head) {
-            $lc = strtolower($head);
+            $lc = strtolower($head ?? '');
 
             if (!isset($this->savedMessage['headers'][$lc])) {
                 $this->savedMessage['headers'][$lc] = $this->getHeaders()->getAll($head);
@@ -267,7 +257,7 @@ class Swift_Message extends Swift_Mime_SimpleMessage
         $this->setChildren($this->savedMessage['children']);
 
         $this->restoreHeaders();
-        $this->savedMessage = array();
+        $this->savedMessage = [];
     }
 
     /**
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php
index d5ba14b91..d994373bd 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Attachment.php
@@ -16,23 +16,19 @@
 class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
 {
     /** Recognized MIME types */
-    private $_mimeTypes = array();
+    private $mimeTypes = [];
 
     /**
      * Create a new Attachment with $headers, $encoder and $cache.
      *
-     * @param Swift_Mime_HeaderSet      $headers
-     * @param Swift_Mime_ContentEncoder $encoder
-     * @param Swift_KeyCache            $cache
-     * @param Swift_Mime_Grammar        $grammar
-     * @param array                     $mimeTypes optional
+     * @param array $mimeTypes
      */
-    public function __construct(Swift_Mime_HeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_Mime_Grammar $grammar, $mimeTypes = array())
+    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $mimeTypes = [])
     {
-        parent::__construct($headers, $encoder, $cache, $grammar);
+        parent::__construct($headers, $encoder, $cache, $idGenerator);
         $this->setDisposition('attachment');
         $this->setContentType('application/octet-stream');
-        $this->_mimeTypes = $mimeTypes;
+        $this->mimeTypes = $mimeTypes;
     }
 
     /**
@@ -56,7 +52,7 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
      */
     public function getDisposition()
     {
-        return $this->_getHeaderFieldModel('Content-Disposition');
+        return $this->getHeaderFieldModel('Content-Disposition');
     }
 
     /**
@@ -68,7 +64,7 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
      */
     public function setDisposition($disposition)
     {
-        if (!$this->_setHeaderFieldModel('Content-Disposition', $disposition)) {
+        if (!$this->setHeaderFieldModel('Content-Disposition', $disposition)) {
             $this->getHeaders()->addParameterizedHeader('Content-Disposition', $disposition);
         }
 
@@ -82,7 +78,7 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
      */
     public function getFilename()
     {
-        return $this->_getHeaderParameter('Content-Disposition', 'filename');
+        return $this->getHeaderParameter('Content-Disposition', 'filename');
     }
 
     /**
@@ -94,8 +90,8 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
      */
     public function setFilename($filename)
     {
-        $this->_setHeaderParameter('Content-Disposition', 'filename', $filename);
-        $this->_setHeaderParameter('Content-Type', 'name', $filename);
+        $this->setHeaderParameter('Content-Disposition', 'filename', $filename);
+        $this->setHeaderParameter('Content-Type', 'name', $filename);
 
         return $this;
     }
@@ -107,7 +103,7 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
      */
     public function getSize()
     {
-        return $this->_getHeaderParameter('Content-Disposition', 'size');
+        return $this->getHeaderParameter('Content-Disposition', 'size');
     }
 
     /**
@@ -119,7 +115,7 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
      */
     public function setSize($size)
     {
-        $this->_setHeaderParameter('Content-Disposition', 'size', $size);
+        $this->setHeaderParameter('Content-Disposition', 'size', $size);
 
         return $this;
     }
@@ -127,8 +123,7 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
     /**
      * Set the file that this attachment is for.
      *
-     * @param Swift_FileStream $file
-     * @param string           $contentType optional
+     * @param string $contentType optional
      *
      * @return $this
      */
@@ -139,8 +134,8 @@ class Swift_Mime_Attachment extends Swift_Mime_SimpleMimeEntity
         if (!isset($contentType)) {
             $extension = strtolower(substr($file->getPath(), strrpos($file->getPath(), '.') + 1));
 
-            if (array_key_exists($extension, $this->_mimeTypes)) {
-                $this->setContentType($this->_mimeTypes[$extension]);
+            if (\array_key_exists($extension, $this->mimeTypes)) {
+                $this->setContentType($this->mimeTypes[$extension]);
             }
         }
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
index 8f76d70f3..b7e1e0283 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/Base64ContentEncoder.php
@@ -18,10 +18,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
     /**
      * Encode stream $in to stream $out.
      *
-     * @param Swift_OutputByteStream $os
-     * @param Swift_InputByteStream  $is
-     * @param int                    $firstLineOffset
-     * @param int                    $maxLineLength,  optional, 0 indicates the default of 76 bytes
+     * @param int $firstLineOffset
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
@@ -30,7 +27,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
         }
 
         $remainder = 0;
-        $base64ReadBufferRemainderBytes = null;
+        $base64ReadBufferRemainderBytes = '';
 
         // To reduce memory usage, the output buffer is streamed to the input buffer like so:
         //   Output Stream => base64encode => wrap line length => Input Stream
@@ -41,17 +38,17 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
         // When the OutputStream is empty, we must flush any remainder bytes.
         while (true) {
             $readBytes = $os->read(8192);
-            $atEOF = ($readBytes === false);
+            $atEOF = (false === $readBytes);
 
             if ($atEOF) {
                 $streamTheseBytes = $base64ReadBufferRemainderBytes;
             } else {
                 $streamTheseBytes = $base64ReadBufferRemainderBytes.$readBytes;
             }
-            $base64ReadBufferRemainderBytes = null;
-            $bytesLength = strlen($streamTheseBytes);
+            $base64ReadBufferRemainderBytes = '';
+            $bytesLength = \strlen($streamTheseBytes);
 
-            if ($bytesLength === 0) { // no data left to encode
+            if (0 === $bytesLength) { // no data left to encode
                 break;
             }
 
@@ -59,7 +56,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
             // and carry over remainder 1-2 bytes to the next loop iteration
             if (!$atEOF) {
                 $excessBytes = $bytesLength % 3;
-                if ($excessBytes !== 0) {
+                if (0 !== $excessBytes) {
                     $base64ReadBufferRemainderBytes = substr($streamTheseBytes, -$excessBytes);
                     $streamTheseBytes = substr($streamTheseBytes, 0, $bytesLength - $excessBytes);
                 }
@@ -69,7 +66,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
             $encodedTransformed = '';
             $thisMaxLineLength = $maxLineLength - $remainder - $firstLineOffset;
 
-            while ($thisMaxLineLength < strlen($encoded)) {
+            while ($thisMaxLineLength < \strlen($encoded)) {
                 $encodedTransformed .= substr($encoded, 0, $thisMaxLineLength)."\r\n";
                 $firstLineOffset = 0;
                 $encoded = substr($encoded, $thisMaxLineLength);
@@ -77,7 +74,7 @@ class Swift_Mime_ContentEncoder_Base64ContentEncoder extends Swift_Encoder_Base6
                 $remainder = 0;
             }
 
-            if (0 < $remainingLength = strlen($encoded)) {
+            if (0 < $remainingLength = \strlen($encoded)) {
                 $remainder += $remainingLength;
                 $encodedTransformed .= $encoded;
                 $encoded = null;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
index 710b5ac9e..8dfea605f 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NativeQpContentEncoder.php
@@ -16,16 +16,16 @@
 class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_ContentEncoder
 {
     /**
-     * @var null|string
+     * @var string|null
      */
     private $charset;
 
     /**
-     * @param null|string $charset
+     * @param string|null $charset
      */
     public function __construct($charset = null)
     {
-        $this->charset = $charset ? $charset : 'utf-8';
+        $this->charset = $charset ?: 'utf-8';
     }
 
     /**
@@ -50,9 +50,8 @@ class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_Con
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        if ($this->charset !== 'utf-8') {
-            throw new RuntimeException(
-                sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
+        if ('utf-8' !== $this->charset) {
+            throw new RuntimeException(sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
         }
 
         $string = '';
@@ -87,12 +86,11 @@ class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_Con
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        if ($this->charset !== 'utf-8') {
-            throw new RuntimeException(
-                sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
+        if ('utf-8' !== $this->charset) {
+            throw new RuntimeException(sprintf('Charset "%s" not supported. NativeQpContentEncoder only supports "utf-8"', $this->charset));
         }
 
-        return $this->_standardize(quoted_printable_encode($string));
+        return $this->standardize(quoted_printable_encode($string));
     }
 
     /**
@@ -102,14 +100,14 @@ class Swift_Mime_ContentEncoder_NativeQpContentEncoder implements Swift_Mime_Con
      *
      * @return string
      */
-    protected function _standardize($string)
+    protected function standardize($string)
     {
         // transform CR or LF to CRLF
         $string = preg_replace('~=0D(?!=0A)|(?<!=0D)=0A~', '=0D=0A', $string);
         // transform =0D=0A to CRLF
-        $string = str_replace(array("\t=0D=0A", ' =0D=0A', '=0D=0A'), array("=09\r\n", "=20\r\n", "\r\n"), $string);
+        $string = str_replace(["\t=0D=0A", ' =0D=0A', '=0D=0A'], ["=09\r\n", "=20\r\n", "\r\n"], $string);
 
-        switch ($end = ord(substr($string, -1))) {
+        switch (\ord(substr($string, -1))) {
             case 0x09:
                 $string = substr_replace($string, '=09', -1);
                 break;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NullContentEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NullContentEncoder.php
new file mode 100644
index 000000000..6539de77b
--- /dev/null
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/NullContentEncoder.php
@@ -0,0 +1,79 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Handles the case where the email body is already encoded and you just need specify the correct
+ * encoding without actually changing the encoding of the body.
+ *
+ * @author Jan Flora <jf@penneo.com>
+ */
+class Swift_Mime_ContentEncoder_NullContentEncoder implements Swift_Mime_ContentEncoder
+{
+    /**
+     * The name of this encoding scheme (probably 7bit or 8bit).
+     *
+     * @var string
+     */
+    private $name;
+
+    /**
+     * Creates a new NullContentEncoder with $name (probably 7bit or 8bit).
+     *
+     * @param string $name
+     */
+    public function __construct($name)
+    {
+        $this->name = $name;
+    }
+
+    /**
+     * Encode a given string to produce an encoded string.
+     *
+     * @param string $string
+     * @param int    $firstLineOffset ignored
+     * @param int    $maxLineLength   ignored
+     *
+     * @return string
+     */
+    public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        return $string;
+    }
+
+    /**
+     * Encode stream $in to stream $out.
+     *
+     * @param int $firstLineOffset ignored
+     * @param int $maxLineLength   ignored
+     */
+    public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
+    {
+        while (false !== ($bytes = $os->read(8192))) {
+            $is->write($bytes);
+        }
+    }
+
+    /**
+     * Get the name of this encoding scheme.
+     *
+     * @return string
+     */
+    public function getName()
+    {
+        return $this->name;
+    }
+
+    /**
+     * Not used.
+     */
+    public function charsetChanged($charset)
+    {
+    }
+}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
index 219f482ce..72592fc58 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/PlainContentEncoder.php
@@ -11,6 +11,10 @@
 /**
  * Handles binary/7/8-bit Transfer Encoding in Swift Mailer.
  *
+ * When sending 8-bit content over SMTP, you should use
+ * Swift_Transport_Esmtp_EightBitMimeHandler to enable the 8BITMIME SMTP
+ * extension.
+ *
  * @author Chris Corbyn
  */
 class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_ContentEncoder
@@ -20,25 +24,25 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
      *
      * @var string
      */
-    private $_name;
+    private $name;
 
     /**
      * True if canonical transformations should be done.
      *
      * @var bool
      */
-    private $_canonical;
+    private $canonical;
 
     /**
      * Creates a new PlainContentEncoder with $name (probably 7bit or 8bit).
      *
      * @param string $name
-     * @param bool   $canonical If canonicalization transformation should be done.
+     * @param bool   $canonical if canonicalization transformation should be done
      */
     public function __construct($name, $canonical = false)
     {
-        $this->_name = $name;
-        $this->_canonical = $canonical;
+        $this->name = $name;
+        $this->canonical = $canonical;
     }
 
     /**
@@ -52,37 +56,35 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        if ($this->_canonical) {
-            $string = $this->_canonicalize($string);
+        if ($this->canonical) {
+            $string = $this->canonicalize($string);
         }
 
-        return $this->_safeWordWrap($string, $maxLineLength, "\r\n");
+        return $this->safeWordwrap($string, $maxLineLength, "\r\n");
     }
 
     /**
      * Encode stream $in to stream $out.
      *
-     * @param Swift_OutputByteStream $os
-     * @param Swift_InputByteStream  $is
-     * @param int                    $firstLineOffset ignored
-     * @param int                    $maxLineLength   optional, 0 means no wrapping will occur
+     * @param int $firstLineOffset ignored
+     * @param int $maxLineLength   optional, 0 means no wrapping will occur
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
         $leftOver = '';
         while (false !== $bytes = $os->read(8192)) {
             $toencode = $leftOver.$bytes;
-            if ($this->_canonical) {
-                $toencode = $this->_canonicalize($toencode);
+            if ($this->canonical) {
+                $toencode = $this->canonicalize($toencode);
             }
-            $wrapped = $this->_safeWordWrap($toencode, $maxLineLength, "\r\n");
+            $wrapped = $this->safeWordwrap($toencode, $maxLineLength, "\r\n");
             $lastLinePos = strrpos($wrapped, "\r\n");
             $leftOver = substr($wrapped, $lastLinePos);
             $wrapped = substr($wrapped, 0, $lastLinePos);
 
             $is->write($wrapped);
         }
-        if (strlen($leftOver)) {
+        if (\strlen($leftOver)) {
             $is->write($leftOver);
         }
     }
@@ -94,7 +96,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
      */
     public function getName()
     {
-        return $this->_name;
+        return $this->name;
     }
 
     /**
@@ -113,7 +115,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
      *
      * @return string
      */
-    private function _safeWordwrap($string, $length = 75, $le = "\r\n")
+    private function safeWordwrap($string, $length = 75, $le = "\r\n")
     {
         if (0 >= $length) {
             return $string;
@@ -121,7 +123,7 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
 
         $originalLines = explode($le, $string);
 
-        $lines = array();
+        $lines = [];
         $lineCount = 0;
 
         foreach ($originalLines as $originalLine) {
@@ -132,8 +134,8 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
             $chunks = preg_split('/(?<=\s)/', $originalLine);
 
             foreach ($chunks as $chunk) {
-                if (0 != strlen($currentLine)
-                    && strlen($currentLine.$chunk) > $length) {
+                if (0 != \strlen($currentLine)
+                    && \strlen($currentLine.$chunk) > $length) {
                     $lines[] = '';
                     $currentLine = &$lines[$lineCount++];
                 }
@@ -151,11 +153,11 @@ class Swift_Mime_ContentEncoder_PlainContentEncoder implements Swift_Mime_Conten
      *
      * @return string
      */
-    private function _canonicalize($string)
+    private function canonicalize($string)
     {
         return str_replace(
-            array("\r\n", "\r", "\n"),
-            array("\n", "\n", "\r\n"),
+            ["\r\n", "\r", "\n"],
+            ["\n", "\n", "\r\n"],
             $string
             );
     }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
index 5cc907b8e..465ffd878 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoder.php
@@ -11,11 +11,11 @@
 /**
  * Handles Quoted Printable (QP) Transfer Encoding in Swift Mailer.
  *
- * @author Chris Corbyn
+ * @author     Chris Corbyn
  */
 class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder implements Swift_Mime_ContentEncoder
 {
-    protected $_dotEscape;
+    protected $dotEscape;
 
     /**
      * Creates a new QpContentEncoder for the given CharacterStream.
@@ -26,26 +26,26 @@ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
      */
     public function __construct(Swift_CharacterStream $charStream, Swift_StreamFilter $filter = null, $dotEscape = false)
     {
-        $this->_dotEscape = $dotEscape;
+        $this->dotEscape = $dotEscape;
         parent::__construct($charStream, $filter);
     }
 
     public function __sleep()
     {
-        return array('_charStream', '_filter', '_dotEscape');
+        return ['charStream', 'filter', 'dotEscape'];
     }
 
     protected function getSafeMapShareId()
     {
-        return get_class($this).($this->_dotEscape ? '.dotEscape' : '');
+        return static::class.($this->dotEscape ? '.dotEscape' : '');
     }
 
     protected function initSafeMap()
     {
         parent::initSafeMap();
-        if ($this->_dotEscape) {
+        if ($this->dotEscape) {
             /* Encode . as =2e for buggy remote servers */
-            unset($this->_safeMap[0x2e]);
+            unset($this->safeMap[0x2e]);
         }
     }
 
@@ -69,20 +69,20 @@ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
 
         $thisLineLength = $maxLineLength - $firstLineOffset;
 
-        $this->_charStream->flushContents();
-        $this->_charStream->importByteStream($os);
+        $this->charStream->flushContents();
+        $this->charStream->importByteStream($os);
 
         $currentLine = '';
         $prepend = '';
         $size = $lineLen = 0;
 
-        while (false !== $bytes = $this->_nextSequence()) {
+        while (false !== $bytes = $this->nextSequence()) {
             // If we're filtering the input
-            if (isset($this->_filter)) {
+            if (isset($this->filter)) {
                 // If we can't filter because we need more bytes
-                while ($this->_filter->shouldBuffer($bytes)) {
+                while ($this->filter->shouldBuffer($bytes)) {
                     // Then collect bytes into the buffer
-                    if (false === $moreBytes = $this->_nextSequence(1)) {
+                    if (false === $moreBytes = $this->nextSequence(1)) {
                         break;
                     }
 
@@ -91,16 +91,16 @@ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
                     }
                 }
                 // And filter them
-                $bytes = $this->_filter->filter($bytes);
+                $bytes = $this->filter->filter($bytes);
             }
 
-            $enc = $this->_encodeByteSequence($bytes, $size);
+            $enc = $this->encodeByteSequence($bytes, $size);
 
             $i = strpos($enc, '=0D=0A');
-            $newLineLength = $lineLen + ($i === false ? $size : $i);
+            $newLineLength = $lineLen + (false === $i ? $size : $i);
 
             if ($currentLine && $newLineLength >= $thisLineLength) {
-                $is->write($prepend.$this->_standardize($currentLine));
+                $is->write($prepend.$this->standardize($currentLine));
                 $currentLine = '';
                 $prepend = "=\r\n";
                 $thisLineLength = $maxLineLength;
@@ -109,15 +109,15 @@ class Swift_Mime_ContentEncoder_QpContentEncoder extends Swift_Encoder_QpEncoder
 
             $currentLine .= $enc;
 
-            if ($i === false) {
+            if (false === $i) {
                 $lineLen += $size;
             } else {
                 // 6 is the length of '=0D=0A'.
                 $lineLen = $size - strrpos($enc, '=0D=0A') - 6;
             }
         }
-        if (strlen($currentLine)) {
-            $is->write($prepend.$this->_standardize($currentLine));
+        if (\strlen($currentLine)) {
+            $is->write($prepend.$this->standardize($currentLine));
         }
     }
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
index 3214e1cf3..f3ece43ae 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/QpContentEncoderProxy.php
@@ -28,16 +28,14 @@ class Swift_Mime_ContentEncoder_QpContentEncoderProxy implements Swift_Mime_Cont
     private $nativeEncoder;
 
     /**
-     * @var null|string
+     * @var string|null
      */
     private $charset;
 
     /**
      * Constructor.
      *
-     * @param Swift_Mime_ContentEncoder_QpContentEncoder       $safeEncoder
-     * @param Swift_Mime_ContentEncoder_NativeQpContentEncoder $nativeEncoder
-     * @param string|null                                      $charset
+     * @param string|null $charset
      */
     public function __construct(Swift_Mime_ContentEncoder_QpContentEncoder $safeEncoder, Swift_Mime_ContentEncoder_NativeQpContentEncoder $nativeEncoder, $charset)
     {
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
index 0b8526e38..870e7f41a 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ContentEncoder/RawContentEncoder.php
@@ -11,6 +11,9 @@
 /**
  * Handles raw Transfer Encoding in Swift Mailer.
  *
+ * When sending 8-bit content over SMTP, you should use
+ * Swift_Transport_Esmtp_EightBitMimeHandler to enable the 8BITMIME SMTP
+ * extension.
  *
  * @author Sebastiaan Stok <s.stok@rollerscapes.net>
  */
@@ -33,10 +36,8 @@ class Swift_Mime_ContentEncoder_RawContentEncoder implements Swift_Mime_ContentE
     /**
      * Encode stream $in to stream $out.
      *
-     * @param Swift_OutputByteStream $in
-     * @param Swift_InputByteStream  $out
-     * @param int                    $firstLineOffset ignored
-     * @param int                    $maxLineLength   ignored
+     * @param int $firstLineOffset ignored
+     * @param int $maxLineLength   ignored
      */
     public function encodeByteStream(Swift_OutputByteStream $os, Swift_InputByteStream $is, $firstLineOffset = 0, $maxLineLength = 0)
     {
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
index 6af757124..42a51770c 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EmbeddedFile.php
@@ -18,15 +18,11 @@ class Swift_Mime_EmbeddedFile extends Swift_Mime_Attachment
     /**
      * Creates a new Attachment with $headers and $encoder.
      *
-     * @param Swift_Mime_HeaderSet      $headers
-     * @param Swift_Mime_ContentEncoder $encoder
-     * @param Swift_KeyCache            $cache
-     * @param Swift_Mime_Grammar        $grammar
-     * @param array                     $mimeTypes optional
+     * @param array $mimeTypes optional
      */
-    public function __construct(Swift_Mime_HeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_Mime_Grammar $grammar, $mimeTypes = array())
+    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $mimeTypes = [])
     {
-        parent::__construct($headers, $encoder, $cache, $grammar, $mimeTypes);
+        parent::__construct($headers, $encoder, $cache, $idGenerator, $mimeTypes);
         $this->setDisposition('inline');
         $this->setId($this->getId());
     }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
index cc44a6efb..1a952ece1 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/EncodingObserver.php
@@ -17,8 +17,6 @@ interface Swift_Mime_EncodingObserver
 {
     /**
      * Notify this observer that the observed entity's ContentEncoder has changed.
-     *
-     * @param Swift_Mime_ContentEncoder $encoder
      */
     public function encoderChanged(Swift_Mime_ContentEncoder $encoder);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Grammar.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Grammar.php
deleted file mode 100644
index a09f33831..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Grammar.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Defines the grammar to use for validation, implements the RFC 2822 (and friends) ABNF grammar definitions.
- *
- * @author     Fabien Potencier
- * @author     Chris Corbyn
- */
-class Swift_Mime_Grammar
-{
-    /**
-     * Special characters used in the syntax which need to be escaped.
-     *
-     * @var string[]
-     */
-    private static $_specials = array();
-
-    /**
-     * Tokens defined in RFC 2822 (and some related RFCs).
-     *
-     * @var string[]
-     */
-    private static $_grammar = array();
-
-    /**
-     * Initialize some RFC 2822 (and friends) ABNF grammar definitions.
-     */
-    public function __construct()
-    {
-        $this->init();
-    }
-
-    public function __wakeup()
-    {
-        $this->init();
-    }
-
-    protected function init()
-    {
-        if (count(self::$_specials) > 0) {
-            return;
-        }
-
-        self::$_specials = array(
-            '(', ')', '<', '>', '[', ']',
-            ':', ';', '@', ',', '.', '"',
-            );
-
-        /*** Refer to RFC 2822 for ABNF grammar ***/
-
-        // All basic building blocks
-        self::$_grammar['NO-WS-CTL'] = '[\x01-\x08\x0B\x0C\x0E-\x19\x7F]';
-        self::$_grammar['WSP'] = '[ \t]';
-        self::$_grammar['CRLF'] = '(?:\r\n)';
-        self::$_grammar['FWS'] = '(?:(?:'.self::$_grammar['WSP'].'*'.
-                self::$_grammar['CRLF'].')?'.self::$_grammar['WSP'].')';
-        self::$_grammar['text'] = '[\x00-\x08\x0B\x0C\x0E-\x7F]';
-        self::$_grammar['quoted-pair'] = '(?:\\\\'.self::$_grammar['text'].')';
-        self::$_grammar['ctext'] = '(?:'.self::$_grammar['NO-WS-CTL'].
-                '|[\x21-\x27\x2A-\x5B\x5D-\x7E])';
-        // Uses recursive PCRE (?1) -- could be a weak point??
-        self::$_grammar['ccontent'] = '(?:'.self::$_grammar['ctext'].'|'.
-                self::$_grammar['quoted-pair'].'|(?1))';
-        self::$_grammar['comment'] = '(\((?:'.self::$_grammar['FWS'].'|'.
-                self::$_grammar['ccontent'].')*'.self::$_grammar['FWS'].'?\))';
-        self::$_grammar['CFWS'] = '(?:(?:'.self::$_grammar['FWS'].'?'.
-                self::$_grammar['comment'].')*(?:(?:'.self::$_grammar['FWS'].'?'.
-                self::$_grammar['comment'].')|'.self::$_grammar['FWS'].'))';
-        self::$_grammar['qtext'] = '(?:'.self::$_grammar['NO-WS-CTL'].
-                '|[\x21\x23-\x5B\x5D-\x7E])';
-        self::$_grammar['qcontent'] = '(?:'.self::$_grammar['qtext'].'|'.
-                self::$_grammar['quoted-pair'].')';
-        self::$_grammar['quoted-string'] = '(?:'.self::$_grammar['CFWS'].'?"'.
-                '('.self::$_grammar['FWS'].'?'.self::$_grammar['qcontent'].')*'.
-                self::$_grammar['FWS'].'?"'.self::$_grammar['CFWS'].'?)';
-        self::$_grammar['atext'] = '[a-zA-Z0-9!#\$%&\'\*\+\-\/=\?\^_`\{\}\|~]';
-        self::$_grammar['atom'] = '(?:'.self::$_grammar['CFWS'].'?'.
-                self::$_grammar['atext'].'+'.self::$_grammar['CFWS'].'?)';
-        self::$_grammar['dot-atom-text'] = '(?:'.self::$_grammar['atext'].'+'.
-                '(\.'.self::$_grammar['atext'].'+)*)';
-        self::$_grammar['dot-atom'] = '(?:'.self::$_grammar['CFWS'].'?'.
-                self::$_grammar['dot-atom-text'].'+'.self::$_grammar['CFWS'].'?)';
-        self::$_grammar['word'] = '(?:'.self::$_grammar['atom'].'|'.
-                self::$_grammar['quoted-string'].')';
-        self::$_grammar['phrase'] = '(?:'.self::$_grammar['word'].'+?)';
-        self::$_grammar['no-fold-quote'] = '(?:"(?:'.self::$_grammar['qtext'].
-                '|'.self::$_grammar['quoted-pair'].')*")';
-        self::$_grammar['dtext'] = '(?:'.self::$_grammar['NO-WS-CTL'].
-                '|[\x21-\x5A\x5E-\x7E])';
-        self::$_grammar['no-fold-literal'] = '(?:\[(?:'.self::$_grammar['dtext'].
-                '|'.self::$_grammar['quoted-pair'].')*\])';
-
-        // Message IDs
-        self::$_grammar['id-left'] = '(?:'.self::$_grammar['dot-atom-text'].'|'.
-                self::$_grammar['no-fold-quote'].')';
-        self::$_grammar['id-right'] = '(?:'.self::$_grammar['dot-atom-text'].'|'.
-                self::$_grammar['no-fold-literal'].')';
-
-        // Addresses, mailboxes and paths
-        self::$_grammar['local-part'] = '(?:'.self::$_grammar['dot-atom'].'|'.
-                self::$_grammar['quoted-string'].')';
-        self::$_grammar['dcontent'] = '(?:'.self::$_grammar['dtext'].'|'.
-                self::$_grammar['quoted-pair'].')';
-        self::$_grammar['domain-literal'] = '(?:'.self::$_grammar['CFWS'].'?\[('.
-                self::$_grammar['FWS'].'?'.self::$_grammar['dcontent'].')*?'.
-                self::$_grammar['FWS'].'?\]'.self::$_grammar['CFWS'].'?)';
-        self::$_grammar['domain'] = '(?:'.self::$_grammar['dot-atom'].'|'.
-                self::$_grammar['domain-literal'].')';
-        self::$_grammar['addr-spec'] = '(?:'.self::$_grammar['local-part'].'@'.
-                self::$_grammar['domain'].')';
-    }
-
-    /**
-     * Get the grammar defined for $name token.
-     *
-     * @param string $name exactly as written in the RFC
-     *
-     * @return string
-     */
-    public function getDefinition($name)
-    {
-        if (array_key_exists($name, self::$_grammar)) {
-            return self::$_grammar[$name];
-        }
-
-        throw new Swift_RfcComplianceException(
-            "No such grammar '".$name."' defined."
-        );
-    }
-
-    /**
-     * Returns the tokens defined in RFC 2822 (and some related RFCs).
-     *
-     * @return array
-     */
-    public function getGrammarDefinitions()
-    {
-        return self::$_grammar;
-    }
-
-    /**
-     * Returns the current special characters used in the syntax which need to be escaped.
-     *
-     * @return array
-     */
-    public function getSpecials()
-    {
-        return self::$_specials;
-    }
-
-    /**
-     * Escape special characters in a string (convert to quoted-pairs).
-     *
-     * @param string   $token
-     * @param string[] $include additional chars to escape
-     * @param string[] $exclude chars from escaping
-     *
-     * @return string
-     */
-    public function escapeSpecials($token, $include = array(), $exclude = array())
-    {
-        foreach (array_merge(array('\\'), array_diff(self::$_specials, $exclude), $include) as $char) {
-            $token = str_replace($char, '\\'.$char, $token);
-        }
-
-        return $token;
-    }
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php
index a8ddd2721..ca712f35a 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Header.php
@@ -85,7 +85,7 @@ interface Swift_Mime_Header
     public function getFieldBody();
 
     /**
-     * Get this Header rendered as a compliant string.
+     * Get this Header rendered as a compliant string, including trailing CRLF.
      *
      * @return string
      */
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
index 83a4f2f3b..21c8aaabf 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/Base64HeaderEncoder.php
@@ -41,7 +41,7 @@ class Swift_Mime_HeaderEncoder_Base64HeaderEncoder extends Swift_Encoder_Base64E
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0, $charset = 'utf-8')
     {
-        if (strtolower($charset) === 'iso-2022-jp') {
+        if ('iso-2022-jp' === strtolower($charset ?? '')) {
             $old = mb_internal_encoding();
             mb_internal_encoding('utf-8');
             $newstring = mb_encode_mimeheader($string, $charset, $this->getName(), "\r\n");
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
index 510dd6637..378c48050 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderEncoder/QpHeaderEncoder.php
@@ -29,9 +29,9 @@ class Swift_Mime_HeaderEncoder_QpHeaderEncoder extends Swift_Encoder_QpEncoder i
     {
         foreach (array_merge(
             range(0x61, 0x7A), range(0x41, 0x5A),
-            range(0x30, 0x39), array(0x20, 0x21, 0x2A, 0x2B, 0x2D, 0x2F)
+            range(0x30, 0x39), [0x20, 0x21, 0x2A, 0x2B, 0x2D, 0x2F]
         ) as $byte) {
-            $this->_safeMap[$byte] = chr($byte);
+            $this->safeMap[$byte] = \chr($byte);
         }
     }
 
@@ -58,7 +58,7 @@ class Swift_Mime_HeaderEncoder_QpHeaderEncoder extends Swift_Encoder_QpEncoder i
      */
     public function encodeString($string, $firstLineOffset = 0, $maxLineLength = 0)
     {
-        return str_replace(array(' ', '=20', "=\r\n"), array('_', '_', "\r\n"),
+        return str_replace([' ', '=20', "=\r\n"], ['_', '_', "\r\n"],
             parent::encodeString($string, $firstLineOffset, $maxLineLength)
         );
     }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php
deleted file mode 100644
index c65f26d72..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderFactory.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Creates MIME headers.
- *
- * @author Chris Corbyn
- */
-interface Swift_Mime_HeaderFactory extends Swift_Mime_CharsetObserver
-{
-    /**
-     * Create a new Mailbox Header with a list of $addresses.
-     *
-     * @param string       $name
-     * @param array|string $addresses
-     *
-     * @return Swift_Mime_Header
-     */
-    public function createMailboxHeader($name, $addresses = null);
-
-    /**
-     * Create a new Date header using $timestamp (UNIX time).
-     *
-     * @param string $name
-     * @param int    $timestamp
-     *
-     * @return Swift_Mime_Header
-     */
-    public function createDateHeader($name, $timestamp = null);
-
-    /**
-     * Create a new basic text header with $name and $value.
-     *
-     * @param string $name
-     * @param string $value
-     *
-     * @return Swift_Mime_Header
-     */
-    public function createTextHeader($name, $value = null);
-
-    /**
-     * Create a new ParameterizedHeader with $name, $value and $params.
-     *
-     * @param string $name
-     * @param string $value
-     * @param array  $params
-     *
-     * @return Swift_Mime_ParameterizedHeader
-     */
-    public function createParameterizedHeader($name, $value = null, $params = array());
-
-    /**
-     * Create a new ID header for Message-ID or Content-ID.
-     *
-     * @param string       $name
-     * @param string|array $ids
-     *
-     * @return Swift_Mime_Header
-     */
-    public function createIdHeader($name, $ids = null);
-
-    /**
-     * Create a new Path header with an address (path) in it.
-     *
-     * @param string $name
-     * @param string $path
-     *
-     * @return Swift_Mime_Header
-     */
-    public function createPathHeader($name, $path = null);
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php
deleted file mode 100644
index 1768709e9..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/HeaderSet.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A collection of MIME headers.
- *
- * @author Chris Corbyn
- */
-interface Swift_Mime_HeaderSet extends Swift_Mime_CharsetObserver
-{
-    /**
-     * Add a new Mailbox Header with a list of $addresses.
-     *
-     * @param string       $name
-     * @param array|string $addresses
-     */
-    public function addMailboxHeader($name, $addresses = null);
-
-    /**
-     * Add a new Date header using $timestamp (UNIX time).
-     *
-     * @param string $name
-     * @param int    $timestamp
-     */
-    public function addDateHeader($name, $timestamp = null);
-
-    /**
-     * Add a new basic text header with $name and $value.
-     *
-     * @param string $name
-     * @param string $value
-     */
-    public function addTextHeader($name, $value = null);
-
-    /**
-     * Add a new ParameterizedHeader with $name, $value and $params.
-     *
-     * @param string $name
-     * @param string $value
-     * @param array  $params
-     */
-    public function addParameterizedHeader($name, $value = null, $params = array());
-
-    /**
-     * Add a new ID header for Message-ID or Content-ID.
-     *
-     * @param string       $name
-     * @param string|array $ids
-     */
-    public function addIdHeader($name, $ids = null);
-
-    /**
-     * Add a new Path header with an address (path) in it.
-     *
-     * @param string $name
-     * @param string $path
-     */
-    public function addPathHeader($name, $path = null);
-
-    /**
-     * Returns true if at least one header with the given $name exists.
-     *
-     * If multiple headers match, the actual one may be specified by $index.
-     *
-     * @param string $name
-     * @param int    $index
-     *
-     * @return bool
-     */
-    public function has($name, $index = 0);
-
-    /**
-     * Set a header in the HeaderSet.
-     *
-     * The header may be a previously fetched header via {@link get()} or it may
-     * be one that has been created separately.
-     *
-     * If $index is specified, the header will be inserted into the set at this
-     * offset.
-     *
-     * @param Swift_Mime_Header $header
-     * @param int               $index
-     */
-    public function set(Swift_Mime_Header $header, $index = 0);
-
-    /**
-     * Get the header with the given $name.
-     * If multiple headers match, the actual one may be specified by $index.
-     * Returns NULL if none present.
-     *
-     * @param string $name
-     * @param int    $index
-     *
-     * @return Swift_Mime_Header
-     */
-    public function get($name, $index = 0);
-
-    /**
-     * Get all headers with the given $name.
-     *
-     * @param string $name
-     *
-     * @return array
-     */
-    public function getAll($name = null);
-
-    /**
-     * Return the name of all Headers.
-     *
-     * @return array
-     */
-    public function listAll();
-
-    /**
-     * Remove the header with the given $name if it's set.
-     *
-     * If multiple headers match, the actual one may be specified by $index.
-     *
-     * @param string $name
-     * @param int    $index
-     */
-    public function remove($name, $index = 0);
-
-    /**
-     * Remove all headers with the given $name.
-     *
-     * @param string $name
-     */
-    public function removeAll($name);
-
-    /**
-     * Create a new instance of this HeaderSet.
-     *
-     * @return self
-     */
-    public function newInstance();
-
-    /**
-     * Define a list of Header names as an array in the correct order.
-     *
-     * These Headers will be output in the given order where present.
-     *
-     * @param array $sequence
-     */
-    public function defineOrdering(array $sequence);
-
-    /**
-     * Set a list of header names which must always be displayed when set.
-     *
-     * Usually headers without a field value won't be output unless set here.
-     *
-     * @param array $names
-     */
-    public function setAlwaysDisplayed(array $names);
-
-    /**
-     * Returns a string with a representation of all headers.
-     *
-     * @return string
-     */
-    public function toString();
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
index 3a6d7b39e..25740d115 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/AbstractHeader.php
@@ -11,68 +11,53 @@
 /**
  * An abstract base MIME Header.
  *
- * @author Chris Corbyn
+ * @author     Chris Corbyn
  */
 abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
 {
+    const PHRASE_PATTERN = '(?:(?:(?:(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?[a-zA-Z0-9!#\$%&\'\*\+\-\/=\?\^_`\{\}\|~]+(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?)|(?:(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?"((?:(?:[ \t]*(?:\r\n))?[ \t])?(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21\x23-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])))*(?:(?:[ \t]*(?:\r\n))?[ \t])?"(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))*(?:(?:(?:(?:[ \t]*(?:\r\n))?[ \t])?(\((?:(?:(?:[ \t]*(?:\r\n))?[ \t])|(?:(?:[\x01-\x08\x0B\x0C\x0E-\x19\x7F]|[\x21-\x27\x2A-\x5B\x5D-\x7E])|(?:\\[\x00-\x08\x0B\x0C\x0E-\x7F])|(?1)))*(?:(?:[ \t]*(?:\r\n))?[ \t])?\)))|(?:(?:[ \t]*(?:\r\n))?[ \t])))?))+?)';
+
     /**
      * The name of this Header.
      *
      * @var string
      */
-    private $_name;
-
-    /**
-     * The Grammar used for this Header.
-     *
-     * @var Swift_Mime_Grammar
-     */
-    private $_grammar;
+    private $name;
 
     /**
      * The Encoder used to encode this Header.
      *
      * @var Swift_Encoder
      */
-    private $_encoder;
+    private $encoder;
 
     /**
      * The maximum length of a line in the header.
      *
      * @var int
      */
-    private $_lineLength = 78;
+    private $lineLength = 78;
 
     /**
      * The language used in this Header.
      *
      * @var string
      */
-    private $_lang;
+    private $lang;
 
     /**
      * The character set of the text in this Header.
      *
      * @var string
      */
-    private $_charset = 'utf-8';
+    private $charset = 'utf-8';
 
     /**
      * The value of this Header, cached.
      *
      * @var string
      */
-    private $_cachedValue = null;
-
-    /**
-     * Creates a new Header.
-     *
-     * @param Swift_Mime_Grammar $grammar
-     */
-    public function __construct(Swift_Mime_Grammar $grammar)
-    {
-        $this->setGrammar($grammar);
-    }
+    private $cachedValue = null;
 
     /**
      * Set the character set used in this Header.
@@ -81,10 +66,10 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     public function setCharset($charset)
     {
-        $this->clearCachedValueIf($charset != $this->_charset);
-        $this->_charset = $charset;
-        if (isset($this->_encoder)) {
-            $this->_encoder->charsetChanged($charset);
+        $this->clearCachedValueIf($charset != $this->charset);
+        $this->charset = $charset;
+        if (isset($this->encoder)) {
+            $this->encoder->charsetChanged($charset);
         }
     }
 
@@ -95,7 +80,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     public function getCharset()
     {
-        return $this->_charset;
+        return $this->charset;
     }
 
     /**
@@ -108,8 +93,8 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     public function setLanguage($lang)
     {
-        $this->clearCachedValueIf($this->_lang != $lang);
-        $this->_lang = $lang;
+        $this->clearCachedValueIf($this->lang != $lang);
+        $this->lang = $lang;
     }
 
     /**
@@ -119,17 +104,15 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     public function getLanguage()
     {
-        return $this->_lang;
+        return $this->lang;
     }
 
     /**
      * Set the encoder used for encoding the header.
-     *
-     * @param Swift_Mime_HeaderEncoder $encoder
      */
     public function setEncoder(Swift_Mime_HeaderEncoder $encoder)
     {
-        $this->_encoder = $encoder;
+        $this->encoder = $encoder;
         $this->setCachedValue(null);
     }
 
@@ -140,28 +123,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     public function getEncoder()
     {
-        return $this->_encoder;
-    }
-
-    /**
-     * Set the grammar used for the header.
-     *
-     * @param Swift_Mime_Grammar $grammar
-     */
-    public function setGrammar(Swift_Mime_Grammar $grammar)
-    {
-        $this->_grammar = $grammar;
-        $this->setCachedValue(null);
-    }
-
-    /**
-     * Get the grammar used for this Header.
-     *
-     * @return Swift_Mime_Grammar
-     */
-    public function getGrammar()
-    {
-        return $this->_grammar;
+        return $this->encoder;
     }
 
     /**
@@ -171,7 +133,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     public function getFieldName()
     {
-        return $this->_name;
+        return $this->name;
     }
 
     /**
@@ -181,8 +143,8 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     public function setMaxLineLength($lineLength)
     {
-        $this->clearCachedValueIf($this->_lineLength != $lineLength);
-        $this->_lineLength = $lineLength;
+        $this->clearCachedValueIf($this->lineLength != $lineLength);
+        $this->lineLength = $lineLength;
     }
 
     /**
@@ -192,19 +154,19 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     public function getMaxLineLength()
     {
-        return $this->_lineLength;
+        return $this->lineLength;
     }
 
     /**
      * Get this Header rendered as a RFC 2822 compliant string.
      *
-     * @throws Swift_RfcComplianceException
-     *
      * @return string
+     *
+     * @throws Swift_RfcComplianceException
      */
     public function toString()
     {
-        return $this->_tokensToString($this->toTokens());
+        return $this->tokensToString($this->toTokens());
     }
 
     /**
@@ -226,17 +188,15 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     protected function setFieldName($name)
     {
-        $this->_name = $name;
+        $this->name = $name;
     }
 
     /**
      * Produces a compliant, formatted RFC 2822 'phrase' based on the string given.
      *
-     * @param Swift_Mime_Header        $header
-     * @param string                   $string  as displayed
-     * @param string                   $charset of the text
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param bool                     $shorten the first line to make remove for header name
+     * @param string $string  as displayed
+     * @param string $charset of the text
+     * @param bool   $shorten the first line to make remove for header name
      *
      * @return string
      */
@@ -245,19 +205,18 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
         // Treat token as exactly what was given
         $phraseStr = $string;
         // If it's not valid
-        if (!preg_match('/^'.$this->getGrammar()->getDefinition('phrase').'$/D', $phraseStr)) {
+
+        if (!preg_match('/^'.self::PHRASE_PATTERN.'$/D', $phraseStr)) {
             // .. but it is just ascii text, try escaping some characters
             // and make it a quoted-string
-            if (preg_match('/^'.$this->getGrammar()->getDefinition('text').'*$/D', $phraseStr)) {
-                $phraseStr = $this->getGrammar()->escapeSpecials(
-                    $phraseStr, array('"'), $this->getGrammar()->getSpecials()
-                    );
+            if (preg_match('/^[\x00-\x08\x0B\x0C\x0E-\x7F]*$/D', $phraseStr)) {
+                $phraseStr = $this->escapeSpecials($phraseStr, ['"']);
                 $phraseStr = '"'.$phraseStr.'"';
             } else {
                 // ... otherwise it needs encoding
                 // Determine space remaining on line if first line
                 if ($shorten) {
-                    $usedLength = strlen($header->getFieldName().': ');
+                    $usedLength = \strlen($header->getFieldName().': ');
                 } else {
                     $usedLength = 0;
                 }
@@ -268,12 +227,28 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
         return $phraseStr;
     }
 
+    /**
+     * Escape special characters in a string (convert to quoted-pairs).
+     *
+     * @param string   $token
+     * @param string[] $include additional chars to escape
+     *
+     * @return string
+     */
+    private function escapeSpecials($token, $include = [])
+    {
+        foreach (array_merge(['\\'], $include) as $char) {
+            $token = str_replace($char, '\\'.$char, $token);
+        }
+
+        return $token;
+    }
+
     /**
      * Encode needed word tokens within a string of input.
      *
-     * @param Swift_Mime_Header $header
-     * @param string            $input
-     * @param string            $usedLength optional
+     * @param string $input
+     * @param string $usedLength optional
      *
      * @return string
      */
@@ -296,7 +271,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
                 }
 
                 if (-1 == $usedLength) {
-                    $usedLength = strlen($header->getFieldName().': ') + strlen($value);
+                    $usedLength = \strlen($header->getFieldName().': ') + \strlen($value);
                 }
                 $value .= $this->getTokenAsEncodedWord($token, $usedLength);
 
@@ -330,22 +305,22 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     protected function getEncodableWordTokens($string)
     {
-        $tokens = array();
+        $tokens = [];
 
         $encodedToken = '';
         // Split at all whitespace boundaries
-        foreach (preg_split('~(?=[\t ])~', $string) as $token) {
+        foreach (preg_split('~(?=[\t ])~', $string ?? '') as $token) {
             if ($this->tokenNeedsEncoding($token)) {
                 $encodedToken .= $token;
             } else {
-                if (strlen($encodedToken) > 0) {
+                if (\strlen($encodedToken) > 0) {
                     $tokens[] = $encodedToken;
                     $encodedToken = '';
                 }
                 $tokens[] = $token;
             }
         }
-        if (strlen($encodedToken)) {
+        if (\strlen($encodedToken)) {
             $tokens[] = $encodedToken;
         }
 
@@ -363,12 +338,12 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
     protected function getTokenAsEncodedWord($token, $firstLineOffset = 0)
     {
         // Adjust $firstLineOffset to account for space needed for syntax
-        $charsetDecl = $this->_charset;
-        if (isset($this->_lang)) {
-            $charsetDecl .= '*'.$this->_lang;
+        $charsetDecl = $this->charset;
+        if (isset($this->lang)) {
+            $charsetDecl .= '*'.$this->lang;
         }
-        $encodingWrapperLength = strlen(
-            '=?'.$charsetDecl.'?'.$this->_encoder->getName().'??='
+        $encodingWrapperLength = \strlen(
+            '=?'.$charsetDecl.'?'.$this->encoder->getName().'??='
             );
 
         if ($firstLineOffset >= 75) {
@@ -377,16 +352,16 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
         }
 
         $encodedTextLines = explode("\r\n",
-            $this->_encoder->encodeString(
-                $token, $firstLineOffset, 75 - $encodingWrapperLength, $this->_charset
-                )
+            $this->encoder->encodeString(
+                $token, $firstLineOffset, 75 - $encodingWrapperLength, $this->charset
+            ) ?? ''
         );
 
-        if (strtolower($this->_charset) !== 'iso-2022-jp') {
+        if ('iso-2022-jp' !== strtolower($this->charset ?? '')) {
             // special encoding for iso-2022-jp using mb_encode_mimeheader
             foreach ($encodedTextLines as $lineNum => $line) {
                 $encodedTextLines[$lineNum] = '=?'.$charsetDecl.
-                    '?'.$this->_encoder->getName().
+                    '?'.$this->encoder->getName().
                     '?'.$line.'?=';
             }
         }
@@ -403,7 +378,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     protected function generateTokenLines($token)
     {
-        return preg_split('~(\r\n)~', $token, -1, PREG_SPLIT_DELIM_CAPTURE);
+        return preg_split('~(\r\n)~', $token ?? '', -1, PREG_SPLIT_DELIM_CAPTURE);
     }
 
     /**
@@ -413,7 +388,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     protected function setCachedValue($value)
     {
-        $this->_cachedValue = $value;
+        $this->cachedValue = $value;
     }
 
     /**
@@ -423,7 +398,7 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      */
     protected function getCachedValue()
     {
-        return $this->_cachedValue;
+        return $this->cachedValue;
     }
 
     /**
@@ -451,10 +426,10 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
             $string = $this->getFieldBody();
         }
 
-        $tokens = array();
+        $tokens = [];
 
         // Generate atoms; split at all invisible boundaries followed by WSP
-        foreach (preg_split('~(?=[ \t])~', $string) as $token) {
+        foreach (preg_split('~(?=[ \t])~', $string ?? '') as $token) {
             $newTokens = $this->generateTokenLines($token);
             foreach ($newTokens as $newToken) {
                 $tokens[] = $newToken;
@@ -472,19 +447,19 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
      *
      * @return string
      */
-    private function _tokensToString(array $tokens)
+    private function tokensToString(array $tokens)
     {
         $lineCount = 0;
-        $headerLines = array();
-        $headerLines[] = $this->_name.': ';
+        $headerLines = [];
+        $headerLines[] = $this->name.': ';
         $currentLine = &$headerLines[$lineCount++];
 
         // Build all tokens back into compliant header
         foreach ($tokens as $i => $token) {
             // Line longer than specified maximum or token was just a new line
             if (("\r\n" == $token) ||
-                ($i > 0 && strlen($currentLine.$token) > $this->_lineLength)
-                && 0 < strlen($currentLine)) {
+                ($i > 0 && \strlen($currentLine.$token) > $this->lineLength)
+                && 0 < \strlen($currentLine)) {
                 $headerLines[] = '';
                 $currentLine = &$headerLines[$lineCount++];
             }
@@ -498,4 +473,14 @@ abstract class Swift_Mime_Headers_AbstractHeader implements Swift_Mime_Header
         // Implode with FWS (RFC 2822, 2.2.3)
         return implode("\r\n", $headerLines)."\r\n";
     }
+
+    /**
+     * Make a deep copy of object.
+     */
+    public function __clone()
+    {
+        if ($this->encoder) {
+            $this->encoder = clone $this->encoder;
+        }
+    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
index 4075cbfa1..efe1dad66 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/DateHeader.php
@@ -16,29 +16,20 @@
 class Swift_Mime_Headers_DateHeader extends Swift_Mime_Headers_AbstractHeader
 {
     /**
-     * The UNIX timestamp value of this Header.
+     * Date-time value of this Header.
      *
-     * @var int
+     * @var DateTimeImmutable
      */
-    private $_timestamp;
+    private $dateTime;
 
     /**
-     * Creates a new DateHeader with $name and $timestamp.
+     * Creates a new DateHeader with $name.
      *
-     * Example:
-     * <code>
-     * <?php
-     * $header = new Swift_Mime_Headers_DateHeader('Date', time());
-     * ?>
-     * </code>
-     *
-     * @param string             $name    of Header
-     * @param Swift_Mime_Grammar $grammar
+     * @param string $name of Header
      */
-    public function __construct($name, Swift_Mime_Grammar $grammar)
+    public function __construct($name)
     {
         $this->setFieldName($name);
-        parent::__construct($grammar);
     }
 
     /**
@@ -57,49 +48,46 @@ class Swift_Mime_Headers_DateHeader extends Swift_Mime_Headers_AbstractHeader
     /**
      * Set the model for the field body.
      *
-     * This method takes a UNIX timestamp.
-     *
-     * @param int $model
+     * @param DateTimeInterface $model
      */
     public function setFieldBodyModel($model)
     {
-        $this->setTimestamp($model);
+        $this->setDateTime($model);
     }
 
     /**
      * Get the model for the field body.
      *
-     * This method returns a UNIX timestamp.
-     *
-     * @return mixed
+     * @return DateTimeImmutable
      */
     public function getFieldBodyModel()
     {
-        return $this->getTimestamp();
+        return $this->getDateTime();
     }
 
     /**
-     * Get the UNIX timestamp of the Date in this Header.
+     * Get the date-time representing the Date in this Header.
      *
-     * @return int
+     * @return DateTimeImmutable
      */
-    public function getTimestamp()
+    public function getDateTime()
     {
-        return $this->_timestamp;
+        return $this->dateTime;
     }
 
     /**
-     * Set the UNIX timestamp of the Date in this Header.
+     * Set the date-time of the Date in this Header.
      *
-     * @param int $timestamp
+     * If a DateTime instance is provided, it is converted to DateTimeImmutable.
      */
-    public function setTimestamp($timestamp)
+    public function setDateTime(DateTimeInterface $dateTime)
     {
-        if (null !== $timestamp) {
-            $timestamp = (int) $timestamp;
+        $this->clearCachedValueIf($this->getCachedValue() != $dateTime->format(DateTime::RFC2822));
+        if ($dateTime instanceof DateTime) {
+            $immutable = new DateTimeImmutable('@'.$dateTime->getTimestamp());
+            $dateTime = $immutable->setTimezone($dateTime->getTimezone());
         }
-        $this->clearCachedValueIf($this->_timestamp != $timestamp);
-        $this->_timestamp = $timestamp;
+        $this->dateTime = $dateTime;
     }
 
     /**
@@ -115,8 +103,8 @@ class Swift_Mime_Headers_DateHeader extends Swift_Mime_Headers_AbstractHeader
     public function getFieldBody()
     {
         if (!$this->getCachedValue()) {
-            if (isset($this->_timestamp)) {
-                $this->setCachedValue(date('r', $this->_timestamp));
+            if (isset($this->dateTime)) {
+                $this->setCachedValue($this->dateTime->format(DateTime::RFC2822));
             }
         }
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
index b114506b4..4fcdff418 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/IdentificationHeader.php
@@ -8,6 +8,10 @@
  * file that was distributed with this source code.
  */
 
+use Egulias\EmailValidator\EmailValidator;
+use Egulias\EmailValidator\Validation\MessageIDValidation;
+use Egulias\EmailValidator\Validation\RFCValidation;
+
 /**
  * An ID MIME Header for something like Message-ID or Content-ID.
  *
@@ -22,18 +26,27 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      *
      * @var string[]
      */
-    private $_ids = array();
+    private $ids = [];
+
+    /**
+     * The strict EmailValidator.
+     *
+     * @var EmailValidator
+     */
+    private $emailValidator;
+
+    private $addressEncoder;
 
     /**
      * Creates a new IdentificationHeader with the given $name and $id.
      *
-     * @param string             $name
-     * @param Swift_Mime_Grammar $grammar
+     * @param string $name
      */
-    public function __construct($name, Swift_Mime_Grammar $grammar)
+    public function __construct($name, EmailValidator $emailValidator, Swift_AddressEncoder $addressEncoder = null)
     {
         $this->setFieldName($name);
-        parent::__construct($grammar);
+        $this->emailValidator = $emailValidator;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
     }
 
     /**
@@ -84,7 +97,7 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      */
     public function setId($id)
     {
-        $this->setIds(is_array($id) ? $id : array($id));
+        $this->setIds(\is_array($id) ? $id : [$id]);
     }
 
     /**
@@ -96,8 +109,8 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      */
     public function getId()
     {
-        if (count($this->_ids) > 0) {
-            return $this->_ids[0];
+        if (\count($this->ids) > 0) {
+            return $this->ids[0];
         }
     }
 
@@ -110,15 +123,15 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      */
     public function setIds(array $ids)
     {
-        $actualIds = array();
+        $actualIds = [];
 
         foreach ($ids as $id) {
-            $this->_assertValidId($id);
+            $this->assertValidId($id);
             $actualIds[] = $id;
         }
 
-        $this->clearCachedValueIf($this->_ids != $actualIds);
-        $this->_ids = $actualIds;
+        $this->clearCachedValueIf($this->ids != $actualIds);
+        $this->ids = $actualIds;
     }
 
     /**
@@ -128,7 +141,7 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      */
     public function getIds()
     {
-        return $this->_ids;
+        return $this->ids;
     }
 
     /**
@@ -146,10 +159,10 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
     public function getFieldBody()
     {
         if (!$this->getCachedValue()) {
-            $angleAddrs = array();
+            $angleAddrs = [];
 
-            foreach ($this->_ids as $id) {
-                $angleAddrs[] = '<'.$id.'>';
+            foreach ($this->ids as $id) {
+                $angleAddrs[] = '<'.$this->addressEncoder->encodeString($id).'>';
             }
 
             $this->setCachedValue(implode(' ', $angleAddrs));
@@ -165,16 +178,12 @@ class Swift_Mime_Headers_IdentificationHeader extends Swift_Mime_Headers_Abstrac
      *
      * @throws Swift_RfcComplianceException
      */
-    private function _assertValidId($id)
+    private function assertValidId($id)
     {
-        if (!preg_match(
-            '/^'.$this->getGrammar()->getDefinition('id-left').'@'.
-            $this->getGrammar()->getDefinition('id-right').'$/D',
-            $id
-            )) {
-            throw new Swift_RfcComplianceException(
-                'Invalid ID given <'.$id.'>'
-                );
+        $emailValidation = class_exists(MessageIDValidation::class) ? new MessageIDValidation() : new RFCValidation();
+
+        if (!$this->emailValidator->isValid($id, $emailValidation)) {
+            throw new Swift_RfcComplianceException('Invalid ID given <'.$id.'>');
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
index e4567fc80..ddd5e8cff 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/MailboxHeader.php
@@ -8,6 +8,9 @@
  * file that was distributed with this source code.
  */
 
+use Egulias\EmailValidator\EmailValidator;
+use Egulias\EmailValidator\Validation\RFCValidation;
+
 /**
  * A Mailbox Address MIME Header for something like From or Sender.
  *
@@ -20,20 +23,28 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      *
      * @var string[]
      */
-    private $_mailboxes = array();
+    private $mailboxes = [];
+
+    /**
+     * The strict EmailValidator.
+     *
+     * @var EmailValidator
+     */
+    private $emailValidator;
+
+    private $addressEncoder;
 
     /**
      * Creates a new MailboxHeader with $name.
      *
-     * @param string                   $name    of Header
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param Swift_Mime_Grammar       $grammar
+     * @param string $name of Header
      */
-    public function __construct($name, Swift_Mime_HeaderEncoder $encoder, Swift_Mime_Grammar $grammar)
+    public function __construct($name, Swift_Mime_HeaderEncoder $encoder, EmailValidator $emailValidator, Swift_AddressEncoder $addressEncoder = null)
     {
         $this->setFieldName($name);
         $this->setEncoder($encoder);
-        parent::__construct($grammar);
+        $this->emailValidator = $emailValidator;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
     }
 
     /**
@@ -103,7 +114,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      */
     public function setNameAddresses($mailboxes)
     {
-        $this->_mailboxes = $this->normalizeMailboxes((array) $mailboxes);
+        $this->mailboxes = $this->normalizeMailboxes((array) $mailboxes);
         $this->setCachedValue(null); //Clear any cached value
     }
 
@@ -134,7 +145,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      */
     public function getNameAddressStrings()
     {
-        return $this->_createNameAddressStrings($this->getNameAddresses());
+        return $this->createNameAddressStrings($this->getNameAddresses());
     }
 
     /**
@@ -163,7 +174,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      */
     public function getNameAddresses()
     {
-        return $this->_mailboxes;
+        return $this->mailboxes;
     }
 
     /**
@@ -200,7 +211,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      */
     public function getAddresses()
     {
-        return array_keys($this->_mailboxes);
+        return array_keys($this->mailboxes);
     }
 
     /**
@@ -212,7 +223,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
     {
         $this->setCachedValue(null);
         foreach ((array) $addresses as $address) {
-            unset($this->_mailboxes[$address]);
+            unset($this->mailboxes[$address]);
         }
     }
 
@@ -232,7 +243,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
     {
         // Compute the string value of the header only if needed
         if (null === $this->getCachedValue()) {
-            $this->setCachedValue($this->createMailboxListString($this->_mailboxes));
+            $this->setCachedValue($this->createMailboxListString($this->mailboxes));
         }
 
         return $this->getCachedValue();
@@ -247,10 +258,10 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      */
     protected function normalizeMailboxes(array $mailboxes)
     {
-        $actualMailboxes = array();
+        $actualMailboxes = [];
 
         foreach ($mailboxes as $key => $value) {
-            if (is_string($key)) {
+            if (\is_string($key)) {
                 //key is email addr
                 $address = $key;
                 $name = $value;
@@ -258,7 +269,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
                 $address = $value;
                 $name = null;
             }
-            $this->_assertValidAddress($address);
+            $this->assertValidAddress($address);
             $actualMailboxes[$address] = $name;
         }
 
@@ -289,7 +300,7 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      */
     protected function createMailboxListString(array $mailboxes)
     {
-        return implode(', ', $this->_createNameAddressStrings($mailboxes));
+        return implode(', ', $this->createNameAddressStrings($mailboxes));
     }
 
     /**
@@ -315,12 +326,12 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      *
      * @return string[]
      */
-    private function _createNameAddressStrings(array $mailboxes)
+    private function createNameAddressStrings(array $mailboxes)
     {
-        $strings = array();
+        $strings = [];
 
         foreach ($mailboxes as $email => $name) {
-            $mailboxStr = $email;
+            $mailboxStr = $this->addressEncoder->encodeString($email);
             if (null !== $name) {
                 $nameStr = $this->createDisplayNameString($name, empty($strings));
                 $mailboxStr = $nameStr.' <'.$mailboxStr.'>';
@@ -336,16 +347,12 @@ class Swift_Mime_Headers_MailboxHeader extends Swift_Mime_Headers_AbstractHeader
      *
      * @param string $address
      *
-     * @throws Swift_RfcComplianceException If invalid.
+     * @throws Swift_RfcComplianceException if invalid
      */
-    private function _assertValidAddress($address)
+    private function assertValidAddress($address)
     {
-        if (!preg_match('/^'.$this->getGrammar()->getDefinition('addr-spec').'$/D',
-            $address)) {
-            throw new Swift_RfcComplianceException(
-                'Address in mailbox given ['.$address.
-                '] does not comply with RFC 2822, 3.6.2.'
-                );
+        if (!$this->emailValidator->isValid($address, new RFCValidation())) {
+            throw new Swift_RfcComplianceException('Address in mailbox given ['.$address.'] does not comply with RFC 2822, 3.6.2.');
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
index d74955007..fafb5bae2 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/OpenDKIMHeader.php
@@ -12,6 +12,8 @@
  * An OpenDKIM Specific Header using only raw header datas without encoding.
  *
  * @author De Cock Xavier <xdecock@gmail.com>
+ *
+ * @deprecated since SwiftMailer 6.1.0; use Swift_Signers_DKIMSigner instead.
  */
 class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
 {
@@ -20,21 +22,21 @@ class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
      *
      * @var string
      */
-    private $_value;
+    private $value;
 
     /**
      * The name of this Header.
      *
      * @var string
      */
-    private $_fieldName;
+    private $fieldName;
 
     /**
      * @param string $name
      */
     public function __construct($name)
     {
-        $this->_fieldName = $name;
+        $this->fieldName = $name;
     }
 
     /**
@@ -81,7 +83,7 @@ class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
      */
     public function getValue()
     {
-        return $this->_value;
+        return $this->value;
     }
 
     /**
@@ -91,7 +93,7 @@ class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
      */
     public function setValue($value)
     {
-        $this->_value = $value;
+        $this->value = $value;
     }
 
     /**
@@ -101,7 +103,7 @@ class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
      */
     public function getFieldBody()
     {
-        return $this->_value;
+        return $this->value;
     }
 
     /**
@@ -111,7 +113,7 @@ class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
      */
     public function toString()
     {
-        return $this->_fieldName.': '.$this->_value;
+        return $this->fieldName.': '.$this->value."\r\n";
     }
 
     /**
@@ -121,7 +123,7 @@ class Swift_Mime_Headers_OpenDKIMHeader implements Swift_Mime_Header
      */
     public function getFieldName()
     {
-        return $this->_fieldName;
+        return $this->fieldName;
     }
 
     /**
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
index c1777d333..47c15e6c0 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/ParameterizedHeader.php
@@ -13,7 +13,7 @@
  *
  * @author Chris Corbyn
  */
-class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_UnstructuredHeader implements Swift_Mime_ParameterizedHeader
+class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_UnstructuredHeader
 {
     /**
      * RFC 2231's definition of a token.
@@ -27,27 +27,24 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
      *
      * @var Swift_Encoder
      */
-    private $_paramEncoder;
+    private $paramEncoder;
 
     /**
      * The parameters as an associative array.
      *
      * @var string[]
      */
-    private $_params = array();
+    private $params = [];
 
     /**
      * Creates a new ParameterizedHeader with $name.
      *
-     * @param string                   $name
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param Swift_Encoder            $paramEncoder, optional
-     * @param Swift_Mime_Grammar       $grammar
+     * @param string $name
      */
-    public function __construct($name, Swift_Mime_HeaderEncoder $encoder, Swift_Encoder $paramEncoder = null, Swift_Mime_Grammar $grammar)
+    public function __construct($name, Swift_Mime_HeaderEncoder $encoder, Swift_Encoder $paramEncoder = null)
     {
-        parent::__construct($name, $encoder, $grammar);
-        $this->_paramEncoder = $paramEncoder;
+        parent::__construct($name, $encoder);
+        $this->paramEncoder = $paramEncoder;
     }
 
     /**
@@ -71,8 +68,8 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
     public function setCharset($charset)
     {
         parent::setCharset($charset);
-        if (isset($this->_paramEncoder)) {
-            $this->_paramEncoder->charsetChanged($charset);
+        if (isset($this->paramEncoder)) {
+            $this->paramEncoder->charsetChanged($charset);
         }
     }
 
@@ -84,7 +81,7 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
      */
     public function setParameter($parameter, $value)
     {
-        $this->setParameters(array_merge($this->getParameters(), array($parameter => $value)));
+        $this->setParameters(array_merge($this->getParameters(), [$parameter => $value]));
     }
 
     /**
@@ -98,7 +95,7 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
     {
         $params = $this->getParameters();
 
-        return array_key_exists($parameter, $params) ? $params[$parameter] : null;
+        return $params[$parameter] ?? null;
     }
 
     /**
@@ -108,8 +105,8 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
      */
     public function setParameters(array $parameters)
     {
-        $this->clearCachedValueIf($this->_params != $parameters);
-        $this->_params = $parameters;
+        $this->clearCachedValueIf($this->params != $parameters);
+        $this->params = $parameters;
     }
 
     /**
@@ -119,7 +116,7 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
      */
     public function getParameters()
     {
-        return $this->_params;
+        return $this->params;
     }
 
     /**
@@ -130,10 +127,10 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
     public function getFieldBody() //TODO: Check caching here
     {
         $body = parent::getFieldBody();
-        foreach ($this->_params as $name => $value) {
+        foreach ($this->params as $name => $value) {
             if (null !== $value) {
                 // Add the parameter
-                $body .= '; '.$this->_createParameter($name, $value);
+                $body .= '; '.$this->createParameter($name, $value);
             }
         }
 
@@ -155,12 +152,12 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
         $tokens = parent::toTokens(parent::getFieldBody());
 
         // Try creating any parameters
-        foreach ($this->_params as $name => $value) {
+        foreach ($this->params as $name => $value) {
             if (null !== $value) {
                 // Add the semi-colon separator
-                $tokens[count($tokens) - 1] .= ';';
+                $tokens[\count($tokens) - 1] .= ';';
                 $tokens = array_merge($tokens, $this->generateTokenLines(
-                    ' '.$this->_createParameter($name, $value)
+                    ' '.$this->createParameter($name, $value)
                     ));
             }
         }
@@ -176,33 +173,33 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
      *
      * @return string
      */
-    private function _createParameter($name, $value)
+    private function createParameter($name, $value)
     {
         $origValue = $value;
 
         $encoded = false;
         // Allow room for parameter name, indices, "=" and DQUOTEs
-        $maxValueLength = $this->getMaxLineLength() - strlen($name.'=*N"";') - 1;
+        $maxValueLength = $this->getMaxLineLength() - \strlen($name.'=*N"";') - 1;
         $firstLineOffset = 0;
 
         // If it's not already a valid parameter value...
         if (!preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)) {
             // TODO: text, or something else??
             // ... and it's not ascii
-            if (!preg_match('/^'.$this->getGrammar()->getDefinition('text').'*$/D', $value)) {
+            if (!preg_match('/^[\x00-\x08\x0B\x0C\x0E-\x7F]*$/D', $value)) {
                 $encoded = true;
                 // Allow space for the indices, charset and language
-                $maxValueLength = $this->getMaxLineLength() - strlen($name.'*N*="";') - 1;
-                $firstLineOffset = strlen(
+                $maxValueLength = $this->getMaxLineLength() - \strlen($name.'*N*="";') - 1;
+                $firstLineOffset = \strlen(
                     $this->getCharset()."'".$this->getLanguage()."'"
                     );
             }
         }
 
         // Encode if we need to
-        if ($encoded || strlen($value) > $maxValueLength) {
-            if (isset($this->_paramEncoder)) {
-                $value = $this->_paramEncoder->encodeString(
+        if ($encoded || \strlen($value) > $maxValueLength) {
+            if (isset($this->paramEncoder)) {
+                $value = $this->paramEncoder->encodeString(
                     $origValue, $firstLineOffset, $maxValueLength, $this->getCharset()
                     );
             } else {
@@ -212,19 +209,19 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
             }
         }
 
-        $valueLines = isset($this->_paramEncoder) ? explode("\r\n", $value) : array($value);
+        $valueLines = isset($this->paramEncoder) ? explode("\r\n", $value) : [$value];
 
         // Need to add indices
-        if (count($valueLines) > 1) {
-            $paramLines = array();
+        if (\count($valueLines) > 1) {
+            $paramLines = [];
             foreach ($valueLines as $i => $line) {
                 $paramLines[] = $name.'*'.$i.
-                    $this->_getEndOfParameterValue($line, true, $i == 0);
+                    $this->getEndOfParameterValue($line, true, 0 == $i);
             }
 
             return implode(";\r\n ", $paramLines);
         } else {
-            return $name.$this->_getEndOfParameterValue(
+            return $name.$this->getEndOfParameterValue(
                 $valueLines[0], $encoded, true
                 );
         }
@@ -239,7 +236,7 @@ class Swift_Mime_Headers_ParameterizedHeader extends Swift_Mime_Headers_Unstruct
      *
      * @return string
      */
-    private function _getEndOfParameterValue($value, $encoded = false, $firstLine = false)
+    private function getEndOfParameterValue($value, $encoded = false, $firstLine = false)
     {
         if (!preg_match('/^'.self::TOKEN_REGEX.'$/D', $value)) {
             $value = '"'.$value.'"';
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
index 4a814b122..81b421ee7 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/PathHeader.php
@@ -8,6 +8,9 @@
  * file that was distributed with this source code.
  */
 
+use Egulias\EmailValidator\EmailValidator;
+use Egulias\EmailValidator\Validation\RFCValidation;
+
 /**
  * A Path Header in Swift Mailer, such a Return-Path.
  *
@@ -20,18 +23,27 @@ class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
      *
      * @var string
      */
-    private $_address;
+    private $address;
+
+    /**
+     * The strict EmailValidator.
+     *
+     * @var EmailValidator
+     */
+    private $emailValidator;
+
+    private $addressEncoder;
 
     /**
      * Creates a new PathHeader with the given $name.
      *
-     * @param string             $name
-     * @param Swift_Mime_Grammar $grammar
+     * @param string $name
      */
-    public function __construct($name, Swift_Mime_Grammar $grammar)
+    public function __construct($name, EmailValidator $emailValidator, Swift_AddressEncoder $addressEncoder = null)
     {
         $this->setFieldName($name);
-        parent::__construct($grammar);
+        $this->emailValidator = $emailValidator;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
     }
 
     /**
@@ -81,12 +93,12 @@ class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
     public function setAddress($address)
     {
         if (null === $address) {
-            $this->_address = null;
+            $this->address = null;
         } elseif ('' == $address) {
-            $this->_address = '';
+            $this->address = '';
         } else {
-            $this->_assertValidAddress($address);
-            $this->_address = $address;
+            $this->assertValidAddress($address);
+            $this->address = $address;
         }
         $this->setCachedValue(null);
     }
@@ -100,7 +112,7 @@ class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
      */
     public function getAddress()
     {
-        return $this->_address;
+        return $this->address;
     }
 
     /**
@@ -116,8 +128,9 @@ class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
     public function getFieldBody()
     {
         if (!$this->getCachedValue()) {
-            if (isset($this->_address)) {
-                $this->setCachedValue('<'.$this->_address.'>');
+            if (isset($this->address)) {
+                $address = $this->addressEncoder->encodeString($this->address);
+                $this->setCachedValue('<'.$address.'>');
             }
         }
 
@@ -131,13 +144,10 @@ class Swift_Mime_Headers_PathHeader extends Swift_Mime_Headers_AbstractHeader
      *
      * @throws Swift_RfcComplianceException If address is invalid
      */
-    private function _assertValidAddress($address)
+    private function assertValidAddress($address)
     {
-        if (!preg_match('/^'.$this->getGrammar()->getDefinition('addr-spec').'$/D',
-            $address)) {
-            throw new Swift_RfcComplianceException(
-                'Address set in PathHeader does not comply with addr-spec of RFC 2822.'
-                );
+        if (!$this->emailValidator->isValid($address, new RFCValidation())) {
+            throw new Swift_RfcComplianceException('Address set in PathHeader does not comply with addr-spec of RFC 2822.');
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
index 86177f14a..64f160dec 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Headers/UnstructuredHeader.php
@@ -20,20 +20,17 @@ class Swift_Mime_Headers_UnstructuredHeader extends Swift_Mime_Headers_AbstractH
      *
      * @var string
      */
-    private $_value;
+    private $value;
 
     /**
      * Creates a new SimpleHeader with $name.
      *
-     * @param string                   $name
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param Swift_Mime_Grammar       $grammar
+     * @param string $name
      */
-    public function __construct($name, Swift_Mime_HeaderEncoder $encoder, Swift_Mime_Grammar $grammar)
+    public function __construct($name, Swift_Mime_HeaderEncoder $encoder)
     {
         $this->setFieldName($name);
         $this->setEncoder($encoder);
-        parent::__construct($grammar);
     }
 
     /**
@@ -80,7 +77,7 @@ class Swift_Mime_Headers_UnstructuredHeader extends Swift_Mime_Headers_AbstractH
      */
     public function getValue()
     {
-        return $this->_value;
+        return $this->value;
     }
 
     /**
@@ -90,8 +87,8 @@ class Swift_Mime_Headers_UnstructuredHeader extends Swift_Mime_Headers_AbstractH
      */
     public function setValue($value)
     {
-        $this->clearCachedValueIf($this->_value != $value);
-        $this->_value = $value;
+        $this->clearCachedValueIf($this->value != $value);
+        $this->value = $value;
     }
 
     /**
@@ -103,7 +100,7 @@ class Swift_Mime_Headers_UnstructuredHeader extends Swift_Mime_Headers_AbstractH
     {
         if (!$this->getCachedValue()) {
             $this->setCachedValue(
-                $this->encodeWords($this, $this->_value)
+                $this->encodeWords($this, $this->value)
                 );
         }
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/IdGenerator.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/IdGenerator.php
new file mode 100644
index 000000000..3ce35f27c
--- /dev/null
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/IdGenerator.php
@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2004-2009 Chris Corbyn
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * Message ID generator.
+ */
+class Swift_Mime_IdGenerator implements Swift_IdGenerator
+{
+    private $idRight;
+
+    /**
+     * @param string $idRight
+     */
+    public function __construct($idRight)
+    {
+        $this->idRight = $idRight;
+    }
+
+    /**
+     * Returns the right-hand side of the "@" used in all generated IDs.
+     *
+     * @return string
+     */
+    public function getIdRight()
+    {
+        return $this->idRight;
+    }
+
+    /**
+     * Sets the right-hand side of the "@" to use in all generated IDs.
+     *
+     * @param string $idRight
+     */
+    public function setIdRight($idRight)
+    {
+        $this->idRight = $idRight;
+    }
+
+    /**
+     * @return string
+     */
+    public function generateId()
+    {
+        // 32 hex values for the left part
+        return bin2hex(random_bytes(16)).'@'.$this->idRight;
+    }
+}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Message.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Message.php
deleted file mode 100644
index 9b36d2162..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/Message.php
+++ /dev/null
@@ -1,223 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A Message (RFC 2822) object.
- *
- * @author Chris Corbyn
- */
-interface Swift_Mime_Message extends Swift_Mime_MimeEntity
-{
-    /**
-     * Generates a valid Message-ID and switches to it.
-     *
-     * @return string
-     */
-    public function generateId();
-
-    /**
-     * Set the subject of the message.
-     *
-     * @param string $subject
-     */
-    public function setSubject($subject);
-
-    /**
-     * Get the subject of the message.
-     *
-     * @return string
-     */
-    public function getSubject();
-
-    /**
-     * Set the origination date of the message as a UNIX timestamp.
-     *
-     * @param int $date
-     */
-    public function setDate($date);
-
-    /**
-     * Get the origination date of the message as a UNIX timestamp.
-     *
-     * @return int
-     */
-    public function getDate();
-
-    /**
-     * Set the return-path (bounce-detect) address.
-     *
-     * @param string $address
-     */
-    public function setReturnPath($address);
-
-    /**
-     * Get the return-path (bounce-detect) address.
-     *
-     * @return string
-     */
-    public function getReturnPath();
-
-    /**
-     * Set the sender of this message.
-     *
-     * If multiple addresses are present in the From field, this SHOULD be set.
-     *
-     * According to RFC 2822 it is a requirement when there are multiple From
-     * addresses, but Swift itself does not require it directly.
-     *
-     * An associative array (with one element!) can be used to provide a display-
-     * name: i.e. array('email@address' => 'Real Name').
-     *
-     * If the second parameter is provided and the first is a string, then $name
-     * is associated with the address.
-     *
-     * @param mixed  $address
-     * @param string $name    optional
-     */
-    public function setSender($address, $name = null);
-
-    /**
-     * Get the sender address for this message.
-     *
-     * This has a higher significance than the From address.
-     *
-     * @return string
-     */
-    public function getSender();
-
-    /**
-     * Set the From address of this message.
-     *
-     * It is permissible for multiple From addresses to be set using an array.
-     *
-     * If multiple From addresses are used, you SHOULD set the Sender address and
-     * according to RFC 2822, MUST set the sender address.
-     *
-     * An array can be used if display names are to be provided: i.e.
-     * array('email@address.com' => 'Real Name').
-     *
-     * If the second parameter is provided and the first is a string, then $name
-     * is associated with the address.
-     *
-     * @param mixed  $addresses
-     * @param string $name      optional
-     */
-    public function setFrom($addresses, $name = null);
-
-    /**
-     * Get the From address(es) of this message.
-     *
-     * This method always returns an associative array where the keys are the
-     * addresses.
-     *
-     * @return string[]
-     */
-    public function getFrom();
-
-    /**
-     * Set the Reply-To address(es).
-     *
-     * Any replies from the receiver will be sent to this address.
-     *
-     * It is permissible for multiple reply-to addresses to be set using an array.
-     *
-     * This method has the same synopsis as {@link setFrom()} and {@link setTo()}.
-     *
-     * If the second parameter is provided and the first is a string, then $name
-     * is associated with the address.
-     *
-     * @param mixed  $addresses
-     * @param string $name      optional
-     */
-    public function setReplyTo($addresses, $name = null);
-
-    /**
-     * Get the Reply-To addresses for this message.
-     *
-     * This method always returns an associative array where the keys provide the
-     * email addresses.
-     *
-     * @return string[]
-     */
-    public function getReplyTo();
-
-    /**
-     * Set the To address(es).
-     *
-     * Recipients set in this field will receive a copy of this message.
-     *
-     * This method has the same synopsis as {@link setFrom()} and {@link setCc()}.
-     *
-     * If the second parameter is provided and the first is a string, then $name
-     * is associated with the address.
-     *
-     * @param mixed  $addresses
-     * @param string $name      optional
-     */
-    public function setTo($addresses, $name = null);
-
-    /**
-     * Get the To addresses for this message.
-     *
-     * This method always returns an associative array, whereby the keys provide
-     * the actual email addresses.
-     *
-     * @return string[]
-     */
-    public function getTo();
-
-    /**
-     * Set the Cc address(es).
-     *
-     * Recipients set in this field will receive a 'carbon-copy' of this message.
-     *
-     * This method has the same synopsis as {@link setFrom()} and {@link setTo()}.
-     *
-     * @param mixed  $addresses
-     * @param string $name      optional
-     */
-    public function setCc($addresses, $name = null);
-
-    /**
-     * Get the Cc addresses for this message.
-     *
-     * This method always returns an associative array, whereby the keys provide
-     * the actual email addresses.
-     *
-     * @return string[]
-     */
-    public function getCc();
-
-    /**
-     * Set the Bcc address(es).
-     *
-     * Recipients set in this field will receive a 'blind-carbon-copy' of this
-     * message.
-     *
-     * In other words, they will get the message, but any other recipients of the
-     * message will have no such knowledge of their receipt of it.
-     *
-     * This method has the same synopsis as {@link setFrom()} and {@link setTo()}.
-     *
-     * @param mixed  $addresses
-     * @param string $name      optional
-     */
-    public function setBcc($addresses, $name = null);
-
-    /**
-     * Get the Bcc addresses for this message.
-     *
-     * This method always returns an associative array, whereby the keys provide
-     * the actual email addresses.
-     *
-     * @return string[]
-     */
-    public function getBcc();
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php
deleted file mode 100644
index 30f460cdc..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimeEntity.php
+++ /dev/null
@@ -1,117 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A MIME entity, such as an attachment.
- *
- * @author Chris Corbyn
- */
-interface Swift_Mime_MimeEntity extends Swift_Mime_CharsetObserver, Swift_Mime_EncodingObserver
-{
-    /** Main message document; there can only be one of these */
-    const LEVEL_TOP = 16;
-
-    /** An entity which nests with the same precedence as an attachment */
-    const LEVEL_MIXED = 256;
-
-    /** An entity which nests with the same precedence as a mime part */
-    const LEVEL_ALTERNATIVE = 4096;
-
-    /** An entity which nests with the same precedence as embedded content */
-    const LEVEL_RELATED = 65536;
-
-    /**
-     * Get the level at which this entity shall be nested in final document.
-     *
-     * The lower the value, the more outermost the entity will be nested.
-     *
-     * @see LEVEL_TOP, LEVEL_MIXED, LEVEL_RELATED, LEVEL_ALTERNATIVE
-     *
-     * @return int
-     */
-    public function getNestingLevel();
-
-    /**
-     * Get the qualified content-type of this mime entity.
-     *
-     * @return string
-     */
-    public function getContentType();
-
-    /**
-     * Returns a unique ID for this entity.
-     *
-     * For most entities this will likely be the Content-ID, though it has
-     * no explicit semantic meaning and can be considered an identifier for
-     * programming logic purposes.
-     *
-     * If a Content-ID header is present, this value SHOULD match the value of
-     * the header.
-     *
-     * @return string
-     */
-    public function getId();
-
-    /**
-     * Get all children nested inside this entity.
-     *
-     * These are not just the immediate children, but all children.
-     *
-     * @return Swift_Mime_MimeEntity[]
-     */
-    public function getChildren();
-
-    /**
-     * Set all children nested inside this entity.
-     *
-     * This includes grandchildren.
-     *
-     * @param Swift_Mime_MimeEntity[] $children
-     */
-    public function setChildren(array $children);
-
-    /**
-     * Get the collection of Headers in this Mime entity.
-     *
-     * @return Swift_Mime_HeaderSet
-     */
-    public function getHeaders();
-
-    /**
-     * Get the body content of this entity as a string.
-     *
-     * Returns NULL if no body has been set.
-     *
-     * @return string|null
-     */
-    public function getBody();
-
-    /**
-     * Set the body content of this entity as a string.
-     *
-     * @param string $body
-     * @param string $contentType optional
-     */
-    public function setBody($body, $contentType = null);
-
-    /**
-     * Get this entire entity in its string form.
-     *
-     * @return string
-     */
-    public function toString();
-
-    /**
-     * Get this entire entity as a ByteStream.
-     *
-     * @param Swift_InputByteStream $is to write to
-     */
-    public function toByteStream(Swift_InputByteStream $is);
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
index 4564fef6f..d0b2e6586 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/MimePart.php
@@ -16,29 +16,25 @@
 class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
 {
     /** The format parameter last specified by the user */
-    protected $_userFormat;
+    protected $userFormat;
 
     /** The charset last specified by the user */
-    protected $_userCharset;
+    protected $userCharset;
 
     /** The delsp parameter last specified by the user */
-    protected $_userDelSp;
+    protected $userDelSp;
 
     /** The nesting level of this MimePart */
-    private $_nestingLevel = self::LEVEL_ALTERNATIVE;
+    private $nestingLevel = self::LEVEL_ALTERNATIVE;
 
     /**
      * Create a new MimePart with $headers, $encoder and $cache.
      *
-     * @param Swift_Mime_HeaderSet      $headers
-     * @param Swift_Mime_ContentEncoder $encoder
-     * @param Swift_KeyCache            $cache
-     * @param Swift_Mime_Grammar        $grammar
-     * @param string                    $charset
+     * @param string $charset
      */
-    public function __construct(Swift_Mime_HeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_Mime_Grammar $grammar, $charset = null)
+    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $charset = null)
     {
-        parent::__construct($headers, $encoder, $cache, $grammar);
+        parent::__construct($headers, $encoder, $cache, $idGenerator);
         $this->setContentType('text/plain');
         if (null !== $charset) {
             $this->setCharset($charset);
@@ -60,7 +56,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
         if (isset($charset)) {
             $this->setCharset($charset);
         }
-        $body = $this->_convertString($body);
+        $body = $this->convertString($body);
 
         parent::setBody($body, $contentType);
 
@@ -74,7 +70,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
      */
     public function getCharset()
     {
-        return $this->_getHeaderParameter('Content-Type', 'charset');
+        return $this->getHeaderParameter('Content-Type', 'charset');
     }
 
     /**
@@ -86,11 +82,11 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
      */
     public function setCharset($charset)
     {
-        $this->_setHeaderParameter('Content-Type', 'charset', $charset);
-        if ($charset !== $this->_userCharset) {
-            $this->_clearCache();
+        $this->setHeaderParameter('Content-Type', 'charset', $charset);
+        if ($charset !== $this->userCharset) {
+            $this->clearCache();
         }
-        $this->_userCharset = $charset;
+        $this->userCharset = $charset;
         parent::charsetChanged($charset);
 
         return $this;
@@ -103,7 +99,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
      */
     public function getFormat()
     {
-        return $this->_getHeaderParameter('Content-Type', 'format');
+        return $this->getHeaderParameter('Content-Type', 'format');
     }
 
     /**
@@ -115,8 +111,8 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
      */
     public function setFormat($format)
     {
-        $this->_setHeaderParameter('Content-Type', 'format', $format);
-        $this->_userFormat = $format;
+        $this->setHeaderParameter('Content-Type', 'format', $format);
+        $this->userFormat = $format;
 
         return $this;
     }
@@ -128,7 +124,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
      */
     public function getDelSp()
     {
-        return 'yes' == $this->_getHeaderParameter('Content-Type', 'delsp') ? true : false;
+        return 'yes' === $this->getHeaderParameter('Content-Type', 'delsp');
     }
 
     /**
@@ -140,8 +136,8 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
      */
     public function setDelSp($delsp = true)
     {
-        $this->_setHeaderParameter('Content-Type', 'delsp', $delsp ? 'yes' : null);
-        $this->_userDelSp = $delsp;
+        $this->setHeaderParameter('Content-Type', 'delsp', $delsp ? 'yes' : null);
+        $this->userDelSp = $delsp;
 
         return $this;
     }
@@ -155,7 +151,7 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
      */
     public function getNestingLevel()
     {
-        return $this->_nestingLevel;
+        return $this->nestingLevel;
     }
 
     /**
@@ -170,41 +166,32 @@ class Swift_Mime_MimePart extends Swift_Mime_SimpleMimeEntity
     }
 
     /** Fix the content-type and encoding of this entity */
-    protected function _fixHeaders()
+    protected function fixHeaders()
     {
-        parent::_fixHeaders();
-        if (count($this->getChildren())) {
-            $this->_setHeaderParameter('Content-Type', 'charset', null);
-            $this->_setHeaderParameter('Content-Type', 'format', null);
-            $this->_setHeaderParameter('Content-Type', 'delsp', null);
+        parent::fixHeaders();
+        if (\count($this->getChildren())) {
+            $this->setHeaderParameter('Content-Type', 'charset', null);
+            $this->setHeaderParameter('Content-Type', 'format', null);
+            $this->setHeaderParameter('Content-Type', 'delsp', null);
         } else {
-            $this->setCharset($this->_userCharset);
-            $this->setFormat($this->_userFormat);
-            $this->setDelSp($this->_userDelSp);
+            $this->setCharset($this->userCharset);
+            $this->setFormat($this->userFormat);
+            $this->setDelSp($this->userDelSp);
         }
     }
 
     /** Set the nesting level of this entity */
-    protected function _setNestingLevel($level)
+    protected function setNestingLevel($level)
     {
-        $this->_nestingLevel = $level;
+        $this->nestingLevel = $level;
     }
 
     /** Encode charset when charset is not utf-8 */
-    protected function _convertString($string)
+    protected function convertString($string)
     {
-        $charset = strtolower($this->getCharset());
-        if (!in_array($charset, array('utf-8', 'iso-8859-1', 'iso-8859-15', ''))) {
-            // mb_convert_encoding must be the first one to check, since iconv cannot convert some words.
-            if (function_exists('mb_convert_encoding')) {
-                $string = mb_convert_encoding($string, $charset, 'utf-8');
-            } elseif (function_exists('iconv')) {
-                $string = iconv('utf-8//TRANSLIT//IGNORE', $charset, $string);
-            } else {
-                throw new Swift_SwiftException('No suitable convert encoding function (use UTF-8 as your charset or install the mbstring or iconv extension).');
-            }
-
-            return $string;
+        $charset = strtolower($this->getCharset() ?? '');
+        if (!\in_array($charset, ['utf-8', 'iso-8859-1', 'iso-8859-15', ''])) {
+            return mb_convert_encoding($string, $charset, 'utf-8');
         }
 
         return $string;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php
deleted file mode 100644
index e15c6ef95..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/ParameterizedHeader.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * A MIME Header with parameters.
- *
- * @author Chris Corbyn
- */
-interface Swift_Mime_ParameterizedHeader extends Swift_Mime_Header
-{
-    /**
-     * Set the value of $parameter.
-     *
-     * @param string $parameter
-     * @param string $value
-     */
-    public function setParameter($parameter, $value);
-
-    /**
-     * Get the value of $parameter.
-     *
-     * @param string $parameter
-     *
-     * @return string
-     */
-    public function getParameter($parameter);
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
index 1ca504e75..ab3ce6b19 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderFactory.php
@@ -8,39 +8,42 @@
  * file that was distributed with this source code.
  */
 
+use Egulias\EmailValidator\EmailValidator;
+
 /**
  * Creates MIME headers.
  *
  * @author Chris Corbyn
  */
-class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_HeaderFactory
+class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_CharsetObserver
 {
     /** The HeaderEncoder used by these headers */
-    private $_encoder;
+    private $encoder;
 
     /** The Encoder used by parameters */
-    private $_paramEncoder;
+    private $paramEncoder;
 
-    /** The Grammar */
-    private $_grammar;
+    /** Strict EmailValidator */
+    private $emailValidator;
 
     /** The charset of created Headers */
-    private $_charset;
+    private $charset;
+
+    /** Swift_AddressEncoder */
+    private $addressEncoder;
 
     /**
      * Creates a new SimpleHeaderFactory using $encoder and $paramEncoder.
      *
-     * @param Swift_Mime_HeaderEncoder $encoder
-     * @param Swift_Encoder            $paramEncoder
-     * @param Swift_Mime_Grammar       $grammar
-     * @param string|null              $charset
+     * @param string|null $charset
      */
-    public function __construct(Swift_Mime_HeaderEncoder $encoder, Swift_Encoder $paramEncoder, Swift_Mime_Grammar $grammar, $charset = null)
+    public function __construct(Swift_Mime_HeaderEncoder $encoder, Swift_Encoder $paramEncoder, EmailValidator $emailValidator, $charset = null, Swift_AddressEncoder $addressEncoder = null)
     {
-        $this->_encoder = $encoder;
-        $this->_paramEncoder = $paramEncoder;
-        $this->_grammar = $grammar;
-        $this->_charset = $charset;
+        $this->encoder = $encoder;
+        $this->paramEncoder = $paramEncoder;
+        $this->emailValidator = $emailValidator;
+        $this->charset = $charset;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
     }
 
     /**
@@ -53,30 +56,29 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_HeaderFactory
      */
     public function createMailboxHeader($name, $addresses = null)
     {
-        $header = new Swift_Mime_Headers_MailboxHeader($name, $this->_encoder, $this->_grammar);
+        $header = new Swift_Mime_Headers_MailboxHeader($name, $this->encoder, $this->emailValidator, $this->addressEncoder);
         if (isset($addresses)) {
             $header->setFieldBodyModel($addresses);
         }
-        $this->_setHeaderCharset($header);
+        $this->setHeaderCharset($header);
 
         return $header;
     }
 
     /**
-     * Create a new Date header using $timestamp (UNIX time).
+     * Create a new Date header using $dateTime.
      *
-     * @param string   $name
-     * @param int|null $timestamp
+     * @param string $name
      *
      * @return Swift_Mime_Header
      */
-    public function createDateHeader($name, $timestamp = null)
+    public function createDateHeader($name, DateTimeInterface $dateTime = null)
     {
-        $header = new Swift_Mime_Headers_DateHeader($name, $this->_grammar);
-        if (isset($timestamp)) {
-            $header->setFieldBodyModel($timestamp);
+        $header = new Swift_Mime_Headers_DateHeader($name);
+        if (isset($dateTime)) {
+            $header->setFieldBodyModel($dateTime);
         }
-        $this->_setHeaderCharset($header);
+        $this->setHeaderCharset($header);
 
         return $header;
     }
@@ -91,11 +93,11 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_HeaderFactory
      */
     public function createTextHeader($name, $value = null)
     {
-        $header = new Swift_Mime_Headers_UnstructuredHeader($name, $this->_encoder, $this->_grammar);
+        $header = new Swift_Mime_Headers_UnstructuredHeader($name, $this->encoder);
         if (isset($value)) {
             $header->setFieldBodyModel($value);
         }
-        $this->_setHeaderCharset($header);
+        $this->setHeaderCharset($header);
 
         return $header;
     }
@@ -107,19 +109,18 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_HeaderFactory
      * @param string $value
      * @param array  $params
      *
-     * @return Swift_Mime_ParameterizedHeader
+     * @return Swift_Mime_Headers_ParameterizedHeader
      */
-    public function createParameterizedHeader($name, $value = null,
-        $params = array())
+    public function createParameterizedHeader($name, $value = null, $params = [])
     {
-        $header = new Swift_Mime_Headers_ParameterizedHeader($name, $this->_encoder, strtolower($name) == 'content-disposition' ? $this->_paramEncoder : null, $this->_grammar);
+        $header = new Swift_Mime_Headers_ParameterizedHeader($name, $this->encoder, ('content-disposition' == strtolower($name ?? '')) ? $this->paramEncoder : null);
         if (isset($value)) {
             $header->setFieldBodyModel($value);
         }
         foreach ($params as $k => $v) {
             $header->setParameter($k, $v);
         }
-        $this->_setHeaderCharset($header);
+        $this->setHeaderCharset($header);
 
         return $header;
     }
@@ -134,11 +135,11 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_HeaderFactory
      */
     public function createIdHeader($name, $ids = null)
     {
-        $header = new Swift_Mime_Headers_IdentificationHeader($name, $this->_grammar);
+        $header = new Swift_Mime_Headers_IdentificationHeader($name, $this->emailValidator);
         if (isset($ids)) {
             $header->setFieldBodyModel($ids);
         }
-        $this->_setHeaderCharset($header);
+        $this->setHeaderCharset($header);
 
         return $header;
     }
@@ -153,11 +154,11 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_HeaderFactory
      */
     public function createPathHeader($name, $path = null)
     {
-        $header = new Swift_Mime_Headers_PathHeader($name, $this->_grammar);
+        $header = new Swift_Mime_Headers_PathHeader($name, $this->emailValidator);
         if (isset($path)) {
             $header->setFieldBodyModel($path);
         }
-        $this->_setHeaderCharset($header);
+        $this->setHeaderCharset($header);
 
         return $header;
     }
@@ -169,9 +170,9 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_HeaderFactory
      */
     public function charsetChanged($charset)
     {
-        $this->_charset = $charset;
-        $this->_encoder->charsetChanged($charset);
-        $this->_paramEncoder->charsetChanged($charset);
+        $this->charset = $charset;
+        $this->encoder->charsetChanged($charset);
+        $this->paramEncoder->charsetChanged($charset);
     }
 
     /**
@@ -179,15 +180,16 @@ class Swift_Mime_SimpleHeaderFactory implements Swift_Mime_HeaderFactory
      */
     public function __clone()
     {
-        $this->_encoder = clone $this->_encoder;
-        $this->_paramEncoder = clone $this->_paramEncoder;
+        $this->encoder = clone $this->encoder;
+        $this->paramEncoder = clone $this->paramEncoder;
+        $this->addressEncoder = clone $this->addressEncoder;
     }
 
     /** Apply the charset to the Header */
-    private function _setHeaderCharset(Swift_Mime_Header $header)
+    private function setHeaderCharset(Swift_Mime_Header $header)
     {
-        if (isset($this->_charset)) {
-            $header->setCharset($this->_charset);
+        if (isset($this->charset)) {
+            $header->setCharset($this->charset);
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
index a06ce7247..5195bcf48 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleHeaderSet.php
@@ -13,37 +13,41 @@
  *
  * @author Chris Corbyn
  */
-class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
+class Swift_Mime_SimpleHeaderSet implements Swift_Mime_CharsetObserver
 {
     /** HeaderFactory */
-    private $_factory;
+    private $factory;
 
     /** Collection of set Headers */
-    private $_headers = array();
+    private $headers = [];
 
     /** Field ordering details */
-    private $_order = array();
+    private $order = [];
 
     /** List of fields which are required to be displayed */
-    private $_required = array();
+    private $required = [];
 
     /** The charset used by Headers */
-    private $_charset;
+    private $charset;
 
     /**
      * Create a new SimpleHeaderSet with the given $factory.
      *
-     * @param Swift_Mime_HeaderFactory $factory
-     * @param string                   $charset
+     * @param string $charset
      */
-    public function __construct(Swift_Mime_HeaderFactory $factory, $charset = null)
+    public function __construct(Swift_Mime_SimpleHeaderFactory $factory, $charset = null)
     {
-        $this->_factory = $factory;
+        $this->factory = $factory;
         if (isset($charset)) {
             $this->setCharset($charset);
         }
     }
 
+    public function newInstance()
+    {
+        return new self($this->factory);
+    }
+
     /**
      * Set the charset used by these headers.
      *
@@ -51,9 +55,9 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      */
     public function setCharset($charset)
     {
-        $this->_charset = $charset;
-        $this->_factory->charsetChanged($charset);
-        $this->_notifyHeadersOfCharset($charset);
+        $this->charset = $charset;
+        $this->factory->charsetChanged($charset);
+        $this->notifyHeadersOfCharset($charset);
     }
 
     /**
@@ -64,20 +68,17 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      */
     public function addMailboxHeader($name, $addresses = null)
     {
-        $this->_storeHeader($name,
-        $this->_factory->createMailboxHeader($name, $addresses));
+        $this->storeHeader($name, $this->factory->createMailboxHeader($name, $addresses));
     }
 
     /**
-     * Add a new Date header using $timestamp (UNIX time).
+     * Add a new Date header using $dateTime.
      *
      * @param string $name
-     * @param int    $timestamp
      */
-    public function addDateHeader($name, $timestamp = null)
+    public function addDateHeader($name, DateTimeInterface $dateTime = null)
     {
-        $this->_storeHeader($name,
-        $this->_factory->createDateHeader($name, $timestamp));
+        $this->storeHeader($name, $this->factory->createDateHeader($name, $dateTime));
     }
 
     /**
@@ -88,8 +89,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      */
     public function addTextHeader($name, $value = null)
     {
-        $this->_storeHeader($name,
-        $this->_factory->createTextHeader($name, $value));
+        $this->storeHeader($name, $this->factory->createTextHeader($name, $value));
     }
 
     /**
@@ -99,9 +99,9 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      * @param string $value
      * @param array  $params
      */
-    public function addParameterizedHeader($name, $value = null, $params = array())
+    public function addParameterizedHeader($name, $value = null, $params = [])
     {
-        $this->_storeHeader($name, $this->_factory->createParameterizedHeader($name, $value, $params));
+        $this->storeHeader($name, $this->factory->createParameterizedHeader($name, $value, $params));
     }
 
     /**
@@ -112,7 +112,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      */
     public function addIdHeader($name, $ids = null)
     {
-        $this->_storeHeader($name, $this->_factory->createIdHeader($name, $ids));
+        $this->storeHeader($name, $this->factory->createIdHeader($name, $ids));
     }
 
     /**
@@ -123,7 +123,7 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      */
     public function addPathHeader($name, $path = null)
     {
-        $this->_storeHeader($name, $this->_factory->createPathHeader($name, $path));
+        $this->storeHeader($name, $this->factory->createPathHeader($name, $path));
     }
 
     /**
@@ -138,18 +138,18 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      */
     public function has($name, $index = 0)
     {
-        $lowerName = strtolower($name);
+        $lowerName = strtolower($name ?? '');
 
-        if (!array_key_exists($lowerName, $this->_headers)) {
+        if (!\array_key_exists($lowerName, $this->headers)) {
             return false;
         }
 
-        if (func_num_args() < 2) {
+        if (\func_num_args() < 2) {
             // index was not specified, so we only need to check that there is at least one header value set
-            return (bool) count($this->_headers[$lowerName]);
+            return (bool) \count($this->headers[$lowerName]);
         }
 
-        return array_key_exists($index, $this->_headers[$lowerName]);
+        return \array_key_exists($index, $this->headers[$lowerName]);
     }
 
     /**
@@ -161,12 +161,11 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      * If $index is specified, the header will be inserted into the set at this
      * offset.
      *
-     * @param Swift_Mime_Header $header
-     * @param int               $index
+     * @param int $index
      */
     public function set(Swift_Mime_Header $header, $index = 0)
     {
-        $this->_storeHeader($header->getFieldName(), $header, $index);
+        $this->storeHeader($header->getFieldName(), $header, $index);
     }
 
     /**
@@ -178,21 +177,21 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      * @param string $name
      * @param int    $index
      *
-     * @return Swift_Mime_Header
+     * @return Swift_Mime_Header|null
      */
     public function get($name, $index = 0)
     {
-        $name = strtolower($name);
+        $name = strtolower($name ?? '');
 
-        if (func_num_args() < 2) {
+        if (\func_num_args() < 2) {
             if ($this->has($name)) {
-                $values = array_values($this->_headers[$name]);
+                $values = array_values($this->headers[$name]);
 
                 return array_shift($values);
             }
         } else {
             if ($this->has($name, $index)) {
-                return $this->_headers[$name][$index];
+                return $this->headers[$name][$index];
             }
         }
     }
@@ -207,20 +206,20 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
     public function getAll($name = null)
     {
         if (!isset($name)) {
-            $headers = array();
-            foreach ($this->_headers as $collection) {
+            $headers = [];
+            foreach ($this->headers as $collection) {
                 $headers = array_merge($headers, $collection);
             }
 
             return $headers;
         }
 
-        $lowerName = strtolower($name);
-        if (!array_key_exists($lowerName, $this->_headers)) {
-            return array();
+        $lowerName = strtolower($name ?? '');
+        if (!\array_key_exists($lowerName, $this->headers)) {
+            return [];
         }
 
-        return $this->_headers[$lowerName];
+        return $this->headers[$lowerName];
     }
 
     /**
@@ -230,9 +229,9 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      */
     public function listAll()
     {
-        $headers = $this->_headers;
-        if ($this->_canSort()) {
-            uksort($headers, array($this, '_sortHeaders'));
+        $headers = $this->headers;
+        if ($this->canSort()) {
+            uksort($headers, [$this, 'sortHeaders']);
         }
 
         return array_keys($headers);
@@ -248,8 +247,8 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      */
     public function remove($name, $index = 0)
     {
-        $lowerName = strtolower($name);
-        unset($this->_headers[$lowerName][$index]);
+        $lowerName = strtolower($name ?? '');
+        unset($this->headers[$lowerName][$index]);
     }
 
     /**
@@ -259,42 +258,28 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      */
     public function removeAll($name)
     {
-        $lowerName = strtolower($name);
-        unset($this->_headers[$lowerName]);
-    }
-
-    /**
-     * Create a new instance of this HeaderSet.
-     *
-     * @return self
-     */
-    public function newInstance()
-    {
-        return new self($this->_factory);
+        $lowerName = strtolower($name ?? '');
+        unset($this->headers[$lowerName]);
     }
 
     /**
      * Define a list of Header names as an array in the correct order.
      *
      * These Headers will be output in the given order where present.
-     *
-     * @param array $sequence
      */
     public function defineOrdering(array $sequence)
     {
-        $this->_order = array_flip(array_map('strtolower', $sequence));
+        $this->order = array_flip(array_map('strtolower', $sequence));
     }
 
     /**
      * Set a list of header names which must always be displayed when set.
      *
      * Usually headers without a field value won't be output unless set here.
-     *
-     * @param array $names
      */
     public function setAlwaysDisplayed(array $names)
     {
-        $this->_required = array_flip(array_map('strtolower', $names));
+        $this->required = array_flip(array_map('strtolower', $names));
     }
 
     /**
@@ -315,13 +300,13 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
     public function toString()
     {
         $string = '';
-        $headers = $this->_headers;
-        if ($this->_canSort()) {
-            uksort($headers, array($this, '_sortHeaders'));
+        $headers = $this->headers;
+        if ($this->canSort()) {
+            uksort($headers, [$this, 'sortHeaders']);
         }
         foreach ($headers as $collection) {
             foreach ($collection as $header) {
-                if ($this->_isDisplayed($header) || $header->getFieldBody() != '') {
+                if ($this->isDisplayed($header) || '' != $header->getFieldBody()) {
                     $string .= $header->toString();
                 }
             }
@@ -343,40 +328,40 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
     }
 
     /** Save a Header to the internal collection */
-    private function _storeHeader($name, Swift_Mime_Header $header, $offset = null)
+    private function storeHeader($name, Swift_Mime_Header $header, $offset = null)
     {
-        if (!isset($this->_headers[strtolower($name)])) {
-            $this->_headers[strtolower($name)] = array();
+        if (!isset($this->headers[strtolower($name ?? '')])) {
+            $this->headers[strtolower($name ?? '')] = [];
         }
         if (!isset($offset)) {
-            $this->_headers[strtolower($name)][] = $header;
+            $this->headers[strtolower($name ?? '')][] = $header;
         } else {
-            $this->_headers[strtolower($name)][$offset] = $header;
+            $this->headers[strtolower($name ?? '')][$offset] = $header;
         }
     }
 
     /** Test if the headers can be sorted */
-    private function _canSort()
+    private function canSort()
     {
-        return count($this->_order) > 0;
+        return \count($this->order) > 0;
     }
 
     /** uksort() algorithm for Header ordering */
-    private function _sortHeaders($a, $b)
+    private function sortHeaders($a, $b)
     {
-        $lowerA = strtolower($a);
-        $lowerB = strtolower($b);
-        $aPos = array_key_exists($lowerA, $this->_order) ? $this->_order[$lowerA] : -1;
-        $bPos = array_key_exists($lowerB, $this->_order) ? $this->_order[$lowerB] : -1;
+        $lowerA = strtolower($a ?? '');
+        $lowerB = strtolower($b ?? '');
+        $aPos = \array_key_exists($lowerA, $this->order) ? $this->order[$lowerA] : -1;
+        $bPos = \array_key_exists($lowerB, $this->order) ? $this->order[$lowerB] : -1;
 
         if (-1 === $aPos && -1 === $bPos) {
             // just be sure to be determinist here
             return $a > $b ? -1 : 1;
         }
 
-        if ($aPos == -1) {
+        if (-1 == $aPos) {
             return 1;
-        } elseif ($bPos == -1) {
+        } elseif (-1 == $bPos) {
             return -1;
         }
 
@@ -384,15 +369,15 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
     }
 
     /** Test if the given Header is always displayed */
-    private function _isDisplayed(Swift_Mime_Header $header)
+    private function isDisplayed(Swift_Mime_Header $header)
     {
-        return array_key_exists(strtolower($header->getFieldName()), $this->_required);
+        return \array_key_exists(strtolower($header->getFieldName() ?? ''), $this->required);
     }
 
     /** Notify all Headers of the new charset */
-    private function _notifyHeadersOfCharset($charset)
+    private function notifyHeadersOfCharset($charset)
     {
-        foreach ($this->_headers as $headerGroup) {
+        foreach ($this->headers as $headerGroup) {
             foreach ($headerGroup as $header) {
                 $header->setCharset($charset);
             }
@@ -404,10 +389,10 @@ class Swift_Mime_SimpleHeaderSet implements Swift_Mime_HeaderSet
      */
     public function __clone()
     {
-        $this->_factory = clone $this->_factory;
-        foreach ($this->_headers as $groupKey => $headerGroup) {
+        $this->factory = clone $this->factory;
+        foreach ($this->headers as $groupKey => $headerGroup) {
             foreach ($headerGroup as $key => $header) {
-                $this->_headers[$groupKey][$key] = clone $header;
+                $this->headers[$groupKey][$key] = clone $header;
             }
         }
     }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
index 72d40cee0..62da1650a 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMessage.php
@@ -13,7 +13,7 @@
  *
  * @author Chris Corbyn
  */
-class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime_Message
+class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart
 {
     const PRIORITY_HIGHEST = 1;
     const PRIORITY_HIGH = 2;
@@ -24,16 +24,12 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
     /**
      * Create a new SimpleMessage with $headers, $encoder and $cache.
      *
-     * @param Swift_Mime_HeaderSet      $headers
-     * @param Swift_Mime_ContentEncoder $encoder
-     * @param Swift_KeyCache            $cache
-     * @param Swift_Mime_Grammar        $grammar
-     * @param string                    $charset
+     * @param string $charset
      */
-    public function __construct(Swift_Mime_HeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_Mime_Grammar $grammar, $charset = null)
+    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator, $charset = null)
     {
-        parent::__construct($headers, $encoder, $cache, $grammar, $charset);
-        $this->getHeaders()->defineOrdering(array(
+        parent::__construct($headers, $encoder, $cache, $idGenerator, $charset);
+        $this->getHeaders()->defineOrdering([
             'Return-Path',
             'Received',
             'DKIM-Signature',
@@ -50,10 +46,10 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
             'MIME-Version',
             'Content-Type',
             'Content-Transfer-Encoding',
-            ));
-        $this->getHeaders()->setAlwaysDisplayed(array('Date', 'Message-ID', 'From'));
+            ]);
+        $this->getHeaders()->setAlwaysDisplayed(['Date', 'Message-ID', 'From']);
         $this->getHeaders()->addTextHeader('MIME-Version', '1.0');
-        $this->setDate(time());
+        $this->setDate(new DateTimeImmutable());
         $this->setId($this->getId());
         $this->getHeaders()->addMailboxHeader('From');
     }
@@ -77,7 +73,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function setSubject($subject)
     {
-        if (!$this->_setHeaderFieldModel('Subject', $subject)) {
+        if (!$this->setHeaderFieldModel('Subject', $subject)) {
             $this->getHeaders()->addTextHeader('Subject', $subject);
         }
 
@@ -91,20 +87,18 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function getSubject()
     {
-        return $this->_getHeaderFieldModel('Subject');
+        return $this->getHeaderFieldModel('Subject');
     }
 
     /**
      * Set the date at which this message was created.
      *
-     * @param int $date
-     *
      * @return $this
      */
-    public function setDate($date)
+    public function setDate(DateTimeInterface $dateTime)
     {
-        if (!$this->_setHeaderFieldModel('Date', $date)) {
-            $this->getHeaders()->addDateHeader('Date', $date);
+        if (!$this->setHeaderFieldModel('Date', $dateTime)) {
+            $this->getHeaders()->addDateHeader('Date', $dateTime);
         }
 
         return $this;
@@ -113,11 +107,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
     /**
      * Get the date at which this message was created.
      *
-     * @return int
+     * @return DateTimeInterface
      */
     public function getDate()
     {
-        return $this->_getHeaderFieldModel('Date');
+        return $this->getHeaderFieldModel('Date');
     }
 
     /**
@@ -129,7 +123,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function setReturnPath($address)
     {
-        if (!$this->_setHeaderFieldModel('Return-Path', $address)) {
+        if (!$this->setHeaderFieldModel('Return-Path', $address)) {
             $this->getHeaders()->addPathHeader('Return-Path', $address);
         }
 
@@ -143,7 +137,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function getReturnPath()
     {
-        return $this->_getHeaderFieldModel('Return-Path');
+        return $this->getHeaderFieldModel('Return-Path');
     }
 
     /**
@@ -158,11 +152,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function setSender($address, $name = null)
     {
-        if (!is_array($address) && isset($name)) {
-            $address = array($address => $name);
+        if (!\is_array($address) && isset($name)) {
+            $address = [$address => $name];
         }
 
-        if (!$this->_setHeaderFieldModel('Sender', (array) $address)) {
+        if (!$this->setHeaderFieldModel('Sender', (array) $address)) {
             $this->getHeaders()->addMailboxHeader('Sender', (array) $address);
         }
 
@@ -176,7 +170,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function getSender()
     {
-        return $this->_getHeaderFieldModel('Sender');
+        return $this->getHeaderFieldModel('Sender');
     }
 
     /**
@@ -212,11 +206,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function setFrom($addresses, $name = null)
     {
-        if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+        if (!\is_array($addresses) && isset($name)) {
+            $addresses = [$addresses => $name];
         }
 
-        if (!$this->_setHeaderFieldModel('From', (array) $addresses)) {
+        if (!$this->setHeaderFieldModel('From', (array) $addresses)) {
             $this->getHeaders()->addMailboxHeader('From', (array) $addresses);
         }
 
@@ -230,7 +224,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function getFrom()
     {
-        return $this->_getHeaderFieldModel('From');
+        return $this->getHeaderFieldModel('From');
     }
 
     /**
@@ -266,11 +260,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function setReplyTo($addresses, $name = null)
     {
-        if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+        if (!\is_array($addresses) && isset($name)) {
+            $addresses = [$addresses => $name];
         }
 
-        if (!$this->_setHeaderFieldModel('Reply-To', (array) $addresses)) {
+        if (!$this->setHeaderFieldModel('Reply-To', (array) $addresses)) {
             $this->getHeaders()->addMailboxHeader('Reply-To', (array) $addresses);
         }
 
@@ -284,7 +278,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function getReplyTo()
     {
-        return $this->_getHeaderFieldModel('Reply-To');
+        return $this->getHeaderFieldModel('Reply-To');
     }
 
     /**
@@ -321,11 +315,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function setTo($addresses, $name = null)
     {
-        if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+        if (!\is_array($addresses) && isset($name)) {
+            $addresses = [$addresses => $name];
         }
 
-        if (!$this->_setHeaderFieldModel('To', (array) $addresses)) {
+        if (!$this->setHeaderFieldModel('To', (array) $addresses)) {
             $this->getHeaders()->addMailboxHeader('To', (array) $addresses);
         }
 
@@ -339,7 +333,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function getTo()
     {
-        return $this->_getHeaderFieldModel('To');
+        return $this->getHeaderFieldModel('To');
     }
 
     /**
@@ -373,11 +367,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function setCc($addresses, $name = null)
     {
-        if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+        if (!\is_array($addresses) && isset($name)) {
+            $addresses = [$addresses => $name];
         }
 
-        if (!$this->_setHeaderFieldModel('Cc', (array) $addresses)) {
+        if (!$this->setHeaderFieldModel('Cc', (array) $addresses)) {
             $this->getHeaders()->addMailboxHeader('Cc', (array) $addresses);
         }
 
@@ -391,7 +385,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function getCc()
     {
-        return $this->_getHeaderFieldModel('Cc');
+        return $this->getHeaderFieldModel('Cc');
     }
 
     /**
@@ -425,11 +419,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function setBcc($addresses, $name = null)
     {
-        if (!is_array($addresses) && isset($name)) {
-            $addresses = array($addresses => $name);
+        if (!\is_array($addresses) && isset($name)) {
+            $addresses = [$addresses => $name];
         }
 
-        if (!$this->_setHeaderFieldModel('Bcc', (array) $addresses)) {
+        if (!$this->setHeaderFieldModel('Bcc', (array) $addresses)) {
             $this->getHeaders()->addMailboxHeader('Bcc', (array) $addresses);
         }
 
@@ -443,7 +437,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function getBcc()
     {
-        return $this->_getHeaderFieldModel('Bcc');
+        return $this->getHeaderFieldModel('Bcc');
     }
 
     /**
@@ -457,20 +451,20 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function setPriority($priority)
     {
-        $priorityMap = array(
+        $priorityMap = [
             self::PRIORITY_HIGHEST => 'Highest',
             self::PRIORITY_HIGH => 'High',
             self::PRIORITY_NORMAL => 'Normal',
             self::PRIORITY_LOW => 'Low',
             self::PRIORITY_LOWEST => 'Lowest',
-            );
+            ];
         $pMapKeys = array_keys($priorityMap);
         if ($priority > max($pMapKeys)) {
             $priority = max($pMapKeys);
         } elseif ($priority < min($pMapKeys)) {
             $priority = min($pMapKeys);
         }
-        if (!$this->_setHeaderFieldModel('X-Priority',
+        if (!$this->setHeaderFieldModel('X-Priority',
             sprintf('%d (%s)', $priority, $priorityMap[$priority]))) {
             $this->getHeaders()->addTextHeader('X-Priority',
                 sprintf('%d (%s)', $priority, $priorityMap[$priority]));
@@ -489,11 +483,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function getPriority()
     {
-        list($priority) = sscanf($this->_getHeaderFieldModel('X-Priority'),
+        list($priority) = sscanf($this->getHeaderFieldModel('X-Priority'),
             '%[1-5]'
             );
 
-        return isset($priority) ? $priority : 3;
+        return $priority ?? 3;
     }
 
     /**
@@ -505,7 +499,7 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function setReadReceiptTo($addresses)
     {
-        if (!$this->_setHeaderFieldModel('Disposition-Notification-To', $addresses)) {
+        if (!$this->setHeaderFieldModel('Disposition-Notification-To', $addresses)) {
             $this->getHeaders()
                 ->addMailboxHeader('Disposition-Notification-To', $addresses);
         }
@@ -520,19 +514,17 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function getReadReceiptTo()
     {
-        return $this->_getHeaderFieldModel('Disposition-Notification-To');
+        return $this->getHeaderFieldModel('Disposition-Notification-To');
     }
 
     /**
-     * Attach a {@link Swift_Mime_MimeEntity} such as an Attachment or MimePart.
-     *
-     * @param Swift_Mime_MimeEntity $entity
+     * Attach a {@link Swift_Mime_SimpleMimeEntity} such as an Attachment or MimePart.
      *
      * @return $this
      */
-    public function attach(Swift_Mime_MimeEntity $entity)
+    public function attach(Swift_Mime_SimpleMimeEntity $entity)
     {
-        $this->setChildren(array_merge($this->getChildren(), array($entity)));
+        $this->setChildren(array_merge($this->getChildren(), [$entity]));
 
         return $this;
     }
@@ -540,13 +532,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
     /**
      * Remove an already attached entity.
      *
-     * @param Swift_Mime_MimeEntity $entity
-     *
      * @return $this
      */
-    public function detach(Swift_Mime_MimeEntity $entity)
+    public function detach(Swift_Mime_SimpleMimeEntity $entity)
     {
-        $newChildren = array();
+        $newChildren = [];
         foreach ($this->getChildren() as $child) {
             if ($entity !== $child) {
                 $newChildren[] = $child;
@@ -558,14 +548,13 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
     }
 
     /**
-     * Attach a {@link Swift_Mime_MimeEntity} and return it's CID source.
-     * This method should be used when embedding images or other data in a message.
+     * Attach a {@link Swift_Mime_SimpleMimeEntity} and return it's CID source.
      *
-     * @param Swift_Mime_MimeEntity $entity
+     * This method should be used when embedding images or other data in a message.
      *
      * @return string
      */
-    public function embed(Swift_Mime_MimeEntity $entity)
+    public function embed(Swift_Mime_SimpleMimeEntity $entity)
     {
         $this->attach($entity);
 
@@ -579,8 +568,8 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
      */
     public function toString()
     {
-        if (count($children = $this->getChildren()) > 0 && $this->getBody() != '') {
-            $this->setChildren(array_merge(array($this->_becomeMimePart()), $children));
+        if (\count($children = $this->getChildren()) > 0 && '' != $this->getBody()) {
+            $this->setChildren(array_merge([$this->becomeMimePart()], $children));
             $string = parent::toString();
             $this->setChildren($children);
         } else {
@@ -604,13 +593,11 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
 
     /**
      * Write this message to a {@link Swift_InputByteStream}.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function toByteStream(Swift_InputByteStream $is)
     {
-        if (count($children = $this->getChildren()) > 0 && $this->getBody() != '') {
-            $this->setChildren(array_merge(array($this->_becomeMimePart()), $children));
+        if (\count($children = $this->getChildren()) > 0 && '' != $this->getBody()) {
+            $this->setChildren(array_merge([$this->becomeMimePart()], $children));
             parent::toByteStream($is);
             $this->setChildren($children);
         } else {
@@ -618,29 +605,29 @@ class Swift_Mime_SimpleMessage extends Swift_Mime_MimePart implements Swift_Mime
         }
     }
 
-    /** @see Swift_Mime_SimpleMimeEntity::_getIdField() */
-    protected function _getIdField()
+    /** @see Swift_Mime_SimpleMimeEntity::getIdField() */
+    protected function getIdField()
     {
         return 'Message-ID';
     }
 
     /** Turn the body of this message into a child of itself if needed */
-    protected function _becomeMimePart()
+    protected function becomeMimePart()
     {
         $part = new parent($this->getHeaders()->newInstance(), $this->getEncoder(),
-            $this->_getCache(), $this->_getGrammar(), $this->_userCharset
+            $this->getCache(), $this->getIdGenerator(), $this->userCharset
             );
-        $part->setContentType($this->_userContentType);
+        $part->setContentType($this->userContentType);
         $part->setBody($this->getBody());
-        $part->setFormat($this->_userFormat);
-        $part->setDelSp($this->_userDelSp);
-        $part->_setNestingLevel($this->_getTopNestingLevel());
+        $part->setFormat($this->userFormat);
+        $part->setDelSp($this->userDelSp);
+        $part->setNestingLevel($this->getTopNestingLevel());
 
         return $part;
     }
 
     /** Get the highest nesting level nested inside this message */
-    private function _getTopNestingLevel()
+    private function getTopNestingLevel()
     {
         $highestLevel = $this->getNestingLevel();
         foreach ($this->getChildren() as $child) {
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
index a13f1b23d..03eaf472d 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Mime/SimpleMimeEntity.php
@@ -13,79 +13,86 @@
  *
  * @author Chris Corbyn
  */
-class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
+class Swift_Mime_SimpleMimeEntity implements Swift_Mime_CharsetObserver, Swift_Mime_EncodingObserver
 {
+    /** Main message document; there can only be one of these */
+    const LEVEL_TOP = 16;
+
+    /** An entity which nests with the same precedence as an attachment */
+    const LEVEL_MIXED = 256;
+
+    /** An entity which nests with the same precedence as a mime part */
+    const LEVEL_ALTERNATIVE = 4096;
+
+    /** An entity which nests with the same precedence as embedded content */
+    const LEVEL_RELATED = 65536;
+
     /** A collection of Headers for this mime entity */
-    private $_headers;
+    private $headers;
 
     /** The body as a string, or a stream */
-    private $_body;
+    private $body;
 
     /** The encoder that encodes the body into a streamable format */
-    private $_encoder;
+    private $encoder;
 
-    /** The grammar to use for id validation */
-    private $_grammar;
+    /** Message ID generator */
+    private $idGenerator;
 
     /** A mime boundary, if any is used */
-    private $_boundary;
+    private $boundary;
 
     /** Mime types to be used based on the nesting level */
-    private $_compositeRanges = array(
-        'multipart/mixed' => array(self::LEVEL_TOP, self::LEVEL_MIXED),
-        'multipart/alternative' => array(self::LEVEL_MIXED, self::LEVEL_ALTERNATIVE),
-        'multipart/related' => array(self::LEVEL_ALTERNATIVE, self::LEVEL_RELATED),
-    );
+    private $compositeRanges = [
+        'multipart/mixed' => [self::LEVEL_TOP, self::LEVEL_MIXED],
+        'multipart/alternative' => [self::LEVEL_MIXED, self::LEVEL_ALTERNATIVE],
+        'multipart/related' => [self::LEVEL_ALTERNATIVE, self::LEVEL_RELATED],
+    ];
 
     /** A set of filter rules to define what level an entity should be nested at */
-    private $_compoundLevelFilters = array();
+    private $compoundLevelFilters = [];
 
     /** The nesting level of this entity */
-    private $_nestingLevel = self::LEVEL_ALTERNATIVE;
+    private $nestingLevel = self::LEVEL_ALTERNATIVE;
 
     /** A KeyCache instance used during encoding and streaming */
-    private $_cache;
+    private $cache;
 
     /** Direct descendants of this entity */
-    private $_immediateChildren = array();
+    private $immediateChildren = [];
 
     /** All descendants of this entity */
-    private $_children = array();
+    private $children = [];
 
     /** The maximum line length of the body of this entity */
-    private $_maxLineLength = 78;
+    private $maxLineLength = 78;
 
     /** The order in which alternative mime types should appear */
-    private $_alternativePartOrder = array(
+    private $alternativePartOrder = [
         'text/plain' => 1,
         'text/html' => 2,
         'multipart/related' => 3,
-    );
+    ];
 
     /** The CID of this entity */
-    private $_id;
+    private $id;
 
     /** The key used for accessing the cache */
-    private $_cacheKey;
+    private $cacheKey;
 
-    protected $_userContentType;
+    protected $userContentType;
 
     /**
      * Create a new SimpleMimeEntity with $headers, $encoder and $cache.
-     *
-     * @param Swift_Mime_HeaderSet      $headers
-     * @param Swift_Mime_ContentEncoder $encoder
-     * @param Swift_KeyCache            $cache
-     * @param Swift_Mime_Grammar        $grammar
      */
-    public function __construct(Swift_Mime_HeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_Mime_Grammar $grammar)
+    public function __construct(Swift_Mime_SimpleHeaderSet $headers, Swift_Mime_ContentEncoder $encoder, Swift_KeyCache $cache, Swift_IdGenerator $idGenerator)
     {
-        $this->_cacheKey = md5(uniqid(getmypid().mt_rand(), true));
-        $this->_cache = $cache;
-        $this->_headers = $headers;
-        $this->_grammar = $grammar;
+        $this->cacheKey = bin2hex(random_bytes(16)); // set 32 hex values
+        $this->cache = $cache;
+        $this->headers = $headers;
+        $this->idGenerator = $idGenerator;
         $this->setEncoder($encoder);
-        $this->_headers->defineOrdering(array('Content-Type', 'Content-Transfer-Encoding'));
+        $this->headers->defineOrdering(['Content-Type', 'Content-Transfer-Encoding']);
 
         // This array specifies that, when the entire MIME document contains
         // $compoundLevel, then for each child within $level, if its Content-Type
@@ -100,16 +107,16 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
         //   )
         // )
 
-        $this->_compoundLevelFilters = array(
-            (self::LEVEL_ALTERNATIVE + self::LEVEL_RELATED) => array(
-                self::LEVEL_ALTERNATIVE => array(
+        $this->compoundLevelFilters = [
+            (self::LEVEL_ALTERNATIVE + self::LEVEL_RELATED) => [
+                self::LEVEL_ALTERNATIVE => [
                     'text/plain' => self::LEVEL_ALTERNATIVE,
                     'text/html' => self::LEVEL_RELATED,
-                    ),
-                ),
-            );
+                    ],
+                ],
+            ];
 
-        $this->_id = $this->getRandomId();
+        $this->id = $this->idGenerator->generateId();
     }
 
     /**
@@ -119,19 +126,19 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function generateId()
     {
-        $this->setId($this->getRandomId());
+        $this->setId($this->idGenerator->generateId());
 
-        return $this->_id;
+        return $this->id;
     }
 
     /**
-     * Get the {@link Swift_Mime_HeaderSet} for this entity.
+     * Get the {@link Swift_Mime_SimpleHeaderSet} for this entity.
      *
-     * @return Swift_Mime_HeaderSet
+     * @return Swift_Mime_SimpleHeaderSet
      */
     public function getHeaders()
     {
-        return $this->_headers;
+        return $this->headers;
     }
 
     /**
@@ -143,7 +150,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function getNestingLevel()
     {
-        return $this->_nestingLevel;
+        return $this->nestingLevel;
     }
 
     /**
@@ -153,7 +160,17 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function getContentType()
     {
-        return $this->_getHeaderFieldModel('Content-Type');
+        return $this->getHeaderFieldModel('Content-Type');
+    }
+
+    /**
+     * Get the Body Content-type of this entity.
+     *
+     * @return string
+     */
+    public function getBodyContentType()
+    {
+        return $this->userContentType;
     }
 
     /**
@@ -165,10 +182,10 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function setContentType($type)
     {
-        $this->_setContentTypeInHeaders($type);
+        $this->setContentTypeInHeaders($type);
         // Keep track of the value so that if the content-type changes automatically
         // due to added child entities, it can be restored if they are later removed
-        $this->_userContentType = $type;
+        $this->userContentType = $type;
 
         return $this;
     }
@@ -182,9 +199,9 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function getId()
     {
-        $tmp = (array) $this->_getHeaderFieldModel($this->_getIdField());
+        $tmp = (array) $this->getHeaderFieldModel($this->getIdField());
 
-        return $this->_headers->has($this->_getIdField()) ? current($tmp) : $this->_id;
+        return $this->headers->has($this->getIdField()) ? current($tmp) : $this->id;
     }
 
     /**
@@ -196,10 +213,10 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function setId($id)
     {
-        if (!$this->_setHeaderFieldModel($this->_getIdField(), $id)) {
-            $this->_headers->addIdHeader($this->_getIdField(), $id);
+        if (!$this->setHeaderFieldModel($this->getIdField(), $id)) {
+            $this->headers->addIdHeader($this->getIdField(), $id);
         }
-        $this->_id = $id;
+        $this->id = $id;
 
         return $this;
     }
@@ -213,7 +230,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function getDescription()
     {
-        return $this->_getHeaderFieldModel('Content-Description');
+        return $this->getHeaderFieldModel('Content-Description');
     }
 
     /**
@@ -227,8 +244,8 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function setDescription($description)
     {
-        if (!$this->_setHeaderFieldModel('Content-Description', $description)) {
-            $this->_headers->addTextHeader('Content-Description', $description);
+        if (!$this->setHeaderFieldModel('Content-Description', $description)) {
+            $this->headers->addTextHeader('Content-Description', $description);
         }
 
         return $this;
@@ -241,7 +258,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function getMaxLineLength()
     {
-        return $this->_maxLineLength;
+        return $this->maxLineLength;
     }
 
     /**
@@ -255,7 +272,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function setMaxLineLength($length)
     {
-        $this->_maxLineLength = $length;
+        $this->maxLineLength = $length;
 
         return $this;
     }
@@ -263,44 +280,43 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
     /**
      * Get all children added to this entity.
      *
-     * @return Swift_Mime_MimeEntity[]
+     * @return Swift_Mime_SimpleMimeEntity[]
      */
     public function getChildren()
     {
-        return $this->_children;
+        return $this->children;
     }
 
     /**
      * Set all children of this entity.
      *
-     * @param Swift_Mime_MimeEntity[] $children
-     * @param int                     $compoundLevel For internal use only
+     * @param Swift_Mime_SimpleMimeEntity[] $children
+     * @param int                           $compoundLevel For internal use only
      *
      * @return $this
      */
     public function setChildren(array $children, $compoundLevel = null)
     {
         // TODO: Try to refactor this logic
-
-        $compoundLevel = isset($compoundLevel) ? $compoundLevel : $this->_getCompoundLevel($children);
-        $immediateChildren = array();
-        $grandchildren = array();
-        $newContentType = $this->_userContentType;
+        $compoundLevel = $compoundLevel ?? $this->getCompoundLevel($children);
+        $immediateChildren = [];
+        $grandchildren = [];
+        $newContentType = $this->userContentType;
 
         foreach ($children as $child) {
-            $level = $this->_getNeededChildLevel($child, $compoundLevel);
+            $level = $this->getNeededChildLevel($child, $compoundLevel);
             if (empty($immediateChildren)) {
                 //first iteration
-                $immediateChildren = array($child);
+                $immediateChildren = [$child];
             } else {
-                $nextLevel = $this->_getNeededChildLevel($immediateChildren[0], $compoundLevel);
+                $nextLevel = $this->getNeededChildLevel($immediateChildren[0], $compoundLevel);
                 if ($nextLevel == $level) {
                     $immediateChildren[] = $child;
                 } elseif ($level < $nextLevel) {
                     // Re-assign immediateChildren to grandchildren
                     $grandchildren = array_merge($grandchildren, $immediateChildren);
                     // Set new children
-                    $immediateChildren = array($child);
+                    $immediateChildren = [$child];
                 } else {
                     $grandchildren[] = $child;
                 }
@@ -308,11 +324,11 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
         }
 
         if ($immediateChildren) {
-            $lowestLevel = $this->_getNeededChildLevel($immediateChildren[0], $compoundLevel);
+            $lowestLevel = $this->getNeededChildLevel($immediateChildren[0], $compoundLevel);
 
             // Determine which composite media type is needed to accommodate the
             // immediate children
-            foreach ($this->_compositeRanges as $mediaType => $range) {
+            foreach ($this->compositeRanges as $mediaType => $range) {
                 if ($lowestLevel > $range[0] && $lowestLevel <= $range[1]) {
                     $newContentType = $mediaType;
 
@@ -322,18 +338,18 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
 
             // Put any grandchildren in a subpart
             if (!empty($grandchildren)) {
-                $subentity = $this->_createChild();
-                $subentity->_setNestingLevel($lowestLevel);
+                $subentity = $this->createChild();
+                $subentity->setNestingLevel($lowestLevel);
                 $subentity->setChildren($grandchildren, $compoundLevel);
                 array_unshift($immediateChildren, $subentity);
             }
         }
 
-        $this->_immediateChildren = $immediateChildren;
-        $this->_children = $children;
-        $this->_setContentTypeInHeaders($newContentType);
-        $this->_fixHeaders();
-        $this->_sortChildren();
+        $this->immediateChildren = $immediateChildren;
+        $this->children = $children;
+        $this->setContentTypeInHeaders($newContentType);
+        $this->fixHeaders();
+        $this->sortChildren();
 
         return $this;
     }
@@ -345,7 +361,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function getBody()
     {
-        return $this->_body instanceof Swift_OutputByteStream ? $this->_readStream($this->_body) : $this->_body;
+        return $this->body instanceof Swift_OutputByteStream ? $this->readStream($this->body) : $this->body;
     }
 
     /**
@@ -359,12 +375,12 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function setBody($body, $contentType = null)
     {
-        if ($body !== $this->_body) {
-            $this->_clearCache();
+        if ($body !== $this->body) {
+            $this->clearCache();
         }
 
-        $this->_body = $body;
-        if (isset($contentType)) {
+        $this->body = $body;
+        if (null !== $contentType) {
             $this->setContentType($contentType);
         }
 
@@ -378,25 +394,23 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function getEncoder()
     {
-        return $this->_encoder;
+        return $this->encoder;
     }
 
     /**
      * Set the encoder used for the body of this entity.
      *
-     * @param Swift_Mime_ContentEncoder $encoder
-     *
      * @return $this
      */
     public function setEncoder(Swift_Mime_ContentEncoder $encoder)
     {
-        if ($encoder !== $this->_encoder) {
-            $this->_clearCache();
+        if ($encoder !== $this->encoder) {
+            $this->clearCache();
         }
 
-        $this->_encoder = $encoder;
-        $this->_setEncoding($encoder->getName());
-        $this->_notifyEncoderChanged($encoder);
+        $this->encoder = $encoder;
+        $this->setEncoding($encoder->getName());
+        $this->notifyEncoderChanged($encoder);
 
         return $this;
     }
@@ -408,11 +422,11 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function getBoundary()
     {
-        if (!isset($this->_boundary)) {
-            $this->_boundary = '_=_swift_v4_'.time().'_'.md5(getmypid().mt_rand().uniqid('', true)).'_=_';
+        if (!isset($this->boundary)) {
+            $this->boundary = '_=_swift_'.time().'_'.bin2hex(random_bytes(16)).'_=_';
         }
 
-        return $this->_boundary;
+        return $this->boundary;
     }
 
     /**
@@ -426,8 +440,8 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function setBoundary($boundary)
     {
-        $this->_assertValidBoundary($boundary);
-        $this->_boundary = $boundary;
+        $this->assertValidBoundary($boundary);
+        $this->boundary = $boundary;
 
         return $this;
     }
@@ -440,18 +454,16 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function charsetChanged($charset)
     {
-        $this->_notifyCharsetChanged($charset);
+        $this->notifyCharsetChanged($charset);
     }
 
     /**
      * Receive notification that the encoder of this entity or a parent entity
      * has changed.
-     *
-     * @param Swift_Mime_ContentEncoder $encoder
      */
     public function encoderChanged(Swift_Mime_ContentEncoder $encoder)
     {
-        $this->_notifyEncoderChanged($encoder);
+        $this->notifyEncoderChanged($encoder);
     }
 
     /**
@@ -461,8 +473,8 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function toString()
     {
-        $string = $this->_headers->toString();
-        $string .= $this->_bodyToString();
+        $string = $this->headers->toString();
+        $string .= $this->bodyToString();
 
         return $string;
     }
@@ -472,22 +484,22 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      *
      * @return string
      */
-    protected function _bodyToString()
+    protected function bodyToString()
     {
         $string = '';
 
-        if (isset($this->_body) && empty($this->_immediateChildren)) {
-            if ($this->_cache->hasKey($this->_cacheKey, 'body')) {
-                $body = $this->_cache->getString($this->_cacheKey, 'body');
+        if (isset($this->body) && empty($this->immediateChildren)) {
+            if ($this->cache->hasKey($this->cacheKey, 'body')) {
+                $body = $this->cache->getString($this->cacheKey, 'body');
             } else {
-                $body = "\r\n".$this->_encoder->encodeString($this->getBody(), 0, $this->getMaxLineLength());
-                $this->_cache->setString($this->_cacheKey, 'body', $body, Swift_KeyCache::MODE_WRITE);
+                $body = "\r\n".$this->encoder->encodeString($this->getBody(), 0, $this->getMaxLineLength());
+                $this->cache->setString($this->cacheKey, 'body', $body, Swift_KeyCache::MODE_WRITE);
             }
             $string .= $body;
         }
 
-        if (!empty($this->_immediateChildren)) {
-            foreach ($this->_immediateChildren as $child) {
+        if (!empty($this->immediateChildren)) {
+            foreach ($this->immediateChildren as $child) {
                 $string .= "\r\n\r\n--".$this->getBoundary()."\r\n";
                 $string .= $child->toString();
             }
@@ -511,42 +523,38 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
 
     /**
      * Write this entire entity to a {@see Swift_InputByteStream}.
-     *
-     * @param Swift_InputByteStream
      */
     public function toByteStream(Swift_InputByteStream $is)
     {
-        $is->write($this->_headers->toString());
+        $is->write($this->headers->toString());
         $is->commit();
 
-        $this->_bodyToByteStream($is);
+        $this->bodyToByteStream($is);
     }
 
     /**
      * Write this entire entity to a {@link Swift_InputByteStream}.
-     *
-     * @param Swift_InputByteStream
      */
-    protected function _bodyToByteStream(Swift_InputByteStream $is)
+    protected function bodyToByteStream(Swift_InputByteStream $is)
     {
-        if (empty($this->_immediateChildren)) {
-            if (isset($this->_body)) {
-                if ($this->_cache->hasKey($this->_cacheKey, 'body')) {
-                    $this->_cache->exportToByteStream($this->_cacheKey, 'body', $is);
+        if (empty($this->immediateChildren)) {
+            if (isset($this->body)) {
+                if ($this->cache->hasKey($this->cacheKey, 'body')) {
+                    $this->cache->exportToByteStream($this->cacheKey, 'body', $is);
                 } else {
-                    $cacheIs = $this->_cache->getInputByteStream($this->_cacheKey, 'body');
+                    $cacheIs = $this->cache->getInputByteStream($this->cacheKey, 'body');
                     if ($cacheIs) {
                         $is->bind($cacheIs);
                     }
 
                     $is->write("\r\n");
 
-                    if ($this->_body instanceof Swift_OutputByteStream) {
-                        $this->_body->setReadPointer(0);
+                    if ($this->body instanceof Swift_OutputByteStream) {
+                        $this->body->setReadPointer(0);
 
-                        $this->_encoder->encodeByteStream($this->_body, $is, 0, $this->getMaxLineLength());
+                        $this->encoder->encodeByteStream($this->body, $is, 0, $this->getMaxLineLength());
                     } else {
-                        $is->write($this->_encoder->encodeString($this->getBody(), 0, $this->getMaxLineLength()));
+                        $is->write($this->encoder->encodeString($this->getBody(), 0, $this->getMaxLineLength()));
                     }
 
                     if ($cacheIs) {
@@ -556,8 +564,8 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
             }
         }
 
-        if (!empty($this->_immediateChildren)) {
-            foreach ($this->_immediateChildren as $child) {
+        if (!empty($this->immediateChildren)) {
+            foreach ($this->immediateChildren as $child) {
                 $is->write("\r\n\r\n--".$this->getBoundary()."\r\n");
                 $child->toByteStream($is);
             }
@@ -568,7 +576,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
     /**
      * Get the name of the header that provides the ID of this entity.
      */
-    protected function _getIdField()
+    protected function getIdField()
     {
         return 'Content-ID';
     }
@@ -576,20 +584,20 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
     /**
      * Get the model data (usually an array or a string) for $field.
      */
-    protected function _getHeaderFieldModel($field)
+    protected function getHeaderFieldModel($field)
     {
-        if ($this->_headers->has($field)) {
-            return $this->_headers->get($field)->getFieldBodyModel();
+        if ($this->headers->has($field)) {
+            return $this->headers->get($field)->getFieldBodyModel();
         }
     }
 
     /**
      * Set the model data for $field.
      */
-    protected function _setHeaderFieldModel($field, $model)
+    protected function setHeaderFieldModel($field, $model)
     {
-        if ($this->_headers->has($field)) {
-            $this->_headers->get($field)->setFieldBodyModel($model);
+        if ($this->headers->has($field)) {
+            $this->headers->get($field)->setFieldBodyModel($model);
 
             return true;
         }
@@ -600,20 +608,20 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
     /**
      * Get the parameter value of $parameter on $field header.
      */
-    protected function _getHeaderParameter($field, $parameter)
+    protected function getHeaderParameter($field, $parameter)
     {
-        if ($this->_headers->has($field)) {
-            return $this->_headers->get($field)->getParameter($parameter);
+        if ($this->headers->has($field)) {
+            return $this->headers->get($field)->getParameter($parameter);
         }
     }
 
     /**
      * Set the parameter value of $parameter on $field header.
      */
-    protected function _setHeaderParameter($field, $parameter, $value)
+    protected function setHeaderParameter($field, $parameter, $value)
     {
-        if ($this->_headers->has($field)) {
-            $this->_headers->get($field)->setParameter($parameter, $value);
+        if ($this->headers->has($field)) {
+            $this->headers->get($field)->setParameter($parameter, $value);
 
             return true;
         }
@@ -624,16 +632,16 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
     /**
      * Re-evaluate what content type and encoding should be used on this entity.
      */
-    protected function _fixHeaders()
+    protected function fixHeaders()
     {
-        if (count($this->_immediateChildren)) {
-            $this->_setHeaderParameter('Content-Type', 'boundary',
+        if (\count($this->immediateChildren)) {
+            $this->setHeaderParameter('Content-Type', 'boundary',
                 $this->getBoundary()
                 );
-            $this->_headers->remove('Content-Transfer-Encoding');
+            $this->headers->remove('Content-Transfer-Encoding');
         } else {
-            $this->_setHeaderParameter('Content-Type', 'boundary', null);
-            $this->_setEncoding($this->_encoder->getName());
+            $this->setHeaderParameter('Content-Type', 'boundary', null);
+            $this->setEncoding($this->encoder->getName());
         }
     }
 
@@ -642,50 +650,30 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      *
      * @return Swift_KeyCache
      */
-    protected function _getCache()
+    protected function getCache()
     {
-        return $this->_cache;
+        return $this->cache;
     }
 
     /**
-     * Get the grammar used for validation.
+     * Get the ID generator.
      *
-     * @return Swift_Mime_Grammar
+     * @return Swift_IdGenerator
      */
-    protected function _getGrammar()
+    protected function getIdGenerator()
     {
-        return $this->_grammar;
+        return $this->idGenerator;
     }
 
     /**
      * Empty the KeyCache for this entity.
      */
-    protected function _clearCache()
+    protected function clearCache()
     {
-        $this->_cache->clearKey($this->_cacheKey, 'body');
+        $this->cache->clearKey($this->cacheKey, 'body');
     }
 
-    /**
-     * Returns a random Content-ID or Message-ID.
-     *
-     * @return string
-     */
-    protected function getRandomId()
-    {
-        $idLeft = md5(getmypid().'.'.time().'.'.uniqid(mt_rand(), true));
-        $idRight = !empty($_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'swift.generated';
-        $id = $idLeft.'@'.$idRight;
-
-        try {
-            $this->_assertValidId($id);
-        } catch (Swift_RfcComplianceException $e) {
-            $id = $idLeft.'@swift.generated';
-        }
-
-        return $id;
-    }
-
-    private function _readStream(Swift_OutputByteStream $os)
+    private function readStream(Swift_OutputByteStream $os)
     {
         $string = '';
         while (false !== $bytes = $os->read(8192)) {
@@ -697,33 +685,33 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
         return $string;
     }
 
-    private function _setEncoding($encoding)
+    private function setEncoding($encoding)
     {
-        if (!$this->_setHeaderFieldModel('Content-Transfer-Encoding', $encoding)) {
-            $this->_headers->addTextHeader('Content-Transfer-Encoding', $encoding);
+        if (!$this->setHeaderFieldModel('Content-Transfer-Encoding', $encoding)) {
+            $this->headers->addTextHeader('Content-Transfer-Encoding', $encoding);
         }
     }
 
-    private function _assertValidBoundary($boundary)
+    private function assertValidBoundary($boundary)
     {
         if (!preg_match('/^[a-z0-9\'\(\)\+_\-,\.\/:=\?\ ]{0,69}[a-z0-9\'\(\)\+_\-,\.\/:=\?]$/Di', $boundary)) {
             throw new Swift_RfcComplianceException('Mime boundary set is not RFC 2046 compliant.');
         }
     }
 
-    private function _setContentTypeInHeaders($type)
+    private function setContentTypeInHeaders($type)
     {
-        if (!$this->_setHeaderFieldModel('Content-Type', $type)) {
-            $this->_headers->addParameterizedHeader('Content-Type', $type);
+        if (!$this->setHeaderFieldModel('Content-Type', $type)) {
+            $this->headers->addParameterizedHeader('Content-Type', $type);
         }
     }
 
-    private function _setNestingLevel($level)
+    private function setNestingLevel($level)
     {
-        $this->_nestingLevel = $level;
+        $this->nestingLevel = $level;
     }
 
-    private function _getCompoundLevel($children)
+    private function getCompoundLevel($children)
     {
         $level = 0;
         foreach ($children as $child) {
@@ -733,17 +721,17 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
         return $level;
     }
 
-    private function _getNeededChildLevel($child, $compoundLevel)
+    private function getNeededChildLevel($child, $compoundLevel)
     {
-        $filter = array();
-        foreach ($this->_compoundLevelFilters as $bitmask => $rules) {
+        $filter = [];
+        foreach ($this->compoundLevelFilters as $bitmask => $rules) {
             if (($compoundLevel & $bitmask) === $bitmask) {
                 $filter = $rules + $filter;
             }
         }
 
         $realLevel = $child->getNestingLevel();
-        $lowercaseType = strtolower($child->getContentType());
+        $lowercaseType = strtolower($child->getContentType() ?? '');
 
         if (isset($filter[$realLevel]) && isset($filter[$realLevel][$lowercaseType])) {
             return $filter[$realLevel][$lowercaseType];
@@ -752,33 +740,33 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
         return $realLevel;
     }
 
-    private function _createChild()
+    private function createChild()
     {
-        return new self($this->_headers->newInstance(), $this->_encoder, $this->_cache, $this->_grammar);
+        return new self($this->headers->newInstance(), $this->encoder, $this->cache, $this->idGenerator);
     }
 
-    private function _notifyEncoderChanged(Swift_Mime_ContentEncoder $encoder)
+    private function notifyEncoderChanged(Swift_Mime_ContentEncoder $encoder)
     {
-        foreach ($this->_immediateChildren as $child) {
+        foreach ($this->immediateChildren as $child) {
             $child->encoderChanged($encoder);
         }
     }
 
-    private function _notifyCharsetChanged($charset)
+    private function notifyCharsetChanged($charset)
     {
-        $this->_encoder->charsetChanged($charset);
-        $this->_headers->charsetChanged($charset);
-        foreach ($this->_immediateChildren as $child) {
+        $this->encoder->charsetChanged($charset);
+        $this->headers->charsetChanged($charset);
+        foreach ($this->immediateChildren as $child) {
             $child->charsetChanged($charset);
         }
     }
 
-    private function _sortChildren()
+    private function sortChildren()
     {
         $shouldSort = false;
-        foreach ($this->_immediateChildren as $child) {
+        foreach ($this->immediateChildren as $child) {
             // NOTE: This include alternative parts moved into a related part
-            if ($child->getNestingLevel() == self::LEVEL_ALTERNATIVE) {
+            if (self::LEVEL_ALTERNATIVE == $child->getNestingLevel()) {
                 $shouldSort = true;
                 break;
             }
@@ -787,13 +775,13 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
         // Sort in order of preference, if there is one
         if ($shouldSort) {
             // Group the messages by order of preference
-            $sorted = array();
-            foreach ($this->_immediateChildren as $child) {
+            $sorted = [];
+            foreach ($this->immediateChildren as $child) {
                 $type = $child->getContentType();
-                $level = array_key_exists($type, $this->_alternativePartOrder) ? $this->_alternativePartOrder[$type] : max($this->_alternativePartOrder) + 1;
+                $level = \array_key_exists($type, $this->alternativePartOrder) ? $this->alternativePartOrder[$type] : max($this->alternativePartOrder) + 1;
 
                 if (empty($sorted[$level])) {
-                    $sorted[$level] = array();
+                    $sorted[$level] = [];
                 }
 
                 $sorted[$level][] = $child;
@@ -801,7 +789,7 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
 
             ksort($sorted);
 
-            $this->_immediateChildren = array_reduce($sorted, 'array_merge', array());
+            $this->immediateChildren = array_reduce($sorted, 'array_merge', []);
         }
     }
 
@@ -810,22 +798,8 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function __destruct()
     {
-        if ($this->_cache instanceof Swift_KeyCache) {
-            $this->_cache->clearAll($this->_cacheKey);
-        }
-    }
-
-    /**
-     * Throws an Exception if the id passed does not comply with RFC 2822.
-     *
-     * @param string $id
-     *
-     * @throws Swift_RfcComplianceException
-     */
-    private function _assertValidId($id)
-    {
-        if (!preg_match('/^'.$this->_grammar->getDefinition('id-left').'@'.$this->_grammar->getDefinition('id-right').'$/D', $id)) {
-            throw new Swift_RfcComplianceException('Invalid ID given <'.$id.'>');
+        if ($this->cache instanceof Swift_KeyCache) {
+            $this->cache->clearAll($this->cacheKey);
         }
     }
 
@@ -834,13 +808,19 @@ class Swift_Mime_SimpleMimeEntity implements Swift_Mime_MimeEntity
      */
     public function __clone()
     {
-        $this->_headers = clone $this->_headers;
-        $this->_encoder = clone $this->_encoder;
-        $this->_cacheKey = md5(uniqid(getmypid().mt_rand(), true));
-        $children = array();
-        foreach ($this->_children as $pos => $child) {
+        $this->headers = clone $this->headers;
+        $this->encoder = clone $this->encoder;
+        $this->cacheKey = bin2hex(random_bytes(16)); // set 32 hex values
+        $children = [];
+        foreach ($this->children as $pos => $child) {
             $children[$pos] = clone $child;
         }
         $this->setChildren($children);
     }
+
+    public function __wakeup()
+    {
+        $this->cacheKey = bin2hex(random_bytes(16)); // set 32 hex values
+        $this->cache = new Swift_KeyCache_ArrayKeyCache(new Swift_KeyCache_SimpleKeyCacheInputStream());
+    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php
index 525b7ec8e..ea97619ad 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/MimePart.php
@@ -26,8 +26,8 @@ class Swift_MimePart extends Swift_Mime_MimePart
      */
     public function __construct($body = null, $contentType = null, $charset = null)
     {
-        call_user_func_array(
-            array($this, 'Swift_Mime_MimePart::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Mime_MimePart::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('mime.part')
             );
@@ -42,18 +42,4 @@ class Swift_MimePart extends Swift_Mime_MimePart
             $this->setContentType($contentType);
         }
     }
-
-    /**
-     * Create a new MimePart.
-     *
-     * @param string $body
-     * @param string $contentType
-     * @param string $charset
-     *
-     * @return self
-     */
-    public static function newInstance($body = null, $contentType = null, $charset = null)
-    {
-        return new self($body, $contentType, $charset);
-    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php
index ddde335c5..e44b7af98 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/NullTransport.php
@@ -17,20 +17,10 @@ class Swift_NullTransport extends Swift_Transport_NullTransport
 {
     public function __construct()
     {
-        call_user_func_array(
-            array($this, 'Swift_Transport_NullTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_NullTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.null')
         );
     }
-
-    /**
-     * Create a new NullTransport instance.
-     *
-     * @return self
-     */
-    public static function newInstance()
-    {
-        return new self();
-    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
index a2ec2abcd..5b1d7deef 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/AntiFloodPlugin.php
@@ -20,28 +20,28 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
      *
      * @var int
      */
-    private $_threshold;
+    private $threshold;
 
     /**
      * The number of seconds to sleep for during a restart.
      *
      * @var int
      */
-    private $_sleep;
+    private $sleep;
 
     /**
      * The internal counter.
      *
      * @var int
      */
-    private $_counter = 0;
+    private $counter = 0;
 
     /**
      * The Sleeper instance for sleeping.
      *
      * @var Swift_Plugins_Sleeper
      */
-    private $_sleeper;
+    private $sleeper;
 
     /**
      * Create a new AntiFloodPlugin with $threshold and $sleep time.
@@ -54,7 +54,7 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
     {
         $this->setThreshold($threshold);
         $this->setSleepTime($sleep);
-        $this->_sleeper = $sleeper;
+        $this->sleeper = $sleeper;
     }
 
     /**
@@ -64,7 +64,7 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
      */
     public function setThreshold($threshold)
     {
-        $this->_threshold = $threshold;
+        $this->threshold = $threshold;
     }
 
     /**
@@ -74,7 +74,7 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
      */
     public function getThreshold()
     {
-        return $this->_threshold;
+        return $this->threshold;
     }
 
     /**
@@ -84,7 +84,7 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
      */
     public function setSleepTime($sleep)
     {
-        $this->_sleep = $sleep;
+        $this->sleep = $sleep;
     }
 
     /**
@@ -94,13 +94,11 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
      */
     public function getSleepTime()
     {
-        return $this->_sleep;
+        return $this->sleep;
     }
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -108,20 +106,18 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
-        ++$this->_counter;
-        if ($this->_counter >= $this->_threshold) {
+        ++$this->counter;
+        if ($this->counter >= $this->threshold) {
             $transport = $evt->getTransport();
             $transport->stop();
-            if ($this->_sleep) {
-                $this->sleep($this->_sleep);
+            if ($this->sleep) {
+                $this->sleep($this->sleep);
             }
             $transport->start();
-            $this->_counter = 0;
+            $this->counter = 0;
         }
     }
 
@@ -132,8 +128,8 @@ class Swift_Plugins_AntiFloodPlugin implements Swift_Events_SendListener, Swift_
      */
     public function sleep($seconds)
     {
-        if (isset($this->_sleeper)) {
-            $this->_sleeper->sleep($seconds);
+        if (isset($this->sleeper)) {
+            $this->sleeper->sleep($seconds);
         } else {
             sleep($seconds);
         }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
index f7e18d0eb..36451f44f 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/BandwidthMonitorPlugin.php
@@ -20,17 +20,17 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      *
      * @var int
      */
-    private $_out = 0;
+    private $out = 0;
 
     /**
      * The incoming traffic counter.
      *
      * @var int
      */
-    private $_in = 0;
+    private $in = 0;
 
     /** Bound byte streams */
-    private $_mirrors = array();
+    private $mirrors = [];
 
     /**
      * Not used.
@@ -41,8 +41,6 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -52,24 +50,20 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
 
     /**
      * Invoked immediately following a command being sent.
-     *
-     * @param Swift_Events_CommandEvent $evt
      */
     public function commandSent(Swift_Events_CommandEvent $evt)
     {
         $command = $evt->getCommand();
-        $this->_out += strlen($command);
+        $this->out += \strlen($command);
     }
 
     /**
      * Invoked immediately following a response coming back.
-     *
-     * @param Swift_Events_ResponseEvent $evt
      */
     public function responseReceived(Swift_Events_ResponseEvent $evt)
     {
         $response = $evt->getResponse();
-        $this->_in += strlen($response);
+        $this->in += \strlen($response);
     }
 
     /**
@@ -79,8 +73,8 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      */
     public function write($bytes)
     {
-        $this->_out += strlen($bytes);
-        foreach ($this->_mirrors as $stream) {
+        $this->out += \strlen($bytes);
+        foreach ($this->mirrors as $stream) {
             $stream->write($bytes);
         }
     }
@@ -97,12 +91,10 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function bind(Swift_InputByteStream $is)
     {
-        $this->_mirrors[] = $is;
+        $this->mirrors[] = $is;
     }
 
     /**
@@ -111,14 +103,12 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function unbind(Swift_InputByteStream $is)
     {
-        foreach ($this->_mirrors as $k => $stream) {
+        foreach ($this->mirrors as $k => $stream) {
             if ($is === $stream) {
-                unset($this->_mirrors[$k]);
+                unset($this->mirrors[$k]);
             }
         }
     }
@@ -128,7 +118,7 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      */
     public function flushBuffers()
     {
-        foreach ($this->_mirrors as $stream) {
+        foreach ($this->mirrors as $stream) {
             $stream->flushBuffers();
         }
     }
@@ -140,7 +130,7 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      */
     public function getBytesOut()
     {
-        return $this->_out;
+        return $this->out;
     }
 
     /**
@@ -150,7 +140,7 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      */
     public function getBytesIn()
     {
-        return $this->_in;
+        return $this->in;
     }
 
     /**
@@ -158,7 +148,7 @@ class Swift_Plugins_BandwidthMonitorPlugin implements Swift_Events_SendListener,
      */
     public function reset()
     {
-        $this->_out = 0;
-        $this->_in = 0;
+        $this->out = 0;
+        $this->in = 0;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
index 0762b36d2..93124c9a5 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/DecoratorPlugin.php
@@ -17,19 +17,19 @@
 class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_Plugins_Decorator_Replacements
 {
     /** The replacement map */
-    private $_replacements;
+    private $replacements;
 
     /** The body as it was before replacements */
-    private $_originalBody;
+    private $originalBody;
 
     /** The original headers of the message, before replacements */
-    private $_originalHeaders = array();
+    private $originalHeaders = [];
 
     /** Bodies of children before they are replaced */
-    private $_originalChildBodies = array();
+    private $originalChildBodies = [];
 
     /** The Message that was last replaced */
-    private $_lastMessage;
+    private $lastMessage;
 
     /**
      * Create a new DecoratorPlugin with $replacements.
@@ -66,21 +66,19 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
     public function setReplacements($replacements)
     {
         if (!($replacements instanceof Swift_Plugins_Decorator_Replacements)) {
-            $this->_replacements = (array) $replacements;
+            $this->replacements = (array) $replacements;
         } else {
-            $this->_replacements = $replacements;
+            $this->replacements = $replacements;
         }
     }
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
         $message = $evt->getMessage();
-        $this->_restoreMessage($message);
+        $this->restoreMessage($message);
         $to = array_keys($message->getTo());
         $address = array_shift($to);
         if ($replacements = $this->getReplacementsFor($address)) {
@@ -91,32 +89,32 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
                 $search, $replace, $body
                 );
             if ($body != $bodyReplaced) {
-                $this->_originalBody = $body;
+                $this->originalBody = $body;
                 $message->setBody($bodyReplaced);
             }
 
             foreach ($message->getHeaders()->getAll() as $header) {
                 $body = $header->getFieldBodyModel();
                 $count = 0;
-                if (is_array($body)) {
-                    $bodyReplaced = array();
+                if (\is_array($body)) {
+                    $bodyReplaced = [];
                     foreach ($body as $key => $value) {
                         $count1 = 0;
                         $count2 = 0;
-                        $key = is_string($key) ? str_replace($search, $replace, $key, $count1) : $key;
-                        $value = is_string($value) ? str_replace($search, $replace, $value, $count2) : $value;
+                        $key = \is_string($key) ? str_replace($search, $replace, $key, $count1) : $key;
+                        $value = \is_string($value) ? str_replace($search, $replace, $value, $count2) : $value;
                         $bodyReplaced[$key] = $value;
 
                         if (!$count && ($count1 || $count2)) {
                             $count = 1;
                         }
                     }
-                } else {
+                } elseif (\is_string($body)) {
                     $bodyReplaced = str_replace($search, $replace, $body, $count);
                 }
 
                 if ($count) {
-                    $this->_originalHeaders[$header->getFieldName()] = $body;
+                    $this->originalHeaders[$header->getFieldName()] = $body;
                     $header->setFieldBodyModel($bodyReplaced);
                 }
             }
@@ -131,11 +129,11 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
                         );
                     if ($body != $bodyReplaced) {
                         $child->setBody($bodyReplaced);
-                        $this->_originalChildBodies[$child->getId()] = $body;
+                        $this->originalChildBodies[$child->getId()] = $body;
                     }
                 }
             }
-            $this->_lastMessage = $message;
+            $this->lastMessage = $message;
         }
     }
 
@@ -155,50 +153,48 @@ class Swift_Plugins_DecoratorPlugin implements Swift_Events_SendListener, Swift_
      */
     public function getReplacementsFor($address)
     {
-        if ($this->_replacements instanceof Swift_Plugins_Decorator_Replacements) {
-            return $this->_replacements->getReplacementsFor($address);
+        if ($this->replacements instanceof Swift_Plugins_Decorator_Replacements) {
+            return $this->replacements->getReplacementsFor($address);
         }
 
-        return isset($this->_replacements[$address]) ? $this->_replacements[$address] : null;
+        return $this->replacements[$address] ?? null;
     }
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
-        $this->_restoreMessage($evt->getMessage());
+        $this->restoreMessage($evt->getMessage());
     }
 
     /** Restore a changed message back to its original state */
-    private function _restoreMessage(Swift_Mime_Message $message)
+    private function restoreMessage(Swift_Mime_SimpleMessage $message)
     {
-        if ($this->_lastMessage === $message) {
-            if (isset($this->_originalBody)) {
-                $message->setBody($this->_originalBody);
-                $this->_originalBody = null;
+        if ($this->lastMessage === $message) {
+            if (isset($this->originalBody)) {
+                $message->setBody($this->originalBody);
+                $this->originalBody = null;
             }
-            if (!empty($this->_originalHeaders)) {
+            if (!empty($this->originalHeaders)) {
                 foreach ($message->getHeaders()->getAll() as $header) {
-                    if (array_key_exists($header->getFieldName(), $this->_originalHeaders)) {
-                        $header->setFieldBodyModel($this->_originalHeaders[$header->getFieldName()]);
+                    if (\array_key_exists($header->getFieldName(), $this->originalHeaders)) {
+                        $header->setFieldBodyModel($this->originalHeaders[$header->getFieldName()]);
                     }
                 }
-                $this->_originalHeaders = array();
+                $this->originalHeaders = [];
             }
-            if (!empty($this->_originalChildBodies)) {
+            if (!empty($this->originalChildBodies)) {
                 $children = (array) $message->getChildren();
                 foreach ($children as $child) {
                     $id = $child->getId();
-                    if (array_key_exists($id, $this->_originalChildBodies)) {
-                        $child->setBody($this->_originalChildBodies[$id]);
+                    if (\array_key_exists($id, $this->originalChildBodies)) {
+                        $child->setBody($this->originalChildBodies[$id]);
                     }
                 }
-                $this->_originalChildBodies = array();
+                $this->originalChildBodies = [];
             }
-            $this->_lastMessage = null;
+            $this->lastMessage = null;
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
index 583444053..3f4dbbfa4 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ImpersonatePlugin.php
@@ -20,7 +20,7 @@ class Swift_Plugins_ImpersonatePlugin implements Swift_Events_SendListener
      *
      * @var string
      */
-    private $_sender;
+    private $sender;
 
     /**
      * Create a new ImpersonatePlugin to impersonate $sender.
@@ -29,13 +29,11 @@ class Swift_Plugins_ImpersonatePlugin implements Swift_Events_SendListener
      */
     public function __construct($sender)
     {
-        $this->_sender = $sender;
+        $this->sender = $sender;
     }
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -46,13 +44,11 @@ class Swift_Plugins_ImpersonatePlugin implements Swift_Events_SendListener
         $headers->addPathHeader('X-Swift-Return-Path', $message->getReturnPath());
 
         // replace them with the one to send to
-        $message->setReturnPath($this->_sender);
+        $message->setReturnPath($this->sender);
     }
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
index 64db43846..e183749b7 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/LoggerPlugin.php
@@ -11,21 +11,19 @@
 /**
  * Does real time logging of Transport level information.
  *
- * @author Chris Corbyn
+ * @author     Chris Corbyn
  */
 class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_Events_ResponseListener, Swift_Events_TransportChangeListener, Swift_Events_TransportExceptionListener, Swift_Plugins_Logger
 {
     /** The logger which is delegated to */
-    private $_logger;
+    private $logger;
 
     /**
      * Create a new LoggerPlugin using $logger.
-     *
-     * @param Swift_Plugins_Logger $logger
      */
     public function __construct(Swift_Plugins_Logger $logger)
     {
-        $this->_logger = $logger;
+        $this->logger = $logger;
     }
 
     /**
@@ -35,7 +33,7 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
      */
     public function add($entry)
     {
-        $this->_logger->add($entry);
+        $this->logger->add($entry);
     }
 
     /**
@@ -43,7 +41,7 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
      */
     public function clear()
     {
-        $this->_logger->clear();
+        $this->logger->clear();
     }
 
     /**
@@ -53,89 +51,75 @@ class Swift_Plugins_LoggerPlugin implements Swift_Events_CommandListener, Swift_
      */
     public function dump()
     {
-        return $this->_logger->dump();
+        return $this->logger->dump();
     }
 
     /**
      * Invoked immediately following a command being sent.
-     *
-     * @param Swift_Events_CommandEvent $evt
      */
     public function commandSent(Swift_Events_CommandEvent $evt)
     {
         $command = $evt->getCommand();
-        $this->_logger->add(sprintf('>> %s', $command));
+        $this->logger->add(sprintf('>> %s', $command));
     }
 
     /**
      * Invoked immediately following a response coming back.
-     *
-     * @param Swift_Events_ResponseEvent $evt
      */
     public function responseReceived(Swift_Events_ResponseEvent $evt)
     {
         $response = $evt->getResponse();
-        $this->_logger->add(sprintf('<< %s', $response));
+        $this->logger->add(sprintf('<< %s', $response));
     }
 
     /**
      * Invoked just before a Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt)
     {
-        $transportName = get_class($evt->getSource());
-        $this->_logger->add(sprintf('++ Starting %s', $transportName));
+        $transportName = \get_class($evt->getSource());
+        $this->logger->add(sprintf('++ Starting %s', $transportName));
     }
 
     /**
      * Invoked immediately after the Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function transportStarted(Swift_Events_TransportChangeEvent $evt)
     {
-        $transportName = get_class($evt->getSource());
-        $this->_logger->add(sprintf('++ %s started', $transportName));
+        $transportName = \get_class($evt->getSource());
+        $this->logger->add(sprintf('++ %s started', $transportName));
     }
 
     /**
      * Invoked just before a Transport is stopped.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStopped(Swift_Events_TransportChangeEvent $evt)
     {
-        $transportName = get_class($evt->getSource());
-        $this->_logger->add(sprintf('++ Stopping %s', $transportName));
+        $transportName = \get_class($evt->getSource());
+        $this->logger->add(sprintf('++ Stopping %s', $transportName));
     }
 
     /**
      * Invoked immediately after the Transport is stopped.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function transportStopped(Swift_Events_TransportChangeEvent $evt)
     {
-        $transportName = get_class($evt->getSource());
-        $this->_logger->add(sprintf('++ %s stopped', $transportName));
+        $transportName = \get_class($evt->getSource());
+        $this->logger->add(sprintf('++ %s stopped', $transportName));
     }
 
     /**
      * Invoked as a TransportException is thrown in the Transport system.
-     *
-     * @param Swift_Events_TransportExceptionEvent $evt
      */
     public function exceptionThrown(Swift_Events_TransportExceptionEvent $evt)
     {
         $e = $evt->getException();
         $message = $e->getMessage();
         $code = $e->getCode();
-        $this->_logger->add(sprintf('!! %s (code: %s)', $message, $code));
+        $this->logger->add(sprintf('!! %s (code: %s)', $message, $code));
         $message .= PHP_EOL;
         $message .= 'Log data:'.PHP_EOL;
-        $message .= $this->_logger->dump();
+        $message .= $this->logger->dump();
         $evt->cancelBubble();
         throw new Swift_TransportException($message, $code, $e->getPrevious());
     }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
index 865bb0aa3..6f595adaa 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/ArrayLogger.php
@@ -20,14 +20,14 @@ class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger
      *
      * @var array
      */
-    private $_log = array();
+    private $log = [];
 
     /**
      * Max size of the log.
      *
      * @var int
      */
-    private $_size = 0;
+    private $size = 0;
 
     /**
      * Create a new ArrayLogger with a maximum of $size entries.
@@ -36,7 +36,7 @@ class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger
      */
     public function __construct($size = 50)
     {
-        $this->_size = $size;
+        $this->size = $size;
     }
 
     /**
@@ -46,9 +46,9 @@ class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger
      */
     public function add($entry)
     {
-        $this->_log[] = $entry;
-        while (count($this->_log) > $this->_size) {
-            array_shift($this->_log);
+        $this->log[] = $entry;
+        while (\count($this->log) > $this->size) {
+            array_shift($this->log);
         }
     }
 
@@ -57,7 +57,7 @@ class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger
      */
     public function clear()
     {
-        $this->_log = array();
+        $this->log = [];
     }
 
     /**
@@ -67,6 +67,6 @@ class Swift_Plugins_Loggers_ArrayLogger implements Swift_Plugins_Logger
      */
     public function dump()
     {
-        return implode(PHP_EOL, $this->_log);
+        return implode(PHP_EOL, $this->log);
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
index 3583297ab..40a53d2bb 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Loggers/EchoLogger.php
@@ -16,7 +16,7 @@
 class Swift_Plugins_Loggers_EchoLogger implements Swift_Plugins_Logger
 {
     /** Whether or not HTML should be output */
-    private $_isHtml;
+    private $isHtml;
 
     /**
      * Create a new EchoLogger.
@@ -25,7 +25,7 @@ class Swift_Plugins_Loggers_EchoLogger implements Swift_Plugins_Logger
      */
     public function __construct($isHtml = true)
     {
-        $this->_isHtml = $isHtml;
+        $this->isHtml = $isHtml;
     }
 
     /**
@@ -35,7 +35,7 @@ class Swift_Plugins_Loggers_EchoLogger implements Swift_Plugins_Logger
      */
     public function add($entry)
     {
-        if ($this->_isHtml) {
+        if ($this->isHtml) {
             printf('%s%s%s', htmlspecialchars($entry, ENT_QUOTES), '<br />', PHP_EOL);
         } else {
             printf('%s%s', $entry, PHP_EOL);
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
index 5ff1d9321..39c48ed18 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/MessageLogger.php
@@ -16,19 +16,19 @@
 class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
 {
     /**
-     * @var Swift_Mime_Message[]
+     * @var Swift_Mime_SimpleMessage[]
      */
     private $messages;
 
     public function __construct()
     {
-        $this->messages = array();
+        $this->messages = [];
     }
 
     /**
      * Get the message list.
      *
-     * @return Swift_Mime_Message[]
+     * @return Swift_Mime_SimpleMessage[]
      */
     public function getMessages()
     {
@@ -42,7 +42,7 @@ class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
      */
     public function countMessages()
     {
-        return count($this->messages);
+        return \count($this->messages);
     }
 
     /**
@@ -50,13 +50,11 @@ class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
      */
     public function clear()
     {
-        $this->messages = array();
+        $this->messages = [];
     }
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -65,8 +63,6 @@ class Swift_Plugins_MessageLogger implements Swift_Events_SendListener
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
index 31461526c..944859409 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/PopBeforeSmtpPlugin.php
@@ -11,87 +11,70 @@
 /**
  * Makes sure a connection to a POP3 host has been established prior to connecting to SMTP.
  *
- * @author Chris Corbyn
+ * @author     Chris Corbyn
  */
 class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeListener, Swift_Plugins_Pop_Pop3Connection
 {
     /** A delegate connection to use (mostly a test hook) */
-    private $_connection;
+    private $connection;
 
     /** Hostname of the POP3 server */
-    private $_host;
+    private $host;
 
     /** Port number to connect on */
-    private $_port;
+    private $port;
 
     /** Encryption type to use (if any) */
-    private $_crypto;
+    private $crypto;
 
     /** Username to use (if any) */
-    private $_username;
+    private $username;
 
     /** Password to use (if any) */
-    private $_password;
+    private $password;
 
     /** Established connection via TCP socket */
-    private $_socket;
+    private $socket;
 
     /** Connect timeout in seconds */
-    private $_timeout = 10;
+    private $timeout = 10;
 
     /** SMTP Transport to bind to */
-    private $_transport;
+    private $transport;
 
     /**
      * Create a new PopBeforeSmtpPlugin for $host and $port.
      *
-     * @param string $host
+     * @param string $host   Hostname or IP. Literal IPv6 addresses should be
+     *                       wrapped in square brackets.
      * @param int    $port
      * @param string $crypto as "tls" or "ssl"
      */
     public function __construct($host, $port = 110, $crypto = null)
     {
-        $this->_host = $host;
-        $this->_port = $port;
-        $this->_crypto = $crypto;
-    }
-
-    /**
-     * Create a new PopBeforeSmtpPlugin for $host and $port.
-     *
-     * @param string $host
-     * @param int    $port
-     * @param string $crypto as "tls" or "ssl"
-     *
-     * @return self
-     */
-    public static function newInstance($host, $port = 110, $crypto = null)
-    {
-        return new self($host, $port, $crypto);
+        $this->host = $host;
+        $this->port = $port;
+        $this->crypto = $crypto;
     }
 
     /**
      * Set a Pop3Connection to delegate to instead of connecting directly.
      *
-     * @param Swift_Plugins_Pop_Pop3Connection $connection
-     *
      * @return $this
      */
     public function setConnection(Swift_Plugins_Pop_Pop3Connection $connection)
     {
-        $this->_connection = $connection;
+        $this->connection = $connection;
 
         return $this;
     }
 
     /**
      * Bind this plugin to a specific SMTP transport instance.
-     *
-     * @param Swift_Transport
      */
     public function bindSmtp(Swift_Transport $smtp)
     {
-        $this->_transport = $smtp;
+        $this->transport = $smtp;
     }
 
     /**
@@ -103,7 +86,7 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
      */
     public function setTimeout($timeout)
     {
-        $this->_timeout = (int) $timeout;
+        $this->timeout = (int) $timeout;
 
         return $this;
     }
@@ -117,7 +100,7 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
      */
     public function setUsername($username)
     {
-        $this->_username = $username;
+        $this->username = $username;
 
         return $this;
     }
@@ -131,7 +114,7 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
      */
     public function setPassword($password)
     {
-        $this->_password = $password;
+        $this->password = $password;
 
         return $this;
     }
@@ -143,29 +126,25 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
      */
     public function connect()
     {
-        if (isset($this->_connection)) {
-            $this->_connection->connect();
+        if (isset($this->connection)) {
+            $this->connection->connect();
         } else {
-            if (!isset($this->_socket)) {
+            if (!isset($this->socket)) {
                 if (!$socket = fsockopen(
-                    $this->_getHostString(), $this->_port, $errno, $errstr, $this->_timeout)) {
-                    throw new Swift_Plugins_Pop_Pop3Exception(
-                        sprintf('Failed to connect to POP3 host [%s]: %s', $this->_host, $errstr)
-                    );
+                    $this->getHostString(), $this->port, $errno, $errstr, $this->timeout)) {
+                    throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to connect to POP3 host [%s]: %s', $this->host, $errstr));
                 }
-                $this->_socket = $socket;
+                $this->socket = $socket;
 
-                if (false === $greeting = fgets($this->_socket)) {
-                    throw new Swift_Plugins_Pop_Pop3Exception(
-                        sprintf('Failed to connect to POP3 host [%s]', trim($greeting))
-                    );
+                if (false === $greeting = fgets($this->socket)) {
+                    throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to connect to POP3 host [%s]', trim($greeting ?? '')));
                 }
 
-                $this->_assertOk($greeting);
+                $this->assertOk($greeting);
 
-                if ($this->_username) {
-                    $this->_command(sprintf("USER %s\r\n", $this->_username));
-                    $this->_command(sprintf("PASS %s\r\n", $this->_password));
+                if ($this->username) {
+                    $this->command(sprintf("USER %s\r\n", $this->username));
+                    $this->command(sprintf("PASS %s\r\n", $this->password));
                 }
             }
         }
@@ -176,28 +155,24 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
      */
     public function disconnect()
     {
-        if (isset($this->_connection)) {
-            $this->_connection->disconnect();
+        if (isset($this->connection)) {
+            $this->connection->disconnect();
         } else {
-            $this->_command("QUIT\r\n");
-            if (!fclose($this->_socket)) {
-                throw new Swift_Plugins_Pop_Pop3Exception(
-                    sprintf('POP3 host [%s] connection could not be stopped', $this->_host)
-                );
+            $this->command("QUIT\r\n");
+            if (!fclose($this->socket)) {
+                throw new Swift_Plugins_Pop_Pop3Exception(sprintf('POP3 host [%s] connection could not be stopped', $this->host));
             }
-            $this->_socket = null;
+            $this->socket = null;
         }
     }
 
     /**
      * Invoked just before a Transport is started.
-     *
-     * @param Swift_Events_TransportChangeEvent $evt
      */
     public function beforeTransportStarted(Swift_Events_TransportChangeEvent $evt)
     {
-        if (isset($this->_transport)) {
-            if ($this->_transport !== $evt->getTransport()) {
+        if (isset($this->transport)) {
+            if ($this->transport !== $evt->getTransport()) {
                 return;
             }
         }
@@ -227,38 +202,32 @@ class Swift_Plugins_PopBeforeSmtpPlugin implements Swift_Events_TransportChangeL
     {
     }
 
-    private function _command($command)
+    private function command($command)
     {
-        if (!fwrite($this->_socket, $command)) {
-            throw new Swift_Plugins_Pop_Pop3Exception(
-                sprintf('Failed to write command [%s] to POP3 host', trim($command))
-            );
+        if (!fwrite($this->socket, $command)) {
+            throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to write command [%s] to POP3 host', trim($command ?? '')));
         }
 
-        if (false === $response = fgets($this->_socket)) {
-            throw new Swift_Plugins_Pop_Pop3Exception(
-                sprintf('Failed to read from POP3 host after command [%s]', trim($command))
-            );
+        if (false === $response = fgets($this->socket)) {
+            throw new Swift_Plugins_Pop_Pop3Exception(sprintf('Failed to read from POP3 host after command [%s]', trim($command ?? '')));
         }
 
-        $this->_assertOk($response);
+        $this->assertOk($response);
 
         return $response;
     }
 
-    private function _assertOk($response)
+    private function assertOk($response)
     {
-        if (substr($response, 0, 3) != '+OK') {
-            throw new Swift_Plugins_Pop_Pop3Exception(
-                sprintf('POP3 command failed [%s]', trim($response))
-            );
+        if ('+OK' != substr($response, 0, 3)) {
+            throw new Swift_Plugins_Pop_Pop3Exception(sprintf('POP3 command failed [%s]', trim($response ?? '')));
         }
     }
 
-    private function _getHostString()
+    private function getHostString()
     {
-        $host = $this->_host;
-        switch (strtolower($this->_crypto)) {
+        $host = $this->host;
+        switch (strtolower($this->crypto ?? '')) {
             case 'ssl':
                 $host = 'ssl://'.$host;
                 break;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
index c3a1f8685..f7373b242 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/RedirectingPlugin.php
@@ -11,7 +11,7 @@
 /**
  * Redirects all email to a single recipient.
  *
- * @author Fabien Potencier
+ * @author     Fabien Potencier
  */
 class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
 {
@@ -20,25 +20,24 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
      *
      * @var mixed
      */
-    private $_recipient;
+    private $recipient;
 
     /**
      * List of regular expression for recipient whitelisting.
      *
      * @var array
      */
-    private $_whitelist = array();
+    private $whitelist = [];
 
     /**
      * Create a new RedirectingPlugin.
      *
      * @param mixed $recipient
-     * @param array $whitelist
      */
-    public function __construct($recipient, array $whitelist = array())
+    public function __construct($recipient, array $whitelist = [])
     {
-        $this->_recipient = $recipient;
-        $this->_whitelist = $whitelist;
+        $this->recipient = $recipient;
+        $this->whitelist = $whitelist;
     }
 
     /**
@@ -48,7 +47,7 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
      */
     public function setRecipient($recipient)
     {
-        $this->_recipient = $recipient;
+        $this->recipient = $recipient;
     }
 
     /**
@@ -58,17 +57,15 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
      */
     public function getRecipient()
     {
-        return $this->_recipient;
+        return $this->recipient;
     }
 
     /**
      * Set a list of regular expressions to whitelist certain recipients.
-     *
-     * @param array $whitelist
      */
     public function setWhitelist(array $whitelist)
     {
-        $this->_whitelist = $whitelist;
+        $this->whitelist = $whitelist;
     }
 
     /**
@@ -78,13 +75,11 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
      */
     public function getWhitelist()
     {
-        return $this->_whitelist;
+        return $this->whitelist;
     }
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
@@ -106,18 +101,18 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
         }
 
         // Filter remaining headers against whitelist
-        $this->_filterHeaderSet($headers, 'To');
-        $this->_filterHeaderSet($headers, 'Cc');
-        $this->_filterHeaderSet($headers, 'Bcc');
+        $this->filterHeaderSet($headers, 'To');
+        $this->filterHeaderSet($headers, 'Cc');
+        $this->filterHeaderSet($headers, 'Bcc');
 
         // Add each hard coded recipient
         $to = $message->getTo();
         if (null === $to) {
-            $to = array();
+            $to = [];
         }
 
-        foreach ((array) $this->_recipient as $recipient) {
-            if (!array_key_exists($recipient, $to)) {
+        foreach ((array) $this->recipient as $recipient) {
+            if (!\array_key_exists($recipient, $to)) {
                 $message->addTo($recipient);
             }
         }
@@ -126,29 +121,26 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
     /**
      * Filter header set against a whitelist of regular expressions.
      *
-     * @param Swift_Mime_HeaderSet $headerSet
-     * @param string               $type
+     * @param string $type
      */
-    private function _filterHeaderSet(Swift_Mime_HeaderSet $headerSet, $type)
+    private function filterHeaderSet(Swift_Mime_SimpleHeaderSet $headerSet, $type)
     {
         foreach ($headerSet->getAll($type) as $headers) {
-            $headers->setNameAddresses($this->_filterNameAddresses($headers->getNameAddresses()));
+            $headers->setNameAddresses($this->filterNameAddresses($headers->getNameAddresses()));
         }
     }
 
     /**
      * Filtered list of addresses => name pairs.
      *
-     * @param array $recipients
-     *
      * @return array
      */
-    private function _filterNameAddresses(array $recipients)
+    private function filterNameAddresses(array $recipients)
     {
-        $filtered = array();
+        $filtered = [];
 
         foreach ($recipients as $address => $name) {
-            if ($this->_isWhitelisted($address)) {
+            if ($this->isWhitelisted($address)) {
                 $filtered[$address] = $name;
             }
         }
@@ -159,17 +151,15 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
     /**
      * Matches address against whitelist of regular expressions.
      *
-     * @param $recipient
-     *
      * @return bool
      */
-    protected function _isWhitelisted($recipient)
+    protected function isWhitelisted($recipient)
     {
-        if (in_array($recipient, (array) $this->_recipient)) {
+        if (\in_array($recipient, (array) $this->recipient)) {
             return true;
         }
 
-        foreach ($this->_whitelist as $pattern) {
+        foreach ($this->whitelist as $pattern) {
             if (preg_match($pattern, $recipient)) {
                 return true;
             }
@@ -180,15 +170,13 @@ class Swift_Plugins_RedirectingPlugin implements Swift_Events_SendListener
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
-        $this->_restoreMessage($evt->getMessage());
+        $this->restoreMessage($evt->getMessage());
     }
 
-    private function _restoreMessage(Swift_Mime_Message $message)
+    private function restoreMessage(Swift_Mime_SimpleMessage $message)
     {
         // restore original headers
         $headers = $message->getHeaders();
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporter.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
index 0f21b7d60..b88183397 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporter.php
@@ -24,9 +24,8 @@ interface Swift_Plugins_Reporter
     /**
      * Notifies this ReportNotifier that $address failed or succeeded.
      *
-     * @param Swift_Mime_Message $message
-     * @param string             $address
-     * @param int                $result  from {@link RESULT_PASS, RESULT_FAIL}
+     * @param string $address
+     * @param int    $result  from {@link RESULT_PASS, RESULT_FAIL}
      */
-    public function notify(Swift_Mime_Message $message, $address, $result);
+    public function notify(Swift_Mime_SimpleMessage $message, $address, $result);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
index a37901ff0..c4a016520 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ReporterPlugin.php
@@ -20,16 +20,14 @@ class Swift_Plugins_ReporterPlugin implements Swift_Events_SendListener
      *
      * @var Swift_Plugins_Reporter
      */
-    private $_reporter;
+    private $reporter;
 
     /**
      * Create a new ReporterPlugin using $reporter.
-     *
-     * @param Swift_Plugins_Reporter $reporter
      */
     public function __construct(Swift_Plugins_Reporter $reporter)
     {
-        $this->_reporter = $reporter;
+        $this->reporter = $reporter;
     }
 
     /**
@@ -41,21 +39,19 @@ class Swift_Plugins_ReporterPlugin implements Swift_Events_SendListener
 
     /**
      * Invoked immediately after the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
         $message = $evt->getMessage();
         $failures = array_flip($evt->getFailedRecipients());
         foreach ((array) $message->getTo() as $address => $null) {
-            $this->_reporter->notify($message, $address, array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS);
+            $this->reporter->notify($message, $address, (\array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
         }
         foreach ((array) $message->getCc() as $address => $null) {
-            $this->_reporter->notify($message, $address, array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS);
+            $this->reporter->notify($message, $address, (\array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
         }
         foreach ((array) $message->getBcc() as $address => $null) {
-            $this->_reporter->notify($message, $address, array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS);
+            $this->reporter->notify($message, $address, (\array_key_exists($address, $failures) ? Swift_Plugins_Reporter::RESULT_FAIL : Swift_Plugins_Reporter::RESULT_PASS));
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
index cad9d168e..249cffbde 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HitReporter.php
@@ -20,22 +20,21 @@ class Swift_Plugins_Reporters_HitReporter implements Swift_Plugins_Reporter
      *
      * @var array
      */
-    private $_failures = array();
+    private $failures = [];
 
-    private $_failures_cache = array();
+    private $failures_cache = [];
 
     /**
      * Notifies this ReportNotifier that $address failed or succeeded.
      *
-     * @param Swift_Mime_Message $message
-     * @param string             $address
-     * @param int                $result  from {@link RESULT_PASS, RESULT_FAIL}
+     * @param string $address
+     * @param int    $result  from {@link RESULT_PASS, RESULT_FAIL}
      */
-    public function notify(Swift_Mime_Message $message, $address, $result)
+    public function notify(Swift_Mime_SimpleMessage $message, $address, $result)
     {
-        if (self::RESULT_FAIL == $result && !isset($this->_failures_cache[$address])) {
-            $this->_failures[] = $address;
-            $this->_failures_cache[$address] = true;
+        if (self::RESULT_FAIL == $result && !isset($this->failures_cache[$address])) {
+            $this->failures[] = $address;
+            $this->failures_cache[$address] = true;
         }
     }
 
@@ -46,7 +45,7 @@ class Swift_Plugins_Reporters_HitReporter implements Swift_Plugins_Reporter
      */
     public function getFailedRecipients()
     {
-        return $this->_failures;
+        return $this->failures;
     }
 
     /**
@@ -54,6 +53,6 @@ class Swift_Plugins_Reporters_HitReporter implements Swift_Plugins_Reporter
      */
     public function clear()
     {
-        $this->_failures = $this->_failures_cache = array();
+        $this->failures = $this->failures_cache = [];
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
index c62593557..1cfc3f974 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/Reporters/HtmlReporter.php
@@ -18,11 +18,10 @@ class Swift_Plugins_Reporters_HtmlReporter implements Swift_Plugins_Reporter
     /**
      * Notifies this ReportNotifier that $address failed or succeeded.
      *
-     * @param Swift_Mime_Message $message
-     * @param string             $address
-     * @param int                $result  from {@see RESULT_PASS, RESULT_FAIL}
+     * @param string $address
+     * @param int    $result  from {@see RESULT_PASS, RESULT_FAIL}
      */
-    public function notify(Swift_Mime_Message $message, $address, $result)
+    public function notify(Swift_Mime_SimpleMessage $message, $address, $result)
     {
         if (self::RESULT_PASS == $result) {
             echo '<div style="color: #fff; background: #006600; padding: 2px; margin: 2px;">'.PHP_EOL;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
index 2f4b9a75e..83d304492 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Plugins/ThrottlerPlugin.php
@@ -29,28 +29,28 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
      *
      * @var Swift_Plugins_Sleeper
      */
-    private $_sleeper;
+    private $sleeper;
 
     /**
      * The Timer instance which provides the timestamp.
      *
      * @var Swift_Plugins_Timer
      */
-    private $_timer;
+    private $timer;
 
     /**
      * The time at which the first email was sent.
      *
      * @var int
      */
-    private $_start;
+    private $start;
 
     /**
      * The rate at which messages should be sent.
      *
      * @var int
      */
-    private $_rate;
+    private $rate;
 
     /**
      * The mode for throttling.
@@ -59,53 +59,51 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
      *
      * @var int
      */
-    private $_mode;
+    private $mode;
 
     /**
      * An internal counter of the number of messages sent.
      *
      * @var int
      */
-    private $_messages = 0;
+    private $messages = 0;
 
     /**
      * Create a new ThrottlerPlugin.
      *
      * @param int                   $rate
-     * @param int                   $mode,   defaults to {@link BYTES_PER_MINUTE}
+     * @param int                   $mode    defaults to {@link BYTES_PER_MINUTE}
      * @param Swift_Plugins_Sleeper $sleeper (only needed in testing)
      * @param Swift_Plugins_Timer   $timer   (only needed in testing)
      */
     public function __construct($rate, $mode = self::BYTES_PER_MINUTE, Swift_Plugins_Sleeper $sleeper = null, Swift_Plugins_Timer $timer = null)
     {
-        $this->_rate = $rate;
-        $this->_mode = $mode;
-        $this->_sleeper = $sleeper;
-        $this->_timer = $timer;
+        $this->rate = $rate;
+        $this->mode = $mode;
+        $this->sleeper = $sleeper;
+        $this->timer = $timer;
     }
 
     /**
      * Invoked immediately before the Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function beforeSendPerformed(Swift_Events_SendEvent $evt)
     {
         $time = $this->getTimestamp();
-        if (!isset($this->_start)) {
-            $this->_start = $time;
+        if (!isset($this->start)) {
+            $this->start = $time;
         }
-        $duration = $time - $this->_start;
+        $duration = $time - $this->start;
 
-        switch ($this->_mode) {
+        switch ($this->mode) {
             case self::BYTES_PER_MINUTE:
-                $sleep = $this->_throttleBytesPerMinute($duration);
+                $sleep = $this->throttleBytesPerMinute($duration);
                 break;
             case self::MESSAGES_PER_SECOND:
-                $sleep = $this->_throttleMessagesPerSecond($duration);
+                $sleep = $this->throttleMessagesPerSecond($duration);
                 break;
             case self::MESSAGES_PER_MINUTE:
-                $sleep = $this->_throttleMessagesPerMinute($duration);
+                $sleep = $this->throttleMessagesPerMinute($duration);
                 break;
             default:
                 $sleep = 0;
@@ -119,13 +117,11 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
 
     /**
      * Invoked when a Message is sent.
-     *
-     * @param Swift_Events_SendEvent $evt
      */
     public function sendPerformed(Swift_Events_SendEvent $evt)
     {
         parent::sendPerformed($evt);
-        ++$this->_messages;
+        ++$this->messages;
     }
 
     /**
@@ -135,8 +131,8 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
      */
     public function sleep($seconds)
     {
-        if (isset($this->_sleeper)) {
-            $this->_sleeper->sleep($seconds);
+        if (isset($this->sleeper)) {
+            $this->sleeper->sleep($seconds);
         } else {
             sleep($seconds);
         }
@@ -149,8 +145,8 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
      */
     public function getTimestamp()
     {
-        if (isset($this->_timer)) {
-            return $this->_timer->getTimestamp();
+        if (isset($this->timer)) {
+            return $this->timer->getTimestamp();
         }
 
         return time();
@@ -163,9 +159,9 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
      *
      * @return int
      */
-    private function _throttleBytesPerMinute($timePassed)
+    private function throttleBytesPerMinute($timePassed)
     {
-        $expectedDuration = $this->getBytesOut() / ($this->_rate / 60);
+        $expectedDuration = $this->getBytesOut() / ($this->rate / 60);
 
         return (int) ceil($expectedDuration - $timePassed);
     }
@@ -177,9 +173,9 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
      *
      * @return int
      */
-    private function _throttleMessagesPerSecond($timePassed)
+    private function throttleMessagesPerSecond($timePassed)
     {
-        $expectedDuration = $this->_messages / ($this->_rate);
+        $expectedDuration = $this->messages / $this->rate;
 
         return (int) ceil($expectedDuration - $timePassed);
     }
@@ -191,9 +187,9 @@ class Swift_Plugins_ThrottlerPlugin extends Swift_Plugins_BandwidthMonitorPlugin
      *
      * @return int
      */
-    private function _throttleMessagesPerMinute($timePassed)
+    private function throttleMessagesPerMinute($timePassed)
     {
-        $expectedDuration = $this->_messages / ($this->_rate / 60);
+        $expectedDuration = $this->messages / ($this->rate / 60);
 
         return (int) ceil($expectedDuration - $timePassed);
     }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php
index 83cbddcd2..16103e110 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Preferences.php
@@ -16,7 +16,7 @@
 class Swift_Preferences
 {
     /** Singleton instance */
-    private static $_instance = null;
+    private static $instance = null;
 
     /** Constructor not to be used */
     private function __construct()
@@ -30,11 +30,11 @@ class Swift_Preferences
      */
     public static function getInstance()
     {
-        if (!isset(self::$_instance)) {
-            self::$_instance = new self();
+        if (!isset(self::$instance)) {
+            self::$instance = new self();
         }
 
-        return self::$_instance;
+        return self::$instance;
     }
 
     /**
@@ -92,7 +92,7 @@ class Swift_Preferences
         Swift_DependencyContainer::getInstance()
             ->register('mime.qpcontentencoder')
             ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoder')
-            ->withDependencies(array('mime.charstream', 'mime.bytecanonicalizer'))
+            ->withDependencies(['mime.charstream', 'mime.bytecanonicalizer'])
             ->addConstructorValue($dotEscape);
 
         return $this;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php
index 47ae7a591..3c756436c 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/SendmailTransport.php
@@ -22,24 +22,12 @@ class Swift_SendmailTransport extends Swift_Transport_SendmailTransport
      */
     public function __construct($command = '/usr/sbin/sendmail -bs')
     {
-        call_user_func_array(
-            array($this, 'Swift_Transport_SendmailTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_SendmailTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.sendmail')
             );
 
         $this->setCommand($command);
     }
-
-    /**
-     * Create a new SendmailTransport instance.
-     *
-     * @param string $command
-     *
-     * @return self
-     */
-    public static function newInstance($command = '/usr/sbin/sendmail -bs')
-    {
-        return new self($command);
-    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/SignedMessage.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/SignedMessage.php
deleted file mode 100644
index 2e7a8726d..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/SignedMessage.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Signed Message, message that can be signed using a signer.
- *
- * This class is only kept for compatibility
- *
- *
- * @author     Xavier De Cock <xdecock@gmail.com>
- *
- * @deprecated
- */
-class Swift_SignedMessage extends Swift_Message
-{
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signer.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signer.php
index 2d8176d90..26c5e285c 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signer.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signer.php
@@ -11,7 +11,6 @@
 /**
  * Base Class of Signer Infrastructure.
  *
- *
  * @author Xavier De Cock <xdecock@gmail.com>
  */
 interface Swift_Signer
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/BodySigner.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
index 8e66e18f4..b25c427af 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/BodySigner.php
@@ -18,8 +18,6 @@ interface Swift_Signers_BodySigner extends Swift_Signer
     /**
      * Change the Swift_Signed_Message to apply the singing.
      *
-     * @param Swift_Message $message
-     *
      * @return self
      */
     public function signMessage(Swift_Message $message);
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
index 454e84b47..ec82dc056 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DKIMSigner.php
@@ -11,7 +11,7 @@
 /**
  * DKIM Signer used to apply DKIM Signature to a message.
  *
- * @author Xavier De Cock <xdecock@gmail.com>
+ * @author     Xavier De Cock <xdecock@gmail.com>
  */
 class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
 {
@@ -20,21 +20,23 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      *
      * @var string
      */
-    protected $_privateKey;
+    protected $privateKey;
 
     /**
      * DomainName.
      *
      * @var string
      */
-    protected $_domainName;
+    protected $domainName;
 
     /**
      * Selector.
      *
      * @var string
      */
-    protected $_selector;
+    protected $selector;
+
+    private $passphrase = '';
 
     /**
      * Hash algorithm used.
@@ -43,63 +45,63 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      *
      * @var string
      */
-    protected $_hashAlgorithm = 'rsa-sha256';
+    protected $hashAlgorithm = 'rsa-sha256';
 
     /**
      * Body canon method.
      *
      * @var string
      */
-    protected $_bodyCanon = 'simple';
+    protected $bodyCanon = 'simple';
 
     /**
      * Header canon method.
      *
      * @var string
      */
-    protected $_headerCanon = 'simple';
+    protected $headerCanon = 'simple';
 
     /**
      * Headers not being signed.
      *
      * @var array
      */
-    protected $_ignoredHeaders = array('return-path' => true);
+    protected $ignoredHeaders = ['return-path' => true];
 
     /**
      * Signer identity.
      *
      * @var string
      */
-    protected $_signerIdentity;
+    protected $signerIdentity;
 
     /**
      * BodyLength.
      *
      * @var int
      */
-    protected $_bodyLen = 0;
+    protected $bodyLen = 0;
 
     /**
      * Maximum signedLen.
      *
      * @var int
      */
-    protected $_maxLen = PHP_INT_MAX;
+    protected $maxLen = PHP_INT_MAX;
 
     /**
      * Embbed bodyLen in signature.
      *
      * @var bool
      */
-    protected $_showLen = false;
+    protected $showLen = false;
 
     /**
      * When the signature has been applied (true means time()), false means not embedded.
      *
      * @var mixed
      */
-    protected $_signatureTimestamp = true;
+    protected $signatureTimestamp = true;
 
     /**
      * When will the signature expires false means not embedded, if sigTimestamp is auto
@@ -107,14 +109,14 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      *
      * @var int
      */
-    protected $_signatureExpiration = false;
+    protected $signatureExpiration = false;
 
     /**
      * Must we embed signed headers?
      *
      * @var bool
      */
-    protected $_debugHeaders = false;
+    protected $debugHeaders = false;
 
     // work variables
     /**
@@ -122,46 +124,46 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      *
      * @var array
      */
-    protected $_signedHeaders = array();
+    protected $signedHeaders = [];
 
     /**
      * If debugHeaders is set store debugData here.
      *
-     * @var string
+     * @var string[]
      */
-    private $_debugHeadersData = '';
+    private $debugHeadersData = [];
 
     /**
      * Stores the bodyHash.
      *
      * @var string
      */
-    private $_bodyHash = '';
+    private $bodyHash = '';
 
     /**
      * Stores the signature header.
      *
      * @var Swift_Mime_Headers_ParameterizedHeader
      */
-    protected $_dkimHeader;
+    protected $dkimHeader;
 
-    private $_bodyHashHandler;
+    private $bodyHashHandler;
 
-    private $_headerHash;
+    private $headerHash;
 
-    private $_headerCanonData = '';
+    private $headerCanonData = '';
 
-    private $_bodyCanonEmptyCounter = 0;
+    private $bodyCanonEmptyCounter = 0;
 
-    private $_bodyCanonIgnoreStart = 2;
+    private $bodyCanonIgnoreStart = 2;
 
-    private $_bodyCanonSpace = false;
+    private $bodyCanonSpace = false;
 
-    private $_bodyCanonLastChar = null;
+    private $bodyCanonLastChar = null;
 
-    private $_bodyCanonLine = '';
+    private $bodyCanonLine = '';
 
-    private $_bound = array();
+    private $bound = [];
 
     /**
      * Constructor.
@@ -169,32 +171,15 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      * @param string $privateKey
      * @param string $domainName
      * @param string $selector
+     * @param string $passphrase
      */
-    public function __construct($privateKey, $domainName, $selector)
+    public function __construct($privateKey, $domainName, $selector, $passphrase = '')
     {
-        $this->_privateKey = $privateKey;
-        $this->_domainName = $domainName;
-        $this->_signerIdentity = '@'.$domainName;
-        $this->_selector = $selector;
-
-        // keep fallback hash algorithm sha1 if php version is lower than 5.4.8
-        if (PHP_VERSION_ID < 50408) {
-            $this->_hashAlgorithm = 'rsa-sha1';
-        }
-    }
-
-    /**
-     * Instanciate DKIMSigner.
-     *
-     * @param string $privateKey
-     * @param string $domainName
-     * @param string $selector
-     *
-     * @return self
-     */
-    public static function newInstance($privateKey, $domainName, $selector)
-    {
-        return new static($privateKey, $domainName, $selector);
+        $this->privateKey = $privateKey;
+        $this->domainName = $domainName;
+        $this->signerIdentity = '@'.$domainName;
+        $this->selector = $selector;
+        $this->passphrase = $passphrase;
     }
 
     /**
@@ -204,14 +189,14 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function reset()
     {
-        $this->_headerHash = null;
-        $this->_signedHeaders = array();
-        $this->_bodyHash = null;
-        $this->_bodyHashHandler = null;
-        $this->_bodyCanonIgnoreStart = 2;
-        $this->_bodyCanonEmptyCounter = 0;
-        $this->_bodyCanonLastChar = null;
-        $this->_bodyCanonSpace = false;
+        $this->headerHash = null;
+        $this->signedHeaders = [];
+        $this->bodyHash = null;
+        $this->bodyHashHandler = null;
+        $this->bodyCanonIgnoreStart = 2;
+        $this->bodyCanonEmptyCounter = 0;
+        $this->bodyCanonLastChar = null;
+        $this->bodyCanonSpace = false;
     }
 
     /**
@@ -226,15 +211,15 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      *
      * @param string $bytes
      *
-     * @throws Swift_IoException
-     *
      * @return int
+     *
+     * @throws Swift_IoException
      */
     // TODO fix return
     public function write($bytes)
     {
-        $this->_canonicalizeBody($bytes);
-        foreach ($this->_bound as $is) {
+        $this->canonicalizeBody($bytes);
+        foreach ($this->bound as $is) {
             $is->write($bytes);
         }
     }
@@ -251,33 +236,31 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
 
     /**
      * Attach $is to this stream.
+     *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function bind(Swift_InputByteStream $is)
     {
         // Don't have to mirror anything
-        $this->_bound[] = $is;
+        $this->bound[] = $is;
 
         return;
     }
 
     /**
      * Remove an already bound stream.
+     *
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
-     *
-     * @param Swift_InputByteStream $is
      */
     public function unbind(Swift_InputByteStream $is)
     {
         // Don't have to mirror anything
-        foreach ($this->_bound as $k => $stream) {
+        foreach ($this->bound as $k => $stream) {
             if ($stream === $is) {
-                unset($this->_bound[$k]);
+                unset($this->bound[$k]);
 
                 return;
             }
@@ -308,11 +291,11 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     {
         switch ($hash) {
             case 'rsa-sha1':
-                $this->_hashAlgorithm = 'rsa-sha1';
+                $this->hashAlgorithm = 'rsa-sha1';
                 break;
             case 'rsa-sha256':
-                $this->_hashAlgorithm = 'rsa-sha256';
-                if (!defined('OPENSSL_ALGO_SHA256')) {
+                $this->hashAlgorithm = 'rsa-sha256';
+                if (!\defined('OPENSSL_ALGO_SHA256')) {
                     throw new Swift_SwiftException('Unable to set sha256 as it is not supported by OpenSSL.');
                 }
                 break;
@@ -332,10 +315,10 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setBodyCanon($canon)
     {
-        if ($canon == 'relaxed') {
-            $this->_bodyCanon = 'relaxed';
+        if ('relaxed' == $canon) {
+            $this->bodyCanon = 'relaxed';
         } else {
-            $this->_bodyCanon = 'simple';
+            $this->bodyCanon = 'simple';
         }
 
         return $this;
@@ -350,10 +333,10 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setHeaderCanon($canon)
     {
-        if ($canon == 'relaxed') {
-            $this->_headerCanon = 'relaxed';
+        if ('relaxed' == $canon) {
+            $this->headerCanon = 'relaxed';
         } else {
-            $this->_headerCanon = 'simple';
+            $this->headerCanon = 'simple';
         }
 
         return $this;
@@ -368,7 +351,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setSignerIdentity($identity)
     {
-        $this->_signerIdentity = $identity;
+        $this->signerIdentity = $identity;
 
         return $this;
     }
@@ -382,15 +365,15 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setBodySignedLen($len)
     {
-        if ($len === true) {
-            $this->_showLen = true;
-            $this->_maxLen = PHP_INT_MAX;
-        } elseif ($len === false) {
-            $this->_showLen = false;
-            $this->_maxLen = PHP_INT_MAX;
+        if (true === $len) {
+            $this->showLen = true;
+            $this->maxLen = PHP_INT_MAX;
+        } elseif (false === $len) {
+            $this->showLen = false;
+            $this->maxLen = PHP_INT_MAX;
         } else {
-            $this->_showLen = true;
-            $this->_maxLen = (int) $len;
+            $this->showLen = true;
+            $this->maxLen = (int) $len;
         }
 
         return $this;
@@ -405,7 +388,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setSignatureTimestamp($time)
     {
-        $this->_signatureTimestamp = $time;
+        $this->signatureTimestamp = $time;
 
         return $this;
     }
@@ -419,7 +402,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setSignatureExpiration($time)
     {
-        $this->_signatureExpiration = $time;
+        $this->signatureExpiration = $time;
 
         return $this;
     }
@@ -433,7 +416,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function setDebugHeaders($debug)
     {
-        $this->_debugHeaders = (bool) $debug;
+        $this->debugHeaders = (bool) $debug;
 
         return $this;
     }
@@ -444,15 +427,15 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     public function startBody()
     {
         // Init
-        switch ($this->_hashAlgorithm) {
+        switch ($this->hashAlgorithm) {
             case 'rsa-sha256':
-                $this->_bodyHashHandler = hash_init('sha256');
+                $this->bodyHashHandler = hash_init('sha256');
                 break;
             case 'rsa-sha1':
-                $this->_bodyHashHandler = hash_init('sha1');
+                $this->bodyHashHandler = hash_init('sha1');
                 break;
         }
-        $this->_bodyCanonLine = '';
+        $this->bodyCanonLine = '';
     }
 
     /**
@@ -460,7 +443,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function endBody()
     {
-        $this->_endOfBody();
+        $this->endOfBody();
     }
 
     /**
@@ -470,10 +453,10 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function getAlteredHeaders()
     {
-        if ($this->_debugHeaders) {
-            return array('DKIM-Signature', 'X-DebugHash');
+        if ($this->debugHeaders) {
+            return ['DKIM-Signature', 'X-DebugHash'];
         } else {
-            return array('DKIM-Signature');
+            return ['DKIM-Signature'];
         }
     }
 
@@ -486,7 +469,7 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      */
     public function ignoreHeader($header_name)
     {
-        $this->_ignoredHeaders[strtolower($header_name)] = true;
+        $this->ignoredHeaders[strtolower($header_name ?? '')] = true;
 
         return $this;
     }
@@ -494,24 +477,22 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     /**
      * Set the headers to sign.
      *
-     * @param Swift_Mime_HeaderSet $headers
-     *
      * @return Swift_Signers_DKIMSigner
      */
-    public function setHeaders(Swift_Mime_HeaderSet $headers)
+    public function setHeaders(Swift_Mime_SimpleHeaderSet $headers)
     {
-        $this->_headerCanonData = '';
+        $this->headerCanonData = '';
         // Loop through Headers
         $listHeaders = $headers->listAll();
         foreach ($listHeaders as $hName) {
             // Check if we need to ignore Header
-            if (!isset($this->_ignoredHeaders[strtolower($hName)])) {
+            if (!isset($this->ignoredHeaders[strtolower($hName ?? '')])) {
                 if ($headers->has($hName)) {
                     $tmp = $headers->getAll($hName);
                     foreach ($tmp as $header) {
-                        if ($header->getFieldBody() != '') {
-                            $this->_addHeader($header->toString());
-                            $this->_signedHeaders[] = $header->getFieldName();
+                        if ('' != $header->getFieldBody()) {
+                            $this->addHeader($header->toString());
+                            $this->signedHeaders[] = $header->getFieldName();
                         }
                     }
                 }
@@ -524,37 +505,35 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
     /**
      * Add the signature to the given Headers.
      *
-     * @param Swift_Mime_HeaderSet $headers
-     *
      * @return Swift_Signers_DKIMSigner
      */
-    public function addSignature(Swift_Mime_HeaderSet $headers)
+    public function addSignature(Swift_Mime_SimpleHeaderSet $headers)
     {
         // Prepare the DKIM-Signature
-        $params = array('v' => '1', 'a' => $this->_hashAlgorithm, 'bh' => base64_encode($this->_bodyHash), 'd' => $this->_domainName, 'h' => implode(': ', $this->_signedHeaders), 'i' => $this->_signerIdentity, 's' => $this->_selector);
-        if ($this->_bodyCanon != 'simple') {
-            $params['c'] = $this->_headerCanon.'/'.$this->_bodyCanon;
-        } elseif ($this->_headerCanon != 'simple') {
-            $params['c'] = $this->_headerCanon;
+        $params = ['v' => '1', 'a' => $this->hashAlgorithm, 'bh' => base64_encode($this->bodyHash ?? ''), 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'i' => $this->signerIdentity, 's' => $this->selector];
+        if ('simple' != $this->bodyCanon) {
+            $params['c'] = $this->headerCanon.'/'.$this->bodyCanon;
+        } elseif ('simple' != $this->headerCanon) {
+            $params['c'] = $this->headerCanon;
         }
-        if ($this->_showLen) {
-            $params['l'] = $this->_bodyLen;
+        if ($this->showLen) {
+            $params['l'] = $this->bodyLen;
         }
-        if ($this->_signatureTimestamp === true) {
+        if (true === $this->signatureTimestamp) {
             $params['t'] = time();
-            if ($this->_signatureExpiration !== false) {
-                $params['x'] = $params['t'] + $this->_signatureExpiration;
+            if (false !== $this->signatureExpiration) {
+                $params['x'] = $params['t'] + $this->signatureExpiration;
             }
         } else {
-            if ($this->_signatureTimestamp !== false) {
-                $params['t'] = $this->_signatureTimestamp;
+            if (false !== $this->signatureTimestamp) {
+                $params['t'] = $this->signatureTimestamp;
             }
-            if ($this->_signatureExpiration !== false) {
-                $params['x'] = $this->_signatureExpiration;
+            if (false !== $this->signatureExpiration) {
+                $params['x'] = $this->signatureExpiration;
             }
         }
-        if ($this->_debugHeaders) {
-            $params['z'] = implode('|', $this->_debugHeadersData);
+        if ($this->debugHeaders) {
+            $params['z'] = implode('|', $this->debugHeadersData);
         }
         $string = '';
         foreach ($params as $k => $v) {
@@ -564,22 +543,21 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
         $headers->addTextHeader('DKIM-Signature', $string);
         // Add the last DKIM-Signature
         $tmp = $headers->getAll('DKIM-Signature');
-        $this->_dkimHeader = end($tmp);
-        $this->_addHeader(trim($this->_dkimHeader->toString())."\r\n b=", true);
-        $this->_endOfHeaders();
-        if ($this->_debugHeaders) {
-            $headers->addTextHeader('X-DebugHash', base64_encode($this->_headerHash));
+        $this->dkimHeader = end($tmp);
+        $this->addHeader(trim($this->dkimHeader->toString() ?? '')."\r\n b=", true);
+        if ($this->debugHeaders) {
+            $headers->addTextHeader('X-DebugHash', base64_encode($this->headerHash ?? ''));
         }
-        $this->_dkimHeader->setValue($string.' b='.trim(chunk_split(base64_encode($this->_getEncryptedHash()), 73, ' ')));
+        $this->dkimHeader->setValue($string.' b='.trim(chunk_split(base64_encode($this->getEncryptedHash() ?? ''), 73, ' ')));
 
         return $this;
     }
 
     /* Private helpers */
 
-    protected function _addHeader($header, $is_sig = false)
+    protected function addHeader($header, $is_sig = false)
     {
-        switch ($this->_headerCanon) {
+        switch ($this->headerCanon) {
             case 'relaxed':
                 // Prepare Header and cascade
                 $exploded = explode(':', $header, 2);
@@ -587,44 +565,36 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
                 $value = str_replace("\r\n", '', $exploded[1]);
                 $value = preg_replace("/[ \t][ \t]+/", ' ', $value);
                 $header = $name.':'.trim($value).($is_sig ? '' : "\r\n");
+                // no break
             case 'simple':
                 // Nothing to do
         }
-        $this->_addToHeaderHash($header);
+        $this->addToHeaderHash($header);
     }
 
-    /**
-     * @deprecated This method is currently useless in this class but it must be
-     *             kept for BC reasons due to its "protected" scope. This method
-     *             might be overridden by custom client code.
-     */
-    protected function _endOfHeaders()
+    protected function canonicalizeBody($string)
     {
-    }
-
-    protected function _canonicalizeBody($string)
-    {
-        $len = strlen($string);
+        $len = \strlen($string);
         $canon = '';
-        $method = ($this->_bodyCanon == 'relaxed');
+        $method = ('relaxed' == $this->bodyCanon);
         for ($i = 0; $i < $len; ++$i) {
-            if ($this->_bodyCanonIgnoreStart > 0) {
-                --$this->_bodyCanonIgnoreStart;
+            if ($this->bodyCanonIgnoreStart > 0) {
+                --$this->bodyCanonIgnoreStart;
                 continue;
             }
             switch ($string[$i]) {
                 case "\r":
-                    $this->_bodyCanonLastChar = "\r";
+                    $this->bodyCanonLastChar = "\r";
                     break;
                 case "\n":
-                    if ($this->_bodyCanonLastChar == "\r") {
+                    if ("\r" == $this->bodyCanonLastChar) {
                         if ($method) {
-                            $this->_bodyCanonSpace = false;
+                            $this->bodyCanonSpace = false;
                         }
-                        if ($this->_bodyCanonLine == '') {
-                            ++$this->_bodyCanonEmptyCounter;
+                        if ('' == $this->bodyCanonLine) {
+                            ++$this->bodyCanonEmptyCounter;
                         } else {
-                            $this->_bodyCanonLine = '';
+                            $this->bodyCanonLine = '';
                             $canon .= "\r\n";
                         }
                     } else {
@@ -635,52 +605,53 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
                 case ' ':
                 case "\t":
                     if ($method) {
-                        $this->_bodyCanonSpace = true;
+                        $this->bodyCanonSpace = true;
                         break;
                     }
+                    // no break
                 default:
-                    if ($this->_bodyCanonEmptyCounter > 0) {
-                        $canon .= str_repeat("\r\n", $this->_bodyCanonEmptyCounter);
-                        $this->_bodyCanonEmptyCounter = 0;
+                    if ($this->bodyCanonEmptyCounter > 0) {
+                        $canon .= str_repeat("\r\n", $this->bodyCanonEmptyCounter);
+                        $this->bodyCanonEmptyCounter = 0;
                     }
-                    if ($this->_bodyCanonSpace) {
-                        $this->_bodyCanonLine .= ' ';
+                    if ($this->bodyCanonSpace) {
+                        $this->bodyCanonLine .= ' ';
                         $canon .= ' ';
-                        $this->_bodyCanonSpace = false;
+                        $this->bodyCanonSpace = false;
                     }
-                    $this->_bodyCanonLine .= $string[$i];
+                    $this->bodyCanonLine .= $string[$i];
                     $canon .= $string[$i];
             }
         }
-        $this->_addToBodyHash($canon);
+        $this->addToBodyHash($canon);
     }
 
-    protected function _endOfBody()
+    protected function endOfBody()
     {
         // Add trailing Line return if last line is non empty
-        if (strlen($this->_bodyCanonLine) > 0) {
-            $this->_addToBodyHash("\r\n");
+        if (\strlen($this->bodyCanonLine) > 0) {
+            $this->addToBodyHash("\r\n");
         }
-        $this->_bodyHash = hash_final($this->_bodyHashHandler, true);
+        $this->bodyHash = hash_final($this->bodyHashHandler, true);
     }
 
-    private function _addToBodyHash($string)
+    private function addToBodyHash($string)
     {
-        $len = strlen($string);
-        if ($len > ($new_len = ($this->_maxLen - $this->_bodyLen))) {
+        $len = \strlen($string);
+        if ($len > ($new_len = ($this->maxLen - $this->bodyLen))) {
             $string = substr($string, 0, $new_len);
             $len = $new_len;
         }
-        hash_update($this->_bodyHashHandler, $string);
-        $this->_bodyLen += $len;
+        hash_update($this->bodyHashHandler, $string);
+        $this->bodyLen += $len;
     }
 
-    private function _addToHeaderHash($header)
+    private function addToHeaderHash($header)
     {
-        if ($this->_debugHeaders) {
-            $this->_debugHeadersData[] = trim($header);
+        if ($this->debugHeaders) {
+            $this->debugHeadersData[] = trim($header ?? '');
         }
-        $this->_headerCanonData .= $header;
+        $this->headerCanonData .= $header;
     }
 
     /**
@@ -688,11 +659,10 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
      *
      * @return string
      */
-    private function _getEncryptedHash()
+    private function getEncryptedHash()
     {
         $signature = '';
-
-        switch ($this->_hashAlgorithm) {
+        switch ($this->hashAlgorithm) {
             case 'rsa-sha1':
                 $algorithm = OPENSSL_ALGO_SHA1;
                 break;
@@ -700,11 +670,11 @@ class Swift_Signers_DKIMSigner implements Swift_Signers_HeaderSigner
                 $algorithm = OPENSSL_ALGO_SHA256;
                 break;
         }
-        $pkeyId = openssl_get_privatekey($this->_privateKey);
+        $pkeyId = openssl_get_privatekey($this->privateKey, $this->passphrase);
         if (!$pkeyId) {
             throw new Swift_SwiftException('Unable to load DKIM Private Key ['.openssl_error_string().']');
         }
-        if (openssl_sign($this->_headerCanonData, $signature, $pkeyId, $algorithm)) {
+        if (openssl_sign($this->headerCanonData, $signature, $pkeyId, $algorithm)) {
             return $signature;
         }
         throw new Swift_SwiftException('Unable to sign DKIM Hash ['.openssl_error_string().']');
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
index 0365363c8..5e2b67b65 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/DomainKeySigner.php
@@ -11,7 +11,7 @@
 /**
  * DomainKey Signer used to apply DomainKeys Signature to a message.
  *
- * @author Xavier De Cock <xdecock@gmail.com>
+ * @author     Xavier De Cock <xdecock@gmail.com>
  */
 class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
 {
@@ -20,56 +20,56 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      *
      * @var string
      */
-    protected $_privateKey;
+    protected $privateKey;
 
     /**
      * DomainName.
      *
      * @var string
      */
-    protected $_domainName;
+    protected $domainName;
 
     /**
      * Selector.
      *
      * @var string
      */
-    protected $_selector;
+    protected $selector;
 
     /**
      * Hash algorithm used.
      *
      * @var string
      */
-    protected $_hashAlgorithm = 'rsa-sha1';
+    protected $hashAlgorithm = 'rsa-sha1';
 
     /**
      * Canonisation method.
      *
      * @var string
      */
-    protected $_canon = 'simple';
+    protected $canon = 'simple';
 
     /**
      * Headers not being signed.
      *
      * @var array
      */
-    protected $_ignoredHeaders = array();
+    protected $ignoredHeaders = [];
 
     /**
      * Signer identity.
      *
      * @var string
      */
-    protected $_signerIdentity;
+    protected $signerIdentity;
 
     /**
      * Must we embed signed headers?
      *
      * @var bool
      */
-    protected $_debugHeaders = false;
+    protected $debugHeaders = false;
 
     // work variables
     /**
@@ -77,37 +77,35 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      *
      * @var array
      */
-    private $_signedHeaders = array();
+    private $signedHeaders = [];
 
     /**
      * Stores the signature header.
      *
      * @var Swift_Mime_Headers_ParameterizedHeader
      */
-    protected $_domainKeyHeader;
+    protected $domainKeyHeader;
 
     /**
      * Hash Handler.
      *
      * @var resource|null
      */
-    private $_hashHandler;
+    private $hashHandler;
 
-    private $_hash;
+    private $canonData = '';
 
-    private $_canonData = '';
+    private $bodyCanonEmptyCounter = 0;
 
-    private $_bodyCanonEmptyCounter = 0;
+    private $bodyCanonIgnoreStart = 2;
 
-    private $_bodyCanonIgnoreStart = 2;
+    private $bodyCanonSpace = false;
 
-    private $_bodyCanonSpace = false;
+    private $bodyCanonLastChar = null;
 
-    private $_bodyCanonLastChar = null;
+    private $bodyCanonLine = '';
 
-    private $_bodyCanonLine = '';
-
-    private $_bound = array();
+    private $bound = [];
 
     /**
      * Constructor.
@@ -118,24 +116,10 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function __construct($privateKey, $domainName, $selector)
     {
-        $this->_privateKey = $privateKey;
-        $this->_domainName = $domainName;
-        $this->_signerIdentity = '@'.$domainName;
-        $this->_selector = $selector;
-    }
-
-    /**
-     * Instanciate DomainKeySigner.
-     *
-     * @param string $privateKey
-     * @param string $domainName
-     * @param string $selector
-     *
-     * @return self
-     */
-    public static function newInstance($privateKey, $domainName, $selector)
-    {
-        return new static($privateKey, $domainName, $selector);
+        $this->privateKey = $privateKey;
+        $this->domainName = $domainName;
+        $this->signerIdentity = '@'.$domainName;
+        $this->selector = $selector;
     }
 
     /**
@@ -145,12 +129,11 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function reset()
     {
-        $this->_hash = null;
-        $this->_hashHandler = null;
-        $this->_bodyCanonIgnoreStart = 2;
-        $this->_bodyCanonEmptyCounter = 0;
-        $this->_bodyCanonLastChar = null;
-        $this->_bodyCanonSpace = false;
+        $this->hashHandler = null;
+        $this->bodyCanonIgnoreStart = 2;
+        $this->bodyCanonEmptyCounter = 0;
+        $this->bodyCanonLastChar = null;
+        $this->bodyCanonSpace = false;
 
         return $this;
     }
@@ -167,14 +150,16 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      *
      * @param string $bytes
      *
+     * @return int
+     *
      * @throws Swift_IoException
      *
      * @return $this
      */
     public function write($bytes)
     {
-        $this->_canonicalizeBody($bytes);
-        foreach ($this->_bound as $is) {
+        $this->canonicalizeBody($bytes);
+        foreach ($this->bound as $is) {
             $is->write($bytes);
         }
 
@@ -197,37 +182,35 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
 
     /**
      * Attach $is to this stream.
+     *
      * The stream acts as an observer, receiving all data that is written.
      * All {@link write()} and {@link flushBuffers()} operations will be mirrored.
      *
-     * @param Swift_InputByteStream $is
-     *
      * @return $this
      */
     public function bind(Swift_InputByteStream $is)
     {
         // Don't have to mirror anything
-        $this->_bound[] = $is;
+        $this->bound[] = $is;
 
         return $this;
     }
 
     /**
      * Remove an already bound stream.
+     *
      * If $is is not bound, no errors will be raised.
      * If the stream currently has any buffered data it will be written to $is
      * before unbinding occurs.
      *
-     * @param Swift_InputByteStream $is
-     *
      * @return $this
      */
     public function unbind(Swift_InputByteStream $is)
     {
         // Don't have to mirror anything
-        foreach ($this->_bound as $k => $stream) {
+        foreach ($this->bound as $k => $stream) {
             if ($stream === $is) {
-                unset($this->_bound[$k]);
+                unset($this->bound[$k]);
 
                 break;
             }
@@ -260,7 +243,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function setHashAlgorithm($hash)
     {
-        $this->_hashAlgorithm = 'rsa-sha1';
+        $this->hashAlgorithm = 'rsa-sha1';
 
         return $this;
     }
@@ -274,10 +257,10 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function setCanon($canon)
     {
-        if ($canon == 'nofws') {
-            $this->_canon = 'nofws';
+        if ('nofws' == $canon) {
+            $this->canon = 'nofws';
         } else {
-            $this->_canon = 'simple';
+            $this->canon = 'simple';
         }
 
         return $this;
@@ -292,7 +275,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function setSignerIdentity($identity)
     {
-        $this->_signerIdentity = $identity;
+        $this->signerIdentity = $identity;
 
         return $this;
     }
@@ -306,7 +289,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function setDebugHeaders($debug)
     {
-        $this->_debugHeaders = (bool) $debug;
+        $this->debugHeaders = (bool) $debug;
 
         return $this;
     }
@@ -323,7 +306,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function endBody()
     {
-        $this->_endOfBody();
+        $this->endOfBody();
     }
 
     /**
@@ -333,11 +316,11 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function getAlteredHeaders()
     {
-        if ($this->_debugHeaders) {
-            return array('DomainKey-Signature', 'X-DebugHash');
+        if ($this->debugHeaders) {
+            return ['DomainKey-Signature', 'X-DebugHash'];
         }
 
-        return array('DomainKey-Signature');
+        return ['DomainKey-Signature'];
     }
 
     /**
@@ -349,7 +332,7 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      */
     public function ignoreHeader($header_name)
     {
-        $this->_ignoredHeaders[strtolower($header_name)] = true;
+        $this->ignoredHeaders[strtolower($header_name ?? '')] = true;
 
         return $this;
     }
@@ -357,31 +340,29 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
     /**
      * Set the headers to sign.
      *
-     * @param Swift_Mime_HeaderSet $headers
-     *
      * @return $this
      */
-    public function setHeaders(Swift_Mime_HeaderSet $headers)
+    public function setHeaders(Swift_Mime_SimpleHeaderSet $headers)
     {
-        $this->_startHash();
-        $this->_canonData = '';
+        $this->startHash();
+        $this->canonData = '';
         // Loop through Headers
         $listHeaders = $headers->listAll();
         foreach ($listHeaders as $hName) {
             // Check if we need to ignore Header
-            if (!isset($this->_ignoredHeaders[strtolower($hName)])) {
+            if (!isset($this->ignoredHeaders[strtolower($hName ?? '')])) {
                 if ($headers->has($hName)) {
                     $tmp = $headers->getAll($hName);
                     foreach ($tmp as $header) {
-                        if ($header->getFieldBody() != '') {
-                            $this->_addHeader($header->toString());
-                            $this->_signedHeaders[] = $header->getFieldName();
+                        if ('' != $header->getFieldBody()) {
+                            $this->addHeader($header->toString());
+                            $this->signedHeaders[] = $header->getFieldName();
                         }
                     }
                 }
             }
         }
-        $this->_endOfHeaders();
+        $this->endOfHeaders();
 
         return $this;
     }
@@ -389,14 +370,12 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
     /**
      * Add the signature to the given Headers.
      *
-     * @param Swift_Mime_HeaderSet $headers
-     *
      * @return $this
      */
-    public function addSignature(Swift_Mime_HeaderSet $headers)
+    public function addSignature(Swift_Mime_SimpleHeaderSet $headers)
     {
         // Prepare the DomainKey-Signature Header
-        $params = array('a' => $this->_hashAlgorithm, 'b' => chunk_split(base64_encode($this->_getEncryptedHash()), 73, ' '), 'c' => $this->_canon, 'd' => $this->_domainName, 'h' => implode(': ', $this->_signedHeaders), 'q' => 'dns', 's' => $this->_selector);
+        $params = ['a' => $this->hashAlgorithm, 'b' => chunk_split(base64_encode($this->getEncryptedHash() ?? ''), 73, ' '), 'c' => $this->canon, 'd' => $this->domainName, 'h' => implode(': ', $this->signedHeaders), 'q' => 'dns', 's' => $this->selector];
         $string = '';
         foreach ($params as $k => $v) {
             $string .= $k.'='.$v.'; ';
@@ -409,9 +388,9 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
 
     /* Private helpers */
 
-    protected function _addHeader($header)
+    protected function addHeader($header)
     {
-        switch ($this->_canon) {
+        switch ($this->canon) {
             case 'nofws':
                 // Prepare Header and cascade
                 $exploded = explode(':', $header, 2);
@@ -419,40 +398,41 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
                 $value = str_replace("\r\n", '', $exploded[1]);
                 $value = preg_replace("/[ \t][ \t]+/", ' ', $value);
                 $header = $name.':'.trim($value)."\r\n";
+                // no break
             case 'simple':
                 // Nothing to do
         }
-        $this->_addToHash($header);
+        $this->addToHash($header);
     }
 
-    protected function _endOfHeaders()
+    protected function endOfHeaders()
     {
-        $this->_bodyCanonEmptyCounter = 1;
+        $this->bodyCanonEmptyCounter = 1;
     }
 
-    protected function _canonicalizeBody($string)
+    protected function canonicalizeBody($string)
     {
-        $len = strlen($string);
+        $len = \strlen($string);
         $canon = '';
-        $nofws = ($this->_canon == 'nofws');
+        $nofws = ('nofws' == $this->canon);
         for ($i = 0; $i < $len; ++$i) {
-            if ($this->_bodyCanonIgnoreStart > 0) {
-                --$this->_bodyCanonIgnoreStart;
+            if ($this->bodyCanonIgnoreStart > 0) {
+                --$this->bodyCanonIgnoreStart;
                 continue;
             }
             switch ($string[$i]) {
                 case "\r":
-                    $this->_bodyCanonLastChar = "\r";
+                    $this->bodyCanonLastChar = "\r";
                     break;
                 case "\n":
-                    if ($this->_bodyCanonLastChar == "\r") {
+                    if ("\r" == $this->bodyCanonLastChar) {
                         if ($nofws) {
-                            $this->_bodyCanonSpace = false;
+                            $this->bodyCanonSpace = false;
                         }
-                        if ($this->_bodyCanonLine == '') {
-                            ++$this->_bodyCanonEmptyCounter;
+                        if ('' == $this->bodyCanonLine) {
+                            ++$this->bodyCanonEmptyCounter;
                         } else {
-                            $this->_bodyCanonLine = '';
+                            $this->bodyCanonLine = '';
                             $canon .= "\r\n";
                         }
                     } else {
@@ -464,44 +444,44 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
                 case "\t":
                 case "\x09": //HTAB
                     if ($nofws) {
-                        $this->_bodyCanonSpace = true;
+                        $this->bodyCanonSpace = true;
                         break;
                     }
+                    // no break
                 default:
-                    if ($this->_bodyCanonEmptyCounter > 0) {
-                        $canon .= str_repeat("\r\n", $this->_bodyCanonEmptyCounter);
-                        $this->_bodyCanonEmptyCounter = 0;
+                    if ($this->bodyCanonEmptyCounter > 0) {
+                        $canon .= str_repeat("\r\n", $this->bodyCanonEmptyCounter);
+                        $this->bodyCanonEmptyCounter = 0;
                     }
-                    $this->_bodyCanonLine .= $string[$i];
+                    $this->bodyCanonLine .= $string[$i];
                     $canon .= $string[$i];
             }
         }
-        $this->_addToHash($canon);
+        $this->addToHash($canon);
     }
 
-    protected function _endOfBody()
+    protected function endOfBody()
     {
-        if (strlen($this->_bodyCanonLine) > 0) {
-            $this->_addToHash("\r\n");
+        if (\strlen($this->bodyCanonLine) > 0) {
+            $this->addToHash("\r\n");
         }
-        $this->_hash = hash_final($this->_hashHandler, true);
     }
 
-    private function _addToHash($string)
+    private function addToHash($string)
     {
-        $this->_canonData .= $string;
-        hash_update($this->_hashHandler, $string);
+        $this->canonData .= $string;
+        hash_update($this->hashHandler, $string);
     }
 
-    private function _startHash()
+    private function startHash()
     {
         // Init
-        switch ($this->_hashAlgorithm) {
+        switch ($this->hashAlgorithm) {
             case 'rsa-sha1':
-                $this->_hashHandler = hash_init('sha1');
+                $this->hashHandler = hash_init('sha1');
                 break;
         }
-        $this->_bodyCanonLine = '';
+        $this->bodyCanonLine = '';
     }
 
     /**
@@ -509,14 +489,14 @@ class Swift_Signers_DomainKeySigner implements Swift_Signers_HeaderSigner
      *
      * @return string
      */
-    private function _getEncryptedHash()
+    private function getEncryptedHash()
     {
         $signature = '';
-        $pkeyId = openssl_get_privatekey($this->_privateKey);
+        $pkeyId = openssl_get_privatekey($this->privateKey);
         if (!$pkeyId) {
             throw new Swift_SwiftException('Unable to load DomainKey Private Key ['.openssl_error_string().']');
         }
-        if (openssl_sign($this->_canonData, $signature, $pkeyId, OPENSSL_ALGO_SHA1)) {
+        if (openssl_sign($this->canonData, $signature, $pkeyId, OPENSSL_ALGO_SHA1)) {
             return $signature;
         }
         throw new Swift_SwiftException('Unable to sign DomainKey Hash  ['.openssl_error_string().']');
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
index ef8832fdf..6f5c20923 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/HeaderSigner.php
@@ -41,20 +41,16 @@ interface Swift_Signers_HeaderSigner extends Swift_Signer, Swift_InputByteStream
     /**
      * Give the headers already given.
      *
-     * @param Swift_Mime_SimpleHeaderSet $headers
-     *
      * @return self
      */
-    public function setHeaders(Swift_Mime_HeaderSet $headers);
+    public function setHeaders(Swift_Mime_SimpleHeaderSet $headers);
 
     /**
      * Add the header(s) to the headerSet.
      *
-     * @param Swift_Mime_HeaderSet $headers
-     *
      * @return self
      */
-    public function addSignature(Swift_Mime_HeaderSet $headers);
+    public function addSignature(Swift_Mime_SimpleHeaderSet $headers);
 
     /**
      * Return the list of header a signer might tamper.
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
index 8fdbaa43b..520bcc15e 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/OpenDKIMSigner.php
@@ -12,13 +12,15 @@
  * DKIM Signer used to apply DKIM Signature to a message
  * Takes advantage of pecl extension.
  *
- * @author Xavier De Cock <xdecock@gmail.com>
+ * @author     Xavier De Cock <xdecock@gmail.com>
+ *
+ * @deprecated since SwiftMailer 6.1.0; use Swift_Signers_DKIMSigner instead.
  */
 class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
 {
-    private $_peclLoaded = false;
+    private $peclLoaded = false;
 
-    private $_dkimHandler = null;
+    private $dkimHandler = null;
 
     private $dropFirstLF = true;
 
@@ -29,26 +31,21 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
 
     public function __construct($privateKey, $domainName, $selector)
     {
-        if (!extension_loaded('opendkim')) {
+        if (!\extension_loaded('opendkim')) {
             throw new Swift_SwiftException('php-opendkim extension not found');
         }
 
-        $this->_peclLoaded = true;
+        $this->peclLoaded = true;
 
         parent::__construct($privateKey, $domainName, $selector);
     }
 
-    public static function newInstance($privateKey, $domainName, $selector)
-    {
-        return new static($privateKey, $domainName, $selector);
-    }
-
-    public function addSignature(Swift_Mime_HeaderSet $headers)
+    public function addSignature(Swift_Mime_SimpleHeaderSet $headers)
     {
         $header = new Swift_Mime_Headers_OpenDKIMHeader('DKIM-Signature');
-        $headerVal = $this->_dkimHandler->getSignatureHeader();
-        if (!$headerVal) {
-            throw new Swift_SwiftException('OpenDKIM Error: '.$this->_dkimHandler->getError());
+        $headerVal = $this->dkimHandler->getSignatureHeader();
+        if (false === $headerVal || \is_int($headerVal)) {
+            throw new Swift_SwiftException('OpenDKIM Error: '.$this->dkimHandler->getError());
         }
         $header->setValue($headerVal);
         $headers->set($header);
@@ -56,40 +53,36 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
         return $this;
     }
 
-    public function setHeaders(Swift_Mime_HeaderSet $headers)
+    public function setHeaders(Swift_Mime_SimpleHeaderSet $headers)
     {
-        $bodyLen = $this->_bodyLen;
-        if (is_bool($bodyLen)) {
-            $bodyLen = -1;
-        }
-        $hash = $this->_hashAlgorithm == 'rsa-sha1' ? OpenDKIMSign::ALG_RSASHA1 : OpenDKIMSign::ALG_RSASHA256;
-        $bodyCanon = $this->_bodyCanon == 'simple' ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
-        $headerCanon = $this->_headerCanon == 'simple' ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
-        $this->_dkimHandler = new OpenDKIMSign($this->_privateKey, $this->_selector, $this->_domainName, $headerCanon, $bodyCanon, $hash, $bodyLen);
+        $hash = 'rsa-sha1' == $this->hashAlgorithm ? OpenDKIMSign::ALG_RSASHA1 : OpenDKIMSign::ALG_RSASHA256;
+        $bodyCanon = 'simple' == $this->bodyCanon ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
+        $headerCanon = 'simple' == $this->headerCanon ? OpenDKIMSign::CANON_SIMPLE : OpenDKIMSign::CANON_RELAXED;
+        $this->dkimHandler = new OpenDKIMSign($this->privateKey, $this->selector, $this->domainName, $headerCanon, $bodyCanon, $hash, -1);
         // Hardcode signature Margin for now
-        $this->_dkimHandler->setMargin(78);
+        $this->dkimHandler->setMargin(78);
 
-        if (!is_numeric($this->_signatureTimestamp)) {
+        if (!is_numeric($this->signatureTimestamp)) {
             OpenDKIM::setOption(OpenDKIM::OPTS_FIXEDTIME, time());
         } else {
-            if (!OpenDKIM::setOption(OpenDKIM::OPTS_FIXEDTIME, $this->_signatureTimestamp)) {
+            if (!OpenDKIM::setOption(OpenDKIM::OPTS_FIXEDTIME, $this->signatureTimestamp)) {
                 throw new Swift_SwiftException('Unable to force signature timestamp ['.openssl_error_string().']');
             }
         }
-        if (isset($this->_signerIdentity)) {
-            $this->_dkimHandler->setSigner($this->_signerIdentity);
+        if (isset($this->signerIdentity)) {
+            $this->dkimHandler->setSigner($this->signerIdentity);
         }
         $listHeaders = $headers->listAll();
         foreach ($listHeaders as $hName) {
             // Check if we need to ignore Header
-            if (!isset($this->_ignoredHeaders[strtolower($hName)])) {
+            if (!isset($this->ignoredHeaders[strtolower($hName ?? '')])) {
                 $tmp = $headers->getAll($hName);
                 if ($headers->has($hName)) {
                     foreach ($tmp as $header) {
-                        if ($header->getFieldBody() != '') {
+                        if ('' != $header->getFieldBody()) {
                             $htosign = $header->toString();
-                            $this->_dkimHandler->header($htosign);
-                            $this->_signedHeaders[] = $header->getFieldName();
+                            $this->dkimHandler->header($htosign);
+                            $this->signedHeaders[] = $header->getFieldName();
                         }
                     }
                 }
@@ -101,28 +94,28 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
 
     public function startBody()
     {
-        if (!$this->_peclLoaded) {
+        if (!$this->peclLoaded) {
             return parent::startBody();
         }
         $this->dropFirstLF = true;
-        $this->_dkimHandler->eoh();
+        $this->dkimHandler->eoh();
 
         return $this;
     }
 
     public function endBody()
     {
-        if (!$this->_peclLoaded) {
+        if (!$this->peclLoaded) {
             return parent::endBody();
         }
-        $this->_dkimHandler->eom();
+        $this->dkimHandler->eom();
 
         return $this;
     }
 
     public function reset()
     {
-        $this->_dkimHandler = null;
+        $this->dkimHandler = null;
         parent::reset();
 
         return $this;
@@ -137,7 +130,7 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
      */
     public function setSignatureTimestamp($time)
     {
-        $this->_signatureTimestamp = $time;
+        $this->signatureTimestamp = $time;
 
         return $this;
     }
@@ -151,7 +144,7 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
      */
     public function setSignatureExpiration($time)
     {
-        $this->_signatureExpiration = $time;
+        $this->signatureExpiration = $time;
 
         return $this;
     }
@@ -165,26 +158,26 @@ class Swift_Signers_OpenDKIMSigner extends Swift_Signers_DKIMSigner
      */
     public function setDebugHeaders($debug)
     {
-        $this->_debugHeaders = (bool) $debug;
+        $this->debugHeaders = (bool) $debug;
 
         return $this;
     }
 
     // Protected
 
-    protected function _canonicalizeBody($string)
+    protected function canonicalizeBody($string)
     {
-        if (!$this->_peclLoaded) {
-            return parent::_canonicalizeBody($string);
+        if (!$this->peclLoaded) {
+            return parent::canonicalizeBody($string);
         }
-        if (false && $this->dropFirstLF === true) {
-            if ($string[0] == "\r" && $string[1] == "\n") {
+        if (true === $this->dropFirstLF) {
+            if ("\r" == $string[0] && "\n" == $string[1]) {
                 $string = substr($string, 2);
             }
         }
         $this->dropFirstLF = false;
-        if (strlen($string)) {
-            $this->_dkimHandler->body($string);
+        if (\strlen($string)) {
+            $this->dkimHandler->body($string);
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
index d13c02e4c..3dd3cd05f 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Signers/SMimeSigner.php
@@ -11,9 +11,9 @@
 /**
  * MIME Message Signer used to apply S/MIME Signature/Encryption to a message.
  *
- *
  * @author Romain-Geissler
  * @author Sebastiaan Stok <s.stok@rollerscapes.net>
+ * @author Jan Flora <jf@penneo.com>
  */
 class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
 {
@@ -27,6 +27,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
     protected $encryptOptions;
     protected $encryptCipher;
     protected $extraCerts = null;
+    protected $wrapFullMessage = false;
 
     /**
      * @var Swift_StreamFilters_StringReplacementFilterFactory
@@ -34,7 +35,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
     protected $replacementFactory;
 
     /**
-     * @var Swift_Mime_HeaderFactory
+     * @var Swift_Mime_SimpleHeaderFactory
      */
     protected $headerFactory;
 
@@ -59,32 +60,13 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
             ->lookup('transport.replacementfactory');
 
         $this->signOptions = PKCS7_DETACHED;
-
-        // Supported since php5.4
-        if (defined('OPENSSL_CIPHER_AES_128_CBC')) {
-            $this->encryptCipher = OPENSSL_CIPHER_AES_128_CBC;
-        } else {
-            $this->encryptCipher = OPENSSL_CIPHER_RC2_128;
-        }
-    }
-
-    /**
-     * Returns an new Swift_Signers_SMimeSigner instance.
-     *
-     * @param string $certificate
-     * @param string $privateKey
-     *
-     * @return self
-     */
-    public static function newInstance($certificate = null, $privateKey = null)
-    {
-        return new self($certificate, $privateKey);
+        $this->encryptCipher = OPENSSL_CIPHER_AES_128_CBC;
     }
 
     /**
      * Set the certificate location to use for signing.
      *
-     * @see http://www.php.net/manual/en/openssl.pkcs7.flags.php
+     * @see https://secure.php.net/manual/en/openssl.pkcs7.flags.php
      *
      * @param string       $certificate
      * @param string|array $privateKey  If the key needs an passphrase use array('file-location', 'passphrase') instead
@@ -98,7 +80,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
         $this->signCertificate = 'file://'.str_replace('\\', '/', realpath($certificate));
 
         if (null !== $privateKey) {
-            if (is_array($privateKey)) {
+            if (\is_array($privateKey)) {
                 $this->signPrivateKey = $privateKey;
                 $this->signPrivateKey[0] = 'file://'.str_replace('\\', '/', realpath($privateKey[0]));
             } else {
@@ -107,9 +89,7 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
         }
 
         $this->signOptions = $signOptions;
-        if (null !== $extraCerts) {
-            $this->extraCerts = str_replace('\\', '/', realpath($extraCerts));
-        }
+        $this->extraCerts = $extraCerts ? realpath($extraCerts) : null;
 
         return $this;
     }
@@ -117,8 +97,8 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
     /**
      * Set the certificate location to use for encryption.
      *
-     * @see http://www.php.net/manual/en/openssl.pkcs7.flags.php
-     * @see http://nl3.php.net/manual/en/openssl.ciphers.php
+     * @see https://secure.php.net/manual/en/openssl.pkcs7.flags.php
+     * @see https://secure.php.net/manual/en/openssl.ciphers.php
      *
      * @param string|array $recipientCerts Either an single X.509 certificate, or an assoc array of X.509 certificates.
      * @param int          $cipher
@@ -127,8 +107,8 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
      */
     public function setEncryptCertificate($recipientCerts, $cipher = null)
     {
-        if (is_array($recipientCerts)) {
-            $this->encryptCert = array();
+        if (\is_array($recipientCerts)) {
+            $this->encryptCert = [];
 
             foreach ($recipientCerts as $cert) {
                 $this->encryptCert[] = 'file://'.str_replace('\\', '/', realpath($cert));
@@ -197,9 +177,27 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
     }
 
     /**
-     * Change the Swift_Message to apply the signing.
+     * Specify whether to wrap the entire MIME message in the S/MIME message.
      *
-     * @param Swift_Message $message
+     * According to RFC5751 section 3.1:
+     * In order to protect outer, non-content-related message header fields
+     * (for instance, the "Subject", "To", "From", and "Cc" fields), the
+     * sending client MAY wrap a full MIME message in a message/rfc822
+     * wrapper in order to apply S/MIME security services to these header
+     * fields.  It is up to the receiving client to decide how to present
+     * this "inner" header along with the unprotected "outer" header.
+     *
+     * @param bool $wrap
+     *
+     * @return $this
+     */
+    public function setWrapFullMessage($wrap)
+    {
+        $this->wrapFullMessage = $wrap;
+    }
+
+    /**
+     * Change the Swift_Message to apply the signing.
      *
      * @return $this
      */
@@ -209,17 +207,13 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
             return $this;
         }
 
-        // Store the message using ByteStream to a file{1}
-        // Remove all Children
-        // Sign file{1}, parse the new MIME headers and set them on the primary MimeEntity
-        // Set the singed-body as the new body (without boundary)
-
-        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
-        $this->toSMimeByteStream($messageStream, $message);
-        $message->setEncoder(Swift_DependencyContainer::getInstance()->lookup('mime.rawcontentencoder'));
-
-        $message->setChildren(array());
-        $this->streamToMime($messageStream, $message);
+        if ($this->signThenEncrypt) {
+            $this->smimeSignMessage($message);
+            $this->smimeEncryptMessage($message);
+        } else {
+            $this->smimeEncryptMessage($message);
+            $this->smimeSignMessage($message);
+        }
     }
 
     /**
@@ -229,102 +223,303 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
      */
     public function getAlteredHeaders()
     {
-        return array('Content-Type', 'Content-Transfer-Encoding', 'Content-Disposition');
+        return ['Content-Type', 'Content-Transfer-Encoding', 'Content-Disposition'];
     }
 
     /**
-     * @param Swift_InputByteStream $inputStream
-     * @param Swift_Message         $mimeEntity
+     * Sign a Swift message.
      */
-    protected function toSMimeByteStream(Swift_InputByteStream $inputStream, Swift_Message $message)
+    protected function smimeSignMessage(Swift_Message $message)
     {
-        $mimeEntity = $this->createMessage($message);
-        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
-
-        $mimeEntity->toByteStream($messageStream);
-        $messageStream->commit();
-
-        if (null !== $this->signCertificate && null !== $this->encryptCert) {
-            $temporaryStream = new Swift_ByteStream_TemporaryFileByteStream();
-
-            if ($this->signThenEncrypt) {
-                $this->messageStreamToSignedByteStream($messageStream, $temporaryStream);
-                $this->messageStreamToEncryptedByteStream($temporaryStream, $inputStream);
-            } else {
-                $this->messageStreamToEncryptedByteStream($messageStream, $temporaryStream);
-                $this->messageStreamToSignedByteStream($temporaryStream, $inputStream);
-            }
-        } elseif ($this->signCertificate !== null) {
-            $this->messageStreamToSignedByteStream($messageStream, $inputStream);
-        } else {
-            $this->messageStreamToEncryptedByteStream($messageStream, $inputStream);
+        // If we don't have a certificate we can't sign the message
+        if (null === $this->signCertificate) {
+            return;
         }
-    }
 
-    /**
-     * @param Swift_Message $message
-     *
-     * @return Swift_Message
-     */
-    protected function createMessage(Swift_Message $message)
-    {
-        $mimeEntity = new Swift_Message('', $message->getBody(), $message->getContentType(), $message->getCharset());
-        $mimeEntity->setChildren($message->getChildren());
+        // Work on a clone of the original message
+        $signMessage = clone $message;
+        $signMessage->clearSigners();
 
-        $messageHeaders = $mimeEntity->getHeaders();
-        $messageHeaders->remove('Message-ID');
-        $messageHeaders->remove('Date');
-        $messageHeaders->remove('Subject');
-        $messageHeaders->remove('MIME-Version');
-        $messageHeaders->remove('To');
-        $messageHeaders->remove('From');
+        if ($this->wrapFullMessage) {
+            // The original message essentially becomes the body of the new
+            // wrapped message
+            $signMessage = $this->wrapMimeMessage($signMessage);
+        } else {
+            // Only keep header needed to parse the body correctly
+            $this->clearAllHeaders($signMessage);
+            $this->copyHeaders(
+                $message,
+                $signMessage,
+                [
+                    'Content-Type',
+                    'Content-Transfer-Encoding',
+                    'Content-Disposition',
+                ]
+            );
+        }
 
-        return $mimeEntity;
-    }
-
-    /**
-     * @param Swift_FileStream      $outputStream
-     * @param Swift_InputByteStream $inputStream
-     *
-     * @throws Swift_IoException
-     */
-    protected function messageStreamToSignedByteStream(Swift_FileStream $outputStream, Swift_InputByteStream $inputStream)
-    {
+        // Copy the cloned message into a temporary file stream
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $signMessage->toByteStream($messageStream);
+        $messageStream->commit();
         $signedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
 
-        $args = array($outputStream->getPath(), $signedMessageStream->getPath(), $this->signCertificate, $this->signPrivateKey, array(), $this->signOptions);
-        if (null !== $this->extraCerts) {
-            $args[] = $this->extraCerts;
-        }
-
-        if (!call_user_func_array('openssl_pkcs7_sign', $args)) {
+        // Sign the message using openssl
+        if (!openssl_pkcs7_sign(
+                $messageStream->getPath(),
+                $signedMessageStream->getPath(),
+                $this->signCertificate,
+                $this->signPrivateKey,
+                [],
+                $this->signOptions,
+                $this->extraCerts
+            )
+        ) {
             throw new Swift_IoException(sprintf('Failed to sign S/Mime message. Error: "%s".', openssl_error_string()));
         }
 
-        $this->copyFromOpenSSLOutput($signedMessageStream, $inputStream);
+        // Parse the resulting signed message content back into the Swift message
+        // preserving the original headers
+        $this->parseSSLOutput($signedMessageStream, $message);
     }
 
     /**
-     * @param Swift_FileStream      $outputStream
-     * @param Swift_InputByteStream $is
-     *
-     * @throws Swift_IoException
+     * Encrypt a Swift message.
      */
-    protected function messageStreamToEncryptedByteStream(Swift_FileStream $outputStream, Swift_InputByteStream $is)
+    protected function smimeEncryptMessage(Swift_Message $message)
     {
+        // If we don't have a certificate we can't encrypt the message
+        if (null === $this->encryptCert) {
+            return;
+        }
+
+        // Work on a clone of the original message
+        $encryptMessage = clone $message;
+        $encryptMessage->clearSigners();
+
+        if ($this->wrapFullMessage) {
+            // The original message essentially becomes the body of the new
+            // wrapped message
+            $encryptMessage = $this->wrapMimeMessage($encryptMessage);
+        } else {
+            // Only keep header needed to parse the body correctly
+            $this->clearAllHeaders($encryptMessage);
+            $this->copyHeaders(
+                $message,
+                $encryptMessage,
+                [
+                    'Content-Type',
+                    'Content-Transfer-Encoding',
+                    'Content-Disposition',
+                ]
+            );
+        }
+
+        // Convert the message content (including headers) to a string
+        // and place it in a temporary file
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $encryptMessage->toByteStream($messageStream);
+        $messageStream->commit();
         $encryptedMessageStream = new Swift_ByteStream_TemporaryFileByteStream();
 
-        if (!openssl_pkcs7_encrypt($outputStream->getPath(), $encryptedMessageStream->getPath(), $this->encryptCert, array(), 0, $this->encryptCipher)) {
+        // Encrypt the message
+        if (!openssl_pkcs7_encrypt(
+                $messageStream->getPath(),
+                $encryptedMessageStream->getPath(),
+                $this->encryptCert,
+                [],
+                0,
+                $this->encryptCipher
+            )
+        ) {
             throw new Swift_IoException(sprintf('Failed to encrypt S/Mime message. Error: "%s".', openssl_error_string()));
         }
 
-        $this->copyFromOpenSSLOutput($encryptedMessageStream, $is);
+        // Parse the resulting signed message content back into the Swift message
+        // preserving the original headers
+        $this->parseSSLOutput($encryptedMessageStream, $message);
     }
 
     /**
-     * @param Swift_OutputByteStream $fromStream
-     * @param Swift_InputByteStream  $toStream
+     * Copy named headers from one Swift message to another.
      */
+    protected function copyHeaders(
+        Swift_Message $fromMessage,
+        Swift_Message $toMessage,
+        array $headers = []
+    ) {
+        foreach ($headers as $header) {
+            $this->copyHeader($fromMessage, $toMessage, $header);
+        }
+    }
+
+    /**
+     * Copy a single header from one Swift message to another.
+     *
+     * @param string $headerName
+     */
+    protected function copyHeader(Swift_Message $fromMessage, Swift_Message $toMessage, $headerName)
+    {
+        $header = $fromMessage->getHeaders()->get($headerName);
+        if (!$header) {
+            return;
+        }
+        $headers = $toMessage->getHeaders();
+        switch ($header->getFieldType()) {
+            case Swift_Mime_Header::TYPE_TEXT:
+                $headers->addTextHeader($header->getFieldName(), $header->getValue());
+                break;
+            case Swift_Mime_Header::TYPE_PARAMETERIZED:
+                $headers->addParameterizedHeader(
+                    $header->getFieldName(),
+                    $header->getValue(),
+                    $header->getParameters()
+                );
+                break;
+        }
+    }
+
+    /**
+     * Remove all headers from a Swift message.
+     */
+    protected function clearAllHeaders(Swift_Message $message)
+    {
+        $headers = $message->getHeaders();
+        foreach ($headers->listAll() as $header) {
+            $headers->removeAll($header);
+        }
+    }
+
+    /**
+     * Wraps a Swift_Message in a message/rfc822 MIME part.
+     *
+     * @return Swift_MimePart
+     */
+    protected function wrapMimeMessage(Swift_Message $message)
+    {
+        // Start by copying the original message into a message stream
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $message->toByteStream($messageStream);
+        $messageStream->commit();
+
+        // Create a new MIME part that wraps the original stream
+        $wrappedMessage = new Swift_MimePart($messageStream, 'message/rfc822');
+        $wrappedMessage->setEncoder(new Swift_Mime_ContentEncoder_PlainContentEncoder('7bit'));
+
+        return $wrappedMessage;
+    }
+
+    protected function parseSSLOutput(Swift_InputByteStream $inputStream, Swift_Message $message)
+    {
+        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
+        $this->copyFromOpenSSLOutput($inputStream, $messageStream);
+
+        $this->streamToMime($messageStream, $message);
+    }
+
+    /**
+     * Merges an OutputByteStream from OpenSSL to a Swift_Message.
+     */
+    protected function streamToMime(Swift_OutputByteStream $fromStream, Swift_Message $message)
+    {
+        // Parse the stream into headers and body
+        list($headers, $messageStream) = $this->parseStream($fromStream);
+
+        // Get the original message headers
+        $messageHeaders = $message->getHeaders();
+
+        // Let the stream determine the headers describing the body content,
+        // since the body of the original message is overwritten by the body
+        // coming from the stream.
+        // These are all content-* headers.
+
+        // Default transfer encoding is 7bit if not set
+        $encoding = '';
+        // Remove all existing transfer encoding headers
+        $messageHeaders->removeAll('Content-Transfer-Encoding');
+        // See whether the stream sets the transfer encoding
+        if (isset($headers['content-transfer-encoding'])) {
+            $encoding = $headers['content-transfer-encoding'];
+        }
+
+        // We use the null content encoder, since the body is already encoded
+        // according to the transfer encoding specified in the stream
+        $message->setEncoder(new Swift_Mime_ContentEncoder_NullContentEncoder($encoding));
+
+        // Set the disposition, if present
+        if (isset($headers['content-disposition'])) {
+            $messageHeaders->addTextHeader('Content-Disposition', $headers['content-disposition']);
+        }
+
+        // Copy over the body from the stream using the content type dictated
+        // by the stream content
+        $message->setChildren([]);
+        $message->setBody($messageStream, $headers['content-type']);
+    }
+
+    /**
+     * This message will parse the headers of a MIME email byte stream
+     * and return an array that contains the headers as an associative
+     * array and the email body as a string.
+     *
+     * @return array
+     */
+    protected function parseStream(Swift_OutputByteStream $emailStream)
+    {
+        $bufferLength = 78;
+        $headerData = '';
+        $headerBodySeparator = "\r\n\r\n";
+
+        $emailStream->setReadPointer(0);
+
+        // Read out the headers section from the stream to a string
+        while (false !== ($buffer = $emailStream->read($bufferLength))) {
+            $headerData .= $buffer;
+
+            $headersPosEnd = strpos($headerData, $headerBodySeparator);
+
+            // Stop reading if we found the end of the headers
+            if (false !== $headersPosEnd) {
+                break;
+            }
+        }
+
+        // Split the header data into lines
+        $headerData = trim(substr($headerData, 0, $headersPosEnd));
+        $headerLines = explode("\r\n", $headerData);
+        unset($headerData);
+
+        $headers = [];
+        $currentHeaderName = '';
+
+        // Transform header lines into an associative array
+        foreach ($headerLines as $headerLine) {
+            // Handle headers that span multiple lines
+            if (false === strpos($headerLine, ':')) {
+                $headers[$currentHeaderName] .= ' '.trim($headerLine ?? '');
+                continue;
+            }
+
+            $header = explode(':', $headerLine, 2);
+            $currentHeaderName = strtolower($header[0] ?? '');
+            $headers[$currentHeaderName] = trim($header[1] ?? '');
+        }
+
+        // Read the entire email body into a byte stream
+        $bodyStream = new Swift_ByteStream_TemporaryFileByteStream();
+
+        // Skip the header and separator and point to the body
+        $emailStream->setReadPointer($headersPosEnd + \strlen($headerBodySeparator));
+
+        while (false !== ($buffer = $emailStream->read($bufferLength))) {
+            $bodyStream->write($buffer);
+        }
+
+        $bodyStream->commit();
+
+        return [$headers, $bodyStream];
+    }
+
     protected function copyFromOpenSSLOutput(Swift_OutputByteStream $fromStream, Swift_InputByteStream $toStream)
     {
         $bufferLength = 4096;
@@ -344,93 +539,4 @@ class Swift_Signers_SMimeSigner implements Swift_Signers_BodySigner
 
         $toStream->commit();
     }
-
-    /**
-     * Merges an OutputByteStream to Swift_Message.
-     *
-     * @param Swift_OutputByteStream $fromStream
-     * @param Swift_Message          $message
-     */
-    protected function streamToMime(Swift_OutputByteStream $fromStream, Swift_Message $message)
-    {
-        $bufferLength = 78;
-        $headerData = '';
-
-        $fromStream->setReadPointer(0);
-
-        while (($buffer = $fromStream->read($bufferLength)) !== false) {
-            $headerData .= $buffer;
-
-            if (false !== strpos($buffer, "\r\n\r\n")) {
-                break;
-            }
-        }
-
-        $headersPosEnd = strpos($headerData, "\r\n\r\n");
-        $headerData = trim($headerData);
-        $headerData = substr($headerData, 0, $headersPosEnd);
-        $headerLines = explode("\r\n", $headerData);
-        unset($headerData);
-
-        $headers = array();
-        $currentHeaderName = '';
-
-        foreach ($headerLines as $headerLine) {
-            // Line separated
-            if (ctype_space($headerLines[0]) || false === strpos($headerLine, ':')) {
-                $headers[$currentHeaderName] .= ' '.trim($headerLine);
-                continue;
-            }
-
-            $header = explode(':', $headerLine, 2);
-            $currentHeaderName = strtolower($header[0]);
-            $headers[$currentHeaderName] = trim($header[1]);
-        }
-
-        $messageStream = new Swift_ByteStream_TemporaryFileByteStream();
-        $messageStream->addFilter($this->replacementFactory->createFilter("\r\n", "\n"), 'CRLF to LF');
-        $messageStream->addFilter($this->replacementFactory->createFilter("\n", "\r\n"), 'LF to CRLF');
-
-        $messageHeaders = $message->getHeaders();
-
-        // No need to check for 'application/pkcs7-mime', as this is always base64
-        if ('multipart/signed;' === substr($headers['content-type'], 0, 17)) {
-            if (!preg_match('/boundary=("[^"]+"|(?:[^\s]+|$))/is', $headers['content-type'], $contentTypeData)) {
-                throw new Swift_SwiftException('Failed to find Boundary parameter');
-            }
-
-            $boundary = trim($contentTypeData['1'], '"');
-
-            // Skip the header and CRLF CRLF
-            $fromStream->setReadPointer($headersPosEnd + 4);
-
-            while (false !== ($buffer = $fromStream->read($bufferLength))) {
-                $messageStream->write($buffer);
-            }
-
-            $messageStream->commit();
-
-            $messageHeaders->remove('Content-Transfer-Encoding');
-            $message->setContentType($headers['content-type']);
-            $message->setBoundary($boundary);
-            $message->setBody($messageStream);
-        } else {
-            $fromStream->setReadPointer($headersPosEnd + 4);
-
-            if (null === $this->headerFactory) {
-                $this->headerFactory = Swift_DependencyContainer::getInstance()->lookup('mime.headerfactory');
-            }
-
-            $message->setContentType($headers['content-type']);
-            $messageHeaders->set($this->headerFactory->createTextHeader('Content-Transfer-Encoding', $headers['content-transfer-encoding']));
-            $messageHeaders->set($this->headerFactory->createTextHeader('Content-Disposition', $headers['content-disposition']));
-
-            while (false !== ($buffer = $fromStream->read($bufferLength))) {
-                $messageStream->write($buffer);
-            }
-
-            $messageStream->commit();
-            $message->setBody($messageStream);
-        }
-    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
index b97f01e7c..56b62323a 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/SmtpTransport.php
@@ -11,7 +11,7 @@
 /**
  * Sends Messages over SMTP with ESMTP support.
  *
- * @author Chris Corbyn
+ * @author     Chris Corbyn
  *
  * @method Swift_SmtpTransport setUsername(string $username) Set the username to authenticate with.
  * @method string              getUsername()                 Get the username to authenticate with.
@@ -23,36 +23,23 @@
 class Swift_SmtpTransport extends Swift_Transport_EsmtpTransport
 {
     /**
-     * Create a new SmtpTransport, optionally with $host, $port and $security.
-     *
      * @param string $host
      * @param int    $port
-     * @param string $security
+     * @param string|null $encryption SMTP encryption mode:
+     *        - null for plain SMTP (no encryption),
+     *        - 'tls' for SMTP with STARTTLS (best effort encryption),
+     *        - 'ssl' for SMTPS = SMTP over TLS (always encrypted).
      */
-    public function __construct($host = 'localhost', $port = 25, $security = null)
+    public function __construct($host = 'localhost', $port = 25, $encryption = null)
     {
-        call_user_func_array(
-            array($this, 'Swift_Transport_EsmtpTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_EsmtpTransport::__construct'],
             Swift_DependencyContainer::getInstance()
                 ->createDependenciesFor('transport.smtp')
-            );
+        );
 
         $this->setHost($host);
         $this->setPort($port);
-        $this->setEncryption($security);
-    }
-
-    /**
-     * Create a new SmtpTransport instance.
-     *
-     * @param string $host
-     * @param int    $port
-     * @param string $security
-     *
-     * @return self
-     */
-    public static function newInstance($host = 'localhost', $port = 25, $security = null)
-    {
-        return new self($host, $port, $security);
+        $this->setEncryption($encryption);
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Spool.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Spool.php
index c16ab4b38..9d0e8fee2 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Spool.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Spool.php
@@ -35,11 +35,11 @@ interface Swift_Spool
     /**
      * Queues a message.
      *
-     * @param Swift_Mime_Message $message The message to store
+     * @param Swift_Mime_SimpleMessage $message The message to store
      *
      * @return bool Whether the operation has succeeded
      */
-    public function queueMessage(Swift_Mime_Message $message);
+    public function queueMessage(Swift_Mime_SimpleMessage $message);
 
     /**
      * Sends messages using the given transport instance.
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php
index 79c9b1f03..c08e0fb17 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/SpoolTransport.php
@@ -17,8 +17,6 @@ class Swift_SpoolTransport extends Swift_Transport_SpoolTransport
 {
     /**
      * Create a new SpoolTransport.
-     *
-     * @param Swift_Spool $spool
      */
     public function __construct(Swift_Spool $spool)
     {
@@ -27,21 +25,9 @@ class Swift_SpoolTransport extends Swift_Transport_SpoolTransport
 
         $arguments[] = $spool;
 
-        call_user_func_array(
-            array($this, 'Swift_Transport_SpoolTransport::__construct'),
+        \call_user_func_array(
+            [$this, 'Swift_Transport_SpoolTransport::__construct'],
             $arguments
         );
     }
-
-    /**
-     * Create a new SpoolTransport instance.
-     *
-     * @param Swift_Spool $spool
-     *
-     * @return self
-     */
-    public static function newInstance(Swift_Spool $spool)
-    {
-        return new self($spool);
-    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
index 9412b1dc7..7e5ddf1b7 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/ByteArrayReplacementFilter.php
@@ -13,26 +13,23 @@
  *
  * This stream filter deals with Byte arrays rather than simple strings.
  *
- * @author Chris Corbyn
+ * @author  Chris Corbyn
  */
 class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilter
 {
-    /** The needle(s) to search for */
-    private $_search;
-
     /** The replacement(s) to make */
-    private $_replace;
+    private $replace;
 
     /** The Index for searching */
-    private $_index;
+    private $index;
 
     /** The Search Tree */
-    private $_tree = array();
+    private $tree = [];
 
     /**  Gives the size of the largest search */
-    private $_treeMaxLen = 0;
+    private $treeMaxLen = 0;
 
-    private $_repSize;
+    private $repSize;
 
     /**
      * Create a new ByteArrayReplacementFilter with $search and $replace.
@@ -42,26 +39,25 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
      */
     public function __construct($search, $replace)
     {
-        $this->_search = $search;
-        $this->_index = array();
-        $this->_tree = array();
-        $this->_replace = array();
-        $this->_repSize = array();
+        $this->index = [];
+        $this->tree = [];
+        $this->replace = [];
+        $this->repSize = [];
 
         $tree = null;
         $i = null;
         $last_size = $size = 0;
         foreach ($search as $i => $search_element) {
-            if ($tree !== null) {
-                $tree[-1] = min(count($replace) - 1, $i - 1);
+            if (null !== $tree) {
+                $tree[-1] = min(\count($replace) - 1, $i - 1);
                 $tree[-2] = $last_size;
             }
-            $tree = &$this->_tree;
-            if (is_array($search_element)) {
+            $tree = &$this->tree;
+            if (\is_array($search_element)) {
                 foreach ($search_element as $k => $char) {
-                    $this->_index[$char] = true;
+                    $this->index[$char] = true;
                     if (!isset($tree[$char])) {
-                        $tree[$char] = array();
+                        $tree[$char] = [];
                     }
                     $tree = &$tree[$char];
                 }
@@ -70,27 +66,27 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
             } else {
                 $last_size = 1;
                 if (!isset($tree[$search_element])) {
-                    $tree[$search_element] = array();
+                    $tree[$search_element] = [];
                 }
                 $tree = &$tree[$search_element];
                 $size = max($last_size, $size);
-                $this->_index[$search_element] = true;
+                $this->index[$search_element] = true;
             }
         }
-        if ($i !== null) {
-            $tree[-1] = min(count($replace) - 1, $i);
+        if (null !== $i) {
+            $tree[-1] = min(\count($replace) - 1, $i);
             $tree[-2] = $last_size;
-            $this->_treeMaxLen = $size;
+            $this->treeMaxLen = $size;
         }
         foreach ($replace as $rep) {
-            if (!is_array($rep)) {
-                $rep = array($rep);
+            if (!\is_array($rep)) {
+                $rep = [$rep];
             }
-            $this->_replace[] = $rep;
+            $this->replace[] = $rep;
         }
-        for ($i = count($this->_replace) - 1; $i >= 0; --$i) {
-            $this->_replace[$i] = $rep = $this->filter($this->_replace[$i], $i);
-            $this->_repSize[$i] = count($rep);
+        for ($i = \count($this->replace) - 1; $i >= 0; --$i) {
+            $this->replace[$i] = $rep = $this->filter($this->replace[$i], $i);
+            $this->repSize[$i] = \count($rep);
         }
     }
 
@@ -105,47 +101,47 @@ class Swift_StreamFilters_ByteArrayReplacementFilter implements Swift_StreamFilt
     {
         $endOfBuffer = end($buffer);
 
-        return isset($this->_index[$endOfBuffer]);
+        return isset($this->index[$endOfBuffer]);
     }
 
     /**
      * Perform the actual replacements on $buffer and return the result.
      *
      * @param array $buffer
-     * @param int   $_minReplaces
+     * @param int   $minReplaces
      *
      * @return array
      */
-    public function filter($buffer, $_minReplaces = -1)
+    public function filter($buffer, $minReplaces = -1)
     {
-        if ($this->_treeMaxLen == 0) {
+        if (0 == $this->treeMaxLen) {
             return $buffer;
         }
 
-        $newBuffer = array();
-        $buf_size = count($buffer);
+        $newBuffer = [];
+        $buf_size = \count($buffer);
         $last_size = 0;
         for ($i = 0; $i < $buf_size; ++$i) {
-            $search_pos = $this->_tree;
+            $search_pos = $this->tree;
             $last_found = PHP_INT_MAX;
             // We try to find if the next byte is part of a search pattern
-            for ($j = 0; $j <= $this->_treeMaxLen; ++$j) {
+            for ($j = 0; $j <= $this->treeMaxLen; ++$j) {
                 // We have a new byte for a search pattern
                 if (isset($buffer[$p = $i + $j]) && isset($search_pos[$buffer[$p]])) {
                     $search_pos = $search_pos[$buffer[$p]];
                     // We have a complete pattern, save, in case we don't find a better match later
                     if (isset($search_pos[-1]) && $search_pos[-1] < $last_found
-                        && $search_pos[-1] > $_minReplaces) {
+                        && $search_pos[-1] > $minReplaces) {
                         $last_found = $search_pos[-1];
                         $last_size = $search_pos[-2];
                     }
                 }
                 // We got a complete pattern
-                elseif ($last_found !== PHP_INT_MAX) {
+                elseif (PHP_INT_MAX !== $last_found) {
                     // Adding replacement datas to output buffer
-                    $rep_size = $this->_repSize[$last_found];
+                    $rep_size = $this->repSize[$last_found];
                     for ($j = 0; $j < $rep_size; ++$j) {
-                        $newBuffer[] = $this->_replace[$last_found][$j];
+                        $newBuffer[] = $this->replace[$last_found][$j];
                     }
                     // We Move cursor forward
                     $i += $last_size - 1;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
index f64144af2..50a63f1aa 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilter.php
@@ -16,10 +16,10 @@
 class Swift_StreamFilters_StringReplacementFilter implements Swift_StreamFilter
 {
     /** The needle(s) to search for */
-    private $_search;
+    private $search;
 
     /** The replacement(s) to make */
-    private $_replace;
+    private $replace;
 
     /**
      * Create a new StringReplacementFilter with $search and $replace.
@@ -29,8 +29,8 @@ class Swift_StreamFilters_StringReplacementFilter implements Swift_StreamFilter
      */
     public function __construct($search, $replace)
     {
-        $this->_search = $search;
-        $this->_replace = $replace;
+        $this->search = $search;
+        $this->replace = $replace;
     }
 
     /**
@@ -47,7 +47,7 @@ class Swift_StreamFilters_StringReplacementFilter implements Swift_StreamFilter
         }
 
         $endOfBuffer = substr($buffer, -1);
-        foreach ((array) $this->_search as $needle) {
+        foreach ((array) $this->search as $needle) {
             if (false !== strpos($needle, $endOfBuffer)) {
                 return true;
             }
@@ -65,6 +65,6 @@ class Swift_StreamFilters_StringReplacementFilter implements Swift_StreamFilter
      */
     public function filter($buffer)
     {
-        return str_replace($this->_search, $this->_replace, $buffer);
+        return str_replace($this->search, $this->replace, $buffer);
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
index e98240b5b..783b8896d 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/StreamFilters/StringReplacementFilterFactory.php
@@ -16,7 +16,7 @@
 class Swift_StreamFilters_StringReplacementFilterFactory implements Swift_ReplacementFilterFactory
 {
     /** Lazy-loaded filters */
-    private $_filters = array();
+    private $filters = [];
 
     /**
      * Create a new StreamFilter to replace $search with $replace in a string.
@@ -28,18 +28,18 @@ class Swift_StreamFilters_StringReplacementFilterFactory implements Swift_Replac
      */
     public function createFilter($search, $replace)
     {
-        if (!isset($this->_filters[$search][$replace])) {
-            if (!isset($this->_filters[$search])) {
-                $this->_filters[$search] = array();
+        if (!isset($this->filters[$search][$replace])) {
+            if (!isset($this->filters[$search])) {
+                $this->filters[$search] = [];
             }
 
-            if (!isset($this->_filters[$search][$replace])) {
-                $this->_filters[$search][$replace] = array();
+            if (!isset($this->filters[$search][$replace])) {
+                $this->filters[$search][$replace] = [];
             }
 
-            $this->_filters[$search][$replace] = new Swift_StreamFilters_StringReplacementFilter($search, $replace);
+            $this->filters[$search][$replace] = new Swift_StreamFilters_StringReplacementFilter($search, $replace);
         }
 
-        return $this->_filters[$search][$replace];
+        return $this->filters[$search][$replace];
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/SwiftException.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/SwiftException.php
index db3d31093..15e68b18e 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/SwiftException.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/SwiftException.php
@@ -18,9 +18,8 @@ class Swift_SwiftException extends Exception
     /**
      * Create a new SwiftException with $message.
      *
-     * @param string    $message
-     * @param int       $code
-     * @param Exception $previous
+     * @param string $message
+     * @param int    $code
      */
     public function __construct($message, $code = 0, Exception $previous = null)
     {
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php
index 6535eadf2..bc324e868 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport.php
@@ -32,23 +32,45 @@ interface Swift_Transport
      */
     public function stop();
 
+    /**
+     * Check if this Transport mechanism is alive.
+     *
+     * If a Transport mechanism session is no longer functional, the method
+     * returns FALSE. It is the responsibility of the developer to handle this
+     * case and restart the Transport mechanism manually.
+     *
+     * @example
+     *
+     *   if (!$transport->ping()) {
+     *      $transport->stop();
+     *      $transport->start();
+     *   }
+     *
+     * The Transport mechanism will be started, if it is not already.
+     *
+     * It is undefined if the Transport mechanism attempts to restart as long as
+     * the return value reflects whether the mechanism is now functional.
+     *
+     * @return bool TRUE if the transport is alive
+     */
+    public function ping();
+
     /**
      * Send the given Message.
      *
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
-     * @param Swift_Mime_Message $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * This is the responsibility of the send method to start the transport if needed.
+     *
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null);
+    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null);
 
     /**
      * Register a plugin in the Transport.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
index 60233f968..d2dbd7a66 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/AbstractSmtpTransport.php
@@ -16,34 +16,42 @@
 abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
 {
     /** Input-Output buffer for sending/receiving SMTP commands and responses */
-    protected $_buffer;
+    protected $buffer;
 
     /** Connection status */
-    protected $_started = false;
+    protected $started = false;
 
     /** The domain name to use in HELO command */
-    protected $_domain = '[127.0.0.1]';
+    protected $domain = '[127.0.0.1]';
 
     /** The event dispatching layer */
-    protected $_eventDispatcher;
+    protected $eventDispatcher;
+
+    protected $addressEncoder;
+
+    /** Whether the PIPELINING SMTP extension is enabled (RFC 2920) */
+    protected $pipelining = null;
+
+    /** The pipelined commands waiting for response */
+    protected $pipeline = [];
 
     /** Source Ip */
-    protected $_sourceIp;
+    protected $sourceIp;
 
     /** Return an array of params for the Buffer */
-    abstract protected function _getBufferParams();
+    abstract protected function getBufferParams();
 
     /**
      * Creates a new EsmtpTransport using the given I/O buffer.
      *
-     * @param Swift_Transport_IoBuffer     $buf
-     * @param Swift_Events_EventDispatcher $dispatcher
+     * @param string $localDomain
      */
-    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher)
+    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1', Swift_AddressEncoder $addressEncoder = null)
     {
-        $this->_eventDispatcher = $dispatcher;
-        $this->_buffer = $buf;
-        $this->_lookupHostname();
+        $this->buffer = $buf;
+        $this->eventDispatcher = $dispatcher;
+        $this->addressEncoder = $addressEncoder ?? new Swift_AddressEncoder_IdnAddressEncoder();
+        $this->setLocalDomain($localDomain);
     }
 
     /**
@@ -52,8 +60,9 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      * This should be a fully-qualified domain name and should be truly the domain
      * you're using.
      *
-     * If your server doesn't have a domain name, use the IP in square
-     * brackets (i.e. [127.0.0.1]).
+     * If your server does not have a domain name, use the IP address. This will
+     * automatically be wrapped in square brackets as described in RFC 5321,
+     * section 4.1.3.
      *
      * @param string $domain
      *
@@ -61,7 +70,15 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function setLocalDomain($domain)
     {
-        $this->_domain = $domain;
+        if ('[' !== substr($domain, 0, 1)) {
+            if (filter_var($domain, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+                $domain = '['.$domain.']';
+            } elseif (filter_var($domain, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
+                $domain = '[IPv6:'.$domain.']';
+            }
+        }
+
+        $this->domain = $domain;
 
         return $this;
     }
@@ -69,11 +86,14 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
     /**
      * Get the name of the domain Swift will identify as.
      *
+     * If an IP address was specified, this will be returned wrapped in square
+     * brackets as described in RFC 5321, section 4.1.3.
+     *
      * @return string
      */
     public function getLocalDomain()
     {
-        return $this->_domain;
+        return $this->domain;
     }
 
     /**
@@ -83,7 +103,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function setSourceIp($source)
     {
-        $this->_sourceIp = $source;
+        $this->sourceIp = $source;
     }
 
     /**
@@ -93,7 +113,17 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function getSourceIp()
     {
-        return $this->_sourceIp;
+        return $this->sourceIp;
+    }
+
+    public function setAddressEncoder(Swift_AddressEncoder $addressEncoder)
+    {
+        $this->addressEncoder = $addressEncoder;
+    }
+
+    public function getAddressEncoder()
+    {
+        return $this->addressEncoder;
     }
 
     /**
@@ -101,27 +131,27 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function start()
     {
-        if (!$this->_started) {
-            if ($evt = $this->_eventDispatcher->createTransportChangeEvent($this)) {
-                $this->_eventDispatcher->dispatchEvent($evt, 'beforeTransportStarted');
+        if (!$this->started) {
+            if ($evt = $this->eventDispatcher->createTransportChangeEvent($this)) {
+                $this->eventDispatcher->dispatchEvent($evt, 'beforeTransportStarted');
                 if ($evt->bubbleCancelled()) {
                     return;
                 }
             }
 
             try {
-                $this->_buffer->initialize($this->_getBufferParams());
+                $this->buffer->initialize($this->getBufferParams());
             } catch (Swift_TransportException $e) {
-                $this->_throwException($e);
+                $this->throwException($e);
             }
-            $this->_readGreeting();
-            $this->_doHeloCommand();
+            $this->readGreeting();
+            $this->doHeloCommand();
 
             if ($evt) {
-                $this->_eventDispatcher->dispatchEvent($evt, 'transportStarted');
+                $this->eventDispatcher->dispatchEvent($evt, 'transportStarted');
             }
 
-            $this->_started = true;
+            $this->started = true;
         }
     }
 
@@ -132,7 +162,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function isStarted()
     {
-        return $this->_started;
+        return $this->started;
     }
 
     /**
@@ -141,49 +171,45 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
-     * @param Swift_Mime_Message $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
+        if (!$this->isStarted()) {
+            $this->start();
+        }
+
         $sent = 0;
         $failedRecipients = (array) $failedRecipients;
 
-        if ($evt = $this->_eventDispatcher->createSendEvent($this, $message)) {
-            $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
+        if ($evt = $this->eventDispatcher->createSendEvent($this, $message)) {
+            $this->eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
             if ($evt->bubbleCancelled()) {
                 return 0;
             }
         }
 
-        if (!$reversePath = $this->_getReversePath($message)) {
-            $this->_throwException(new Swift_TransportException(
-                'Cannot send message without a sender address'
-                )
-            );
+        if (!$reversePath = $this->getReversePath($message)) {
+            $this->throwException(new Swift_TransportException('Cannot send message without a sender address'));
         }
 
         $to = (array) $message->getTo();
         $cc = (array) $message->getCc();
-        $tos = array_merge($to, $cc);
         $bcc = (array) $message->getBcc();
+        $tos = array_merge($to, $cc, $bcc);
 
-        $message->setBcc(array());
+        $message->setBcc([]);
 
         try {
-            $sent += $this->_sendTo($message, $reversePath, $tos, $failedRecipients);
-            $sent += $this->_sendBcc($message, $reversePath, $bcc, $failedRecipients);
-        } catch (Exception $e) {
+            $sent += $this->sendTo($message, $reversePath, $tos, $failedRecipients);
+        } finally {
             $message->setBcc($bcc);
-            throw $e;
         }
 
-        $message->setBcc($bcc);
-
         if ($evt) {
-            if ($sent == count($to) + count($cc) + count($bcc)) {
+            if ($sent == \count($to) + \count($cc) + \count($bcc)) {
                 $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
             } elseif ($sent > 0) {
                 $evt->setResult(Swift_Events_SendEvent::RESULT_TENTATIVE);
@@ -191,7 +217,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
                 $evt->setResult(Swift_Events_SendEvent::RESULT_FAILED);
             }
             $evt->setFailedRecipients($failedRecipients);
-            $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
+            $this->eventDispatcher->dispatchEvent($evt, 'sendPerformed');
         }
 
         $message->generateId(); //Make sure a new Message ID is used
@@ -204,40 +230,61 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function stop()
     {
-        if ($this->_started) {
-            if ($evt = $this->_eventDispatcher->createTransportChangeEvent($this)) {
-                $this->_eventDispatcher->dispatchEvent($evt, 'beforeTransportStopped');
+        if ($this->started) {
+            if ($evt = $this->eventDispatcher->createTransportChangeEvent($this)) {
+                $this->eventDispatcher->dispatchEvent($evt, 'beforeTransportStopped');
                 if ($evt->bubbleCancelled()) {
                     return;
                 }
             }
 
             try {
-                $this->executeCommand("QUIT\r\n", array(221));
+                $this->executeCommand("QUIT\r\n", [221]);
             } catch (Swift_TransportException $e) {
             }
 
             try {
-                $this->_buffer->terminate();
+                $this->buffer->terminate();
 
                 if ($evt) {
-                    $this->_eventDispatcher->dispatchEvent($evt, 'transportStopped');
+                    $this->eventDispatcher->dispatchEvent($evt, 'transportStopped');
                 }
             } catch (Swift_TransportException $e) {
-                $this->_throwException($e);
+                $this->throwException($e);
             }
         }
-        $this->_started = false;
+        $this->started = false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function ping()
+    {
+        try {
+            if (!$this->isStarted()) {
+                $this->start();
+            }
+
+            $this->executeCommand("NOOP\r\n", [250]);
+        } catch (Swift_TransportException $e) {
+            try {
+                $this->stop();
+            } catch (Swift_TransportException $e) {
+            }
+
+            return false;
+        }
+
+        return true;
     }
 
     /**
      * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
-        $this->_eventDispatcher->bindEventListener($plugin);
+        $this->eventDispatcher->bindEventListener($plugin);
     }
 
     /**
@@ -245,7 +292,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function reset()
     {
-        $this->executeCommand("RSET\r\n", array(250));
+        $this->executeCommand("RSET\r\n", [250], $failures, true);
     }
 
     /**
@@ -255,7 +302,7 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      */
     public function getBuffer()
     {
-        return $this->_buffer;
+        return $this->buffer;
     }
 
     /**
@@ -263,78 +310,104 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
      *
      * If no response codes are given, the response will not be validated.
      * If codes are given, an exception will be thrown on an invalid response.
+     * If the command is RCPT TO, and the pipeline is non-empty, no exception
+     * will be thrown; instead the failing address is added to $failures.
      *
      * @param string   $command
      * @param int[]    $codes
      * @param string[] $failures An array of failures by-reference
+     * @param bool     $pipeline Do not wait for response
+     * @param string   $address  the address, if command is RCPT TO
      *
-     * @return string
+     * @return string|null The server response, or null if pipelining is enabled
      */
-    public function executeCommand($command, $codes = array(), &$failures = null)
+    public function executeCommand($command, $codes = [], &$failures = null, $pipeline = false, $address = null)
     {
         $failures = (array) $failures;
-        $seq = $this->_buffer->write($command);
-        $response = $this->_getFullResponse($seq);
-        if ($evt = $this->_eventDispatcher->createCommandEvent($this, $command, $codes)) {
-            $this->_eventDispatcher->dispatchEvent($evt, 'commandSent');
+        $seq = $this->buffer->write($command);
+        if ($evt = $this->eventDispatcher->createCommandEvent($this, $command, $codes)) {
+            $this->eventDispatcher->dispatchEvent($evt, 'commandSent');
+        }
+
+        $this->pipeline[] = [$command, $seq, $codes, $address];
+
+        if ($pipeline && $this->pipelining) {
+            return null;
+        }
+
+        $response = null;
+
+        while ($this->pipeline) {
+            list($command, $seq, $codes, $address) = array_shift($this->pipeline);
+            $response = $this->getFullResponse($seq);
+            try {
+                $this->assertResponseCode($response, $codes);
+            } catch (Swift_TransportException $e) {
+                if ($this->pipeline && $address) {
+                    $failures[] = $address;
+                } else {
+                    $this->throwException($e);
+                }
+            }
         }
-        $this->_assertResponseCode($response, $codes);
 
         return $response;
     }
 
     /** Read the opening SMTP greeting */
-    protected function _readGreeting()
+    protected function readGreeting()
     {
-        $this->_assertResponseCode($this->_getFullResponse(0), array(220));
+        $this->assertResponseCode($this->getFullResponse(0), [220]);
     }
 
     /** Send the HELO welcome */
-    protected function _doHeloCommand()
+    protected function doHeloCommand()
     {
         $this->executeCommand(
-            sprintf("HELO %s\r\n", $this->_domain), array(250)
+            sprintf("HELO %s\r\n", $this->domain), [250]
             );
     }
 
     /** Send the MAIL FROM command */
-    protected function _doMailFromCommand($address)
+    protected function doMailFromCommand($address)
     {
+        $address = $this->addressEncoder->encodeString($address);
         $this->executeCommand(
-            sprintf("MAIL FROM:<%s>\r\n", $address), array(250)
+            sprintf("MAIL FROM:<%s>\r\n", $address), [250], $failures, true
             );
     }
 
     /** Send the RCPT TO command */
-    protected function _doRcptToCommand($address)
+    protected function doRcptToCommand($address)
     {
+        $address = $this->addressEncoder->encodeString($address);
         $this->executeCommand(
-            sprintf("RCPT TO:<%s>\r\n", $address), array(250, 251, 252)
+            sprintf("RCPT TO:<%s>\r\n", $address), [250, 251, 252], $failures, true, $address
             );
     }
 
     /** Send the DATA command */
-    protected function _doDataCommand()
+    protected function doDataCommand(&$failedRecipients)
     {
-        $this->executeCommand("DATA\r\n", array(354));
+        $this->executeCommand("DATA\r\n", [354], $failedRecipients);
     }
 
     /** Stream the contents of the message over the buffer */
-    protected function _streamMessage(Swift_Mime_Message $message)
+    protected function streamMessage(Swift_Mime_SimpleMessage $message)
     {
-        $this->_buffer->setWriteTranslations(array("\r\n." => "\r\n.."));
+        $this->buffer->setWriteTranslations(["\r\n." => "\r\n.."]);
         try {
-            $message->toByteStream($this->_buffer);
-            $this->_buffer->flushBuffers();
+            $message->toByteStream($this->buffer);
+            $this->buffer->flushBuffers();
         } catch (Swift_TransportException $e) {
-            $this->_throwException($e);
+            $this->throwException($e);
         }
-        $this->_buffer->setWriteTranslations(array());
-        $this->executeCommand("\r\n.\r\n", array(250));
+        $this->buffer->setWriteTranslations([]);
+        $this->executeCommand("\r\n.\r\n", [250]);
     }
 
     /** Determine the best-use reverse path for this message */
-    protected function _getReversePath(Swift_Mime_Message $message)
+    protected function getReversePath(Swift_Mime_SimpleMessage $message)
     {
         $return = $message->getReturnPath();
         $sender = $message->getSender();
@@ -355,10 +428,10 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
     }
 
     /** Throw a TransportException, first sending it to any listeners */
-    protected function _throwException(Swift_TransportException $e)
+    protected function throwException(Swift_TransportException $e)
     {
-        if ($evt = $this->_eventDispatcher->createTransportExceptionEvent($this, $e)) {
-            $this->_eventDispatcher->dispatchEvent($evt, 'exceptionThrown');
+        if ($evt = $this->eventDispatcher->createTransportExceptionEvent($this, $e)) {
+            $this->eventDispatcher->dispatchEvent($evt, 'exceptionThrown');
             if (!$evt->bubbleCancelled()) {
                 throw $e;
             }
@@ -368,64 +441,65 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
     }
 
     /** Throws an Exception if a response code is incorrect */
-    protected function _assertResponseCode($response, $wanted)
+    protected function assertResponseCode($response, $wanted)
     {
-        list($code) = sscanf($response, '%3d');
-        $valid = (empty($wanted) || in_array($code, $wanted));
+        if (!$response) {
+            $this->throwException(new Swift_TransportException('Expected response code '.implode('/', $wanted).' but got an empty response'));
+        }
 
-        if ($evt = $this->_eventDispatcher->createResponseEvent($this, $response,
+        list($code) = sscanf($response, '%3d');
+        $valid = (empty($wanted) || \in_array($code, $wanted));
+
+        if ($evt = $this->eventDispatcher->createResponseEvent($this, $response,
             $valid)) {
-            $this->_eventDispatcher->dispatchEvent($evt, 'responseReceived');
+            $this->eventDispatcher->dispatchEvent($evt, 'responseReceived');
         }
 
         if (!$valid) {
-            $this->_throwException(
-                new Swift_TransportException(
-                    'Expected response code '.implode('/', $wanted).' but got code '.
-                    '"'.$code.'", with message "'.$response.'"',
-                    $code)
-                );
+            $this->throwException(new Swift_TransportException('Expected response code '.implode('/', $wanted).' but got code "'.$code.'", with message "'.$response.'"', $code));
         }
     }
 
     /** Get an entire multi-line response using its sequence number */
-    protected function _getFullResponse($seq)
+    protected function getFullResponse($seq)
     {
         $response = '';
         try {
             do {
-                $line = $this->_buffer->readLine($seq);
+                $line = $this->buffer->readLine($seq);
                 $response .= $line;
             } while (null !== $line && false !== $line && ' ' != $line[3]);
         } catch (Swift_TransportException $e) {
-            $this->_throwException($e);
+            $this->throwException($e);
         } catch (Swift_IoException $e) {
-            $this->_throwException(
-                new Swift_TransportException(
-                    $e->getMessage())
-                );
+            $this->throwException(new Swift_TransportException($e->getMessage(), 0, $e));
         }
 
         return $response;
     }
 
     /** Send an email to the given recipients from the given reverse path */
-    private function _doMailTransaction($message, $reversePath, array $recipients, array &$failedRecipients)
+    private function doMailTransaction($message, $reversePath, array $recipients, array &$failedRecipients)
     {
         $sent = 0;
-        $this->_doMailFromCommand($reversePath);
+        $this->doMailFromCommand($reversePath);
         foreach ($recipients as $forwardPath) {
             try {
-                $this->_doRcptToCommand($forwardPath);
+                $this->doRcptToCommand($forwardPath);
                 ++$sent;
             } catch (Swift_TransportException $e) {
                 $failedRecipients[] = $forwardPath;
+            } catch (Swift_AddressEncoderException $e) {
+                $failedRecipients[] = $forwardPath;
             }
         }
 
-        if ($sent != 0) {
-            $this->_doDataCommand();
-            $this->_streamMessage($message);
+        if (0 != $sent) {
+            $sent += \count($failedRecipients);
+            $this->doDataCommand($failedRecipients);
+            $sent -= \count($failedRecipients);
+
+            $this->streamMessage($message);
         } else {
             $this->reset();
         }
@@ -434,58 +508,16 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
     }
 
     /** Send a message to the given To: recipients */
-    private function _sendTo(Swift_Mime_Message $message, $reversePath, array $to, array &$failedRecipients)
+    private function sendTo(Swift_Mime_SimpleMessage $message, $reversePath, array $to, array &$failedRecipients)
     {
         if (empty($to)) {
             return 0;
         }
 
-        return $this->_doMailTransaction($message, $reversePath, array_keys($to),
+        return $this->doMailTransaction($message, $reversePath, array_keys($to),
             $failedRecipients);
     }
 
-    /** Send a message to all Bcc: recipients */
-    private function _sendBcc(Swift_Mime_Message $message, $reversePath, array $bcc, array &$failedRecipients)
-    {
-        $sent = 0;
-        foreach ($bcc as $forwardPath => $name) {
-            $message->setBcc(array($forwardPath => $name));
-            $sent += $this->_doMailTransaction(
-                $message, $reversePath, array($forwardPath), $failedRecipients
-                );
-        }
-
-        return $sent;
-    }
-
-    /** Try to determine the hostname of the server this is run on */
-    private function _lookupHostname()
-    {
-        if (!empty($_SERVER['SERVER_NAME']) && $this->_isFqdn($_SERVER['SERVER_NAME'])) {
-            $this->_domain = $_SERVER['SERVER_NAME'];
-        } elseif (!empty($_SERVER['SERVER_ADDR'])) {
-            // Set the address literal tag (See RFC 5321, section: 4.1.3)
-            if (false === strpos($_SERVER['SERVER_ADDR'], ':')) {
-                $prefix = ''; // IPv4 addresses are not tagged.
-            } else {
-                $prefix = 'IPv6:'; // Adding prefix in case of IPv6.
-            }
-
-            $this->_domain = sprintf('[%s%s]', $prefix, $_SERVER['SERVER_ADDR']);
-        }
-    }
-
-    /** Determine is the $hostname is a fully-qualified name */
-    private function _isFqdn($hostname)
-    {
-        // We could do a really thorough check, but there's really no point
-        if (false !== $dotPos = strpos($hostname, '.')) {
-            return ($dotPos > 0) && ($dotPos != strlen($hostname) - 1);
-        }
-
-        return false;
-    }
-
     /**
      * Destructor.
      */
@@ -496,4 +528,14 @@ abstract class Swift_Transport_AbstractSmtpTransport implements Swift_Transport
         } catch (Exception $e) {
         }
     }
+
+    public function __sleep()
+    {
+        throw new \BadMethodCallException('Cannot serialize '.__CLASS__);
+    }
+
+    public function __wakeup()
+    {
+        throw new \BadMethodCallException('Cannot unserialize '.__CLASS__);
+    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
index 53f721d03..bb3a16150 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/CramMd5Authenticator.php
@@ -26,29 +26,23 @@ class Swift_Transport_Esmtp_Auth_CramMd5Authenticator implements Swift_Transport
     }
 
     /**
-     * Try to authenticate the user with $username and $password.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
         try {
-            $challenge = $agent->executeCommand("AUTH CRAM-MD5\r\n", array(334));
+            $challenge = $agent->executeCommand("AUTH CRAM-MD5\r\n", [334]);
             $challenge = base64_decode(substr($challenge, 4));
             $message = base64_encode(
-                $username.' '.$this->_getResponse($password, $challenge)
-                );
-            $agent->executeCommand(sprintf("%s\r\n", $message), array(235));
+                $username.' '.$this->getResponse($password, $challenge)
+            );
+            $agent->executeCommand(sprintf("%s\r\n", $message), [235]);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 
@@ -60,18 +54,18 @@ class Swift_Transport_Esmtp_Auth_CramMd5Authenticator implements Swift_Transport
      *
      * @return string
      */
-    private function _getResponse($secret, $challenge)
+    private function getResponse($secret, $challenge)
     {
-        if (strlen($secret) > 64) {
+        if (\strlen($secret) > 64) {
             $secret = pack('H32', md5($secret));
         }
 
-        if (strlen($secret) < 64) {
-            $secret = str_pad($secret, 64, chr(0));
+        if (\strlen($secret) < 64) {
+            $secret = str_pad($secret, 64, \chr(0));
         }
 
-        $k_ipad = substr($secret, 0, 64) ^ str_repeat(chr(0x36), 64);
-        $k_opad = substr($secret, 0, 64) ^ str_repeat(chr(0x5C), 64);
+        $k_ipad = substr($secret, 0, 64) ^ str_repeat(\chr(0x36), 64);
+        $k_opad = substr($secret, 0, 64) ^ str_repeat(\chr(0x5C), 64);
 
         $inner = pack('H32', md5($k_ipad.$challenge));
         $digest = md5($k_opad.$inner);
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
index 6ab6e3337..0b9d81b8a 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/LoginAuthenticator.php
@@ -26,26 +26,20 @@ class Swift_Transport_Esmtp_Auth_LoginAuthenticator implements Swift_Transport_E
     }
 
     /**
-     * Try to authenticate the user with $username and $password.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
         try {
-            $agent->executeCommand("AUTH LOGIN\r\n", array(334));
-            $agent->executeCommand(sprintf("%s\r\n", base64_encode($username)), array(334));
-            $agent->executeCommand(sprintf("%s\r\n", base64_encode($password)), array(235));
+            $agent->executeCommand("AUTH LOGIN\r\n", [334]);
+            $agent->executeCommand(sprintf("%s\r\n", base64_encode($username ?? '')), [334]);
+            $agent->executeCommand(sprintf("%s\r\n", base64_encode($password ?? '')), [235]);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
index 839265857..41931fdd2 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/NTLMAuthenticator.php
@@ -13,7 +13,7 @@
 /**
  * Handles NTLM authentication.
  *
- * @author Ward Peeters <ward@coding-tech.com>
+ * @author     Ward Peeters <ward@coding-tech.com>
  */
 class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Esmtp_Authenticator
 {
@@ -31,61 +31,57 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     }
 
     /**
-     * Try to authenticate the user with $username and $password.
+     * {@inheritdoc}
      *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
-     *
-     * @return bool
+     * @throws \LogicException
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
-        if (!function_exists('openssl_random_pseudo_bytes') || !function_exists('openssl_encrypt')) {
+        if (!\function_exists('openssl_encrypt')) {
             throw new LogicException('The OpenSSL extension must be enabled to use the NTLM authenticator.');
         }
 
-        if (!function_exists('bcmul')) {
+        if (!\function_exists('bcmul')) {
             throw new LogicException('The BCMath functions must be enabled to use the NTLM authenticator.');
         }
 
         try {
             // execute AUTH command and filter out the code at the beginning
             // AUTH NTLM xxxx
-            $response = base64_decode(substr(trim($this->sendMessage1($agent)), 4));
+            $response = base64_decode(substr(trim($this->sendMessage1($agent) ?? ''), 4));
 
             // extra parameters for our unit cases
-            $timestamp = func_num_args() > 3 ? func_get_arg(3) : $this->getCorrectTimestamp(bcmul(microtime(true), '1000'));
-            $client = func_num_args() > 4 ? func_get_arg(4) : $this->getRandomBytes(8);
+            $timestamp = \func_num_args() > 3 ? func_get_arg(3) : $this->getCorrectTimestamp(bcmul(microtime(true), '1000'));
+            $client = \func_num_args() > 4 ? func_get_arg(4) : random_bytes(8);
 
             // Message 3 response
             $this->sendMessage3($response, $username, $password, $timestamp, $client, $agent);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 
     protected function si2bin($si, $bits = 32)
     {
         $bin = null;
-        if ($si >= -pow(2, $bits - 1) && ($si <= pow(2, $bits - 1))) {
+        if ($si >= -2 ** ($bits - 1) && ($si <= 2 ** ($bits - 1))) {
             // positive or zero
             if ($si >= 0) {
                 $bin = base_convert($si, 10, 2);
                 // pad to $bits bit
-                $bin_length = strlen($bin);
+                $bin_length = \strlen($bin);
                 if ($bin_length < $bits) {
                     $bin = str_repeat('0', $bits - $bin_length).$bin;
                 }
             } else {
                 // negative
-                $si = -$si - pow(2, $bits);
+                $si = -$si - 2 ** $bits;
                 $bin = base_convert($si, 10, 2);
-                $bin_length = strlen($bin);
+                $bin_length = \strlen($bin);
                 if ($bin_length > $bits) {
                     $bin = str_repeat('1', $bits - $bin_length).$bin;
                 }
@@ -98,15 +94,13 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     /**
      * Send our auth message and returns the response.
      *
-     * @param Swift_Transport_SmtpAgent $agent
-     *
      * @return string SMTP Response
      */
     protected function sendMessage1(Swift_Transport_SmtpAgent $agent)
     {
         $message = $this->createMessage1();
 
-        return $agent->executeCommand(sprintf("AUTH %s %s\r\n", $this->getAuthKeyword(), base64_encode($message)), array(334));
+        return $agent->executeCommand(sprintf("AUTH %s %s\r\n", $this->getAuthKeyword(), base64_encode($message)), [334]);
     }
 
     /**
@@ -121,15 +115,15 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         $responseHex = bin2hex($response);
         $length = floor(hexdec(substr($responseHex, 28, 4)) / 256) * 2;
         $offset = floor(hexdec(substr($responseHex, 32, 4)) / 256) * 2;
-        $challenge = $this->hex2bin(substr($responseHex, 48, 16));
-        $context = $this->hex2bin(substr($responseHex, 64, 16));
-        $targetInfoH = $this->hex2bin(substr($responseHex, 80, 16));
-        $targetName = $this->hex2bin(substr($responseHex, $offset, $length));
+        $challenge = hex2bin(substr($responseHex, 48, 16));
+        $context = hex2bin(substr($responseHex, 64, 16));
+        $targetInfoH = hex2bin(substr($responseHex, 80, 16));
+        $targetName = hex2bin(substr($responseHex, $offset, $length));
         $offset = floor(hexdec(substr($responseHex, 88, 4)) / 256) * 2;
         $targetInfoBlock = substr($responseHex, $offset);
         list($domainName, $serverName, $DNSDomainName, $DNSServerName, $terminatorByte) = $this->readSubBlock($targetInfoBlock);
 
-        return array(
+        return [
             $challenge,
             $context,
             $targetInfoH,
@@ -138,16 +132,14 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
             $serverName,
             $DNSDomainName,
             $DNSServerName,
-            $this->hex2bin($targetInfoBlock),
+            hex2bin($targetInfoBlock),
             $terminatorByte,
-        );
+        ];
     }
 
     /**
      * Read the blob information in from message2.
      *
-     * @param $block
-     *
      * @return array
      */
     protected function readSubBlock($block)
@@ -155,17 +147,17 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         // remove terminatorByte cause it's always the same
         $block = substr($block, 0, -8);
 
-        $length = strlen($block);
+        $length = \strlen($block);
         $offset = 0;
-        $data = array();
+        $data = [];
         while ($offset < $length) {
             $blockLength = hexdec(substr(substr($block, $offset, 8), -4)) / 256;
             $offset += 8;
-            $data[] = $this->hex2bin(substr($block, $offset, $blockLength * 2));
+            $data[] = hex2bin(substr($block, $offset, $blockLength * 2));
             $offset += $blockLength * 2;
         }
 
-        if (count($data) == 3) {
+        if (3 == \count($data)) {
             $data[] = $data[2];
             $data[2] = '';
         }
@@ -178,13 +170,12 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     /**
      * Send our final message with all our data.
      *
-     * @param string                    $response  Message 1 response (message 2)
-     * @param string                    $username
-     * @param string                    $password
-     * @param string                    $timestamp
-     * @param string                    $client
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param bool                      $v2        Use version2 of the protocol
+     * @param string $response  Message 1 response (message 2)
+     * @param string $username
+     * @param string $password
+     * @param string $timestamp
+     * @param string $client
+     * @param bool   $v2        Use version2 of the protocol
      *
      * @return string
      */
@@ -208,7 +199,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
 
         $message = $this->createMessage3($domain, $username, $workstation, $lmResponse, $ntlmResponse);
 
-        return $agent->executeCommand(sprintf("%s\r\n", base64_encode($message)), array(235));
+        return $agent->executeCommand(sprintf("%s\r\n", base64_encode($message)), [235]);
     }
 
     /**
@@ -292,18 +283,18 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
      */
     protected function getDomainAndUsername($name)
     {
-        if (strpos($name, '\\') !== false) {
+        if (false !== strpos($name, '\\')) {
             return explode('\\', $name);
         }
 
         if (false !== strpos($name, '@')) {
             list($user, $domain) = explode('@', $name);
 
-            return array($domain, $user);
+            return [$domain, $user];
         }
 
         // no domain passed
-        return array('', $name);
+        return ['', $name];
     }
 
     /**
@@ -373,7 +364,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         $binary = $this->si2bin($time, 64); // create 64 bit binary string
         $timestamp = '';
         for ($i = 0; $i < 8; ++$i) {
-            $timestamp .= chr(bindec(substr($binary, -(($i + 1) * 8), 8)));
+            $timestamp .= \chr(bindec(substr($binary, -(($i + 1) * 8), 8)));
         }
 
         return $timestamp;
@@ -394,7 +385,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     {
         $lmPass = '00'; // by default 00
         // if $password > 15 than we can't use this method
-        if (strlen($password) <= 15) {
+        if (\strlen($password) <= 15) {
             $ntlmHash = $this->md4Encrypt($password);
             $ntml2Hash = $this->md5Encrypt($ntlmHash, $this->convertTo16bit(strtoupper($username).$domain));
 
@@ -434,21 +425,21 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
 
     protected function createDesKey($key)
     {
-        $material = array(bin2hex($key[0]));
-        $len = strlen($key);
+        $material = [bin2hex($key[0])];
+        $len = \strlen($key);
         for ($i = 1; $i < $len; ++$i) {
             list($high, $low) = str_split(bin2hex($key[$i]));
-            $v = $this->castToByte(ord($key[$i - 1]) << (7 + 1 - $i) | $this->uRShift(hexdec(dechex(hexdec($high) & 0xf).dechex(hexdec($low) & 0xf)), $i));
+            $v = $this->castToByte(\ord($key[$i - 1]) << (7 + 1 - $i) | $this->uRShift(hexdec(dechex(hexdec($high) & 0xf).dechex(hexdec($low) & 0xf)), $i));
             $material[] = str_pad(substr(dechex($v), -2), 2, '0', STR_PAD_LEFT); // cast to byte
         }
-        $material[] = str_pad(substr(dechex($this->castToByte(ord($key[6]) << 1)), -2), 2, '0');
+        $material[] = str_pad(substr(dechex($this->castToByte(\ord($key[6]) << 1)), -2), 2, '0');
 
         // odd parity
         foreach ($material as $k => $v) {
             $b = $this->castToByte(hexdec($v));
-            $needsParity = (($this->uRShift($b, 7) ^ $this->uRShift($b, 6) ^ $this->uRShift($b, 5)
+            $needsParity = 0 == (($this->uRShift($b, 7) ^ $this->uRShift($b, 6) ^ $this->uRShift($b, 5)
                         ^ $this->uRShift($b, 4) ^ $this->uRShift($b, 3) ^ $this->uRShift($b, 2)
-                        ^ $this->uRShift($b, 1)) & 0x01) == 0;
+                        ^ $this->uRShift($b, 1)) & 0x01);
 
             list($high, $low) = str_split($v);
             if ($needsParity) {
@@ -458,7 +449,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
             }
         }
 
-        return $this->hex2bin(implode('', $material));
+        return hex2bin(implode('', $material));
     }
 
     /** HELPER FUNCTIONS */
@@ -474,7 +465,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
      */
     protected function createSecurityBuffer($value, $offset, $is16 = false)
     {
-        $length = strlen(bin2hex($value));
+        $length = \strlen(bin2hex($value));
         $length = $is16 ? $length / 2 : $length;
         $length = $this->createByte(str_pad(dechex($length), 2, '0', STR_PAD_LEFT), 2);
 
@@ -493,7 +484,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         $length = floor(hexdec(substr($value, 0, 4)) / 256) * 2;
         $offset = floor(hexdec(substr($value, 8, 4)) / 256) * 2;
 
-        return array($length, $offset);
+        return [$length, $offset];
     }
 
     /**
@@ -519,7 +510,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
      */
     protected function uRShift($a, $b)
     {
-        if ($b == 0) {
+        if (0 == $b) {
             return $a;
         }
 
@@ -538,7 +529,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     protected function createByte($input, $bytes = 4, $isHex = true)
     {
         if ($isHex) {
-            $byte = $this->hex2bin(str_pad($input, $bytes * 2, '00'));
+            $byte = hex2bin(str_pad($input, $bytes * 2, '00'));
         } else {
             $byte = str_pad($input, $bytes, "\x00");
         }
@@ -546,24 +537,6 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         return $byte;
     }
 
-    /**
-     * Create random bytes.
-     *
-     * @param $length
-     *
-     * @return string
-     */
-    protected function getRandomBytes($length)
-    {
-        $bytes = openssl_random_pseudo_bytes($length, $strong);
-
-        if (false !== $bytes && true === $strong) {
-            return $bytes;
-        }
-
-        throw new RuntimeException('OpenSSL did not produce a secure random number.');
-    }
-
     /** ENCRYPTION ALGORITHMS */
 
     /**
@@ -576,8 +549,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
      */
     protected function desEncrypt($value, $key)
     {
-        // 1 == OPENSSL_RAW_DATA - but constant is only available as of PHP 5.4.
-        return substr(openssl_encrypt($value, 'DES-ECB', $key, 1), 0, 8);
+        return substr(openssl_encrypt($value, 'DES-ECB', $key, \OPENSSL_RAW_DATA), 0, 8);
     }
 
     /**
@@ -591,7 +563,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
     protected function md5Encrypt($key, $msg)
     {
         $blocksize = 64;
-        if (strlen($key) > $blocksize) {
+        if (\strlen($key) > $blocksize) {
             $key = pack('H*', md5($key));
         }
 
@@ -609,13 +581,13 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
      *
      * @return string
      *
-     * @see http://php.net/manual/en/ref.hash.php
+     * @see https://secure.php.net/manual/en/ref.hash.php
      */
     protected function md4Encrypt($input)
     {
         $input = $this->convertTo16bit($input);
 
-        return function_exists('hash') ? $this->hex2bin(hash('md4', $input)) : mhash(MHASH_MD4, $input);
+        return \function_exists('hash') ? hex2bin(hash('md4', $input)) : mhash(MHASH_MD4, $input);
     }
 
     /**
@@ -630,22 +602,6 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         return iconv('UTF-8', 'UTF-16LE', $input);
     }
 
-    /**
-     * Hex2bin replacement for < PHP 5.4.
-     *
-     * @param string $hex
-     *
-     * @return string Binary
-     */
-    protected function hex2bin($hex)
-    {
-        if (function_exists('hex2bin')) {
-            return hex2bin($hex);
-        } else {
-            return pack('H*', $hex);
-        }
-    }
-
     /**
      * @param string $message
      */
@@ -656,8 +612,8 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
         echo substr($message, 0, 16)." NTLMSSP Signature<br />\n";
         echo $messageId." Type Indicator<br />\n";
 
-        if ($messageId == '02000000') {
-            $map = array(
+        if ('02000000' == $messageId) {
+            $map = [
                 'Challenge',
                 'Context',
                 'Target Information Security Buffer',
@@ -668,14 +624,14 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
                 'DNS Server Name',
                 'BLOB',
                 'Target Information Terminator',
-            );
+            ];
 
-            $data = $this->parseMessage2($this->hex2bin($message));
+            $data = $this->parseMessage2(hex2bin($message));
 
             foreach ($map as $key => $value) {
                 echo bin2hex($data[$key]).' - '.$data[$key].' ||| '.$value."<br />\n";
             }
-        } elseif ($messageId == '03000000') {
+        } elseif ('03000000' == $messageId) {
             $i = 0;
             $data[$i++] = substr($message, 24, 16);
             list($lmLength, $lmOffset) = $this->readSecurityBuffer($data[$i - 1]);
@@ -700,7 +656,7 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
             $data[$i++] = substr($message, $lmOffset, $lmLength);
             $data[$i] = substr($message, $ntmlOffset, $ntmlLength);
 
-            $map = array(
+            $map = [
                 'LM Response Security Buffer',
                 'NTLM Response Security Buffer',
                 'Target Name Security Buffer',
@@ -713,10 +669,10 @@ class Swift_Transport_Esmtp_Auth_NTLMAuthenticator implements Swift_Transport_Es
                 'Workstation Name Data',
                 'LM Response Data',
                 'NTLM Response Data',
-            );
+            ];
 
             foreach ($map as $key => $value) {
-                echo $data[$key].' - '.$this->hex2bin($data[$key]).' ||| '.$value."<br />\n";
+                echo $data[$key].' - '.hex2bin($data[$key]).' ||| '.$value."<br />\n";
             }
         }
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
index 43219f934..41d0a50a8 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/PlainAuthenticator.php
@@ -26,25 +26,19 @@ class Swift_Transport_Esmtp_Auth_PlainAuthenticator implements Swift_Transport_E
     }
 
     /**
-     * Try to authenticate the user with $username and $password.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password)
     {
         try {
-            $message = base64_encode($username.chr(0).$username.chr(0).$password);
-            $agent->executeCommand(sprintf("AUTH PLAIN %s\r\n", $message), array(235));
+            $message = base64_encode($username.\chr(0).$username.\chr(0).$password);
+            $agent->executeCommand(sprintf("AUTH PLAIN %s\r\n", $message), [235]);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
index ca35e7b83..859f22f3d 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Auth/XOAuth2Authenticator.php
@@ -13,7 +13,7 @@
  *
  * Example:
  * <code>
- * $transport = Swift_SmtpTransport::newInstance('smtp.gmail.com', 587, 'tls')
+ * $transport = (new Swift_SmtpTransport('smtp.gmail.com', 587, 'tls'))
  *   ->setAuthMode('XOAUTH2')
  *   ->setUsername('YOUR_EMAIL_ADDRESS')
  *   ->setPassword('YOUR_ACCESS_TOKEN');
@@ -36,25 +36,19 @@ class Swift_Transport_Esmtp_Auth_XOAuth2Authenticator implements Swift_Transport
     }
 
     /**
-     * Try to authenticate the user with $email and $token.
-     *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $email
-     * @param string                    $token
-     *
-     * @return bool
+     * {@inheritdoc}
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $email, $token)
     {
         try {
             $param = $this->constructXOAuth2Params($email, $token);
-            $agent->executeCommand('AUTH XOAUTH2 '.$param."\r\n", array(235));
+            $agent->executeCommand('AUTH XOAUTH2 '.$param."\r\n", [235]);
 
             return true;
         } catch (Swift_TransportException $e) {
-            $agent->executeCommand("RSET\r\n", array(250));
+            $agent->executeCommand("RSET\r\n", [250]);
 
-            return false;
+            throw $e;
         }
     }
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
index cb36133c9..53a90a873 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/AuthHandler.php
@@ -9,7 +9,7 @@
  */
 
 /**
- * An ESMTP handler for AUTH support.
+ * An ESMTP handler for AUTH support (RFC 5248).
  *
  * @author Chris Corbyn
  */
@@ -20,35 +20,35 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      *
      * @var Swift_Transport_Esmtp_Authenticator[]
      */
-    private $_authenticators = array();
+    private $authenticators = [];
 
     /**
      * The username for authentication.
      *
      * @var string
      */
-    private $_username;
+    private $username;
 
     /**
      * The password for authentication.
      *
      * @var string
      */
-    private $_password;
+    private $password;
 
     /**
      * The auth mode for authentication.
      *
      * @var string
      */
-    private $_auth_mode;
+    private $auth_mode;
 
     /**
      * The ESMTP AUTH parameters available.
      *
      * @var string[]
      */
-    private $_esmtpParams = array();
+    private $esmtpParams = [];
 
     /**
      * Create a new AuthHandler with $authenticators for support.
@@ -67,7 +67,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function setAuthenticators(array $authenticators)
     {
-        $this->_authenticators = $authenticators;
+        $this->authenticators = $authenticators;
     }
 
     /**
@@ -77,7 +77,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function getAuthenticators()
     {
-        return $this->_authenticators;
+        return $this->authenticators;
     }
 
     /**
@@ -87,7 +87,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function setUsername($username)
     {
-        $this->_username = $username;
+        $this->username = $username;
     }
 
     /**
@@ -97,7 +97,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function getUsername()
     {
-        return $this->_username;
+        return $this->username;
     }
 
     /**
@@ -107,7 +107,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function setPassword($password)
     {
-        $this->_password = $password;
+        $this->password = $password;
     }
 
     /**
@@ -117,7 +117,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function getPassword()
     {
-        return $this->_password;
+        return $this->password;
     }
 
     /**
@@ -127,7 +127,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function setAuthMode($mode)
     {
-        $this->_auth_mode = $mode;
+        $this->auth_mode = $mode;
     }
 
     /**
@@ -137,13 +137,13 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function getAuthMode()
     {
-        return $this->_auth_mode;
+        return $this->auth_mode;
     }
 
     /**
      * Get the name of the ESMTP extension this handles.
      *
-     * @return bool
+     * @return string
      */
     public function getHandledKeyword()
     {
@@ -157,7 +157,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function setKeywordParams(array $parameters)
     {
-        $this->_esmtpParams = $parameters;
+        $this->esmtpParams = $parameters;
     }
 
     /**
@@ -167,21 +167,28 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function afterEhlo(Swift_Transport_SmtpAgent $agent)
     {
-        if ($this->_username) {
+        if ($this->username) {
             $count = 0;
-            foreach ($this->_getAuthenticatorsForAgent() as $authenticator) {
-                if (in_array(strtolower($authenticator->getAuthKeyword()),
-                    array_map('strtolower', $this->_esmtpParams))) {
+            $errors = [];
+            foreach ($this->getAuthenticatorsForAgent() as $authenticator) {
+                if (\in_array(strtolower($authenticator->getAuthKeyword() ?? ''), array_map('strtolower', $this->esmtpParams))) {
                     ++$count;
-                    if ($authenticator->authenticate($agent, $this->_username, $this->_password)) {
-                        return;
+                    try {
+                        if ($authenticator->authenticate($agent, $this->username, $this->password)) {
+                            return;
+                        }
+                    } catch (Swift_TransportException $e) {
+                        // keep the error message, but tries the other authenticators
+                        $errors[] = [$authenticator->getAuthKeyword(), $e->getMessage()];
                     }
                 }
             }
-            throw new Swift_TransportException(
-                'Failed to authenticate on SMTP server with username "'.
-                $this->_username.'" using '.$count.' possible authenticators'
-                );
+
+            $message = 'Failed to authenticate on SMTP server with username "'.$this->username.'" using '.$count.' possible authenticators.';
+            foreach ($errors as $error) {
+                $message .= ' Authenticator '.$error[0].' returned '.$error[1].'.';
+            }
+            throw new Swift_TransportException($message);
         }
     }
 
@@ -190,7 +197,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function getMailParams()
     {
-        return array();
+        return [];
     }
 
     /**
@@ -198,13 +205,13 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function getRcptParams()
     {
-        return array();
+        return [];
     }
 
     /**
      * Not used.
      */
-    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = array(), &$failedRecipients = null, &$stop = false)
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = [], &$failedRecipients = null, &$stop = false)
     {
     }
 
@@ -229,7 +236,7 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
      */
     public function exposeMixinMethods()
     {
-        return array('setUsername', 'getUsername', 'setPassword', 'getPassword', 'setAuthMode', 'getAuthMode');
+        return ['setUsername', 'getUsername', 'setPassword', 'getPassword', 'setAuthMode', 'getAuthMode'];
     }
 
     /**
@@ -242,19 +249,17 @@ class Swift_Transport_Esmtp_AuthHandler implements Swift_Transport_EsmtpHandler
     /**
      * Returns the authenticator list for the given agent.
      *
-     * @param Swift_Transport_SmtpAgent $agent
-     *
      * @return array
      */
-    protected function _getAuthenticatorsForAgent()
+    protected function getAuthenticatorsForAgent()
     {
-        if (!$mode = strtolower($this->_auth_mode)) {
-            return $this->_authenticators;
+        if (!$mode = strtolower($this->auth_mode ?? '')) {
+            return $this->authenticators;
         }
 
-        foreach ($this->_authenticators as $authenticator) {
-            if (strtolower($authenticator->getAuthKeyword()) == $mode) {
-                return array($authenticator);
+        foreach ($this->authenticators as $authenticator) {
+            if (strtolower($authenticator->getAuthKeyword() ?? '') == $mode) {
+                return [$authenticator];
             }
         }
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
index 12a9abf81..f692a6fe4 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/Authenticator.php
@@ -25,11 +25,12 @@ interface Swift_Transport_Esmtp_Authenticator
     /**
      * Try to authenticate the user with $username and $password.
      *
-     * @param Swift_Transport_SmtpAgent $agent
-     * @param string                    $username
-     * @param string                    $password
+     * @param string $username
+     * @param string $password
      *
-     * @return bool
+     * @return bool true if authentication worked (returning false is deprecated, throw a Swift_TransportException instead)
+     *
+     * @throws Swift_TransportException Allows the message to bubble up when authentication was not successful
      */
     public function authenticate(Swift_Transport_SmtpAgent $agent, $username, $password);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/EightBitMimeHandler.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/EightBitMimeHandler.php
new file mode 100644
index 000000000..63f708669
--- /dev/null
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/EightBitMimeHandler.php
@@ -0,0 +1,113 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An ESMTP handler for 8BITMIME support (RFC 6152).
+ *
+ * 8BITMIME is required when sending 8-bit content to over SMTP, e.g. when using
+ * Swift_Mime_ContentEncoder_PlainContentEncoder in "8bit" mode.
+ *
+ * 8BITMIME mode is enabled unconditionally, even when sending ASCII-only
+ * messages, so it should only be used with an outbound SMTP server that will
+ * convert the message to 7-bit MIME if the next hop does not support 8BITMIME.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_Transport_Esmtp_EightBitMimeHandler implements Swift_Transport_EsmtpHandler
+{
+    protected $encoding;
+
+    /**
+     * @param string $encoding The parameter so send with the MAIL FROM command;
+     *                         either "8BITMIME" or "7BIT"
+     */
+    public function __construct(string $encoding = '8BITMIME')
+    {
+        $this->encoding = $encoding;
+    }
+
+    /**
+     * Get the name of the ESMTP extension this handles.
+     *
+     * @return string
+     */
+    public function getHandledKeyword()
+    {
+        return '8BITMIME';
+    }
+
+    /**
+     * Not used.
+     */
+    public function setKeywordParams(array $parameters)
+    {
+    }
+
+    /**
+     * Not used.
+     */
+    public function afterEhlo(Swift_Transport_SmtpAgent $agent)
+    {
+    }
+
+    /**
+     * Get params which are appended to MAIL FROM:<>.
+     *
+     * @return string[]
+     */
+    public function getMailParams()
+    {
+        return ['BODY='.$this->encoding];
+    }
+
+    /**
+     * Not used.
+     */
+    public function getRcptParams()
+    {
+        return [];
+    }
+
+    /**
+     * Not used.
+     */
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = [], &$failedRecipients = null, &$stop = false)
+    {
+    }
+
+    /**
+     * Returns +1, -1 or 0 according to the rules for usort().
+     *
+     * This method is called to ensure extensions can be execute in an appropriate order.
+     *
+     * @param string $esmtpKeyword to compare with
+     *
+     * @return int
+     */
+    public function getPriorityOver($esmtpKeyword)
+    {
+        return 0;
+    }
+
+    /**
+     * Not used.
+     */
+    public function exposeMixinMethods()
+    {
+        return [];
+    }
+
+    /**
+     * Not used.
+     */
+    public function resetState()
+    {
+    }
+}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/SmtpUtf8Handler.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/SmtpUtf8Handler.php
new file mode 100644
index 000000000..7d0252a01
--- /dev/null
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/Esmtp/SmtpUtf8Handler.php
@@ -0,0 +1,107 @@
+<?php
+
+/*
+ * This file is part of SwiftMailer.
+ * (c) 2018 Christian Schmidt
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ * An ESMTP handler for SMTPUTF8 support (RFC 6531).
+ *
+ * SMTPUTF8 is required when sending to email addresses containing non-ASCII
+ * characters in local-part (the substring before @). This handler should be
+ * used together with Swift_AddressEncoder_Utf8AddressEncoder.
+ *
+ * SMTPUTF8 mode is enabled unconditionally, even when sending to ASCII-only
+ * addresses, so it should only be used with an outbound SMTP server that will
+ * deliver ASCII-only messages even if the next hop does not support SMTPUTF8.
+ *
+ * @author Christian Schmidt
+ */
+class Swift_Transport_Esmtp_SmtpUtf8Handler implements Swift_Transport_EsmtpHandler
+{
+    public function __construct()
+    {
+    }
+
+    /**
+     * Get the name of the ESMTP extension this handles.
+     *
+     * @return string
+     */
+    public function getHandledKeyword()
+    {
+        return 'SMTPUTF8';
+    }
+
+    /**
+     * Not used.
+     */
+    public function setKeywordParams(array $parameters)
+    {
+    }
+
+    /**
+     * Not used.
+     */
+    public function afterEhlo(Swift_Transport_SmtpAgent $agent)
+    {
+    }
+
+    /**
+     * Get params which are appended to MAIL FROM:<>.
+     *
+     * @return string[]
+     */
+    public function getMailParams()
+    {
+        return ['SMTPUTF8'];
+    }
+
+    /**
+     * Not used.
+     */
+    public function getRcptParams()
+    {
+        return [];
+    }
+
+    /**
+     * Not used.
+     */
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = [], &$failedRecipients = null, &$stop = false)
+    {
+    }
+
+    /**
+     * Returns +1, -1 or 0 according to the rules for usort().
+     *
+     * This method is called to ensure extensions can be execute in an appropriate order.
+     *
+     * @param string $esmtpKeyword to compare with
+     *
+     * @return int
+     */
+    public function getPriorityOver($esmtpKeyword)
+    {
+        return 0;
+    }
+
+    /**
+     * Not used.
+     */
+    public function exposeMixinMethods()
+    {
+        return [];
+    }
+
+    /**
+     * Not used.
+     */
+    public function resetState()
+    {
+    }
+}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
index c17ef8feb..b8ea36e2f 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpHandler.php
@@ -18,7 +18,7 @@ interface Swift_Transport_EsmtpHandler
     /**
      * Get the name of the ESMTP extension this handles.
      *
-     * @return bool
+     * @return string
      */
     public function getHandledKeyword();
 
@@ -59,7 +59,7 @@ interface Swift_Transport_EsmtpHandler
      * @param string[]                  $failedRecipients to collect failures
      * @param bool                      $stop             to be set true  by-reference if the command is now sent
      */
-    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = array(), &$failedRecipients = null, &$stop = false);
+    public function onCommand(Swift_Transport_SmtpAgent $agent, $command, $codes = [], &$failedRecipients = null, &$stop = false);
 
     /**
      * Returns +1, -1 or 0 according to the rules for usort().
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
index 156e2cf5b..36545f51f 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/EsmtpTransport.php
@@ -20,21 +20,21 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      *
      * @var Swift_Transport_EsmtpHandler[]
      */
-    private $_handlers = array();
+    private $handlers = [];
 
     /**
      * ESMTP capabilities.
      *
      * @var string[]
      */
-    private $_capabilities = array();
+    private $capabilities = [];
 
     /**
      * Connection buffer parameters.
      *
      * @var array
      */
-    private $_params = array(
+    private $params = [
         'protocol' => 'tcp',
         'host' => 'localhost',
         'port' => 25,
@@ -42,32 +42,33 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
         'blocking' => 1,
         'tls' => false,
         'type' => Swift_Transport_IoBuffer::TYPE_SOCKET,
-        'stream_context_options' => array(),
-        );
+        'stream_context_options' => [],
+        ];
 
     /**
      * Creates a new EsmtpTransport using the given I/O buffer.
      *
-     * @param Swift_Transport_IoBuffer       $buf
      * @param Swift_Transport_EsmtpHandler[] $extensionHandlers
-     * @param Swift_Events_EventDispatcher   $dispatcher
+     * @param string                         $localDomain
      */
-    public function __construct(Swift_Transport_IoBuffer $buf, array $extensionHandlers, Swift_Events_EventDispatcher $dispatcher)
+    public function __construct(Swift_Transport_IoBuffer $buf, array $extensionHandlers, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1', Swift_AddressEncoder $addressEncoder = null)
     {
-        parent::__construct($buf, $dispatcher);
+        parent::__construct($buf, $dispatcher, $localDomain, $addressEncoder);
         $this->setExtensionHandlers($extensionHandlers);
     }
 
     /**
      * Set the host to connect to.
      *
+     * Literal IPv6 addresses should be wrapped in square brackets.
+     *
      * @param string $host
      *
      * @return $this
      */
     public function setHost($host)
     {
-        $this->_params['host'] = $host;
+        $this->params['host'] = $host;
 
         return $this;
     }
@@ -79,7 +80,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function getHost()
     {
-        return $this->_params['host'];
+        return $this->params['host'];
     }
 
     /**
@@ -91,7 +92,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function setPort($port)
     {
-        $this->_params['port'] = (int) $port;
+        $this->params['port'] = (int) $port;
 
         return $this;
     }
@@ -103,7 +104,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function getPort()
     {
-        return $this->_params['port'];
+        return $this->params['port'];
     }
 
     /**
@@ -115,8 +116,8 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function setTimeout($timeout)
     {
-        $this->_params['timeout'] = (int) $timeout;
-        $this->_buffer->setParam('timeout', (int) $timeout);
+        $this->params['timeout'] = (int) $timeout;
+        $this->buffer->setParam('timeout', (int) $timeout);
 
         return $this;
     }
@@ -128,7 +129,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function getTimeout()
     {
-        return $this->_params['timeout'];
+        return $this->params['timeout'];
     }
 
     /**
@@ -140,13 +141,13 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function setEncryption($encryption)
     {
-        $encryption = strtolower($encryption);
+        $encryption = strtolower($encryption ?? '');
         if ('tls' == $encryption) {
-            $this->_params['protocol'] = 'tcp';
-            $this->_params['tls'] = true;
+            $this->params['protocol'] = 'tcp';
+            $this->params['tls'] = true;
         } else {
-            $this->_params['protocol'] = $encryption;
-            $this->_params['tls'] = false;
+            $this->params['protocol'] = $encryption;
+            $this->params['tls'] = false;
         }
 
         return $this;
@@ -159,7 +160,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function getEncryption()
     {
-        return $this->_params['tls'] ? 'tls' : $this->_params['protocol'];
+        return $this->params['tls'] ? 'tls' : $this->params['protocol'];
     }
 
     /**
@@ -171,7 +172,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function setStreamOptions($options)
     {
-        $this->_params['stream_context_options'] = $options;
+        $this->params['stream_context_options'] = $options;
 
         return $this;
     }
@@ -183,19 +184,21 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function getStreamOptions()
     {
-        return $this->_params['stream_context_options'];
+        return $this->params['stream_context_options'];
     }
 
     /**
      * Sets the source IP.
      *
+     * IPv6 addresses should be wrapped in square brackets.
+     *
      * @param string $source
      *
      * @return $this
      */
     public function setSourceIp($source)
     {
-        $this->_params['sourceIp'] = $source;
+        $this->params['sourceIp'] = $source;
 
         return $this;
     }
@@ -207,7 +210,36 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function getSourceIp()
     {
-        return isset($this->_params['sourceIp']) ? $this->_params['sourceIp'] : null;
+        return $this->params['sourceIp'] ?? null;
+    }
+
+    /**
+     * Sets whether SMTP pipelining is enabled.
+     *
+     * By default, support is auto-detected using the PIPELINING SMTP extension.
+     * Use this function to override that in the unlikely event of compatibility
+     * issues.
+     *
+     * @param bool $enabled
+     *
+     * @return $this
+     */
+    public function setPipelining($enabled)
+    {
+        $this->pipelining = $enabled;
+
+        return $this;
+    }
+
+    /**
+     * Returns whether SMTP pipelining is enabled.
+     *
+     * @return bool|null a boolean if pipelining is explicitly enabled or disabled,
+     *                   or null if support is auto-detected
+     */
+    public function getPipelining()
+    {
+        return $this->pipelining;
     }
 
     /**
@@ -219,14 +251,15 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function setExtensionHandlers(array $handlers)
     {
-        $assoc = array();
+        $assoc = [];
         foreach ($handlers as $handler) {
             $assoc[$handler->getHandledKeyword()] = $handler;
         }
-
-        @uasort($assoc, array($this, '_sortHandlers'));
-        $this->_handlers = $assoc;
-        $this->_setHandlerParams();
+        uasort($assoc, function ($a, $b) {
+            return $a->getPriorityOver($b->getHandledKeyword());
+        });
+        $this->handlers = $assoc;
+        $this->setHandlerParams();
 
         return $this;
     }
@@ -238,7 +271,7 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      */
     public function getExtensionHandlers()
     {
-        return array_values($this->_handlers);
+        return array_values($this->handlers);
     }
 
     /**
@@ -250,15 +283,17 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
      * @param string   $command
      * @param int[]    $codes
      * @param string[] $failures An array of failures by-reference
+     * @param bool     $pipeline Do not wait for response
+     * @param string   $address  the address, if command is RCPT TO
      *
-     * @return string
+     * @return string|null The server response, or null if pipelining is enabled
      */
-    public function executeCommand($command, $codes = array(), &$failures = null)
+    public function executeCommand($command, $codes = [], &$failures = null, $pipeline = false, $address = null)
     {
         $failures = (array) $failures;
         $stopSignal = false;
         $response = null;
-        foreach ($this->_getActiveHandlers() as $handler) {
+        foreach ($this->getActiveHandlers() as $handler) {
             $response = $handler->onCommand(
                 $this, $command, $codes, $failures, $stopSignal
                 );
@@ -267,19 +302,19 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
             }
         }
 
-        return parent::executeCommand($command, $codes, $failures);
+        return parent::executeCommand($command, $codes, $failures, $pipeline, $address);
     }
 
     /** Mixin handling method for ESMTP handlers */
     public function __call($method, $args)
     {
-        foreach ($this->_handlers as $handler) {
-            if (in_array(strtolower($method),
+        foreach ($this->handlers as $handler) {
+            if (\in_array(strtolower($method),
                 array_map('strtolower', (array) $handler->exposeMixinMethods())
                 )) {
-                $return = call_user_func_array(array($handler, $method), $args);
+                $return = \call_user_func_array([$handler, $method], $args);
                 // Allow fluid method calls
-                if (null === $return && substr($method, 0, 3) == 'set') {
+                if (null === $return && 'set' == substr($method, 0, 3)) {
                     return $this;
                 } else {
                     return $return;
@@ -290,89 +325,95 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
     }
 
     /** Get the params to initialize the buffer */
-    protected function _getBufferParams()
+    protected function getBufferParams()
     {
-        return $this->_params;
+        return $this->params;
     }
 
     /** Overridden to perform EHLO instead */
-    protected function _doHeloCommand()
+    protected function doHeloCommand()
     {
         try {
             $response = $this->executeCommand(
-                sprintf("EHLO %s\r\n", $this->_domain), array(250)
+                sprintf("EHLO %s\r\n", $this->domain), [250]
                 );
         } catch (Swift_TransportException $e) {
-            return parent::_doHeloCommand();
+            return parent::doHeloCommand();
         }
 
-        if ($this->_params['tls']) {
+        if ($this->params['tls']) {
             try {
-                $this->executeCommand("STARTTLS\r\n", array(220));
+                $this->executeCommand("STARTTLS\r\n", [220]);
 
-                if (!$this->_buffer->startTLS()) {
+                if (!$this->buffer->startTLS()) {
                     throw new Swift_TransportException('Unable to connect with TLS encryption');
                 }
 
                 try {
                     $response = $this->executeCommand(
-                        sprintf("EHLO %s\r\n", $this->_domain), array(250)
+                        sprintf("EHLO %s\r\n", $this->domain), [250]
                         );
                 } catch (Swift_TransportException $e) {
-                    return parent::_doHeloCommand();
+                    return parent::doHeloCommand();
                 }
             } catch (Swift_TransportException $e) {
-                $this->_throwException($e);
+                $this->throwException($e);
             }
         }
 
-        $this->_capabilities = $this->_getCapabilities($response);
-        $this->_setHandlerParams();
-        foreach ($this->_getActiveHandlers() as $handler) {
+        $this->capabilities = $this->getCapabilities($response);
+        if (!isset($this->pipelining)) {
+            $this->pipelining = isset($this->capabilities['PIPELINING']);
+        }
+
+        $this->setHandlerParams();
+        foreach ($this->getActiveHandlers() as $handler) {
             $handler->afterEhlo($this);
         }
     }
 
     /** Overridden to add Extension support */
-    protected function _doMailFromCommand($address)
+    protected function doMailFromCommand($address)
     {
-        $handlers = $this->_getActiveHandlers();
-        $params = array();
+        $address = $this->addressEncoder->encodeString($address);
+        $handlers = $this->getActiveHandlers();
+        $params = [];
         foreach ($handlers as $handler) {
             $params = array_merge($params, (array) $handler->getMailParams());
         }
         $paramStr = !empty($params) ? ' '.implode(' ', $params) : '';
         $this->executeCommand(
-            sprintf("MAIL FROM:<%s>%s\r\n", $address, $paramStr), array(250)
+            sprintf("MAIL FROM:<%s>%s\r\n", $address, $paramStr), [250], $failures, true
             );
     }
 
     /** Overridden to add Extension support */
-    protected function _doRcptToCommand($address)
+    protected function doRcptToCommand($address)
     {
-        $handlers = $this->_getActiveHandlers();
-        $params = array();
+        $address = $this->addressEncoder->encodeString($address);
+        $handlers = $this->getActiveHandlers();
+        $params = [];
         foreach ($handlers as $handler) {
             $params = array_merge($params, (array) $handler->getRcptParams());
         }
         $paramStr = !empty($params) ? ' '.implode(' ', $params) : '';
         $this->executeCommand(
-            sprintf("RCPT TO:<%s>%s\r\n", $address, $paramStr), array(250, 251, 252)
+            sprintf("RCPT TO:<%s>%s\r\n", $address, $paramStr), [250, 251, 252], $failures, true, $address
             );
     }
 
     /** Determine ESMTP capabilities by function group */
-    private function _getCapabilities($ehloResponse)
+    private function getCapabilities($ehloResponse)
     {
-        $capabilities = array();
-        $ehloResponse = trim($ehloResponse);
+        $capabilities = [];
+        $ehloResponse = trim($ehloResponse ?? '');
         $lines = explode("\r\n", $ehloResponse);
         array_shift($lines);
         foreach ($lines as $line) {
             if (preg_match('/^[0-9]{3}[ -]([A-Z0-9-]+)((?:[ =].*)?)$/Di', $line, $matches)) {
                 $keyword = strtoupper($matches[1]);
                 $paramStr = strtoupper(ltrim($matches[2], ' ='));
-                $params = !empty($paramStr) ? explode(' ', $paramStr) : array();
+                $params = !empty($paramStr) ? explode(' ', $paramStr) : [];
                 $capabilities[$keyword] = $params;
             }
         }
@@ -381,31 +422,25 @@ class Swift_Transport_EsmtpTransport extends Swift_Transport_AbstractSmtpTranspo
     }
 
     /** Set parameters which are used by each extension handler */
-    private function _setHandlerParams()
+    private function setHandlerParams()
     {
-        foreach ($this->_handlers as $keyword => $handler) {
-            if (array_key_exists($keyword, $this->_capabilities)) {
-                $handler->setKeywordParams($this->_capabilities[$keyword]);
+        foreach ($this->handlers as $keyword => $handler) {
+            if (\array_key_exists($keyword, $this->capabilities)) {
+                $handler->setKeywordParams($this->capabilities[$keyword]);
             }
         }
     }
 
     /** Get ESMTP handlers which are currently ok to use */
-    private function _getActiveHandlers()
+    private function getActiveHandlers()
     {
-        $handlers = array();
-        foreach ($this->_handlers as $keyword => $handler) {
-            if (array_key_exists($keyword, $this->_capabilities)) {
+        $handlers = [];
+        foreach ($this->handlers as $keyword => $handler) {
+            if (\array_key_exists($keyword, $this->capabilities)) {
                 $handlers[] = $handler;
             }
         }
 
         return $handlers;
     }
-
-    /** Custom sort for extension handler ordering */
-    private function _sortHandlers($a, $b)
-    {
-        return $a->getPriorityOver($b->getHandledKeyword());
-    }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
index 311a0f2ad..1a4b4754f 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/FailoverTransport.php
@@ -20,7 +20,7 @@ class Swift_Transport_FailoverTransport extends Swift_Transport_LoadBalancedTran
      *
      * @var Swift_Transport
      */
-    private $_currentTransport;
+    private $currentTransport;
 
     // needed as __construct is called from elsewhere explicitly
     public function __construct()
@@ -28,61 +28,76 @@ class Swift_Transport_FailoverTransport extends Swift_Transport_LoadBalancedTran
         parent::__construct();
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function ping()
+    {
+        $maxTransports = \count($this->transports);
+        for ($i = 0; $i < $maxTransports
+            && $transport = $this->getNextTransport(); ++$i) {
+            if ($transport->ping()) {
+                return true;
+            } else {
+                $this->killCurrentTransport();
+            }
+        }
+
+        return \count($this->transports) > 0;
+    }
+
     /**
      * Send the given Message.
      *
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
-     * @param Swift_Mime_Message $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
-        $maxTransports = count($this->_transports);
+        $maxTransports = \count($this->transports);
         $sent = 0;
-        $this->_lastUsedTransport = null;
+        $this->lastUsedTransport = null;
 
         for ($i = 0; $i < $maxTransports
-            && $transport = $this->_getNextTransport(); ++$i) {
+            && $transport = $this->getNextTransport(); ++$i) {
             try {
                 if (!$transport->isStarted()) {
                     $transport->start();
                 }
 
                 if ($sent = $transport->send($message, $failedRecipients)) {
-                    $this->_lastUsedTransport = $transport;
+                    $this->lastUsedTransport = $transport;
 
                     return $sent;
                 }
             } catch (Swift_TransportException $e) {
-                $this->_killCurrentTransport();
+                $this->killCurrentTransport();
             }
         }
 
-        if (count($this->_transports) == 0) {
-            throw new Swift_TransportException(
-                'All Transports in FailoverTransport failed, or no Transports available'
-                );
+        if (0 == \count($this->transports)) {
+            throw new Swift_TransportException('All Transports in FailoverTransport failed, or no Transports available');
         }
 
         return $sent;
     }
 
-    protected function _getNextTransport()
+    protected function getNextTransport()
     {
-        if (!isset($this->_currentTransport)) {
-            $this->_currentTransport = parent::_getNextTransport();
+        if (!isset($this->currentTransport)) {
+            $this->currentTransport = parent::getNextTransport();
         }
 
-        return $this->_currentTransport;
+        return $this->currentTransport;
     }
 
-    protected function _killCurrentTransport()
+    protected function killCurrentTransport()
     {
-        $this->_currentTransport = null;
-        parent::_killCurrentTransport();
+        $this->currentTransport = null;
+        parent::killCurrentTransport();
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
index af97adf1f..50f1e5e40 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/IoBuffer.php
@@ -25,8 +25,6 @@ interface Swift_Transport_IoBuffer extends Swift_InputByteStream, Swift_OutputBy
      * Perform any initialization needed, using the given $params.
      *
      * Parameters will vary depending upon the type of IoBuffer used.
-     *
-     * @param array $params
      */
     public function initialize(array $params);
 
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
index e2adc567e..0b5ba9d30 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/LoadBalancedTransport.php
@@ -20,21 +20,21 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      *
      * @var Swift_Transport[]
      */
-    private $_deadTransports = array();
+    private $deadTransports = [];
 
     /**
      * The Transports which are used in rotation.
      *
      * @var Swift_Transport[]
      */
-    protected $_transports = array();
+    protected $transports = [];
 
     /**
      * The Transport used in the last successful send operation.
      *
      * @var Swift_Transport
      */
-    protected $_lastUsedTransport = null;
+    protected $lastUsedTransport = null;
 
     // needed as __construct is called from elsewhere explicitly
     public function __construct()
@@ -48,8 +48,8 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      */
     public function setTransports(array $transports)
     {
-        $this->_transports = $transports;
-        $this->_deadTransports = array();
+        $this->transports = $transports;
+        $this->deadTransports = [];
     }
 
     /**
@@ -59,7 +59,7 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      */
     public function getTransports()
     {
-        return array_merge($this->_transports, $this->_deadTransports);
+        return array_merge($this->transports, $this->deadTransports);
     }
 
     /**
@@ -69,7 +69,7 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      */
     public function getLastUsedTransport()
     {
-        return $this->_lastUsedTransport;
+        return $this->lastUsedTransport;
     }
 
     /**
@@ -79,7 +79,7 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      */
     public function isStarted()
     {
-        return count($this->_transports) > 0;
+        return \count($this->transports) > 0;
     }
 
     /**
@@ -87,7 +87,7 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      */
     public function start()
     {
-        $this->_transports = array_merge($this->_transports, $this->_deadTransports);
+        $this->transports = array_merge($this->transports, $this->deadTransports);
     }
 
     /**
@@ -95,47 +95,58 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      */
     public function stop()
     {
-        foreach ($this->_transports as $transport) {
+        foreach ($this->transports as $transport) {
             $transport->stop();
         }
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function ping()
+    {
+        foreach ($this->transports as $transport) {
+            if (!$transport->ping()) {
+                $this->killCurrentTransport();
+            }
+        }
+
+        return \count($this->transports) > 0;
+    }
+
     /**
      * Send the given Message.
      *
      * Recipient/sender data will be retrieved from the Message API.
      * The return value is the number of recipients who were accepted for delivery.
      *
-     * @param Swift_Mime_Message $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
-        $maxTransports = count($this->_transports);
+        $maxTransports = \count($this->transports);
         $sent = 0;
-        $this->_lastUsedTransport = null;
+        $this->lastUsedTransport = null;
 
         for ($i = 0; $i < $maxTransports
-            && $transport = $this->_getNextTransport(); ++$i) {
+            && $transport = $this->getNextTransport(); ++$i) {
             try {
                 if (!$transport->isStarted()) {
                     $transport->start();
                 }
                 if ($sent = $transport->send($message, $failedRecipients)) {
-                    $this->_lastUsedTransport = $transport;
+                    $this->lastUsedTransport = $transport;
                     break;
                 }
             } catch (Swift_TransportException $e) {
-                $this->_killCurrentTransport();
+                $this->killCurrentTransport();
             }
         }
 
-        if (count($this->_transports) == 0) {
-            throw new Swift_TransportException(
-                'All Transports in LoadBalancedTransport failed, or no Transports available'
-                );
+        if (0 == \count($this->transports)) {
+            throw new Swift_TransportException('All Transports in LoadBalancedTransport failed, or no Transports available');
         }
 
         return $sent;
@@ -143,12 +154,10 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
 
     /**
      * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
-        foreach ($this->_transports as $transport) {
+        foreach ($this->transports as $transport) {
             $transport->registerPlugin($plugin);
         }
     }
@@ -158,10 +167,10 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
      *
      * @return Swift_Transport
      */
-    protected function _getNextTransport()
+    protected function getNextTransport()
     {
-        if ($next = array_shift($this->_transports)) {
-            $this->_transports[] = $next;
+        if ($next = array_shift($this->transports)) {
+            $this->transports[] = $next;
         }
 
         return $next;
@@ -170,14 +179,14 @@ class Swift_Transport_LoadBalancedTransport implements Swift_Transport
     /**
      * Tag the currently used (top of stack) transport as dead/useless.
      */
-    protected function _killCurrentTransport()
+    protected function killCurrentTransport()
     {
-        if ($transport = array_pop($this->_transports)) {
+        if ($transport = array_pop($this->transports)) {
             try {
                 $transport->stop();
             } catch (Exception $e) {
             }
-            $this->_deadTransports[] = $transport;
+            $this->deadTransports[] = $transport;
         }
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php
deleted file mode 100644
index 77489cedc..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailInvoker.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * This interface intercepts calls to the mail() function.
- *
- * @author     Chris Corbyn
- */
-interface Swift_Transport_MailInvoker
-{
-    /**
-     * Send mail via the mail() function.
-     *
-     * This method takes the same arguments as PHP mail().
-     *
-     * @param string $to
-     * @param string $subject
-     * @param string $body
-     * @param string $headers
-     * @param string $extraParams
-     *
-     * @return bool
-     */
-    public function mail($to, $subject, $body, $headers = null, $extraParams = null);
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php
deleted file mode 100644
index 48ef4a702..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/MailTransport.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Sends Messages using the mail() function.
- *
- * It is advised that users do not use this transport if at all possible
- * since a number of plugin features cannot be used in conjunction with this
- * transport due to the internal interface in PHP itself.
- *
- * The level of error reporting with this transport is incredibly weak, again
- * due to limitations of PHP's internal mail() function.  You'll get an
- * all-or-nothing result from sending.
- *
- * @author Chris Corbyn
- *
- * @deprecated since 5.4.5 (to be removed in 6.0)
- */
-class Swift_Transport_MailTransport implements Swift_Transport
-{
-    /** Additional parameters to pass to mail() */
-    private $_extraParams = '-f%s';
-
-    /** The event dispatcher from the plugin API */
-    private $_eventDispatcher;
-
-    /** An invoker that calls the mail() function */
-    private $_invoker;
-
-    /**
-     * Create a new MailTransport with the $log.
-     *
-     * @param Swift_Transport_MailInvoker  $invoker
-     * @param Swift_Events_EventDispatcher $eventDispatcher
-     */
-    public function __construct(Swift_Transport_MailInvoker $invoker, Swift_Events_EventDispatcher $eventDispatcher)
-    {
-        @trigger_error(sprintf('The %s class is deprecated since version 5.4.5 and will be removed in 6.0. Use the Sendmail or SMTP transport instead.', __CLASS__), E_USER_DEPRECATED);
-
-        $this->_invoker = $invoker;
-        $this->_eventDispatcher = $eventDispatcher;
-    }
-
-    /**
-     * Not used.
-     */
-    public function isStarted()
-    {
-        return false;
-    }
-
-    /**
-     * Not used.
-     */
-    public function start()
-    {
-    }
-
-    /**
-     * Not used.
-     */
-    public function stop()
-    {
-    }
-
-    /**
-     * Set the additional parameters used on the mail() function.
-     *
-     * This string is formatted for sprintf() where %s is the sender address.
-     *
-     * @param string $params
-     *
-     * @return $this
-     */
-    public function setExtraParams($params)
-    {
-        $this->_extraParams = $params;
-
-        return $this;
-    }
-
-    /**
-     * Get the additional parameters used on the mail() function.
-     *
-     * This string is formatted for sprintf() where %s is the sender address.
-     *
-     * @return string
-     */
-    public function getExtraParams()
-    {
-        return $this->_extraParams;
-    }
-
-    /**
-     * Send the given Message.
-     *
-     * Recipient/sender data will be retrieved from the Message API.
-     * The return value is the number of recipients who were accepted for delivery.
-     *
-     * @param Swift_Mime_Message $message
-     * @param string[]           $failedRecipients An array of failures by-reference
-     *
-     * @return int
-     */
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
-    {
-        $failedRecipients = (array) $failedRecipients;
-
-        if ($evt = $this->_eventDispatcher->createSendEvent($this, $message)) {
-            $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
-            if ($evt->bubbleCancelled()) {
-                return 0;
-            }
-        }
-
-        $count = (
-            count((array) $message->getTo())
-            + count((array) $message->getCc())
-            + count((array) $message->getBcc())
-            );
-
-        $toHeader = $message->getHeaders()->get('To');
-        $subjectHeader = $message->getHeaders()->get('Subject');
-
-        if (0 === $count) {
-            $this->_throwException(new Swift_TransportException('Cannot send message without a recipient'));
-        }
-        $to = $toHeader ? $toHeader->getFieldBody() : '';
-        $subject = $subjectHeader ? $subjectHeader->getFieldBody() : '';
-
-        $reversePath = $this->_getReversePath($message);
-
-        // Remove headers that would otherwise be duplicated
-        $message->getHeaders()->remove('To');
-        $message->getHeaders()->remove('Subject');
-
-        $messageStr = $message->toString();
-
-        if ($toHeader) {
-            $message->getHeaders()->set($toHeader);
-        }
-        $message->getHeaders()->set($subjectHeader);
-
-        // Separate headers from body
-        if (false !== $endHeaders = strpos($messageStr, "\r\n\r\n")) {
-            $headers = substr($messageStr, 0, $endHeaders)."\r\n"; //Keep last EOL
-            $body = substr($messageStr, $endHeaders + 4);
-        } else {
-            $headers = $messageStr."\r\n";
-            $body = '';
-        }
-
-        unset($messageStr);
-
-        if ("\r\n" != PHP_EOL) {
-            // Non-windows (not using SMTP)
-            $headers = str_replace("\r\n", PHP_EOL, $headers);
-            $subject = str_replace("\r\n", PHP_EOL, $subject);
-            $body = str_replace("\r\n", PHP_EOL, $body);
-            $to = str_replace("\r\n", PHP_EOL, $to);
-        } else {
-            // Windows, using SMTP
-            $headers = str_replace("\r\n.", "\r\n..", $headers);
-            $subject = str_replace("\r\n.", "\r\n..", $subject);
-            $body = str_replace("\r\n.", "\r\n..", $body);
-            $to = str_replace("\r\n.", "\r\n..", $to);
-        }
-
-        if ($this->_invoker->mail($to, $subject, $body, $headers, $this->_formatExtraParams($this->_extraParams, $reversePath))) {
-            if ($evt) {
-                $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
-                $evt->setFailedRecipients($failedRecipients);
-                $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
-            }
-        } else {
-            $failedRecipients = array_merge(
-                $failedRecipients,
-                array_keys((array) $message->getTo()),
-                array_keys((array) $message->getCc()),
-                array_keys((array) $message->getBcc())
-                );
-
-            if ($evt) {
-                $evt->setResult(Swift_Events_SendEvent::RESULT_FAILED);
-                $evt->setFailedRecipients($failedRecipients);
-                $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
-            }
-
-            $message->generateId();
-
-            $count = 0;
-        }
-
-        return $count;
-    }
-
-    /**
-     * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
-     */
-    public function registerPlugin(Swift_Events_EventListener $plugin)
-    {
-        $this->_eventDispatcher->bindEventListener($plugin);
-    }
-
-    /** Throw a TransportException, first sending it to any listeners */
-    protected function _throwException(Swift_TransportException $e)
-    {
-        if ($evt = $this->_eventDispatcher->createTransportExceptionEvent($this, $e)) {
-            $this->_eventDispatcher->dispatchEvent($evt, 'exceptionThrown');
-            if (!$evt->bubbleCancelled()) {
-                throw $e;
-            }
-        } else {
-            throw $e;
-        }
-    }
-
-    /** Determine the best-use reverse path for this message */
-    private function _getReversePath(Swift_Mime_Message $message)
-    {
-        $return = $message->getReturnPath();
-        $sender = $message->getSender();
-        $from = $message->getFrom();
-        $path = null;
-        if (!empty($return)) {
-            $path = $return;
-        } elseif (!empty($sender)) {
-            $keys = array_keys($sender);
-            $path = array_shift($keys);
-        } elseif (!empty($from)) {
-            $keys = array_keys($from);
-            $path = array_shift($keys);
-        }
-
-        return $path;
-    }
-
-    /**
-     * Fix CVE-2016-10074 by disallowing potentially unsafe shell characters.
-     *
-     * Note that escapeshellarg and escapeshellcmd are inadequate for our purposes, especially on Windows.
-     *
-     * @param string $string The string to be validated
-     *
-     * @return bool
-     */
-    private function _isShellSafe($string)
-    {
-        // Future-proof
-        if (escapeshellcmd($string) !== $string || !in_array(escapeshellarg($string), array("'$string'", "\"$string\""))) {
-            return false;
-        }
-
-        $length = strlen($string);
-        for ($i = 0; $i < $length; ++$i) {
-            $c = $string[$i];
-            // All other characters have a special meaning in at least one common shell, including = and +.
-            // Full stop (.) has a special meaning in cmd.exe, but its impact should be negligible here.
-            // Note that this does permit non-Latin alphanumeric characters based on the current locale.
-            if (!ctype_alnum($c) && strpos('@_-.', $c) === false) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * Return php mail extra params to use for invoker->mail.
-     *
-     * @param $extraParams
-     * @param $reversePath
-     *
-     * @return string|null
-     */
-    private function _formatExtraParams($extraParams, $reversePath)
-    {
-        if (false !== strpos($extraParams, '-f%s')) {
-            if (empty($reversePath) || false === $this->_isShellSafe($reversePath)) {
-                $extraParams = str_replace('-f%s', '', $extraParams);
-            } else {
-                $extraParams = sprintf($extraParams, $reversePath);
-            }
-        }
-
-        return !empty($extraParams) ? $extraParams : null;
-    }
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
index ad20e0e53..7d910db5a 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/NullTransport.php
@@ -16,14 +16,14 @@
 class Swift_Transport_NullTransport implements Swift_Transport
 {
     /** The event dispatcher from the plugin API */
-    private $_eventDispatcher;
+    private $eventDispatcher;
 
     /**
      * Constructor.
      */
     public function __construct(Swift_Events_EventDispatcher $eventDispatcher)
     {
-        $this->_eventDispatcher = $eventDispatcher;
+        $this->eventDispatcher = $eventDispatcher;
     }
 
     /**
@@ -50,18 +50,25 @@ class Swift_Transport_NullTransport implements Swift_Transport
     {
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function ping()
+    {
+        return true;
+    }
+
     /**
      * Sends the given message.
      *
-     * @param Swift_Mime_Message $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int The number of sent emails
      */
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
-        if ($evt = $this->_eventDispatcher->createSendEvent($this, $message)) {
-            $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
+        if ($evt = $this->eventDispatcher->createSendEvent($this, $message)) {
+            $this->eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
             if ($evt->bubbleCancelled()) {
                 return 0;
             }
@@ -69,13 +76,13 @@ class Swift_Transport_NullTransport implements Swift_Transport
 
         if ($evt) {
             $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
-            $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
+            $this->eventDispatcher->dispatchEvent($evt, 'sendPerformed');
         }
 
         $count = (
-            count((array) $message->getTo())
-            + count((array) $message->getCc())
-            + count((array) $message->getBcc())
+            \count((array) $message->getTo())
+            + \count((array) $message->getCc())
+            + \count((array) $message->getBcc())
             );
 
         return $count;
@@ -83,11 +90,9 @@ class Swift_Transport_NullTransport implements Swift_Transport
 
     /**
      * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
-        $this->_eventDispatcher->bindEventListener($plugin);
+        $this->eventDispatcher->bindEventListener($plugin);
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
index 6430d5f6b..65a434d11 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SendmailTransport.php
@@ -24,22 +24,21 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
      *
      * @var array
      */
-    private $_params = array(
+    private $params = [
         'timeout' => 30,
         'blocking' => 1,
         'command' => '/usr/sbin/sendmail -bs',
         'type' => Swift_Transport_IoBuffer::TYPE_PROCESS,
-        );
+        ];
 
     /**
      * Create a new SendmailTransport with $buf for I/O.
      *
-     * @param Swift_Transport_IoBuffer     $buf
-     * @param Swift_Events_EventDispatcher $dispatcher
+     * @param string $localDomain
      */
-    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher)
+    public function __construct(Swift_Transport_IoBuffer $buf, Swift_Events_EventDispatcher $dispatcher, $localDomain = '127.0.0.1', Swift_AddressEncoder $addressEncoder = null)
     {
-        parent::__construct($buf, $dispatcher);
+        parent::__construct($buf, $dispatcher, $localDomain, $addressEncoder);
     }
 
     /**
@@ -68,7 +67,7 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
      */
     public function setCommand($command)
     {
-        $this->_params['command'] = $command;
+        $this->params['command'] = $command;
 
         return $this;
     }
@@ -80,7 +79,7 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
      */
     public function getCommand()
     {
-        return $this->_params['command'];
+        return $this->params['command'];
     }
 
     /**
@@ -92,12 +91,11 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
      * NOTE: If using 'sendmail -t' you will not be aware of any failures until
      * they bounce (i.e. send() will always return 100% success).
      *
-     * @param Swift_Mime_Message $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int
      */
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
         $failedRecipients = (array) $failedRecipients;
         $command = $this->getCommand();
@@ -105,45 +103,45 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
         $count = 0;
 
         if (false !== strpos($command, ' -t')) {
-            if ($evt = $this->_eventDispatcher->createSendEvent($this, $message)) {
-                $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
+            if ($evt = $this->eventDispatcher->createSendEvent($this, $message)) {
+                $this->eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
                 if ($evt->bubbleCancelled()) {
                     return 0;
                 }
             }
 
             if (false === strpos($command, ' -f')) {
-                $command .= ' -f'.escapeshellarg($this->_getReversePath($message));
+                $command .= ' -f'.escapeshellarg($this->getReversePath($message) ?? '');
             }
 
-            $buffer->initialize(array_merge($this->_params, array('command' => $command)));
+            $buffer->initialize(array_merge($this->params, ['command' => $command]));
 
             if (false === strpos($command, ' -i') && false === strpos($command, ' -oi')) {
-                $buffer->setWriteTranslations(array("\r\n" => "\n", "\n." => "\n.."));
+                $buffer->setWriteTranslations(["\r\n" => "\n", "\n." => "\n.."]);
             } else {
-                $buffer->setWriteTranslations(array("\r\n" => "\n"));
+                $buffer->setWriteTranslations(["\r\n" => "\n"]);
             }
 
-            $count = count((array) $message->getTo())
-                + count((array) $message->getCc())
-                + count((array) $message->getBcc())
+            $count = \count((array) $message->getTo())
+                + \count((array) $message->getCc())
+                + \count((array) $message->getBcc())
                 ;
             $message->toByteStream($buffer);
             $buffer->flushBuffers();
-            $buffer->setWriteTranslations(array());
+            $buffer->setWriteTranslations([]);
             $buffer->terminate();
 
             if ($evt) {
                 $evt->setResult(Swift_Events_SendEvent::RESULT_SUCCESS);
                 $evt->setFailedRecipients($failedRecipients);
-                $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
+                $this->eventDispatcher->dispatchEvent($evt, 'sendPerformed');
             }
 
             $message->generateId();
         } elseif (false !== strpos($command, ' -bs')) {
             $count = parent::send($message, $failedRecipients);
         } else {
-            $this->_throwException(new Swift_TransportException(
+            $this->throwException(new Swift_TransportException(
                 'Unsupported sendmail command flags ['.$command.']. '.
                 'Must be one of "-bs" or "-t" but can include additional flags.'
                 ));
@@ -153,8 +151,8 @@ class Swift_Transport_SendmailTransport extends Swift_Transport_AbstractSmtpTran
     }
 
     /** Get the params to initialize the buffer */
-    protected function _getBufferParams()
+    protected function getBufferParams()
     {
-        return $this->_params;
+        return $this->params;
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php
deleted file mode 100644
index 4cab66bd6..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SimpleMailInvoker.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * This is the implementation class for {@link Swift_Transport_MailInvoker}.
- *
- * @author     Chris Corbyn
- */
-class Swift_Transport_SimpleMailInvoker implements Swift_Transport_MailInvoker
-{
-    /**
-     * Send mail via the mail() function.
-     *
-     * This method takes the same arguments as PHP mail().
-     *
-     * @param string $to
-     * @param string $subject
-     * @param string $body
-     * @param string $headers
-     * @param string $extraParams
-     *
-     * @return bool
-     */
-    public function mail($to, $subject, $body, $headers = null, $extraParams = null)
-    {
-        if (!ini_get('safe_mode')) {
-            return @mail($to, $subject, $body, $headers, $extraParams);
-        }
-
-        return @mail($to, $subject, $body, $headers);
-    }
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
index 90e913f8e..e8ce65c26 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SmtpAgent.php
@@ -32,5 +32,5 @@ interface Swift_Transport_SmtpAgent
      * @param int[]    $codes
      * @param string[] $failures An array of failures by-reference
      */
-    public function executeCommand($command, $codes = array(), &$failures = null);
+    public function executeCommand($command, $codes = [], &$failures = null);
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
index e4b87f347..0cb6a5b80 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/SpoolTransport.php
@@ -16,30 +16,28 @@
 class Swift_Transport_SpoolTransport implements Swift_Transport
 {
     /** The spool instance */
-    private $_spool;
+    private $spool;
 
     /** The event dispatcher from the plugin API */
-    private $_eventDispatcher;
+    private $eventDispatcher;
 
     /**
      * Constructor.
      */
     public function __construct(Swift_Events_EventDispatcher $eventDispatcher, Swift_Spool $spool = null)
     {
-        $this->_eventDispatcher = $eventDispatcher;
-        $this->_spool = $spool;
+        $this->eventDispatcher = $eventDispatcher;
+        $this->spool = $spool;
     }
 
     /**
      * Sets the spool object.
      *
-     * @param Swift_Spool $spool
-     *
      * @return $this
      */
     public function setSpool(Swift_Spool $spool)
     {
-        $this->_spool = $spool;
+        $this->spool = $spool;
 
         return $this;
     }
@@ -51,7 +49,7 @@ class Swift_Transport_SpoolTransport implements Swift_Transport
      */
     public function getSpool()
     {
-        return $this->_spool;
+        return $this->spool;
     }
 
     /**
@@ -78,28 +76,35 @@ class Swift_Transport_SpoolTransport implements Swift_Transport
     {
     }
 
+    /**
+     * {@inheritdoc}
+     */
+    public function ping()
+    {
+        return true;
+    }
+
     /**
      * Sends the given message.
      *
-     * @param Swift_Mime_Message $message
-     * @param string[]           $failedRecipients An array of failures by-reference
+     * @param string[] $failedRecipients An array of failures by-reference
      *
      * @return int The number of sent e-mail's
      */
-    public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+    public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
     {
-        if ($evt = $this->_eventDispatcher->createSendEvent($this, $message)) {
-            $this->_eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
+        if ($evt = $this->eventDispatcher->createSendEvent($this, $message)) {
+            $this->eventDispatcher->dispatchEvent($evt, 'beforeSendPerformed');
             if ($evt->bubbleCancelled()) {
                 return 0;
             }
         }
 
-        $success = $this->_spool->queueMessage($message);
+        $success = $this->spool->queueMessage($message);
 
         if ($evt) {
             $evt->setResult($success ? Swift_Events_SendEvent::RESULT_SPOOLED : Swift_Events_SendEvent::RESULT_FAILED);
-            $this->_eventDispatcher->dispatchEvent($evt, 'sendPerformed');
+            $this->eventDispatcher->dispatchEvent($evt, 'sendPerformed');
         }
 
         return 1;
@@ -107,11 +112,9 @@ class Swift_Transport_SpoolTransport implements Swift_Transport
 
     /**
      * Register a plugin.
-     *
-     * @param Swift_Events_EventListener $plugin
      */
     public function registerPlugin(Swift_Events_EventListener $plugin)
     {
-        $this->_eventDispatcher->bindEventListener($plugin);
+        $this->eventDispatcher->bindEventListener($plugin);
     }
 }
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
index 3a9fe76b2..70782ada0 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Transport/StreamBuffer.php
@@ -11,55 +11,51 @@
 /**
  * A generic IoBuffer implementation supporting remote sockets and local processes.
  *
- * @author Chris Corbyn
+ * @author     Chris Corbyn
  */
 class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableInputStream implements Swift_Transport_IoBuffer
 {
     /** A primary socket */
-    private $_stream;
+    private $stream;
 
     /** The input stream */
-    private $_in;
+    private $in;
 
     /** The output stream */
-    private $_out;
+    private $out;
 
     /** Buffer initialization parameters */
-    private $_params = array();
+    private $params = [];
 
     /** The ReplacementFilterFactory */
-    private $_replacementFactory;
+    private $replacementFactory;
 
     /** Translations performed on data being streamed into the buffer */
-    private $_translations = array();
+    private $translations = [];
 
     /**
      * Create a new StreamBuffer using $replacementFactory for transformations.
-     *
-     * @param Swift_ReplacementFilterFactory $replacementFactory
      */
     public function __construct(Swift_ReplacementFilterFactory $replacementFactory)
     {
-        $this->_replacementFactory = $replacementFactory;
+        $this->replacementFactory = $replacementFactory;
     }
 
     /**
      * Perform any initialization needed, using the given $params.
      *
      * Parameters will vary depending upon the type of IoBuffer used.
-     *
-     * @param array $params
      */
     public function initialize(array $params)
     {
-        $this->_params = $params;
+        $this->params = $params;
         switch ($params['type']) {
             case self::TYPE_PROCESS:
-                $this->_establishProcessConnection();
+                $this->establishProcessConnection();
                 break;
             case self::TYPE_SOCKET:
             default:
-                $this->_establishSocketConnection();
+                $this->establishSocketConnection();
                 break;
         }
     }
@@ -72,21 +68,21 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
      */
     public function setParam($param, $value)
     {
-        if (isset($this->_stream)) {
+        if (isset($this->stream)) {
             switch ($param) {
                 case 'timeout':
-                    if ($this->_stream) {
-                        stream_set_timeout($this->_stream, $value);
+                    if ($this->stream) {
+                        stream_set_timeout($this->stream, $value);
                     }
                     break;
 
                 case 'blocking':
-                    if ($this->_stream) {
-                        stream_set_blocking($this->_stream, 1);
+                    if ($this->stream) {
+                        stream_set_blocking($this->stream, 1);
                     }
             }
         }
-        $this->_params[$param] = $value;
+        $this->params[$param] = $value;
     }
 
     public function startTLS()
@@ -95,12 +91,7 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
         // To support modern tls we allow explicit tls1.0, tls1.1, tls1.2
         // Ssl3 and older are not allowed because they are vulnerable
         // @TODO make tls arguments configurable
-        $cryptoType = STREAM_CRYPTO_METHOD_TLS_CLIENT;
-        if (PHP_VERSION_ID >= 50600) {
-            $cryptoType = STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT;
-        }
-
-        return stream_socket_enable_crypto($this->_stream, true, $cryptoType);
+        return stream_socket_enable_crypto($this->stream, true, STREAM_CRYPTO_METHOD_TLSv1_0_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT | STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT);
     }
 
     /**
@@ -108,22 +99,22 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
      */
     public function terminate()
     {
-        if (isset($this->_stream)) {
-            switch ($this->_params['type']) {
+        if (isset($this->stream)) {
+            switch ($this->params['type']) {
                 case self::TYPE_PROCESS:
-                    fclose($this->_in);
-                    fclose($this->_out);
-                    proc_close($this->_stream);
+                    fclose($this->in);
+                    fclose($this->out);
+                    proc_close($this->stream);
                     break;
                 case self::TYPE_SOCKET:
                 default:
-                    fclose($this->_stream);
+                    fclose($this->stream);
                     break;
             }
         }
-        $this->_stream = null;
-        $this->_out = null;
-        $this->_in = null;
+        $this->stream = null;
+        $this->out = null;
+        $this->in = null;
     }
 
     /**
@@ -136,19 +127,19 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
      */
     public function setWriteTranslations(array $replacements)
     {
-        foreach ($this->_translations as $search => $replace) {
+        foreach ($this->translations as $search => $replace) {
             if (!isset($replacements[$search])) {
                 $this->removeFilter($search);
-                unset($this->_translations[$search]);
+                unset($this->translations[$search]);
             }
         }
 
         foreach ($replacements as $search => $replace) {
-            if (!isset($this->_translations[$search])) {
+            if (!isset($this->translations[$search])) {
                 $this->addFilter(
-                    $this->_replacementFactory->createFilter($search, $replace), $search
+                    $this->replacementFactory->createFilter($search, $replace), $search
                     );
-                $this->_translations[$search] = true;
+                $this->translations[$search] = true;
             }
         }
     }
@@ -161,22 +152,18 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
      *
      * @param int $sequence of last write to scan from
      *
-     * @throws Swift_IoException
-     *
      * @return string
+     *
+     * @throws Swift_IoException
      */
     public function readLine($sequence)
     {
-        if (isset($this->_out) && !feof($this->_out)) {
-            $line = fgets($this->_out);
-            if (strlen($line) == 0) {
-                $metas = stream_get_meta_data($this->_out);
+        if (isset($this->out) && !feof($this->out)) {
+            $line = fgets($this->out);
+            if (0 == \strlen($line)) {
+                $metas = stream_get_meta_data($this->out);
                 if ($metas['timed_out']) {
-                    throw new Swift_IoException(
-                        'Connection to '.
-                            $this->_getReadConnectionDescription().
-                        ' Timed Out'
-                    );
+                    throw new Swift_IoException('Connection to '.$this->getReadConnectionDescription().' Timed Out');
                 }
             }
 
@@ -193,22 +180,18 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
      *
      * @param int $length
      *
-     * @throws Swift_IoException
-     *
      * @return string|bool
+     *
+     * @throws Swift_IoException
      */
     public function read($length)
     {
-        if (isset($this->_out) && !feof($this->_out)) {
-            $ret = fread($this->_out, $length);
-            if (strlen($ret) == 0) {
-                $metas = stream_get_meta_data($this->_out);
+        if (isset($this->out) && !feof($this->out)) {
+            $ret = fread($this->out, $length);
+            if (0 == \strlen($ret)) {
+                $metas = stream_get_meta_data($this->out);
                 if ($metas['timed_out']) {
-                    throw new Swift_IoException(
-                        'Connection to '.
-                            $this->_getReadConnectionDescription().
-                        ' Timed Out'
-                    );
+                    throw new Swift_IoException('Connection to '.$this->getReadConnectionDescription().' Timed Out');
                 }
             }
 
@@ -222,22 +205,22 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
     }
 
     /** Flush the stream contents */
-    protected function _flush()
+    protected function flush()
     {
-        if (isset($this->_in)) {
-            fflush($this->_in);
+        if (isset($this->in)) {
+            fflush($this->in);
         }
     }
 
     /** Write this bytes to the stream */
-    protected function _commit($bytes)
+    protected function doCommit($bytes)
     {
-        if (isset($this->_in)) {
-            $bytesToWrite = strlen($bytes);
+        if (isset($this->in)) {
+            $bytesToWrite = \strlen($bytes);
             $totalBytesWritten = 0;
 
             while ($totalBytesWritten < $bytesToWrite) {
-                $bytesWritten = fwrite($this->_in, substr($bytes, $totalBytesWritten));
+                $bytesWritten = fwrite($this->in, substr($bytes, $totalBytesWritten));
                 if (false === $bytesWritten || 0 === $bytesWritten) {
                     break;
                 }
@@ -246,7 +229,7 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
             }
 
             if ($totalBytesWritten > 0) {
-                return ++$this->_sequence;
+                return ++$this->sequence;
             }
         }
     }
@@ -254,78 +237,80 @@ class Swift_Transport_StreamBuffer extends Swift_ByteStream_AbstractFilterableIn
     /**
      * Establishes a connection to a remote server.
      */
-    private function _establishSocketConnection()
+    private function establishSocketConnection()
     {
-        $host = $this->_params['host'];
-        if (!empty($this->_params['protocol'])) {
-            $host = $this->_params['protocol'].'://'.$host;
+        $host = $this->params['host'];
+        if (!empty($this->params['protocol'])) {
+            $host = $this->params['protocol'].'://'.$host;
         }
         $timeout = 15;
-        if (!empty($this->_params['timeout'])) {
-            $timeout = $this->_params['timeout'];
+        if (!empty($this->params['timeout'])) {
+            $timeout = $this->params['timeout'];
         }
-        $options = array();
-        if (!empty($this->_params['sourceIp'])) {
-            $options['socket']['bindto'] = $this->_params['sourceIp'].':0';
+        $options = [];
+        if (!empty($this->params['sourceIp'])) {
+            $options['socket']['bindto'] = $this->params['sourceIp'].':0';
         }
-        if (isset($this->_params['stream_context_options'])) {
-            $options = array_merge($options, $this->_params['stream_context_options']);
+
+        if (isset($this->params['stream_context_options'])) {
+            $options = array_merge($options, $this->params['stream_context_options']);
         }
         $streamContext = stream_context_create($options);
-        $this->_stream = @stream_socket_client($host.':'.$this->_params['port'], $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $streamContext);
-        if (false === $this->_stream) {
-            throw new Swift_TransportException(
-                'Connection could not be established with host '.$this->_params['host'].
-                ' ['.$errstr.' #'.$errno.']'
-                );
+
+        set_error_handler(function ($type, $msg) {
+            throw new Swift_TransportException('Connection could not be established with host '.$this->params['host'].' :'.$msg);
+        });
+        try {
+            $this->stream = stream_socket_client($host.':'.$this->params['port'], $errno, $errstr, $timeout, STREAM_CLIENT_CONNECT, $streamContext);
+        } finally {
+            restore_error_handler();
         }
-        if (!empty($this->_params['blocking'])) {
-            stream_set_blocking($this->_stream, 1);
+
+        if (!empty($this->params['blocking'])) {
+            stream_set_blocking($this->stream, 1);
         } else {
-            stream_set_blocking($this->_stream, 0);
+            stream_set_blocking($this->stream, 0);
         }
-        stream_set_timeout($this->_stream, $timeout);
-        $this->_in = &$this->_stream;
-        $this->_out = &$this->_stream;
+        stream_set_timeout($this->stream, $timeout);
+        $this->in = &$this->stream;
+        $this->out = &$this->stream;
     }
 
     /**
      * Opens a process for input/output.
      */
-    private function _establishProcessConnection()
+    private function establishProcessConnection()
     {
-        $command = $this->_params['command'];
-        $descriptorSpec = array(
-            0 => array('pipe', 'r'),
-            1 => array('pipe', 'w'),
-            2 => array('pipe', 'w'),
-            );
-        $pipes = array();
-        $this->_stream = proc_open($command, $descriptorSpec, $pipes);
+        $command = $this->params['command'];
+        $descriptorSpec = [
+            0 => ['pipe', 'r'],
+            1 => ['pipe', 'w'],
+            2 => ['pipe', 'w'],
+            ];
+        $pipes = [];
+        $this->stream = proc_open($command, $descriptorSpec, $pipes);
         stream_set_blocking($pipes[2], 0);
         if ($err = stream_get_contents($pipes[2])) {
-            throw new Swift_TransportException(
-                'Process could not be started ['.$err.']'
-                );
+            throw new Swift_TransportException('Process could not be started ['.$err.']');
         }
-        $this->_in = &$pipes[0];
-        $this->_out = &$pipes[1];
+        $this->in = &$pipes[0];
+        $this->out = &$pipes[1];
     }
 
-    private function _getReadConnectionDescription()
+    private function getReadConnectionDescription()
     {
-        switch ($this->_params['type']) {
+        switch ($this->params['type']) {
             case self::TYPE_PROCESS:
-                return 'Process '.$this->_params['command'];
+                return 'Process '.$this->params['command'];
                 break;
 
             case self::TYPE_SOCKET:
             default:
-                $host = $this->_params['host'];
-                if (!empty($this->_params['protocol'])) {
-                    $host = $this->_params['protocol'].'://'.$host;
+                $host = $this->params['host'];
+                if (!empty($this->params['protocol'])) {
+                    $host = $this->params['protocol'].'://'.$host;
                 }
-                $host .= ':'.$this->_params['port'];
+                $host .= ':'.$this->params['port'];
 
                 return $host;
                 break;
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/TransportException.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/TransportException.php
index 4ae2412e6..c7417455b 100644
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/TransportException.php
+++ b/lib/swiftmailer/swiftmailer/lib/classes/Swift/TransportException.php
@@ -18,9 +18,8 @@ class Swift_TransportException extends Swift_IoException
     /**
      * Create a new TransportException with $message.
      *
-     * @param string    $message
-     * @param int       $code
-     * @param Exception $previous
+     * @param string $message
+     * @param int    $code
      */
     public function __construct($message, $code = 0, Exception $previous = null)
     {
diff --git a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Validate.php b/lib/swiftmailer/swiftmailer/lib/classes/Swift/Validate.php
deleted file mode 100644
index e16c212c4..000000000
--- a/lib/swiftmailer/swiftmailer/lib/classes/Swift/Validate.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- * Utility Class allowing users to simply check expressions again Swift Grammar.
- *
- * @author  Xavier De Cock <xdecock@gmail.com>
- */
-class Swift_Validate
-{
-    /**
-     * Grammar Object.
-     *
-     * @var Swift_Mime_Grammar
-     */
-    private static $grammar = null;
-
-    /**
-     * Checks if an e-mail address matches the current grammars.
-     *
-     * @param string $email
-     *
-     * @return bool
-     */
-    public static function email($email)
-    {
-        if (self::$grammar === null) {
-            self::$grammar = Swift_DependencyContainer::getInstance()
-                ->lookup('mime.grammar');
-        }
-
-        return (bool) preg_match(
-                '/^'.self::$grammar->getDefinition('addr-spec').'$/D',
-                $email
-            );
-    }
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/dependency_maps/cache_deps.php b/lib/swiftmailer/swiftmailer/lib/dependency_maps/cache_deps.php
index 6023448e8..9d94d7740 100644
--- a/lib/swiftmailer/swiftmailer/lib/dependency_maps/cache_deps.php
+++ b/lib/swiftmailer/swiftmailer/lib/dependency_maps/cache_deps.php
@@ -12,11 +12,11 @@ Swift_DependencyContainer::getInstance()
 
     ->register('cache.array')
     ->asSharedInstanceOf('Swift_KeyCache_ArrayKeyCache')
-    ->withDependencies(array('cache.inputstream'))
+    ->withDependencies(['cache.inputstream'])
 
     ->register('cache.disk')
     ->asSharedInstanceOf('Swift_KeyCache_DiskKeyCache')
-    ->withDependencies(array('cache.inputstream', 'tempdir'))
+    ->withDependencies(['cache.inputstream', 'tempdir'])
 
     ->register('cache.inputstream')
     ->asNewInstanceOf('Swift_KeyCache_SimpleKeyCacheInputStream')
diff --git a/lib/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php b/lib/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php
index d575e4f2d..307756c89 100644
--- a/lib/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php
+++ b/lib/swiftmailer/swiftmailer/lib/dependency_maps/mime_deps.php
@@ -6,96 +6,112 @@ Swift_DependencyContainer::getInstance()
     ->register('properties.charset')
     ->asValue('utf-8')
 
-    ->register('mime.grammar')
-    ->asSharedInstanceOf('Swift_Mime_Grammar')
+    ->register('email.validator')
+    ->asSharedInstanceOf('Egulias\EmailValidator\EmailValidator')
+
+    ->register('mime.idgenerator.idright')
+    // As SERVER_NAME can come from the user in certain configurations, check that
+    // it does not contain forbidden characters (see RFC 952 and RFC 2181). Use
+    // preg_replace() instead of preg_match() to prevent DoS attacks with long host names.
+    ->asValue(!empty($_SERVER['SERVER_NAME']) && '' === preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) ? $_SERVER['SERVER_NAME'] : 'swift.generated')
+
+    ->register('mime.idgenerator')
+    ->asSharedInstanceOf('Swift_Mime_IdGenerator')
+    ->withDependencies([
+        'mime.idgenerator.idright',
+    ])
 
     ->register('mime.message')
     ->asNewInstanceOf('Swift_Mime_SimpleMessage')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.headerset',
-        'mime.qpcontentencoder',
+        'mime.textcontentencoder',
         'cache',
-        'mime.grammar',
+        'mime.idgenerator',
         'properties.charset',
-    ))
+    ])
 
     ->register('mime.part')
     ->asNewInstanceOf('Swift_Mime_MimePart')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.headerset',
-        'mime.qpcontentencoder',
+        'mime.textcontentencoder',
         'cache',
-        'mime.grammar',
+        'mime.idgenerator',
         'properties.charset',
-    ))
+    ])
 
     ->register('mime.attachment')
     ->asNewInstanceOf('Swift_Mime_Attachment')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.headerset',
         'mime.base64contentencoder',
         'cache',
-        'mime.grammar',
-    ))
+        'mime.idgenerator',
+    ])
     ->addConstructorValue($swift_mime_types)
 
     ->register('mime.embeddedfile')
     ->asNewInstanceOf('Swift_Mime_EmbeddedFile')
-    ->withDependencies(array(
+    ->withDependencies([
         'mime.headerset',
         'mime.base64contentencoder',
         'cache',
-        'mime.grammar',
-    ))
+        'mime.idgenerator',
+    ])
     ->addConstructorValue($swift_mime_types)
 
     ->register('mime.headerfactory')
     ->asNewInstanceOf('Swift_Mime_SimpleHeaderFactory')
-    ->withDependencies(array(
-            'mime.qpheaderencoder',
-            'mime.rfc2231encoder',
-            'mime.grammar',
-            'properties.charset',
-        ))
+    ->withDependencies([
+        'mime.qpheaderencoder',
+        'mime.rfc2231encoder',
+        'email.validator',
+        'properties.charset',
+        'address.idnaddressencoder',
+    ])
 
     ->register('mime.headerset')
     ->asNewInstanceOf('Swift_Mime_SimpleHeaderSet')
-    ->withDependencies(array('mime.headerfactory', 'properties.charset'))
+    ->withDependencies(['mime.headerfactory', 'properties.charset'])
 
     ->register('mime.qpheaderencoder')
     ->asNewInstanceOf('Swift_Mime_HeaderEncoder_QpHeaderEncoder')
-    ->withDependencies(array('mime.charstream'))
+    ->withDependencies(['mime.charstream'])
 
     ->register('mime.base64headerencoder')
     ->asNewInstanceOf('Swift_Mime_HeaderEncoder_Base64HeaderEncoder')
-    ->withDependencies(array('mime.charstream'))
+    ->withDependencies(['mime.charstream'])
 
     ->register('mime.charstream')
     ->asNewInstanceOf('Swift_CharacterStream_NgCharacterStream')
-    ->withDependencies(array('mime.characterreaderfactory', 'properties.charset'))
+    ->withDependencies(['mime.characterreaderfactory', 'properties.charset'])
 
     ->register('mime.bytecanonicalizer')
     ->asSharedInstanceOf('Swift_StreamFilters_ByteArrayReplacementFilter')
-    ->addConstructorValue(array(array(0x0D, 0x0A), array(0x0D), array(0x0A)))
-    ->addConstructorValue(array(array(0x0A), array(0x0A), array(0x0D, 0x0A)))
+    ->addConstructorValue([[0x0D, 0x0A], [0x0D], [0x0A]])
+    ->addConstructorValue([[0x0A], [0x0A], [0x0D, 0x0A]])
 
     ->register('mime.characterreaderfactory')
     ->asSharedInstanceOf('Swift_CharacterReaderFactory_SimpleCharacterReaderFactory')
 
+    ->register('mime.textcontentencoder')
+    ->asAliasOf('mime.qpcontentencoder')
+
     ->register('mime.safeqpcontentencoder')
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoder')
-    ->withDependencies(array('mime.charstream', 'mime.bytecanonicalizer'))
+    ->withDependencies(['mime.charstream', 'mime.bytecanonicalizer'])
 
     ->register('mime.rawcontentencoder')
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_RawContentEncoder')
 
     ->register('mime.nativeqpcontentencoder')
-    ->withDependencies(array('properties.charset'))
+    ->withDependencies(['properties.charset'])
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_NativeQpContentEncoder')
 
-    ->register('mime.qpcontentencoderproxy')
+    ->register('mime.qpcontentencoder')
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_QpContentEncoderProxy')
-    ->withDependencies(array('mime.safeqpcontentencoder', 'mime.nativeqpcontentencoder', 'properties.charset'))
+    ->withDependencies(['mime.safeqpcontentencoder', 'mime.nativeqpcontentencoder', 'properties.charset'])
 
     ->register('mime.7bitcontentencoder')
     ->asNewInstanceOf('Swift_Mime_ContentEncoder_PlainContentEncoder')
@@ -112,12 +128,7 @@ Swift_DependencyContainer::getInstance()
 
     ->register('mime.rfc2231encoder')
     ->asNewInstanceOf('Swift_Encoder_Rfc2231Encoder')
-    ->withDependencies(array('mime.charstream'))
-
-    // As of PHP 5.4.7, the quoted_printable_encode() function behaves correctly.
-    // see https://github.com/php/php-src/commit/18bb426587d62f93c54c40bf8535eb8416603629
-    ->register('mime.qpcontentencoder')
-    ->asAliasOf(PHP_VERSION_ID >= 50407 ? 'mime.qpcontentencoderproxy' : 'mime.safeqpcontentencoder')
+    ->withDependencies(['mime.charstream'])
 ;
 
 unset($swift_mime_types);
diff --git a/lib/swiftmailer/swiftmailer/lib/dependency_maps/transport_deps.php b/lib/swiftmailer/swiftmailer/lib/dependency_maps/transport_deps.php
index 77e432cfa..34a63c78e 100644
--- a/lib/swiftmailer/swiftmailer/lib/dependency_maps/transport_deps.php
+++ b/lib/swiftmailer/swiftmailer/lib/dependency_maps/transport_deps.php
@@ -1,24 +1,29 @@
 <?php
 
 Swift_DependencyContainer::getInstance()
+    ->register('transport.localdomain')
+    // As SERVER_NAME can come from the user in certain configurations, check that
+    // it does not contain forbidden characters (see RFC 952 and RFC 2181). Use
+    // preg_replace() instead of preg_match() to prevent DoS attacks with long host names.
+    ->asValue(!empty($_SERVER['SERVER_NAME']) && '' === preg_replace('/(?:^\[)?[a-zA-Z0-9-:\]_]+\.?/', '', $_SERVER['SERVER_NAME']) ? trim($_SERVER['SERVER_NAME'], '[]') : '127.0.0.1')
+
     ->register('transport.smtp')
     ->asNewInstanceOf('Swift_Transport_EsmtpTransport')
-    ->withDependencies(array(
+    ->withDependencies([
         'transport.buffer',
-        array('transport.authhandler'),
+        'transport.smtphandlers',
         'transport.eventdispatcher',
-    ))
+        'transport.localdomain',
+        'address.idnaddressencoder',
+    ])
 
     ->register('transport.sendmail')
     ->asNewInstanceOf('Swift_Transport_SendmailTransport')
-    ->withDependencies(array(
+    ->withDependencies([
         'transport.buffer',
         'transport.eventdispatcher',
-    ))
-
-    ->register('transport.mail')
-    ->asNewInstanceOf('Swift_Transport_MailTransport')
-    ->withDependencies(array('transport.mailinvoker', 'transport.eventdispatcher'))
+        'transport.localdomain',
+    ])
 
     ->register('transport.loadbalanced')
     ->asNewInstanceOf('Swift_Transport_LoadBalancedTransport')
@@ -28,30 +33,40 @@ Swift_DependencyContainer::getInstance()
 
     ->register('transport.spool')
     ->asNewInstanceOf('Swift_Transport_SpoolTransport')
-    ->withDependencies(array('transport.eventdispatcher'))
+    ->withDependencies(['transport.eventdispatcher'])
 
     ->register('transport.null')
     ->asNewInstanceOf('Swift_Transport_NullTransport')
-    ->withDependencies(array('transport.eventdispatcher'))
-
-    ->register('transport.mailinvoker')
-    ->asSharedInstanceOf('Swift_Transport_SimpleMailInvoker')
+    ->withDependencies(['transport.eventdispatcher'])
 
     ->register('transport.buffer')
     ->asNewInstanceOf('Swift_Transport_StreamBuffer')
-    ->withDependencies(array('transport.replacementfactory'))
+    ->withDependencies(['transport.replacementfactory'])
+
+    ->register('transport.smtphandlers')
+    ->asArray()
+    ->withDependencies(['transport.authhandler'])
 
     ->register('transport.authhandler')
     ->asNewInstanceOf('Swift_Transport_Esmtp_AuthHandler')
-    ->withDependencies(array(
-        array(
-            'transport.crammd5auth',
-            'transport.loginauth',
-            'transport.plainauth',
-            'transport.ntlmauth',
-            'transport.xoauth2auth',
-        ),
-    ))
+    ->withDependencies(['transport.authhandlers'])
+
+    ->register('transport.authhandlers')
+    ->asArray()
+    ->withDependencies([
+        'transport.crammd5auth',
+        'transport.loginauth',
+        'transport.plainauth',
+        'transport.ntlmauth',
+        'transport.xoauth2auth',
+    ])
+
+    ->register('transport.smtputf8handler')
+    ->asNewInstanceOf('Swift_Transport_Esmtp_SmtpUtf8Handler')
+
+    ->register('transport.8bitmimehandler')
+    ->asNewInstanceOf('Swift_Transport_Esmtp_EightBitMimeHandler')
+    ->addConstructorValue('8BITMIME')
 
     ->register('transport.crammd5auth')
     ->asNewInstanceOf('Swift_Transport_Esmtp_Auth_CramMd5Authenticator')
@@ -73,4 +88,10 @@ Swift_DependencyContainer::getInstance()
 
     ->register('transport.replacementfactory')
     ->asSharedInstanceOf('Swift_StreamFilters_StringReplacementFilterFactory')
+
+    ->register('address.idnaddressencoder')
+    ->asNewInstanceOf('Swift_AddressEncoder_IdnAddressEncoder')
+
+    ->register('address.utf8addressencoder')
+    ->asNewInstanceOf('Swift_AddressEncoder_Utf8AddressEncoder')
 ;
diff --git a/lib/swiftmailer/swiftmailer/lib/mime_types.php b/lib/swiftmailer/swiftmailer/lib/mime_types.php
index b42c1cc1a..72c6fd2af 100644
--- a/lib/swiftmailer/swiftmailer/lib/mime_types.php
+++ b/lib/swiftmailer/swiftmailer/lib/mime_types.php
@@ -17,7 +17,7 @@
 
 // You may add or take away what you like (lowercase required)
 
-$swift_mime_types = array(
+$swift_mime_types = [
     '3dml' => 'text/vnd.in3d.3dml',
     '3ds' => 'image/x-3ds',
     '3g2' => 'video/3gpp2',
@@ -1004,4 +1004,4 @@ $swift_mime_types = array(
     'zirz' => 'application/vnd.zul',
     'zmm' => 'application/vnd.handheld-entertainment+xml',
     '123' => 'application/vnd.lotus-1-2-3',
-);
+];
diff --git a/lib/swiftmailer/swiftmailer/lib/preferences.php b/lib/swiftmailer/swiftmailer/lib/preferences.php
index 0b430e67d..27b7065db 100644
--- a/lib/swiftmailer/swiftmailer/lib/preferences.php
+++ b/lib/swiftmailer/swiftmailer/lib/preferences.php
@@ -17,9 +17,3 @@ $preferences->setCharset('utf-8');
 if (@is_writable($tmpDir = sys_get_temp_dir())) {
     $preferences->setTempDir($tmpDir)->setCacheType('disk');
 }
-
-// this should only be done when Swiftmailer won't use the native QP content encoder
-// see mime_deps.php
-if (PHP_VERSION_ID < 50407) {
-    $preferences->setQPDotEscape(false);
-}
diff --git a/lib/swiftmailer/swiftmailer/lib/swift_init.php b/lib/swiftmailer/swiftmailer/lib/swift_init.php
deleted file mode 100644
index ff7196344..000000000
--- a/lib/swiftmailer/swiftmailer/lib/swift_init.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/*
- * Dependency injection initialization for Swift Mailer.
- */
-
-if (defined('SWIFT_INIT_LOADED')) {
-    return;
-}
-
-define('SWIFT_INIT_LOADED', true);
-
-// Load in dependency maps
-require __DIR__.'/dependency_maps/cache_deps.php';
-require __DIR__.'/dependency_maps/mime_deps.php';
-require __DIR__.'/dependency_maps/message_deps.php';
-require __DIR__.'/dependency_maps/transport_deps.php';
-
-// Load in global library preferences
-require __DIR__.'/preferences.php';
diff --git a/lib/swiftmailer/swiftmailer/lib/swift_required.php b/lib/swiftmailer/swiftmailer/lib/swift_required.php
index 03a72ceae..d696056aa 100644
--- a/lib/swiftmailer/swiftmailer/lib/swift_required.php
+++ b/lib/swiftmailer/swiftmailer/lib/swift_required.php
@@ -8,23 +8,15 @@
  * file that was distributed with this source code.
  */
 
-/*
- * Autoloader and dependency injection initialization for Swift Mailer.
- */
-
-if (class_exists('Swift', false)) {
-    return;
-}
-
-// Load Swift utility class
 require __DIR__.'/classes/Swift.php';
 
-if (!function_exists('_swiftmailer_init')) {
-    function _swiftmailer_init()
-    {
-        require __DIR__.'/swift_init.php';
-    }
-}
+Swift::registerAutoload(function () {
+    // Load in dependency maps
+    require __DIR__.'/dependency_maps/cache_deps.php';
+    require __DIR__.'/dependency_maps/mime_deps.php';
+    require __DIR__.'/dependency_maps/message_deps.php';
+    require __DIR__.'/dependency_maps/transport_deps.php';
 
-// Start the autoloader and lazy-load the init script to set up dependency injection
-Swift::registerAutoload('_swiftmailer_init');
+    // Load in global library preferences
+    require __DIR__.'/preferences.php';
+});
diff --git a/lib/swiftmailer/swiftmailer/lib/swift_required_pear.php b/lib/swiftmailer/swiftmailer/lib/swift_required_pear.php
deleted file mode 100644
index 2b5181a93..000000000
--- a/lib/swiftmailer/swiftmailer/lib/swift_required_pear.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/*
- * This file is part of SwiftMailer.
- * (c) 2004-2009 Chris Corbyn
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/*
- * Autoloader and dependency injection initialization for Swift Mailer.
- */
-
-if (class_exists('Swift', false)) {
-    return;
-}
-
-// Load Swift utility class
-require __DIR__.'/Swift.php';
-
-if (!function_exists('_swiftmailer_init')) {
-    function _swiftmailer_init()
-    {
-        require __DIR__.'/swift_init.php';
-    }
-}
-
-// Start the autoloader and lazy-load the init script to set up dependency injection
-Swift::registerAutoload('_swiftmailer_init');
diff --git a/lib/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php b/lib/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php
index 85f2d69f2..ad8fd2aa0 100644
--- a/lib/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php
+++ b/lib/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php
@@ -1,8 +1,8 @@
 #!/usr/bin/php
 
 <?php
-define('APACHE_MIME_TYPES_URL', 'https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types');
-define('FREEDESKTOP_XML_URL', 'https://raw.github.com/minad/mimemagic/master/script/freedesktop.org.xml');
+\define('APACHE_MIME_TYPES_URL', 'https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types');
+\define('FREEDESKTOP_XML_URL', 'https://raw.github.com/minad/mimemagic/master/script/freedesktop.org.xml');
 
 function generateUpToDateMimeArray()
 {
@@ -25,12 +25,12 @@ function generateUpToDateMimeArray()
     $mime_xml = @file_get_contents(FREEDESKTOP_XML_URL);
 
     // prepare valid mime types
-    $valid_mime_types = array();
+    $valid_mime_types = [];
 
     // split mime type and extensions eg. "video/x-matroska        mkv mk3d mks"
-    if (preg_match_all('/^#?([a-z0-9\-\+\/\.]+)[\t]+(.*)$/miu', $mime_types, $matches) !== false) {
+    if (false !== preg_match_all('/^#?([a-z0-9\-\+\/\.]+)[\t]+(.*)$/miu', $mime_types, $matches)) {
         // collection of predefined mimetypes (bugfix for wrong resolved or missing mime types)
-        $valid_mime_types_preset = array(
+        $valid_mime_types_preset = [
             'php' => 'application/x-php',
             'php3' => 'application/x-php',
             'php4' => 'application/x-php',
@@ -95,7 +95,7 @@ function generateUpToDateMimeArray()
             'xls' => 'application/vnd.ms-excel',
             'xlsx' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
             'xml' => 'application/xml',
-        );
+        ];
 
         // wrap array for generating file
         foreach ($valid_mime_types_preset as $extension => $mime_type) {
@@ -103,17 +103,14 @@ function generateUpToDateMimeArray()
             $valid_mime_types[$extension] = "'{$extension}' => '{$mime_type}'";
         }
 
-        // collect extensions
-        $valid_extensions = array();
-
         // all extensions from second match
         foreach ($matches[2] as $i => $extensions) {
             // explode multiple extensions from string
-            $extensions = explode(' ', strtolower($extensions));
+            $extensions = explode(' ', strtolower($extensions ?? ''));
 
             // force array for foreach
-            if (!is_array($extensions)) {
-                $extensions = array($extensions);
+            if (!\is_array($extensions)) {
+                $extensions = [$extensions];
             }
 
             foreach ($extensions as $extension) {
@@ -121,10 +118,7 @@ function generateUpToDateMimeArray()
                 $mime_type = $matches[1][$i];
 
                 // check if string length lower than 10
-                if (strlen($extension) < 10) {
-                    // add extension
-                    $valid_extensions[] = $extension;
-
+                if (\strlen($extension) < 10) {
                     if (!isset($valid_mime_types[$mime_type])) {
                         // generate array for mimetype to extension resolver (only first match)
                         $valid_mime_types[$extension] = "'{$extension}' => '{$mime_type}'";
@@ -145,29 +139,24 @@ function generateUpToDateMimeArray()
         // get all matching extensions from match
         foreach ((array) $node->glob['pattern'] as $extension) {
             // skip none glob extensions
-            if (strpos($extension, '.') === false) {
+            if (false === strpos($extension ?? '', '.')) {
                 continue;
             }
 
             // remove get only last part
-            $extension = explode('.', strtolower($extension));
+            $extension = explode('.', strtolower($extension ?? ''));
             $extension = end($extension);
-
-            // maximum length in database column
-            if (strlen($extension) <= 9) {
-                $valid_extensions[] = $extension;
-            }
         }
 
         if (isset($node->glob['pattern'][0])) {
             // mime type
-            $mime_type = strtolower((string) $node['type']);
+            $mime_type = strtolower((string) $node['type'] ?? '');
 
             // get first extension
-            $extension = strtolower(trim($node->glob['ddpattern'][0], '*.'));
+            $extension = strtolower(trim($node->glob['ddpattern'][0] ?? '', '*.'));
 
             // skip none glob extensions and check if string length between 1 and 10
-            if (strpos($extension, '.') !== false || strlen($extension) < 1 || strlen($extension) > 9) {
+            if (false !== strpos($extension, '.') || \strlen($extension) < 1 || \strlen($extension) > 9) {
                 continue;
             }
 
@@ -184,7 +173,7 @@ function generateUpToDateMimeArray()
     ksort($valid_mime_types);
 
     // combine mime types and extensions array
-    $output = "$preamble\$swift_mime_types = array(\n    ".implode($valid_mime_types, ",\n    ")."\n);";
+    $output = "$preamble\$swift_mime_types = array(\n    ".implode(",\n    ", $valid_mime_types)."\n);";
 
     // write mime_types.php config file
     @file_put_contents('./mime_types.php', $output);
diff --git a/lib/swiftmailer/swiftmailer/phpunit.xml.dist b/lib/swiftmailer/swiftmailer/phpunit.xml.dist
deleted file mode 100644
index 606c5b449..000000000
--- a/lib/swiftmailer/swiftmailer/phpunit.xml.dist
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
-         colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false"
-         syntaxCheck="false"
-         bootstrap="tests/bootstrap.php"
->
-    <php>
-        <ini name="intl.default_locale" value="en"/>
-        <ini name="intl.error_level" value="0"/>
-        <ini name="memory_limit" value="-1"/>
-        <ini name="error_reporting" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="SwiftMailer unit tests">
-            <directory>tests/unit</directory>
-        </testsuite>
-        <testsuite name="SwiftMailer acceptance tests">
-            <directory>tests/acceptance</directory>
-        </testsuite>
-        <testsuite name="SwiftMailer bug">
-            <directory>tests/bug</directory>
-        </testsuite>
-        <testsuite name="SwiftMailer smoke tests">
-            <directory>tests/smoke</directory>
-        </testsuite>
-    </testsuites>
-
-    <listeners>
-        <listener class="Symfony\Bridge\PhpUnit\SymfonyTestsListener" />
-        <listener class="Mockery\Adapter\Phpunit\TestListener" />
-    </listeners>
-</phpunit>
diff --git a/lib/symfony/polyfill-iconv/Iconv.php b/lib/symfony/polyfill-iconv/Iconv.php
new file mode 100644
index 000000000..180b5bfff
--- /dev/null
+++ b/lib/symfony/polyfill-iconv/Iconv.php
@@ -0,0 +1,745 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Iconv;
+
+/**
+ * iconv implementation in pure PHP, UTF-8 centric.
+ *
+ * Implemented:
+ * - iconv              - Convert string to requested character encoding
+ * - iconv_mime_decode  - Decodes a MIME header field
+ * - iconv_mime_decode_headers - Decodes multiple MIME header fields at once
+ * - iconv_get_encoding - Retrieve internal configuration variables of iconv extension
+ * - iconv_set_encoding - Set current setting for character encoding conversion
+ * - iconv_mime_encode  - Composes a MIME header field
+ * - iconv_strlen       - Returns the character count of string
+ * - iconv_strpos       - Finds position of first occurrence of a needle within a haystack
+ * - iconv_strrpos      - Finds the last occurrence of a needle within a haystack
+ * - iconv_substr       - Cut out part of a string
+ *
+ * Charsets available for conversion are defined by files
+ * in the charset/ directory and by Iconv::$alias below.
+ * You're welcome to send back any addition you make.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+final class Iconv
+{
+    const ERROR_ILLEGAL_CHARACTER = 'iconv(): Detected an illegal character in input string';
+    const ERROR_WRONG_CHARSET = 'iconv(): Wrong charset, conversion from `%s\' to `%s\' is not allowed';
+
+    public static $inputEncoding = 'utf-8';
+    public static $outputEncoding = 'utf-8';
+    public static $internalEncoding = 'utf-8';
+
+    private static $alias = array(
+        'utf8' => 'utf-8',
+        'ascii' => 'us-ascii',
+        'tis-620' => 'iso-8859-11',
+        'cp1250' => 'windows-1250',
+        'cp1251' => 'windows-1251',
+        'cp1252' => 'windows-1252',
+        'cp1253' => 'windows-1253',
+        'cp1254' => 'windows-1254',
+        'cp1255' => 'windows-1255',
+        'cp1256' => 'windows-1256',
+        'cp1257' => 'windows-1257',
+        'cp1258' => 'windows-1258',
+        'shift-jis' => 'cp932',
+        'shift_jis' => 'cp932',
+        'latin1' => 'iso-8859-1',
+        'latin2' => 'iso-8859-2',
+        'latin3' => 'iso-8859-3',
+        'latin4' => 'iso-8859-4',
+        'latin5' => 'iso-8859-9',
+        'latin6' => 'iso-8859-10',
+        'latin7' => 'iso-8859-13',
+        'latin8' => 'iso-8859-14',
+        'latin9' => 'iso-8859-15',
+        'latin10' => 'iso-8859-16',
+        'iso8859-1' => 'iso-8859-1',
+        'iso8859-2' => 'iso-8859-2',
+        'iso8859-3' => 'iso-8859-3',
+        'iso8859-4' => 'iso-8859-4',
+        'iso8859-5' => 'iso-8859-5',
+        'iso8859-6' => 'iso-8859-6',
+        'iso8859-7' => 'iso-8859-7',
+        'iso8859-8' => 'iso-8859-8',
+        'iso8859-9' => 'iso-8859-9',
+        'iso8859-10' => 'iso-8859-10',
+        'iso8859-11' => 'iso-8859-11',
+        'iso8859-12' => 'iso-8859-12',
+        'iso8859-13' => 'iso-8859-13',
+        'iso8859-14' => 'iso-8859-14',
+        'iso8859-15' => 'iso-8859-15',
+        'iso8859-16' => 'iso-8859-16',
+        'iso_8859-1' => 'iso-8859-1',
+        'iso_8859-2' => 'iso-8859-2',
+        'iso_8859-3' => 'iso-8859-3',
+        'iso_8859-4' => 'iso-8859-4',
+        'iso_8859-5' => 'iso-8859-5',
+        'iso_8859-6' => 'iso-8859-6',
+        'iso_8859-7' => 'iso-8859-7',
+        'iso_8859-8' => 'iso-8859-8',
+        'iso_8859-9' => 'iso-8859-9',
+        'iso_8859-10' => 'iso-8859-10',
+        'iso_8859-11' => 'iso-8859-11',
+        'iso_8859-12' => 'iso-8859-12',
+        'iso_8859-13' => 'iso-8859-13',
+        'iso_8859-14' => 'iso-8859-14',
+        'iso_8859-15' => 'iso-8859-15',
+        'iso_8859-16' => 'iso-8859-16',
+        'iso88591' => 'iso-8859-1',
+        'iso88592' => 'iso-8859-2',
+        'iso88593' => 'iso-8859-3',
+        'iso88594' => 'iso-8859-4',
+        'iso88595' => 'iso-8859-5',
+        'iso88596' => 'iso-8859-6',
+        'iso88597' => 'iso-8859-7',
+        'iso88598' => 'iso-8859-8',
+        'iso88599' => 'iso-8859-9',
+        'iso885910' => 'iso-8859-10',
+        'iso885911' => 'iso-8859-11',
+        'iso885912' => 'iso-8859-12',
+        'iso885913' => 'iso-8859-13',
+        'iso885914' => 'iso-8859-14',
+        'iso885915' => 'iso-8859-15',
+        'iso885916' => 'iso-8859-16',
+    );
+    private static $translitMap = array();
+    private static $convertMap = array();
+    private static $errorHandler;
+    private static $lastError;
+
+    private static $ulenMask = array("\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4);
+    private static $isValidUtf8;
+
+    public static function iconv($inCharset, $outCharset, $str)
+    {
+        $str = (string) $str;
+        if ('' === $str) {
+            return '';
+        }
+
+        // Prepare for //IGNORE and //TRANSLIT
+
+        $translit = $ignore = '';
+
+        $outCharset = strtolower($outCharset);
+        $inCharset = strtolower($inCharset);
+
+        if ('' === $outCharset) {
+            $outCharset = 'iso-8859-1';
+        }
+        if ('' === $inCharset) {
+            $inCharset = 'iso-8859-1';
+        }
+
+        do {
+            $loop = false;
+
+            if ('//translit' === substr($outCharset, -10)) {
+                $loop = $translit = true;
+                $outCharset = substr($outCharset, 0, -10);
+            }
+
+            if ('//ignore' === substr($outCharset, -8)) {
+                $loop = $ignore = true;
+                $outCharset = substr($outCharset, 0, -8);
+            }
+        } while ($loop);
+
+        do {
+            $loop = false;
+
+            if ('//translit' === substr($inCharset, -10)) {
+                $loop = true;
+                $inCharset = substr($inCharset, 0, -10);
+            }
+
+            if ('//ignore' === substr($inCharset, -8)) {
+                $loop = true;
+                $inCharset = substr($inCharset, 0, -8);
+            }
+        } while ($loop);
+
+        if (isset(self::$alias[$inCharset])) {
+            $inCharset = self::$alias[$inCharset];
+        }
+        if (isset(self::$alias[$outCharset])) {
+            $outCharset = self::$alias[$outCharset];
+        }
+
+        // Load charset maps
+
+        if (('utf-8' !== $inCharset && !self::loadMap('from.', $inCharset, $inMap))
+          || ('utf-8' !== $outCharset && !self::loadMap('to.', $outCharset, $outMap))) {
+            trigger_error(sprintf(self::ERROR_WRONG_CHARSET, $inCharset, $outCharset));
+
+            return false;
+        }
+
+        if ('utf-8' !== $inCharset) {
+            // Convert input to UTF-8
+            $result = '';
+            if (self::mapToUtf8($result, $inMap, $str, $ignore)) {
+                $str = $result;
+            } else {
+                $str = false;
+            }
+            self::$isValidUtf8 = true;
+        } else {
+            self::$isValidUtf8 = preg_match('//u', $str);
+
+            if (!self::$isValidUtf8 && !$ignore) {
+                trigger_error(self::ERROR_ILLEGAL_CHARACTER);
+
+                return false;
+            }
+
+            if ('utf-8' === $outCharset) {
+                // UTF-8 validation
+                $str = self::utf8ToUtf8($str, $ignore);
+            }
+        }
+
+        if ('utf-8' !== $outCharset && false !== $str) {
+            // Convert output to UTF-8
+            $result = '';
+            if (self::mapFromUtf8($result, $outMap, $str, $ignore, $translit)) {
+                return $result;
+            }
+
+            return false;
+        }
+
+        return $str;
+    }
+
+    public static function iconv_mime_decode_headers($str, $mode = 0, $charset = null)
+    {
+        if (null === $charset) {
+            $charset = self::$internalEncoding;
+        }
+
+        if (false !== strpos($str, "\r")) {
+            $str = strtr(str_replace("\r\n", "\n", $str), "\r", "\n");
+        }
+        $str = explode("\n\n", $str, 2);
+
+        $headers = array();
+
+        $str = preg_split('/\n(?![ \t])/', $str[0]);
+        foreach ($str as $str) {
+            $str = self::iconv_mime_decode($str, $mode, $charset);
+            if (false === $str) {
+                return false;
+            }
+            $str = explode(':', $str, 2);
+
+            if (2 === \count($str)) {
+                if (isset($headers[$str[0]])) {
+                    if (!\is_array($headers[$str[0]])) {
+                        $headers[$str[0]] = array($headers[$str[0]]);
+                    }
+                    $headers[$str[0]][] = ltrim($str[1]);
+                } else {
+                    $headers[$str[0]] = ltrim($str[1]);
+                }
+            }
+        }
+
+        return $headers;
+    }
+
+    public static function iconv_mime_decode($str, $mode = 0, $charset = null)
+    {
+        if (null === $charset) {
+            $charset = self::$internalEncoding;
+        }
+        if (ICONV_MIME_DECODE_CONTINUE_ON_ERROR & $mode) {
+            $charset .= '//IGNORE';
+        }
+
+        if (false !== strpos($str, "\r")) {
+            $str = strtr(str_replace("\r\n", "\n", $str), "\r", "\n");
+        }
+        $str = preg_split('/\n(?![ \t])/', rtrim($str), 2);
+        $str = preg_replace('/[ \t]*\n[ \t]+/', ' ', rtrim($str[0]));
+        $str = preg_split('/=\?([^?]+)\?([bqBQ])\?(.*?)\?=/', $str, -1, PREG_SPLIT_DELIM_CAPTURE);
+
+        $result = self::iconv('utf-8', $charset, $str[0]);
+        if (false === $result) {
+            return false;
+        }
+
+        $i = 1;
+        $len = \count($str);
+
+        while ($i < $len) {
+            $c = strtolower($str[$i]);
+            if ((ICONV_MIME_DECODE_CONTINUE_ON_ERROR & $mode)
+              && 'utf-8' !== $c
+              && !isset(self::$alias[$c])
+              && !self::loadMap('from.', $c, $d)) {
+                $d = false;
+            } elseif ('B' === strtoupper($str[$i + 1])) {
+                $d = base64_decode($str[$i + 2]);
+            } else {
+                $d = rawurldecode(strtr(str_replace('%', '%25', $str[$i + 2]), '=_', '% '));
+            }
+
+            if (false !== $d) {
+                if ('' !== $d) {
+                    if ('' === $d = self::iconv($c, $charset, $d)) {
+                        $str[$i + 3] = substr($str[$i + 3], 1);
+                    } else {
+                        $result .= $d;
+                    }
+                }
+                $d = self::iconv('utf-8', $charset, $str[$i + 3]);
+                if ('' !== trim($d)) {
+                    $result .= $d;
+                }
+            } elseif (ICONV_MIME_DECODE_CONTINUE_ON_ERROR & $mode) {
+                $result .= "=?{$str[$i]}?{$str[$i + 1]}?{$str[$i + 2]}?={$str[$i + 3]}";
+            } else {
+                $result = false;
+                break;
+            }
+
+            $i += 4;
+        }
+
+        return $result;
+    }
+
+    public static function iconv_get_encoding($type = 'all')
+    {
+        switch ($type) {
+            case 'input_encoding': return self::$inputEncoding;
+            case 'output_encoding': return self::$outputEncoding;
+            case 'internal_encoding': return self::$internalEncoding;
+        }
+
+        return array(
+            'input_encoding' => self::$inputEncoding,
+            'output_encoding' => self::$outputEncoding,
+            'internal_encoding' => self::$internalEncoding,
+        );
+    }
+
+    public static function iconv_set_encoding($type, $charset)
+    {
+        switch ($type) {
+            case 'input_encoding': self::$inputEncoding = $charset; break;
+            case 'output_encoding': self::$outputEncoding = $charset; break;
+            case 'internal_encoding': self::$internalEncoding = $charset; break;
+
+            default: return false;
+        }
+
+        return true;
+    }
+
+    public static function iconv_mime_encode($fieldName, $fieldValue, $pref = null)
+    {
+        if (!\is_array($pref)) {
+            $pref = array();
+        }
+
+        $pref += array(
+            'scheme' => 'B',
+            'input-charset' => self::$internalEncoding,
+            'output-charset' => self::$internalEncoding,
+            'line-length' => 76,
+            'line-break-chars' => "\r\n",
+        );
+
+        if (preg_match('/[\x80-\xFF]/', $fieldName)) {
+            $fieldName = '';
+        }
+
+        $scheme = strtoupper(substr($pref['scheme'], 0, 1));
+        $in = strtolower($pref['input-charset']);
+        $out = strtolower($pref['output-charset']);
+
+        if ('utf-8' !== $in && false === $fieldValue = self::iconv($in, 'utf-8', $fieldValue)) {
+            return false;
+        }
+
+        preg_match_all('/./us', $fieldValue, $chars);
+
+        $chars = isset($chars[0]) ? $chars[0] : array();
+
+        $lineBreak = (int) $pref['line-length'];
+        $lineStart = "=?{$pref['output-charset']}?{$scheme}?";
+        $lineLength = \strlen($fieldName) + 2 + \strlen($lineStart) + 2;
+        $lineOffset = \strlen($lineStart) + 3;
+        $lineData = '';
+
+        $fieldValue = array();
+
+        $Q = 'Q' === $scheme;
+
+        foreach ($chars as $c) {
+            if ('utf-8' !== $out && false === $c = self::iconv('utf-8', $out, $c)) {
+                return false;
+            }
+
+            $o = $Q
+                ? $c = preg_replace_callback(
+                    '/[=_\?\x00-\x1F\x80-\xFF]/',
+                    array(__CLASS__, 'qpByteCallback'),
+                    $c
+                )
+                : base64_encode($lineData.$c);
+
+            if (isset($o[$lineBreak - $lineLength])) {
+                if (!$Q) {
+                    $lineData = base64_encode($lineData);
+                }
+                $fieldValue[] = $lineStart.$lineData.'?=';
+                $lineLength = $lineOffset;
+                $lineData = '';
+            }
+
+            $lineData .= $c;
+            $Q && $lineLength += \strlen($c);
+        }
+
+        if ('' !== $lineData) {
+            if (!$Q) {
+                $lineData = base64_encode($lineData);
+            }
+            $fieldValue[] = $lineStart.$lineData.'?=';
+        }
+
+        return $fieldName.': '.implode($pref['line-break-chars'].' ', $fieldValue);
+    }
+
+    public static function iconv_strlen($s, $encoding = null)
+    {
+        static $hasXml = null;
+        if (null === $hasXml) {
+            $hasXml = \extension_loaded('xml');
+        }
+
+        if ($hasXml) {
+            return self::strlen1($s, $encoding);
+        }
+
+        return self::strlen2($s, $encoding);
+    }
+
+    public static function strlen1($s, $encoding = null)
+    {
+        if (null === $encoding) {
+            $encoding = self::$internalEncoding;
+        }
+        if (0 !== stripos($encoding, 'utf-8') && false === $s = self::iconv($encoding, 'utf-8', $s)) {
+            return false;
+        }
+
+        return \strlen(utf8_decode($s));
+    }
+
+    public static function strlen2($s, $encoding = null)
+    {
+        if (null === $encoding) {
+            $encoding = self::$internalEncoding;
+        }
+        if (0 !== stripos($encoding, 'utf-8') && false === $s = self::iconv($encoding, 'utf-8', $s)) {
+            return false;
+        }
+
+        $ulenMask = self::$ulenMask;
+
+        $i = 0;
+        $j = 0;
+        $len = \strlen($s);
+
+        while ($i < $len) {
+            $u = $s[$i] & "\xF0";
+            $i += isset($ulenMask[$u]) ? $ulenMask[$u] : 1;
+            ++$j;
+        }
+
+        return $j;
+    }
+
+    public static function iconv_strpos($haystack, $needle, $offset = 0, $encoding = null)
+    {
+        if (null === $encoding) {
+            $encoding = self::$internalEncoding;
+        }
+
+        if (0 !== stripos($encoding, 'utf-8')) {
+            if (false === $haystack = self::iconv($encoding, 'utf-8', $haystack)) {
+                return false;
+            }
+            if (false === $needle = self::iconv($encoding, 'utf-8', $needle)) {
+                return false;
+            }
+        }
+
+        if ($offset = (int) $offset) {
+            $haystack = self::iconv_substr($haystack, $offset, 2147483647, 'utf-8');
+        }
+        $pos = strpos($haystack, $needle);
+
+        return false === $pos ? false : ($offset + ($pos ? self::iconv_strlen(substr($haystack, 0, $pos), 'utf-8') : 0));
+    }
+
+    public static function iconv_strrpos($haystack, $needle, $encoding = null)
+    {
+        if (null === $encoding) {
+            $encoding = self::$internalEncoding;
+        }
+
+        if (0 !== stripos($encoding, 'utf-8')) {
+            if (false === $haystack = self::iconv($encoding, 'utf-8', $haystack)) {
+                return false;
+            }
+            if (false === $needle = self::iconv($encoding, 'utf-8', $needle)) {
+                return false;
+            }
+        }
+
+        $pos = isset($needle[0]) ? strrpos($haystack, $needle) : false;
+
+        return false === $pos ? false : self::iconv_strlen($pos ? substr($haystack, 0, $pos) : $haystack, 'utf-8');
+    }
+
+    public static function iconv_substr($s, $start, $length = 2147483647, $encoding = null)
+    {
+        if (null === $encoding) {
+            $encoding = self::$internalEncoding;
+        }
+        if (0 !== stripos($encoding, 'utf-8')) {
+            $encoding = null;
+        } elseif (false === $s = self::iconv($encoding, 'utf-8', $s)) {
+            return false;
+        }
+
+        $s = (string) $s;
+        $slen = self::iconv_strlen($s, 'utf-8');
+        $start = (int) $start;
+
+        if (0 > $start) {
+            $start += $slen;
+        }
+        if (0 > $start) {
+            if (\PHP_VERSION_ID < 80000) {
+                return false;
+            }
+
+            $start = 0;
+        }
+        if ($start >= $slen) {
+            return \PHP_VERSION_ID >= 80000 ? '' : false;
+        }
+
+        $rx = $slen - $start;
+
+        if (0 > $length) {
+            $length += $rx;
+        }
+        if (0 === $length) {
+            return '';
+        }
+        if (0 > $length) {
+            return \PHP_VERSION_ID >= 80000 ? '' : false;
+        }
+
+        if ($length > $rx) {
+            $length = $rx;
+        }
+
+        $rx = '/^'.($start ? self::pregOffset($start) : '').'('.self::pregOffset($length).')/u';
+
+        $s = preg_match($rx, $s, $s) ? $s[1] : '';
+
+        if (null === $encoding) {
+            return $s;
+        }
+
+        return self::iconv('utf-8', $encoding, $s);
+    }
+
+    private static function loadMap($type, $charset, &$map)
+    {
+        if (!isset(self::$convertMap[$type.$charset])) {
+            if (false === $map = self::getData($type.$charset)) {
+                if ('to.' === $type && self::loadMap('from.', $charset, $map)) {
+                    $map = array_flip($map);
+                } else {
+                    return false;
+                }
+            }
+
+            self::$convertMap[$type.$charset] = $map;
+        } else {
+            $map = self::$convertMap[$type.$charset];
+        }
+
+        return true;
+    }
+
+    private static function utf8ToUtf8($str, $ignore)
+    {
+        $ulenMask = self::$ulenMask;
+        $valid = self::$isValidUtf8;
+
+        $u = $str;
+        $i = $j = 0;
+        $len = \strlen($str);
+
+        while ($i < $len) {
+            if ($str[$i] < "\x80") {
+                $u[$j++] = $str[$i++];
+            } else {
+                $ulen = $str[$i] & "\xF0";
+                $ulen = isset($ulenMask[$ulen]) ? $ulenMask[$ulen] : 1;
+                $uchr = substr($str, $i, $ulen);
+
+                if (1 === $ulen || !($valid || preg_match('/^.$/us', $uchr))) {
+                    if ($ignore) {
+                        ++$i;
+                        continue;
+                    }
+
+                    trigger_error(self::ERROR_ILLEGAL_CHARACTER);
+
+                    return false;
+                } else {
+                    $i += $ulen;
+                }
+
+                $u[$j++] = $uchr[0];
+
+                isset($uchr[1]) && 0 !== ($u[$j++] = $uchr[1])
+                    && isset($uchr[2]) && 0 !== ($u[$j++] = $uchr[2])
+                    && isset($uchr[3]) && 0 !== ($u[$j++] = $uchr[3]);
+            }
+        }
+
+        return substr($u, 0, $j);
+    }
+
+    private static function mapToUtf8(&$result, array $map, $str, $ignore)
+    {
+        $len = \strlen($str);
+        for ($i = 0; $i < $len; ++$i) {
+            if (isset($str[$i + 1], $map[$str[$i].$str[$i + 1]])) {
+                $result .= $map[$str[$i].$str[++$i]];
+            } elseif (isset($map[$str[$i]])) {
+                $result .= $map[$str[$i]];
+            } elseif (!$ignore) {
+                trigger_error(self::ERROR_ILLEGAL_CHARACTER);
+
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private static function mapFromUtf8(&$result, array $map, $str, $ignore, $translit)
+    {
+        $ulenMask = self::$ulenMask;
+        $valid = self::$isValidUtf8;
+
+        if ($translit && !self::$translitMap) {
+            self::$translitMap = self::getData('translit');
+        }
+
+        $i = 0;
+        $len = \strlen($str);
+
+        while ($i < $len) {
+            if ($str[$i] < "\x80") {
+                $uchr = $str[$i++];
+            } else {
+                $ulen = $str[$i] & "\xF0";
+                $ulen = isset($ulenMask[$ulen]) ? $ulenMask[$ulen] : 1;
+                $uchr = substr($str, $i, $ulen);
+
+                if ($ignore && (1 === $ulen || !($valid || preg_match('/^.$/us', $uchr)))) {
+                    ++$i;
+                    continue;
+                } else {
+                    $i += $ulen;
+                }
+            }
+
+            if (isset($map[$uchr])) {
+                $result .= $map[$uchr];
+            } elseif ($translit) {
+                if (isset(self::$translitMap[$uchr])) {
+                    $uchr = self::$translitMap[$uchr];
+                } elseif ($uchr >= "\xC3\x80") {
+                    $uchr = \Normalizer::normalize($uchr, \Normalizer::NFD);
+
+                    if ($uchr[0] < "\x80") {
+                        $uchr = $uchr[0];
+                    } elseif ($ignore) {
+                        continue;
+                    } else {
+                        return false;
+                    }
+                } elseif ($ignore) {
+                    continue;
+                } else {
+                    return false;
+                }
+
+                $str = $uchr.substr($str, $i);
+                $len = \strlen($str);
+                $i = 0;
+            } elseif (!$ignore) {
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    private static function qpByteCallback(array $m)
+    {
+        return '='.strtoupper(dechex(\ord($m[0])));
+    }
+
+    private static function pregOffset($offset)
+    {
+        $rx = array();
+        $offset = (int) $offset;
+
+        while ($offset > 65535) {
+            $rx[] = '.{65535}';
+            $offset -= 65535;
+        }
+
+        return implode('', $rx).'.{'.$offset.'}';
+    }
+
+    private static function getData($file)
+    {
+        if (file_exists($file = __DIR__.'/Resources/charset/'.$file.'.php')) {
+            return require $file;
+        }
+
+        return false;
+    }
+}
diff --git a/lib/symfony/polyfill-iconv/LICENSE b/lib/symfony/polyfill-iconv/LICENSE
new file mode 100644
index 000000000..4cd8bdd30
--- /dev/null
+++ b/lib/symfony/polyfill-iconv/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2015-2019 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/lib/symfony/polyfill-iconv/README.md b/lib/symfony/polyfill-iconv/README.md
new file mode 100644
index 000000000..b0c8984cd
--- /dev/null
+++ b/lib/symfony/polyfill-iconv/README.md
@@ -0,0 +1,14 @@
+Symfony Polyfill / Iconv
+========================
+
+This component provides a native PHP implementation of the
+[php.net/iconv](https://php.net/iconv) functions
+(short of [`ob_iconv_handler`](https://php.net/ob-iconv-handler)).
+
+More information can be found in the
+[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
+
+License
+=======
+
+This library is released under the [MIT license](LICENSE).
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.big5.php b/lib/symfony/polyfill-iconv/Resources/charset/from.big5.php
new file mode 100644
index 000000000..b11985494
--- /dev/null
+++ b/lib/symfony/polyfill-iconv/Resources/charset/from.big5.php
@@ -0,0 +1,13719 @@
+<?php
+
+static $data = array (
+  '¡@' => '　',
+  '¡A' => '，',
+  '¡B' => 'ã€�',
+  '¡C' => '。',
+  '¡D' => '．',
+  '¡E' => '•',
+  '¡F' => 'ï¼›',
+  '¡G' => '：',
+  '¡H' => '？',
+  '¡I' => 'ï¼�',
+  '¡J' => '︰',
+  '¡K' => '…',
+  '¡L' => '‥',
+  '¡M' => 'ï¹�',
+  '¡N' => '､',
+  '¡O' => 'ï¹’',
+  '¡P' => '·',
+  '¡Q' => 'ï¹”',
+  '¡R' => '﹕',
+  '¡S' => 'ï¹–',
+  '¡T' => 'ï¹—',
+  '¡U' => '｜',
+  '¡V' => '–',
+  '¡W' => '︱',
+  '¡X' => '—',
+  '¡Y' => '︳',
+  '¡Z' => '�',
+  '¡[' => '︴',
+  '¡\\' => 'ï¹�',
+  '¡]' => '（',
+  '¡^' => '）',
+  '¡_' => '︵',
+  '¡`' => '︶',
+  '¡a' => 'ï½›',
+  '¡b' => 'ï½�',
+  '¡c' => '︷',
+  '¡d' => '︸',
+  '¡e' => '〔',
+  '¡f' => '〕',
+  '¡g' => '︹',
+  '¡h' => '︺',
+  '¡i' => 'ã€�',
+  '¡j' => '】',
+  '¡k' => '︻',
+  '¡l' => '︼',
+  '¡m' => '《',
+  '¡n' => '》',
+  '¡o' => '︽',
+  '¡p' => '︾',
+  '¡q' => '〈',
+  '¡r' => '〉',
+  '¡s' => '︿',
+  '¡t' => 'ï¹€',
+  '¡u' => '「',
+  '¡v' => 'ã€�',
+  '¡w' => 'ï¹�',
+  '¡x' => '﹂',
+  '¡y' => '『',
+  '¡z' => 'ã€�',
+  '¡{' => '﹃',
+  '¡|' => '﹄',
+  '¡}' => 'ï¹™',
+  '¡~' => '﹚',
+  '¡¡' => 'ï¹›',
+  '¡¢' => '﹜',
+  '¡£' => 'ï¹�',
+  '¡¤' => '﹞',
+  '¡¥' => '‘',
+  '¡¦' => '’',
+  '¡§' => '“',
+  '¡¨' => 'â€�',
+  '¡©' => 'ã€�',
+  '¡ª' => '〞',
+  '¡«' => '‵',
+  '¡¬' => '′',
+  '¡­' => '＃',
+  '¡®' => '＆',
+  '¡¯' => '＊',
+  '¡°' => '※',
+  '¡±' => '§',
+  '¡²' => '〃',
+  '¡³' => 'â—‹',
+  '¡´' => 'â—�',
+  '¡µ' => 'â–³',
+  '¡¶' => 'â–²',
+  '¡·' => 'â—Ž',
+  '¡¸' => '☆',
+  '¡¹' => '★',
+  '¡º' => 'â—‡',
+  '¡»' => 'â—†',
+  '¡¼' => 'â–¡',
+  '¡½' => 'â– ',
+  '¡¾' => 'â–½',
+  '¡¿' => 'â–¼',
+  '¡À' => '㊣',
+  '¡Á' => 'â„…',
+  '¡Â' => '‾',
+  '¡Ã' => '�',
+  '¡Ä' => '＿',
+  '¡Å' => '�',
+  '¡Æ' => '﹉',
+  '¡Ç' => '﹊',
+  '¡È' => 'ï¹�',
+  '¡É' => '﹎',
+  '¡Ê' => '﹋',
+  '¡Ë' => '﹌',
+  '¡Ì' => '﹟',
+  '¡Í' => 'ï¹ ',
+  '¡Î' => '﹡',
+  '¡Ï' => '＋',
+  '¡Ð' => 'ï¼�',
+  '¡Ñ' => '×',
+  '¡Ò' => '÷',
+  '¡Ó' => '±',
+  '¡Ô' => '√',
+  '¡Õ' => '＜',
+  '¡Ö' => '＞',
+  '¡×' => 'ï¼�',
+  '¡Ø' => '≦',
+  '¡Ù' => '≧',
+  '¡Ú' => '≠',
+  '¡Û' => '∞',
+  '¡Ü' => '≒',
+  '¡Ý' => '≡',
+  '¡Þ' => 'ï¹¢',
+  '¡ß' => 'ï¹£',
+  '¡à' => '﹤',
+  '¡á' => 'ï¹¥',
+  '¡â' => '﹦',
+  '¡ã' => '∼',
+  '¡ä' => '∩',
+  '¡å' => '∪',
+  '¡æ' => '⊥',
+  '¡ç' => '∠',
+  '¡è' => '∟',
+  '¡é' => '⊿',
+  '¡ê' => 'ã�’',
+  '¡ë' => 'ã�‘',
+  '¡ì' => '∫',
+  '¡í' => '∮',
+  '¡î' => '∵',
+  '¡ï' => '∴',
+  '¡ð' => '♀',
+  '¡ñ' => '♂',
+  '¡ò' => 'â™�',
+  '¡ó' => '☉',
+  '¡ô' => '↑',
+  '¡õ' => '↓',
+  '¡ö' => 'â†�',
+  '¡÷' => '→',
+  '¡ø' => '↖',
+  '¡ù' => '↗',
+  '¡ú' => '↙',
+  '¡û' => '↘',
+  '¡ü' => '∥',
+  '¡ý' => '∣',
+  '¡þ' => '�',
+  '¢@' => '�',
+  '¢A' => 'ï¼�',
+  '¢B' => 'ï¼¼',
+  '¢C' => '＄',
+  '¢D' => 'Â¥',
+  '¢E' => '〒',
+  '¢F' => '¢',
+  '¢G' => '£',
+  '¢H' => 'ï¼…',
+  '¢I' => 'ï¼ ',
+  '¢J' => '℃',
+  '¢K' => '℉',
+  '¢L' => '﹩',
+  '¢M' => '﹪',
+  '¢N' => '﹫',
+  '¢O' => 'ã�•',
+  '¢P' => '㎜',
+  '¢Q' => 'ãŽ�',
+  '¢R' => '㎞',
+  '¢S' => 'ã�Ž',
+  '¢T' => '㎡',
+  '¢U' => '㎎',
+  '¢V' => 'ãŽ�',
+  '¢W' => 'ã�„',
+  '¢X' => '°',
+  '¢Y' => 'å…™',
+  '¢Z' => 'å…›',
+  '¢[' => 'å…ž',
+  '¢\\' => 'å…�',
+  '¢]' => 'å…¡',
+  '¢^' => 'å…£',
+  '¢_' => 'å—§',
+  '¢`' => 'ç“©',
+  '¢a' => '糎',
+  '¢b' => 'â–�',
+  '¢c' => 'â–‚',
+  '¢d' => 'â–ƒ',
+  '¢e' => 'â–„',
+  '¢f' => 'â–…',
+  '¢g' => 'â–†',
+  '¢h' => 'â–‡',
+  '¢i' => 'â–ˆ',
+  '¢j' => 'â–�',
+  '¢k' => 'â–Ž',
+  '¢l' => 'â–�',
+  '¢m' => 'â–Œ',
+  '¢n' => 'â–‹',
+  '¢o' => 'â–Š',
+  '¢p' => 'â–‰',
+  '¢q' => '┼',
+  '¢r' => 'â”´',
+  '¢s' => '┬',
+  '¢t' => '┤',
+  '¢u' => '├',
+  '¢v' => 'â–”',
+  '¢w' => '─',
+  '¢x' => '│',
+  '¢y' => 'â–•',
+  '¢z' => '┌',
+  '¢{' => 'â”�',
+  '¢|' => 'â””',
+  '¢}' => '┘',
+  '¢~' => 'â•­',
+  '¢¡' => 'â•®',
+  '¢¢' => 'â•°',
+  '¢£' => '╯',
+  '¢¤' => 'â•�',
+  '¢¥' => 'â•ž',
+  '¢¦' => '╪',
+  '¢§' => 'â•¡',
+  '¢¨' => 'â—¢',
+  '¢©' => 'â—£',
+  '¢ª' => 'â—¥',
+  '¢«' => 'â—¤',
+  '¢¬' => '╱',
+  '¢­' => '╲',
+  '¢®' => '╳',
+  '¢¯' => 'ï¼�',
+  '¢°' => '１',
+  '¢±' => 'ï¼’',
+  '¢²' => '３',
+  '¢³' => 'ï¼”',
+  '¢´' => '５',
+  '¢µ' => 'ï¼–',
+  '¢¶' => 'ï¼—',
+  '¢·' => '８',
+  '¢¸' => 'ï¼™',
+  '¢¹' => 'â… ',
+  '¢º' => 'â…¡',
+  '¢»' => 'â…¢',
+  '¢¼' => 'â…£',
+  '¢½' => 'â…¤',
+  '¢¾' => 'â…¥',
+  '¢¿' => 'â…¦',
+  '¢À' => 'â…§',
+  '¢Á' => 'â…¨',
+  '¢Â' => 'â…©',
+  '¢Ã' => '〡',
+  '¢Ä' => '〢',
+  '¢Å' => '〣',
+  '¢Æ' => '〤',
+  '¢Ç' => '〥',
+  '¢È' => '〦',
+  '¢É' => '〧',
+  '¢Ê' => '〨',
+  '¢Ë' => '〩',
+  '¢Ì' => '�',
+  '¢Í' => 'å�„',
+  '¢Î' => '�',
+  '¢Ï' => 'Ａ',
+  '¢Ð' => 'ï¼¢',
+  '¢Ñ' => 'ï¼£',
+  '¢Ò' => 'Ｄ',
+  '¢Ó' => 'ï¼¥',
+  '¢Ô' => 'Ｆ',
+  '¢Õ' => 'Ｇ',
+  '¢Ö' => 'Ｈ',
+  '¢×' => 'Ｉ',
+  '¢Ø' => 'Ｊ',
+  '¢Ù' => 'Ｋ',
+  '¢Ú' => 'Ｌ',
+  '¢Û' => 'ï¼­',
+  '¢Ü' => 'ï¼®',
+  '¢Ý' => 'Ｏ',
+  '¢Þ' => 'ï¼°',
+  '¢ß' => 'ï¼±',
+  '¢à' => 'ï¼²',
+  '¢á' => 'ï¼³',
+  '¢â' => 'ï¼´',
+  '¢ã' => 'ï¼µ',
+  '¢ä' => 'Ｖ',
+  '¢å' => 'ï¼·',
+  '¢æ' => 'Ｘ',
+  '¢ç' => 'ï¼¹',
+  '¢è' => 'Ｚ',
+  '¢é' => 'ï½�',
+  '¢ê' => 'ｂ',
+  '¢ë' => 'ｃ',
+  '¢ì' => 'ｄ',
+  '¢í' => 'ï½…',
+  '¢î' => 'ｆ',
+  '¢ï' => 'ｇ',
+  '¢ð' => 'ｈ',
+  '¢ñ' => 'ｉ',
+  '¢ò' => 'ｊ',
+  '¢ó' => 'ｋ',
+  '¢ô' => 'ｌ',
+  '¢õ' => 'ï½�',
+  '¢ö' => 'ｎ',
+  '¢÷' => 'ï½�',
+  '¢ø' => 'ï½�',
+  '¢ù' => 'ｑ',
+  '¢ú' => 'ï½’',
+  '¢û' => 'ｓ',
+  '¢ü' => 'ï½”',
+  '¢ý' => 'ｕ',
+  '¢þ' => 'ï½–',
+  '£@' => 'ï½—',
+  '£A' => 'ｘ',
+  '£B' => 'ï½™',
+  '£C' => 'ｚ',
+  '£D' => 'Α',
+  '£E' => 'Î’',
+  '£F' => 'Γ',
+  '£G' => 'Δ',
+  '£H' => 'Ε',
+  '£I' => 'Ζ',
+  '£J' => 'Η',
+  '£K' => 'Θ',
+  '£L' => 'Ι',
+  '£M' => 'Κ',
+  '£N' => 'Λ',
+  '£O' => 'Îœ',
+  '£P' => 'Î�',
+  '£Q' => 'Ξ',
+  '£R' => 'Ο',
+  '£S' => 'Π',
+  '£T' => 'Ρ',
+  '£U' => 'Σ',
+  '£V' => 'Τ',
+  '£W' => 'Î¥',
+  '£X' => 'Φ',
+  '£Y' => 'Χ',
+  '£Z' => 'Ψ',
+  '£[' => 'Ω',
+  '£\\' => 'α',
+  '£]' => 'β',
+  '£^' => 'γ',
+  '£_' => 'δ',
+  '£`' => 'ε',
+  '£a' => 'ζ',
+  '£b' => 'η',
+  '£c' => 'θ',
+  '£d' => 'ι',
+  '£e' => 'κ',
+  '£f' => 'λ',
+  '£g' => 'μ',
+  '£h' => 'ν',
+  '£i' => 'ξ',
+  '£j' => 'ο',
+  '£k' => 'Ï€',
+  '£l' => 'Ï�',
+  '£m' => 'σ',
+  '£n' => 'Ï„',
+  '£o' => 'Ï…',
+  '£p' => 'φ',
+  '£q' => 'χ',
+  '£r' => 'ψ',
+  '£s' => 'ω',
+  '£t' => 'ã„…',
+  '£u' => 'ㄆ',
+  '£v' => 'ㄇ',
+  '£w' => 'ㄈ',
+  '£x' => 'ㄉ',
+  '£y' => 'ã„Š',
+  '£z' => 'ã„‹',
+  '£{' => 'ã„Œ',
+  '£|' => 'ã„�',
+  '£}' => 'ã„Ž',
+  '£~' => 'ã„�',
+  '£¡' => 'ã„�',
+  '£¢' => 'ã„‘',
+  '££' => 'ã„’',
+  '£¤' => 'ã„“',
+  '£¥' => 'ã„”',
+  '£¦' => 'ã„•',
+  '£§' => 'ã„–',
+  '£¨' => 'ã„—',
+  '£©' => 'ㄘ',
+  '£ª' => 'ã„™',
+  '£«' => 'ã„š',
+  '£¬' => 'ã„›',
+  '£­' => 'ã„œ',
+  '£®' => 'ã„�',
+  '£¯' => 'ã„ž',
+  '£°' => 'ã„Ÿ',
+  '£±' => 'ã„ ',
+  '£²' => 'ã„¡',
+  '£³' => 'ã„¢',
+  '£´' => 'ã„£',
+  '£µ' => 'ㄤ',
+  '£¶' => 'ã„¥',
+  '£·' => 'ㄦ',
+  '£¸' => 'ㄧ',
+  '£¹' => 'ㄨ',
+  '£º' => 'ã„©',
+  '£»' => 'Ë™',
+  '£¼' => 'ˉ',
+  '£½' => 'ËŠ',
+  '£¾' => 'ˇ',
+  '£¿' => 'Ë‹',
+  '¤@' => '一',
+  '¤A' => 'ä¹™',
+  '¤B' => 'ä¸�',
+  '¤C' => '七',
+  '¤D' => '乃',
+  '¤E' => 'ä¹�',
+  '¤F' => '了',
+  '¤G' => '二',
+  '¤H' => '人',
+  '¤I' => 'å„¿',
+  '¤J' => 'å…¥',
+  '¤K' => 'å…«',
+  '¤L' => '几',
+  '¤M' => '刀',
+  '¤N' => 'åˆ�',
+  '¤O' => '力',
+  '¤P' => '匕',
+  '¤Q' => 'å��',
+  '¤R' => 'å�œ',
+  '¤S' => 'å�ˆ',
+  '¤T' => '三',
+  '¤U' => '下',
+  '¤V' => '丈',
+  '¤W' => '上',
+  '¤X' => '丫',
+  '¤Y' => '丸',
+  '¤Z' => '凡',
+  '¤[' => 'ä¹…',
+  '¤\\' => '么',
+  '¤]' => '也',
+  '¤^' => '乞',
+  '¤_' => '于',
+  '¤`' => '亡',
+  '¤a' => 'å…€',
+  '¤b' => '刃',
+  '¤c' => '勺',
+  '¤d' => 'å�ƒ',
+  '¤e' => 'å�‰',
+  '¤f' => 'å�£',
+  '¤g' => '土',
+  '¤h' => '士',
+  '¤i' => '夕',
+  '¤j' => '大',
+  '¤k' => '女',
+  '¤l' => 'å­�',
+  '¤m' => 'å­‘',
+  '¤n' => 'å­“',
+  '¤o' => '寸',
+  '¤p' => 'å°�',
+  '¤q' => 'å°¢',
+  '¤r' => 'å°¸',
+  '¤s' => 'å±±',
+  '¤t' => 'å·�',
+  '¤u' => 'å·¥',
+  '¤v' => 'å·±',
+  '¤w' => 'å·²',
+  '¤x' => 'å·³',
+  '¤y' => 'å·¾',
+  '¤z' => 'å¹²',
+  '¤{' => '廾',
+  '¤|' => '弋',
+  '¤}' => '弓',
+  '¤~' => 'æ‰�',
+  '¤¡' => '丑',
+  '¤¢' => 'ä¸�',
+  '¤£' => 'ä¸�',
+  '¤¤' => '中',
+  '¤¥' => '丰',
+  '¤¦' => '丹',
+  '¤§' => '之',
+  '¤¨' => 'å°¹',
+  '¤©' => '予',
+  '¤ª' => '云',
+  '¤«' => '井',
+  '¤¬' => '互',
+  '¤­' => '五',
+  '¤®' => '亢',
+  '¤¯' => 'ä»�',
+  '¤°' => '什',
+  '¤±' => '仃',
+  '¤²' => '仆',
+  '¤³' => '仇',
+  '¤´' => 'ä»�',
+  '¤µ' => '今',
+  '¤¶' => '介',
+  '¤·' => '仄',
+  '¤¸' => 'å…ƒ',
+  '¤¹' => 'å…�',
+  '¤º' => 'å…§',
+  '¤»' => 'å…­',
+  '¤¼' => 'å…®',
+  '¤½' => 'å…¬',
+  '¤¾' => '冗',
+  '¤¿' => '凶',
+  '¤À' => '分',
+  '¤Á' => '切',
+  '¤Â' => '刈',
+  '¤Ã' => 'å‹»',
+  '¤Ä' => '勾',
+  '¤Å' => 'å‹¿',
+  '¤Æ' => '化',
+  '¤Ç' => '匹',
+  '¤È' => 'å�ˆ',
+  '¤É' => 'å�‡',
+  '¤Ê' => 'å�…',
+  '¤Ë' => 'å�ž',
+  '¤Ì' => '厄',
+  '¤Í' => 'å�‹',
+  '¤Î' => 'å�Š',
+  '¤Ï' => 'å��',
+  '¤Ð' => '壬',
+  '¤Ñ' => '天',
+  '¤Ò' => '夫',
+  '¤Ó' => '太',
+  '¤Ô' => '夭',
+  '¤Õ' => 'å­”',
+  '¤Ö' => 'å°‘',
+  '¤×' => 'å°¤',
+  '¤Ø' => 'å°º',
+  '¤Ù' => '屯',
+  '¤Ú' => 'å·´',
+  '¤Û' => 'å¹»',
+  '¤Ü' => '廿',
+  '¤Ý' => 'å¼”',
+  '¤Þ' => '引',
+  '¤ß' => '心',
+  '¤à' => '戈',
+  '¤á' => '戶',
+  '¤â' => '手',
+  '¤ã' => '扎',
+  '¤ä' => '支',
+  '¤å' => 'æ–‡',
+  '¤æ' => 'æ–—',
+  '¤ç' => 'æ–¤',
+  '¤è' => 'æ–¹',
+  '¤é' => 'æ—¥',
+  '¤ê' => 'æ›°',
+  '¤ë' => '月',
+  '¤ì' => '木',
+  '¤í' => '欠',
+  '¤î' => 'æ­¢',
+  '¤ï' => 'æ­¹',
+  '¤ð' => '毋',
+  '¤ñ' => '比',
+  '¤ò' => '毛',
+  '¤ó' => 'æ°�',
+  '¤ô' => 'æ°´',
+  '¤õ' => 'ç�«',
+  '¤ö' => '爪',
+  '¤÷' => '父',
+  '¤ø' => '爻',
+  '¤ù' => '片',
+  '¤ú' => '牙',
+  '¤û' => '牛',
+  '¤ü' => '犬',
+  '¤ý' => '王',
+  '¤þ' => '丙',
+  '¥@' => '世',
+  '¥A' => '丕',
+  '¥B' => '且',
+  '¥C' => '丘',
+  '¥D' => '主',
+  '¥E' => 'ä¹�',
+  '¥F' => 'ä¹�',
+  '¥G' => '乎',
+  '¥H' => '以',
+  '¥I' => '付',
+  '¥J' => 'ä»”',
+  '¥K' => '仕',
+  '¥L' => 'ä»–',
+  '¥M' => 'ä»—',
+  '¥N' => '代',
+  '¥O' => '令',
+  '¥P' => 'ä»™',
+  '¥Q' => '仞',
+  '¥R' => 'å……',
+  '¥S' => 'å…„',
+  '¥T' => '冉',
+  '¥U' => '冊',
+  '¥V' => '冬',
+  '¥W' => '凹',
+  '¥X' => '出',
+  '¥Y' => '凸',
+  '¥Z' => '刊',
+  '¥[' => '加',
+  '¥\\' => '功',
+  '¥]' => '包',
+  '¥^' => '匆',
+  '¥_' => '北',
+  '¥`' => 'åŒ�',
+  '¥a' => '仟',
+  '¥b' => 'å�Š',
+  '¥c' => 'å�‰',
+  '¥d' => 'å�¡',
+  '¥e' => 'å� ',
+  '¥f' => 'å�¯',
+  '¥g' => 'å�®',
+  '¥h' => '去',
+  '¥i' => 'å�¯',
+  '¥j' => 'å�¤',
+  '¥k' => 'å�³',
+  '¥l' => 'å�¬',
+  '¥m' => 'å�®',
+  '¥n' => 'å�©',
+  '¥o' => 'å�¨',
+  '¥p' => 'å�¼',
+  '¥q' => 'å�¸',
+  '¥r' => 'å�µ',
+  '¥s' => 'å�«',
+  '¥t' => 'å�¦',
+  '¥u' => 'å�ª',
+  '¥v' => 'å�²',
+  '¥w' => 'å�±',
+  '¥x' => 'å�°',
+  '¥y' => 'å�¥',
+  '¥z' => 'å�­',
+  '¥{' => 'å�»',
+  '¥|' => 'å››',
+  '¥}' => '囚',
+  '¥~' => '外',
+  '¥¡' => '央',
+  '¥¢' => '失',
+  '¥£' => '奴',
+  '¥¤' => '奶',
+  '¥¥' => 'å­•',
+  '¥¦' => '它',
+  '¥§' => 'å°¼',
+  '¥¨' => 'å·¨',
+  '¥©' => 'å·§',
+  '¥ª' => 'å·¦',
+  '¥«' => '市',
+  '¥¬' => '布',
+  '¥­' => 'å¹³',
+  '¥®' => 'å¹¼',
+  '¥¯' => 'å¼�',
+  '¥°' => '弘',
+  '¥±' => 'å¼—',
+  '¥²' => 'å¿…',
+  '¥³' => '戊',
+  '¥´' => '打',
+  '¥µ' => '扔',
+  '¥¶' => '扒',
+  '¥·' => '扑',
+  '¥¸' => 'æ–¥',
+  '¥¹' => 'æ—¦',
+  '¥º' => '朮',
+  '¥»' => '本',
+  '¥¼' => '未',
+  '¥½' => '末',
+  '¥¾' => '札',
+  '¥¿' => 'æ­£',
+  '¥À' => 'æ¯�',
+  '¥Á' => 'æ°‘',
+  '¥Â' => 'æ°�',
+  '¥Ã' => 'æ°¸',
+  '¥Ä' => 'æ±�',
+  '¥Å' => 'æ±€',
+  '¥Æ' => 'æ°¾',
+  '¥Ç' => '犯',
+  '¥È' => '玄',
+  '¥É' => '玉',
+  '¥Ê' => 'ç“œ',
+  '¥Ë' => '瓦',
+  '¥Ì' => '甘',
+  '¥Í' => '生',
+  '¥Î' => '用',
+  '¥Ï' => '甩',
+  '¥Ð' => 'ç”°',
+  '¥Ñ' => 'ç”±',
+  '¥Ò' => '甲',
+  '¥Ó' => '申',
+  '¥Ô' => 'ç–‹',
+  '¥Õ' => '白',
+  '¥Ö' => 'çš®',
+  '¥×' => 'çš¿',
+  '¥Ø' => 'ç›®',
+  '¥Ù' => '矛',
+  '¥Ú' => '矢',
+  '¥Û' => '石',
+  '¥Ü' => '示',
+  '¥Ý' => '禾',
+  '¥Þ' => 'ç©´',
+  '¥ß' => 'ç«‹',
+  '¥à' => '丞',
+  '¥á' => '丟',
+  '¥â' => 'ä¹’',
+  '¥ã' => '乓',
+  '¥ä' => '乩',
+  '¥å' => '亙',
+  '¥æ' => '交',
+  '¥ç' => '亦',
+  '¥è' => '亥',
+  '¥é' => '仿',
+  '¥ê' => '伉',
+  '¥ë' => 'ä¼™',
+  '¥ì' => '伊',
+  '¥í' => '伕',
+  '¥î' => 'ä¼�',
+  '¥ï' => 'ä¼�',
+  '¥ð' => '休',
+  '¥ñ' => 'ä¼�',
+  '¥ò' => '仲',
+  '¥ó' => '件',
+  '¥ô' => 'ä»»',
+  '¥õ' => 'ä»°',
+  '¥ö' => '仳',
+  '¥÷' => '份',
+  '¥ø' => 'ä¼�',
+  '¥ù' => '伋',
+  '¥ú' => 'å…‰',
+  '¥û' => 'å…‡',
+  '¥ü' => 'å…†',
+  '¥ý' => 'å…ˆ',
+  '¥þ' => 'å…¨',
+  '¦@' => 'å…±',
+  '¦A' => 'å†�',
+  '¦B' => '冰',
+  '¦C' => '列',
+  '¦D' => '刑',
+  '¦E' => '划',
+  '¦F' => '刎',
+  '¦G' => '刖',
+  '¦H' => '劣',
+  '¦I' => '匈',
+  '¦J' => '匡',
+  '¦K' => '匠',
+  '¦L' => 'å�°',
+  '¦M' => 'å�±',
+  '¦N' => 'å�‰',
+  '¦O' => 'å��',
+  '¦P' => 'å�Œ',
+  '¦Q' => 'å�Š',
+  '¦R' => 'å��',
+  '¦S' => 'å��',
+  '¦T' => 'å�‹',
+  '¦U' => 'å�„',
+  '¦V' => 'å�‘',
+  '¦W' => 'å��',
+  '¦X' => 'å�ˆ',
+  '¦Y' => 'å�ƒ',
+  '¦Z' => 'å�Ž',
+  '¦[' => 'å�†',
+  '¦\\' => 'å�’',
+  '¦]' => 'å› ',
+  '¦^' => '回',
+  '¦_' => 'å›�',
+  '¦`' => '圳',
+  '¦a' => '地',
+  '¦b' => '在',
+  '¦c' => '圭',
+  '¦d' => '圬',
+  '¦e' => '圯',
+  '¦f' => '圩',
+  '¦g' => '夙',
+  '¦h' => '多',
+  '¦i' => '夷',
+  '¦j' => '夸',
+  '¦k' => '妄',
+  '¦l' => '奸',
+  '¦m' => '妃',
+  '¦n' => '好',
+  '¦o' => '她',
+  '¦p' => '如',
+  '¦q' => 'å¦�',
+  '¦r' => 'å­—',
+  '¦s' => 'å­˜',
+  '¦t' => '宇',
+  '¦u' => '守',
+  '¦v' => 'å®…',
+  '¦w' => '安',
+  '¦x' => '寺',
+  '¦y' => 'å°–',
+  '¦z' => 'å±¹',
+  '¦{' => 'å·ž',
+  '¦|' => '帆',
+  '¦}' => '并',
+  '¦~' => 'å¹´',
+  '¦¡' => 'å¼�',
+  '¦¢' => 'å¼›',
+  '¦£' => 'å¿™',
+  '¦¤' => 'å¿–',
+  '¦¥' => '戎',
+  '¦¦' => '戌',
+  '¦§' => 'æˆ�',
+  '¦¨' => 'æˆ�',
+  '¦©' => '扣',
+  '¦ª' => '扛',
+  '¦«' => '托',
+  '¦¬' => '收',
+  '¦­' => 'æ—©',
+  '¦®' => 'æ—¨',
+  '¦¯' => 'æ—¬',
+  '¦°' => 'æ—­',
+  '¦±' => '曲',
+  '¦²' => '曳',
+  '¦³' => '有',
+  '¦´' => '朽',
+  '¦µ' => '朴',
+  '¦¶' => '朱',
+  '¦·' => '朵',
+  '¦¸' => '次',
+  '¦¹' => 'æ­¤',
+  '¦º' => 'æ­»',
+  '¦»' => 'æ°–',
+  '¦¼' => 'æ±�',
+  '¦½' => 'æ±—',
+  '¦¾' => 'æ±™',
+  '¦¿' => '江',
+  '¦À' => 'æ± ',
+  '¦Á' => 'æ±�',
+  '¦Â' => '汕',
+  '¦Ã' => '污',
+  '¦Ä' => 'æ±›',
+  '¦Å' => 'æ±�',
+  '¦Æ' => '汎',
+  '¦Ç' => 'ç�°',
+  '¦È' => '牟',
+  '¦É' => 'ç‰�',
+  '¦Ê' => '百',
+  '¦Ë' => '竹',
+  '¦Ì' => 'ç±³',
+  '¦Í' => '糸',
+  '¦Î' => '缶',
+  '¦Ï' => '羊',
+  '¦Ð' => 'ç¾½',
+  '¦Ñ' => 'è€�',
+  '¦Ò' => '考',
+  '¦Ó' => '而',
+  '¦Ô' => '耒',
+  '¦Õ' => '耳',
+  '¦Ö' => 'è�¿',
+  '¦×' => '肉',
+  '¦Ø' => 'è‚‹',
+  '¦Ù' => 'è‚Œ',
+  '¦Ú' => '臣',
+  '¦Û' => '自',
+  '¦Ü' => '至',
+  '¦Ý' => '臼',
+  '¦Þ' => '舌',
+  '¦ß' => '舛',
+  '¦à' => '舟',
+  '¦á' => '艮',
+  '¦â' => '色',
+  '¦ã' => '艾',
+  '¦ä' => '虫',
+  '¦å' => 'è¡€',
+  '¦æ' => 'è¡Œ',
+  '¦ç' => 'è¡£',
+  '¦è' => '西',
+  '¦é' => '阡',
+  '¦ê' => '串',
+  '¦ë' => '亨',
+  '¦ì' => 'ä½�',
+  '¦í' => 'ä½�',
+  '¦î' => '佇',
+  '¦ï' => 'ä½—',
+  '¦ð' => '佞',
+  '¦ñ' => 'ä¼´',
+  '¦ò' => 'ä½›',
+  '¦ó' => '何',
+  '¦ô' => 'ä¼°',
+  '¦õ' => 'ä½�',
+  '¦ö' => '佑',
+  '¦÷' => 'ä¼½',
+  '¦ø' => '伺',
+  '¦ù' => '伸',
+  '¦ú' => '佃',
+  '¦û' => 'ä½”',
+  '¦ü' => 'ä¼¼',
+  '¦ý' => '但',
+  '¦þ' => 'ä½£',
+  '§@' => '作',
+  '§A' => 'ä½ ',
+  '§B' => '伯',
+  '§C' => '低',
+  '§D' => '伶',
+  '§E' => 'ä½™',
+  '§F' => 'ä½�',
+  '§G' => '佈',
+  '§H' => '佚',
+  '§I' => 'å…Œ',
+  '§J' => 'å…‹',
+  '§K' => 'å…�',
+  '§L' => 'å…µ',
+  '§M' => '冶',
+  '§N' => '冷',
+  '§O' => '別',
+  '§P' => '判',
+  '§Q' => '利',
+  '§R' => '刪',
+  '§S' => '刨',
+  '§T' => '劫',
+  '§U' => '助',
+  '§V' => '努',
+  '§W' => '劬',
+  '§X' => '匣',
+  '§Y' => 'å�³',
+  '§Z' => 'å�µ',
+  '§[' => 'å��',
+  '§\\' => 'å�­',
+  '§]' => 'å�ž',
+  '§^' => 'å�¾',
+  '§_' => 'å�¦',
+  '§`' => 'å‘Ž',
+  '§a' => 'å�§',
+  '§b' => '呆',
+  '§c' => '呃',
+  '§d' => 'å�³',
+  '§e' => '呈',
+  '§f' => 'å‘‚',
+  '§g' => 'å�›',
+  '§h' => 'å�©',
+  '§i' => 'å‘Š',
+  '§j' => 'å�¹',
+  '§k' => 'å�»',
+  '§l' => 'å�¸',
+  '§m' => 'å�®',
+  '§n' => 'å�µ',
+  '§o' => 'å�¶',
+  '§p' => 'å� ',
+  '§q' => 'å�¼',
+  '§r' => 'å‘€',
+  '§s' => 'å�±',
+  '§t' => 'å�«',
+  '§u' => 'å�Ÿ',
+  '§v' => 'å�¬',
+  '§w' => '囪',
+  '§x' => 'å›°',
+  '§y' => '囤',
+  '§z' => '囫',
+  '§{' => 'å�Š',
+  '§|' => 'å�‘',
+  '§}' => 'å�€',
+  '§~' => 'å��',
+  '§¡' => 'å�‡',
+  '§¢' => 'å�Ž',
+  '§£' => '圾',
+  '§¤' => 'å��',
+  '§¥' => 'å��',
+  '§¦' => '圻',
+  '§§' => '壯',
+  '§¨' => '夾',
+  '§©' => 'å¦�',
+  '§ª' => '妒',
+  '§«' => '妨',
+  '§¬' => '妞',
+  '§­' => '妣',
+  '§®' => '妙',
+  '§¯' => '妖',
+  '§°' => 'å¦�',
+  '§±' => '妤',
+  '§²' => '妓',
+  '§³' => '妊',
+  '§´' => '妥',
+  '§µ' => 'å­�',
+  '§¶' => 'å­œ',
+  '§·' => 'å­š',
+  '§¸' => 'å­›',
+  '§¹' => '完',
+  '§º' => '宋',
+  '§»' => 'å®�',
+  '§¼' => 'å°¬',
+  '§½' => 'å±€',
+  '§¾' => 'å±�',
+  '§¿' => 'å°¿',
+  '§À' => 'å°¾',
+  '§Á' => 'å²�',
+  '§Â' => '岑',
+  '§Ã' => 'å²”',
+  '§Ä' => '岌',
+  '§Å' => 'å·«',
+  '§Æ' => '希',
+  '§Ç' => 'åº�',
+  '§È' => '庇',
+  '§É' => '床',
+  '§Ê' => 'å»·',
+  '§Ë' => '弄',
+  '§Ì' => '弟',
+  '§Í' => '彤',
+  '§Î' => 'å½¢',
+  '§Ï' => 'å½·',
+  '§Ð' => 'å½¹',
+  '§Ñ' => '忘',
+  '§Ò' => 'å¿Œ',
+  '§Ó' => 'å¿—',
+  '§Ô' => 'å¿�',
+  '§Õ' => '忱',
+  '§Ö' => 'å¿«',
+  '§×' => '忸',
+  '§Ø' => '忪',
+  '§Ù' => '戒',
+  '§Ú' => '我',
+  '§Û' => '抄',
+  '§Ü' => '抗',
+  '§Ý' => '抖',
+  '§Þ' => '技',
+  '§ß' => '扶',
+  '§à' => '抉',
+  '§á' => '扭',
+  '§â' => '把',
+  '§ã' => '扼',
+  '§ä' => '找',
+  '§å' => '批',
+  '§æ' => '扳',
+  '§ç' => '抒',
+  '§è' => '扯',
+  '§é' => '折',
+  '§ê' => '扮',
+  '§ë' => '投',
+  '§ì' => '抓',
+  '§í' => '抑',
+  '§î' => '抆',
+  '§ï' => '改',
+  '§ð' => 'æ”»',
+  '§ñ' => '攸',
+  '§ò' => 'æ—±',
+  '§ó' => 'æ›´',
+  '§ô' => 'æ�Ÿ',
+  '§õ' => 'æ�Ž',
+  '§ö' => 'æ��',
+  '§÷' => 'æ��',
+  '§ø' => 'æ�‘',
+  '§ù' => 'æ�œ',
+  '§ú' => 'æ�–',
+  '§û' => 'æ�ž',
+  '§ü' => 'æ�‰',
+  '§ý' => 'æ�†',
+  '§þ' => 'æ� ',
+  '¨@' => 'æ�“',
+  '¨A' => 'æ�—',
+  '¨B' => 'æ­¥',
+  '¨C' => 'æ¯�',
+  '¨D' => '求',
+  '¨E' => '汞',
+  '¨F' => 'æ²™',
+  '¨G' => 'æ²�',
+  '¨H' => '沈',
+  '¨I' => '沉',
+  '¨J' => 'æ²…',
+  '¨K' => 'æ²›',
+  '¨L' => '汪',
+  '¨M' => '決',
+  '¨N' => 'æ²�',
+  '¨O' => 'æ±°',
+  '¨P' => '沌',
+  '¨Q' => '汨',
+  '¨R' => 'æ²–',
+  '¨S' => 'æ²’',
+  '¨T' => 'æ±½',
+  '¨U' => '沃',
+  '¨V' => 'æ±²',
+  '¨W' => 'æ±¾',
+  '¨X' => 'æ±´',
+  '¨Y' => '沆',
+  '¨Z' => '汶',
+  '¨[' => 'æ²�',
+  '¨\\' => 'æ²”',
+  '¨]' => '沘',
+  '¨^' => '沂',
+  '¨_' => 'ç�¶',
+  '¨`' => 'ç�¼',
+  '¨a' => 'ç�½',
+  '¨b' => 'ç�¸',
+  '¨c' => '牢',
+  '¨d' => '牡',
+  '¨e' => '牠',
+  '¨f' => 'ç‹„',
+  '¨g' => 'ç‹‚',
+  '¨h' => '玖',
+  '¨i' => '甬',
+  '¨j' => '甫',
+  '¨k' => 'ç”·',
+  '¨l' => '甸',
+  '¨m' => 'çš‚',
+  '¨n' => '盯',
+  '¨o' => '矣',
+  '¨p' => 'ç§�',
+  '¨q' => '秀',
+  '¨r' => '禿',
+  '¨s' => '究',
+  '¨t' => 'ç³»',
+  '¨u' => '罕',
+  '¨v' => 'è‚–',
+  '¨w' => 'è‚“',
+  '¨x' => 'è‚�',
+  '¨y' => '肘',
+  '¨z' => 'è‚›',
+  '¨{' => 'è‚š',
+  '¨|' => '育',
+  '¨}' => '良',
+  '¨~' => '芒',
+  '¨¡' => '芋',
+  '¨¢' => 'èŠ�',
+  '¨£' => '見',
+  '¨¤' => '角',
+  '¨¥' => '言',
+  '¨¦' => 'è°·',
+  '¨§' => '豆',
+  '¨¨' => '豕',
+  '¨©' => 'è²�',
+  '¨ª' => '赤',
+  '¨«' => 'èµ°',
+  '¨¬' => '足',
+  '¨­' => '身',
+  '¨®' => '車',
+  '¨¯' => 'è¾›',
+  '¨°' => 'è¾°',
+  '¨±' => 'è¿‚',
+  '¨²' => '迆',
+  '¨³' => 'è¿…',
+  '¨´' => 'è¿„',
+  '¨µ' => 'å·¡',
+  '¨¶' => 'é‚‘',
+  '¨·' => 'é‚¢',
+  '¨¸' => '邪',
+  '¨¹' => '邦',
+  '¨º' => 'é‚£',
+  '¨»' => 'é…‰',
+  '¨¼' => '釆',
+  '¨½' => '里',
+  '¨¾' => '防',
+  '¨¿' => '阮',
+  '¨À' => '阱',
+  '¨Á' => '阪',
+  '¨Â' => '阬',
+  '¨Ã' => '並',
+  '¨Ä' => 'ä¹–',
+  '¨Å' => 'ä¹³',
+  '¨Æ' => '事',
+  '¨Ç' => '些',
+  '¨È' => '亞',
+  '¨É' => '享',
+  '¨Ê' => '京',
+  '¨Ë' => '佯',
+  '¨Ì' => 'ä¾�',
+  '¨Í' => 'ä¾�',
+  '¨Î' => 'ä½³',
+  '¨Ï' => '使',
+  '¨Ð' => '佬',
+  '¨Ñ' => 'ä¾›',
+  '¨Ò' => '例',
+  '¨Ó' => '來',
+  '¨Ô' => '侃',
+  '¨Õ' => 'ä½°',
+  '¨Ö' => 'ä½µ',
+  '¨×' => '侈',
+  '¨Ø' => '佩',
+  '¨Ù' => 'ä½»',
+  '¨Ú' => 'ä¾–',
+  '¨Û' => 'ä½¾',
+  '¨Ü' => 'ä¾�',
+  '¨Ý' => '侑',
+  '¨Þ' => '佺',
+  '¨ß' => 'å…”',
+  '¨à' => 'å…’',
+  '¨á' => 'å…•',
+  '¨â' => 'å…©',
+  '¨ã' => 'å…·',
+  '¨ä' => 'å…¶',
+  '¨å' => 'å…¸',
+  '¨æ' => '冽',
+  '¨ç' => '函',
+  '¨è' => '刻',
+  '¨é' => '券',
+  '¨ê' => '刷',
+  '¨ë' => '刺',
+  '¨ì' => '到',
+  '¨í' => '刮',
+  '¨î' => '制',
+  '¨ï' => 'å‰�',
+  '¨ð' => '劾',
+  '¨ñ' => '劻',
+  '¨ò' => 'å�’',
+  '¨ó' => 'å�”',
+  '¨ô' => 'å�“',
+  '¨õ' => 'å�‘',
+  '¨ö' => 'å�¦',
+  '¨÷' => 'å�·',
+  '¨ø' => 'å�¸',
+  '¨ù' => 'å�¹',
+  '¨ú' => 'å�–',
+  '¨û' => 'å�”',
+  '¨ü' => 'å�—',
+  '¨ý' => '味',
+  '¨þ' => '呵',
+  '©@' => 'å’–',
+  '©A' => '呸',
+  '©B' => 'å’•',
+  '©C' => 'å’€',
+  '©D' => 'å‘»',
+  '©E' => 'å‘·',
+  '©F' => 'å’„',
+  '©G' => 'å’’',
+  '©H' => 'å’†',
+  '©I' => '呼',
+  '©J' => 'å’�',
+  '©K' => '呱',
+  '©L' => '呶',
+  '©M' => 'å’Œ',
+  '©N' => 'å’š',
+  '©O' => 'å‘¢',
+  '©P' => '周',
+  '©Q' => 'å’‹',
+  '©R' => '命',
+  '©S' => 'å’Ž',
+  '©T' => '固',
+  '©U' => '垃',
+  '©V' => 'å�·',
+  '©W' => 'å�ª',
+  '©X' => 'å�©',
+  '©Y' => 'å�¡',
+  '©Z' => 'å�¦',
+  '©[' => 'å�¤',
+  '©\\' => 'å�¼',
+  '©]' => '夜',
+  '©^' => '奉',
+  '©_' => '奇',
+  '©`' => '奈',
+  '©a' => '奄',
+  '©b' => '奔',
+  '©c' => '妾',
+  '©d' => '妻',
+  '©e' => '委',
+  '©f' => '妹',
+  '©g' => '妮',
+  '©h' => '姑',
+  '©i' => '姆',
+  '©j' => 'å§�',
+  '©k' => 'å§�',
+  '©l' => '始',
+  '©m' => '姓',
+  '©n' => '姊',
+  '©o' => '妯',
+  '©p' => '妳',
+  '©q' => '姒',
+  '©r' => '姅',
+  '©s' => 'å­Ÿ',
+  '©t' => 'å­¤',
+  '©u' => 'å­£',
+  '©v' => 'å®—',
+  '©w' => '定',
+  '©x' => '官',
+  '©y' => '宜',
+  '©z' => 'å®™',
+  '©{' => 'å®›',
+  '©|' => 'å°š',
+  '©}' => '屈',
+  '©~' => 'å±…',
+  '©¡' => '屆',
+  '©¢' => 'å²·',
+  '©£' => '岡',
+  '©¤' => '岸',
+  '©¥' => '岩',
+  '©¦' => '岫',
+  '©§' => 'å²±',
+  '©¨' => 'å²³',
+  '©©' => '帘',
+  '©ª' => '帚',
+  '©«' => '帖',
+  '©¬' => '帕',
+  '©­' => '帛',
+  '©®' => '帑',
+  '©¯' => '幸',
+  '©°' => '庚',
+  '©±' => '店',
+  '©²' => '府',
+  '©³' => '底',
+  '©´' => '庖',
+  '©µ' => '延',
+  '©¶' => '弦',
+  '©·' => '弧',
+  '©¸' => '弩',
+  '©¹' => 'å¾€',
+  '©º' => 'å¾�',
+  '©»' => '彿',
+  '©¼' => 'å½¼',
+  '©½' => 'å¿�',
+  '©¾' => 'å¿ ',
+  '©¿' => '忽',
+  '©À' => '念',
+  '©Á' => 'å¿¿',
+  '©Â' => 'æ€�',
+  '©Ã' => '怔',
+  '©Ä' => '怯',
+  '©Å' => '怵',
+  '©Æ' => '怖',
+  '©Ç' => '怪',
+  '©È' => '怕',
+  '©É' => '怡',
+  '©Ê' => '性',
+  '©Ë' => '怩',
+  '©Ì' => '怫',
+  '©Í' => '怛',
+  '©Î' => '或',
+  '©Ï' => '戕',
+  '©Ð' => '房',
+  '©Ñ' => '戾',
+  '©Ò' => '所',
+  '©Ó' => '承',
+  '©Ô' => '拉',
+  '©Õ' => 'æ‹Œ',
+  '©Ö' => 'æ‹„',
+  '©×' => '抿',
+  '©Ø' => 'æ‹‚',
+  '©Ù' => '抹',
+  '©Ú' => 'æ‹’',
+  '©Û' => 'æ‹›',
+  '©Ü' => '披',
+  '©Ý' => 'æ‹“',
+  '©Þ' => 'æ‹”',
+  '©ß' => 'æ‹‹',
+  '©à' => '拈',
+  '©á' => '抨',
+  '©â' => '抽',
+  '©ã' => '押',
+  '©ä' => 'æ‹�',
+  '©å' => 'æ‹™',
+  '©æ' => '拇',
+  '©ç' => 'æ‹�',
+  '©è' => '抵',
+  '©é' => 'æ‹š',
+  '©ê' => '抱',
+  '©ë' => '拘',
+  '©ì' => 'æ‹–',
+  '©í' => 'æ‹—',
+  '©î' => '拆',
+  '©ï' => '抬',
+  '©ð' => 'æ‹Ž',
+  '©ñ' => '放',
+  '©ò' => 'æ–§',
+  '©ó' => 'æ–¼',
+  '©ô' => 'æ—º',
+  '©õ' => '昔',
+  '©ö' => '易',
+  '©÷' => '昌',
+  '©ø' => '昆',
+  '©ù' => '昂',
+  '©ú' => '明',
+  '©û' => '昀',
+  '©ü' => 'æ˜�',
+  '©ý' => '昕',
+  '©þ' => '昊',
+  'ª@' => '昇',
+  'ªA' => 'æœ�',
+  'ªB' => '朋',
+  'ªC' => 'æ�­',
+  'ªD' => 'æž‹',
+  'ªE' => 'æž•',
+  'ªF' => 'æ�±',
+  'ªG' => 'æžœ',
+  'ªH' => 'æ�³',
+  'ªI' => 'æ�·',
+  'ªJ' => '枇',
+  'ªK' => 'æž�',
+  'ªL' => 'æž—',
+  'ªM' => 'æ�¯',
+  'ªN' => 'æ�°',
+  'ªO' => 'æ�¿',
+  'ªP' => '枉',
+  'ªQ' => 'æ�¾',
+  'ªR' => 'æž�',
+  'ªS' => 'æ�µ',
+  'ªT' => 'æžš',
+  'ªU' => 'æž“',
+  'ªV' => 'æ�¼',
+  'ªW' => 'æ�ª',
+  'ªX' => 'æ�²',
+  'ªY' => '欣',
+  'ªZ' => 'æ­¦',
+  'ª[' => 'æ­§',
+  'ª\\' => 'æ­¿',
+  'ª]' => 'æ°“',
+  'ª^' => 'æ°›',
+  'ª_' => 'æ³£',
+  'ª`' => '注',
+  'ªa' => 'æ³³',
+  'ªb' => 'æ²±',
+  'ªc' => '泌',
+  'ªd' => 'æ³¥',
+  'ªe' => 'æ²³',
+  'ªf' => 'æ²½',
+  'ªg' => 'æ²¾',
+  'ªh' => 'æ²¼',
+  'ªi' => 'æ³¢',
+  'ªj' => '沫',
+  'ªk' => '法',
+  'ªl' => '泓',
+  'ªm' => '沸',
+  'ªn' => '泄',
+  'ªo' => 'æ²¹',
+  'ªp' => 'æ³�',
+  'ªq' => 'æ²®',
+  'ªr' => 'æ³—',
+  'ªs' => 'æ³…',
+  'ªt' => 'æ³±',
+  'ªu' => '沿',
+  'ªv' => 'æ²»',
+  'ªw' => '泡',
+  'ªx' => 'æ³›',
+  'ªy' => '泊',
+  'ªz' => '沬',
+  'ª{' => '泯',
+  'ª|' => '泜',
+  'ª}' => 'æ³–',
+  'ª~' => 'æ³ ',
+  'ª¡' => 'ç‚•',
+  'ª¢' => 'ç‚Ž',
+  'ª£' => 'ç‚’',
+  'ª¤' => 'ç‚Š',
+  'ª¥' => 'ç‚™',
+  'ª¦' => '爬',
+  'ª§' => '爭',
+  'ª¨' => '爸',
+  'ª©' => '版',
+  'ªª' => '牧',
+  'ª«' => '物',
+  'ª¬' => 'ç‹€',
+  'ª­' => 'ç‹Ž',
+  'ª®' => 'ç‹™',
+  'ª¯' => 'ç‹—',
+  'ª°' => 'ç‹�',
+  'ª±' => '玩',
+  'ª²' => '玨',
+  'ª³' => '玟',
+  'ª´' => '玫',
+  'ªµ' => '玥',
+  'ª¶' => '甽',
+  'ª·' => 'ç–�',
+  'ª¸' => 'ç–™',
+  'ª¹' => 'ç–š',
+  'ªº' => 'çš„',
+  'ª»' => '盂',
+  'ª¼' => '盲',
+  'ª½' => 'ç›´',
+  'ª¾' => '知',
+  'ª¿' => '矽',
+  'ªÀ' => '社',
+  'ªÁ' => '祀',
+  'ªÂ' => 'ç¥�',
+  'ªÃ' => '秉',
+  'ªÄ' => '秈',
+  'ªÅ' => '空',
+  'ªÆ' => '穹',
+  'ªÇ' => '竺',
+  'ªÈ' => 'ç³¾',
+  'ªÉ' => 'ç½”',
+  'ªÊ' => '羌',
+  'ªË' => '羋',
+  'ªÌ' => '者',
+  'ªÍ' => '肺',
+  'ªÎ' => 'è‚¥',
+  'ªÏ' => 'è‚¢',
+  'ªÐ' => '肱',
+  'ªÑ' => 'è‚¡',
+  'ªÒ' => 'è‚«',
+  'ªÓ' => 'è‚©',
+  'ªÔ' => 'è‚´',
+  'ªÕ' => '肪',
+  'ªÖ' => '肯',
+  'ª×' => '臥',
+  'ªØ' => '臾',
+  'ªÙ' => 'èˆ�',
+  'ªÚ' => '芳',
+  'ªÛ' => 'èŠ�',
+  'ªÜ' => '芙',
+  'ªÝ' => '芭',
+  'ªÞ' => '芽',
+  'ªß' => '芟',
+  'ªà' => '芹',
+  'ªá' => '花',
+  'ªâ' => '芬',
+  'ªã' => '芥',
+  'ªä' => '芯',
+  'ªå' => '芸',
+  'ªæ' => '芣',
+  'ªç' => '芰',
+  'ªè' => '芾',
+  'ªé' => '芷',
+  'ªê' => '虎',
+  'ªë' => 'è™±',
+  'ªì' => 'åˆ�',
+  'ªí' => '表',
+  'ªî' => '軋',
+  'ªï' => 'è¿Ž',
+  'ªð' => 'è¿”',
+  'ªñ' => 'è¿‘',
+  'ªò' => '邵',
+  'ªó' => '邸',
+  'ªô' => '邱',
+  'ªõ' => '邶',
+  'ªö' => '采',
+  'ª÷' => '金',
+  'ªø' => 'é•·',
+  'ªù' => 'é–€',
+  'ªú' => '阜',
+  'ªû' => '陀',
+  'ªü' => '阿',
+  'ªý' => '阻',
+  'ªþ' => '附',
+  '«@' => '陂',
+  '«A' => 'éš¹',
+  '«B' => '雨',
+  '«C' => 'é�’',
+  '«D' => 'é�ž',
+  '«E' => '亟',
+  '«F' => '亭',
+  '«G' => '亮',
+  '«H' => 'ä¿¡',
+  '«I' => 'ä¾µ',
+  '«J' => '侯',
+  '«K' => '便',
+  '«L' => 'ä¿ ',
+  '«M' => 'ä¿‘',
+  '«N' => 'ä¿�',
+  '«O' => 'ä¿�',
+  '«P' => '促',
+  '«Q' => '侶',
+  '«R' => '俘',
+  '«S' => 'ä¿Ÿ',
+  '«T' => 'ä¿Š',
+  '«U' => 'ä¿—',
+  '«V' => 'ä¾®',
+  '«W' => 'ä¿�',
+  '«X' => 'ä¿„',
+  '«Y' => 'ä¿‚',
+  '«Z' => 'ä¿š',
+  '«[' => 'ä¿Ž',
+  '«\\' => 'ä¿ž',
+  '«]' => 'ä¾·',
+  '«^' => 'å…—',
+  '«_' => '冒',
+  '«`' => '冑',
+  '«a' => '冠',
+  '«b' => '剎',
+  '«c' => '剃',
+  '«d' => '削',
+  '«e' => 'å‰�',
+  '«f' => '剌',
+  '«g' => '剋',
+  '«h' => '則',
+  '«i' => '勇',
+  '«j' => '勉',
+  '«k' => '勃',
+  '«l' => 'å‹�',
+  '«m' => 'åŒ�',
+  '«n' => 'å�—',
+  '«o' => 'å�»',
+  '«p' => '厚',
+  '«q' => 'å�›',
+  '«r' => 'å’¬',
+  '«s' => 'å“€',
+  '«t' => 'å’¨',
+  '«u' => 'å“Ž',
+  '«v' => '哉',
+  '«w' => 'å’¸',
+  '«x' => 'å’¦',
+  '«y' => 'å’³',
+  '«z' => '哇',
+  '«{' => 'å“‚',
+  '«|' => 'å’½',
+  '«}' => 'å’ª',
+  '«~' => 'å“�',
+  '«¡' => 'å“„',
+  '«¢' => '哈',
+  '«£' => 'å’¯',
+  '«¤' => 'å’«',
+  '«¥' => 'å’±',
+  '«¦' => 'å’»',
+  '«§' => 'å’©',
+  '«¨' => 'å’§',
+  '«©' => 'å’¿',
+  '«ª' => '囿',
+  '««' => 'åž‚',
+  '«¬' => 'åž‹',
+  '«­' => 'åž ',
+  '«®' => '垣',
+  '«¯' => '垢',
+  '«°' => '城',
+  '«±' => 'åž®',
+  '«²' => 'åž“',
+  '«³' => '奕',
+  '«´' => '契',
+  '«µ' => 'å¥�',
+  '«¶' => '奎',
+  '«·' => 'å¥�',
+  '«¸' => '姜',
+  '«¹' => '姘',
+  '«º' => '姿',
+  '«»' => '姣',
+  '«¼' => '姨',
+  '«½' => '娃',
+  '«¾' => '姥',
+  '«¿' => '姪',
+  '«À' => '姚',
+  '«Á' => '姦',
+  '«Â' => 'å¨�',
+  '«Ã' => '姻',
+  '«Ä' => 'å­©',
+  '«Å' => '宣',
+  '«Æ' => '宦',
+  '«Ç' => '室',
+  '«È' => '客',
+  '«É' => '宥',
+  '«Ê' => 'å°�',
+  '«Ë' => '屎',
+  '«Ì' => 'å±�',
+  '«Í' => 'å±�',
+  '«Î' => '屋',
+  '«Ï' => 'å³™',
+  '«Ð' => 'å³’',
+  '«Ñ' => 'å··',
+  '«Ò' => 'å¸�',
+  '«Ó' => '帥',
+  '«Ô' => '帟',
+  '«Õ' => 'å¹½',
+  '«Ö' => '庠',
+  '«×' => '度',
+  '«Ø' => '建',
+  '«Ù' => '弈',
+  '«Ú' => 'å¼­',
+  '«Û' => 'å½¥',
+  '«Ü' => '很',
+  '«Ý' => 'å¾…',
+  '«Þ' => '徊',
+  '«ß' => '律',
+  '«à' => '徇',
+  '«á' => '後',
+  '«â' => '徉',
+  '«ã' => '怒',
+  '«ä' => 'æ€�',
+  '«å' => '怠',
+  '«æ' => '急',
+  '«ç' => '怎',
+  '«è' => '怨',
+  '«é' => 'æ��',
+  '«ê' => 'æ�°',
+  '«ë' => 'æ�¨',
+  '«ì' => 'æ�¢',
+  '«í' => 'æ�†',
+  '«î' => 'æ�ƒ',
+  '«ï' => 'æ�¬',
+  '«ð' => 'æ�«',
+  '«ñ' => 'æ�ª',
+  '«ò' => 'æ�¤',
+  '«ó' => 'æ‰�',
+  '«ô' => 'æ‹œ',
+  '«õ' => '挖',
+  '«ö' => '按',
+  '«÷' => '拼',
+  '«ø' => 'æ‹­',
+  '«ù' => 'æŒ�',
+  '«ú' => 'æ‹®',
+  '«û' => '拽',
+  '«ü' => '指',
+  '«ý' => '拱',
+  '«þ' => 'æ‹·',
+  '¬@' => '拯',
+  '¬A' => '括',
+  '¬B' => '拾',
+  '¬C' => 'æ‹´',
+  '¬D' => '挑',
+  '¬E' => '挂',
+  '¬F' => '政',
+  '¬G' => 'æ•…',
+  '¬H' => 'æ–«',
+  '¬I' => 'æ–½',
+  '¬J' => 'æ—¢',
+  '¬K' => '春',
+  '¬L' => '昭',
+  '¬M' => '映',
+  '¬N' => '昧',
+  '¬O' => '是',
+  '¬P' => '星',
+  '¬Q' => '昨',
+  '¬R' => '昱',
+  '¬S' => '昤',
+  '¬T' => 'æ›·',
+  '¬U' => '柿',
+  '¬V' => '染',
+  '¬W' => '柱',
+  '¬X' => '柔',
+  '¬Y' => 'æŸ�',
+  '¬Z' => '柬',
+  '¬[' => '架',
+  '¬\\' => '枯',
+  '¬]' => '柵',
+  '¬^' => '柩',
+  '¬_' => '柯',
+  '¬`' => '柄',
+  '¬a' => '柑',
+  '¬b' => 'æž´',
+  '¬c' => '柚',
+  '¬d' => '查',
+  '¬e' => '枸',
+  '¬f' => 'æŸ�',
+  '¬g' => '柞',
+  '¬h' => '柳',
+  '¬i' => 'æž°',
+  '¬j' => '柙',
+  '¬k' => '柢',
+  '¬l' => 'æŸ�',
+  '¬m' => '柒',
+  '¬n' => 'æ­ª',
+  '¬o' => '殃',
+  '¬p' => '殆',
+  '¬q' => '段',
+  '¬r' => '毒',
+  '¬s' => '毗',
+  '¬t' => 'æ°Ÿ',
+  '¬u' => '泉',
+  '¬v' => 'æ´‹',
+  '¬w' => 'æ´²',
+  '¬x' => 'æ´ª',
+  '¬y' => 'æµ�',
+  '¬z' => 'æ´¥',
+  '¬{' => 'æ´Œ',
+  '¬|' => 'æ´±',
+  '¬}' => 'æ´ž',
+  '¬~' => 'æ´—',
+  '¬¡' => 'æ´»',
+  '¬¢' => 'æ´½',
+  '¬£' => 'æ´¾',
+  '¬¤' => 'æ´¶',
+  '¬¥' => 'æ´›',
+  '¬¦' => 'æ³µ',
+  '¬§' => 'æ´¹',
+  '¬¨' => 'æ´§',
+  '¬©' => 'æ´¸',
+  '¬ª' => 'æ´©',
+  '¬«' => 'æ´®',
+  '¬¬' => 'æ´µ',
+  '¬­' => 'æ´Ž',
+  '¬®' => 'æ´«',
+  '¬¯' => 'ç‚«',
+  '¬°' => '為',
+  '¬±' => '炳',
+  '¬²' => '炬',
+  '¬³' => '炯',
+  '¬´' => 'ç‚­',
+  '¬µ' => '炸',
+  '¬¶' => 'ç‚®',
+  '¬·' => '炤',
+  '¬¸' => '爰',
+  '¬¹' => '牲',
+  '¬º' => '牯',
+  '¬»' => '牴',
+  '¬¼' => 'ç‹©',
+  '¬½' => 'ç‹ ',
+  '¬¾' => 'ç‹¡',
+  '¬¿' => '玷',
+  '¬À' => 'ç�Š',
+  '¬Á' => '玻',
+  '¬Â' => '玲',
+  '¬Ã' => 'ç��',
+  '¬Ä' => 'ç�€',
+  '¬Å' => '玳',
+  '¬Æ' => '甚',
+  '¬Ç' => 'ç”­',
+  '¬È' => 'ç•�',
+  '¬É' => 'ç•Œ',
+  '¬Ê' => 'ç•Ž',
+  '¬Ë' => 'ç•‹',
+  '¬Ì' => 'ç–«',
+  '¬Í' => 'ç–¤',
+  '¬Î' => 'ç–¥',
+  '¬Ï' => 'ç–¢',
+  '¬Ð' => 'ç–£',
+  '¬Ñ' => '癸',
+  '¬Ò' => '皆',
+  '¬Ó' => '皇',
+  '¬Ô' => '皈',
+  '¬Õ' => '盈',
+  '¬Ö' => '盆',
+  '¬×' => '盃',
+  '¬Ø' => 'ç›…',
+  '¬Ù' => 'çœ�',
+  '¬Ú' => '盹',
+  '¬Û' => '相',
+  '¬Ü' => '眉',
+  '¬Ý' => '看',
+  '¬Þ' => '盾',
+  '¬ß' => '盼',
+  '¬à' => '眇',
+  '¬á' => '矜',
+  '¬â' => 'ç ‚',
+  '¬ã' => 'ç ”',
+  '¬ä' => 'ç Œ',
+  '¬å' => 'ç �',
+  '¬æ' => '祆',
+  '¬ç' => '祉',
+  '¬è' => '祈',
+  '¬é' => '祇',
+  '¬ê' => '禹',
+  '¬ë' => '禺',
+  '¬ì' => '科',
+  '¬í' => '秒',
+  '¬î' => '秋',
+  '¬ï' => 'ç©¿',
+  '¬ð' => 'çª�',
+  '¬ñ' => 'ç«¿',
+  '¬ò' => '竽',
+  '¬ó' => 'ç±½',
+  '¬ô' => 'ç´‚',
+  '¬õ' => 'ç´…',
+  '¬ö' => 'ç´€',
+  '¬÷' => 'ç´‰',
+  '¬ø' => 'ç´‡',
+  '¬ù' => 'ç´„',
+  '¬ú' => 'ç´†',
+  '¬û' => '缸',
+  '¬ü' => '美',
+  '¬ý' => '羿',
+  '¬þ' => '耄',
+  '­@' => 'è€�',
+  '­A' => 'è€�',
+  '­B' => '耑',
+  '­C' => '耶',
+  '­D' => '胖',
+  '­E' => '胥',
+  '­F' => '胚',
+  '­G' => '胃',
+  '­H' => '胄',
+  '­I' => '背',
+  '­J' => '胡',
+  '­K' => '胛',
+  '­L' => '胎',
+  '­M' => '胞',
+  '­N' => '胤',
+  '­O' => 'èƒ�',
+  '­P' => '致',
+  '­Q' => '舢',
+  '­R' => '苧',
+  '­S' => '范',
+  '­T' => '茅',
+  '­U' => 'è‹£',
+  '­V' => 'è‹›',
+  '­W' => '苦',
+  '­X' => '茄',
+  '­Y' => 'è‹¥',
+  '­Z' => '茂',
+  '­[' => '茉',
+  '­\\' => 'è‹’',
+  '­]' => 'è‹—',
+  '­^' => '英',
+  '­_' => 'èŒ�',
+  '­`' => 'è‹œ',
+  '­a' => 'è‹”',
+  '­b' => 'è‹‘',
+  '­c' => 'è‹ž',
+  '­d' => 'è‹“',
+  '­e' => 'è‹Ÿ',
+  '­f' => '苯',
+  '­g' => '茆',
+  '­h' => 'è™�',
+  '­i' => '虹',
+  '­j' => 'è™»',
+  '­k' => '虺',
+  '­l' => 'è¡�',
+  '­m' => 'è¡«',
+  '­n' => 'è¦�',
+  '­o' => '觔',
+  '­p' => '計',
+  '­q' => '訂',
+  '­r' => '訃',
+  '­s' => '貞',
+  '­t' => 'è² ',
+  '­u' => 'èµ´',
+  '­v' => 'èµ³',
+  '­w' => '趴',
+  '­x' => 'è»�',
+  '­y' => '軌',
+  '­z' => 'è¿°',
+  '­{' => '迦',
+  '­|' => 'è¿¢',
+  '­}' => '迪',
+  '­~' => 'è¿¥',
+  '­¡' => 'è¿­',
+  '­¢' => 'è¿«',
+  '­£' => '迤',
+  '­¤' => '迨',
+  '­¥' => '郊',
+  '­¦' => '郎',
+  '­§' => 'éƒ�',
+  '­¨' => '郃',
+  '­©' => 'é…‹',
+  '­ª' => 'é…Š',
+  '­«' => 'é‡�',
+  '­¬' => 'é–‚',
+  '­­' => 'é™�',
+  '­®' => '陋',
+  '­¯' => '陌',
+  '­°' => 'é™�',
+  '­±' => 'é�¢',
+  '­²' => 'é�©',
+  '­³' => '韋',
+  '­´' => '韭',
+  '­µ' => '音',
+  '­¶' => 'é �',
+  '­·' => '風',
+  '­¸' => '飛',
+  '­¹' => '食',
+  '­º' => '首',
+  '­»' => '香',
+  '­¼' => '乘',
+  '­½' => '亳',
+  '­¾' => '倌',
+  '­¿' => 'å€�',
+  '­À' => '倣',
+  '­Á' => '俯',
+  '­Â' => '倦',
+  '­Ã' => '倥',
+  '­Ä' => '俸',
+  '­Å' => '倩',
+  '­Æ' => '倖',
+  '­Ç' => '倆',
+  '­È' => '值',
+  '­É' => '借',
+  '­Ê' => '倚',
+  '­Ë' => '倒',
+  '­Ì' => '們',
+  '­Í' => '俺',
+  '­Î' => '倀',
+  '­Ï' => '倔',
+  '­Ð' => '倨',
+  '­Ñ' => '俱',
+  '­Ò' => '倡',
+  '­Ó' => '個',
+  '­Ô' => '候',
+  '­Õ' => '倘',
+  '­Ö' => '俳',
+  '­×' => 'ä¿®',
+  '­Ø' => '倭',
+  '­Ù' => '倪',
+  '­Ú' => '俾',
+  '­Û' => '倫',
+  '­Ü' => '倉',
+  '­Ý' => 'å…¼',
+  '­Þ' => '冤',
+  '­ß' => '冥',
+  '­à' => '冢',
+  '­á' => 'å‡�',
+  '­â' => '凌',
+  '­ã' => '准',
+  '­ä' => '凋',
+  '­å' => '剖',
+  '­æ' => '剜',
+  '­ç' => '剔',
+  '­è' => '剛',
+  '­é' => 'å‰�',
+  '­ê' => '匪',
+  '­ë' => 'å�¿',
+  '­ì' => '原',
+  '­í' => 'åŽ�',
+  '­î' => 'å�Ÿ',
+  '­ï' => '哨',
+  '­ð' => 'å”�',
+  '­ñ' => 'å”�',
+  '­ò' => 'å”·',
+  '­ó' => '哼',
+  '­ô' => 'å“¥',
+  '­õ' => '哲',
+  '­ö' => '唆',
+  '­÷' => '哺',
+  '­ø' => 'å””',
+  '­ù' => 'å“©',
+  '­ú' => 'å“­',
+  '­û' => 'å“¡',
+  '­ü' => '唉',
+  '­ý' => 'å“®',
+  '­þ' => '哪',
+  '®@' => '哦',
+  '®A' => '唧',
+  '®B' => '唇',
+  '®C' => '哽',
+  '®D' => 'å”�',
+  '®E' => '圃',
+  '®F' => '圄',
+  '®G' => '埂',
+  '®H' => '埔',
+  '®I' => '埋',
+  '®J' => '埃',
+  '®K' => 'å ‰',
+  '®L' => 'å¤�',
+  '®M' => '套',
+  '®N' => '奘',
+  '®O' => '奚',
+  '®P' => '娑',
+  '®Q' => '娘',
+  '®R' => '娜',
+  '®S' => '娟',
+  '®T' => '娛',
+  '®U' => '娓',
+  '®V' => '姬',
+  '®W' => '娠',
+  '®X' => '娣',
+  '®Y' => '娩',
+  '®Z' => '娥',
+  '®[' => '娌',
+  '®\\' => '娉',
+  '®]' => 'å­«',
+  '®^' => '屘',
+  '®_' => 'å®°',
+  '®`' => '害',
+  '®a' => '家',
+  '®b' => 'å®´',
+  '®c' => 'å®®',
+  '®d' => '宵',
+  '®e' => '容',
+  '®f' => '宸',
+  '®g' => 'å°„',
+  '®h' => '屑',
+  '®i' => '展',
+  '®j' => 'å±�',
+  '®k' => 'å³­',
+  '®l' => 'å³½',
+  '®m' => 'å³»',
+  '®n' => '峪',
+  '®o' => '峨',
+  '®p' => 'å³°',
+  '®q' => '島',
+  '®r' => 'å´�',
+  '®s' => 'å³´',
+  '®t' => 'å·®',
+  '®u' => '席',
+  '®v' => '師',
+  '®w' => '庫',
+  '®x' => '庭',
+  '®y' => '座',
+  '®z' => 'å¼±',
+  '®{' => 'å¾’',
+  '®|' => '徑',
+  '®}' => 'å¾�',
+  '®~' => 'æ�™',
+  '®¡' => 'æ�£',
+  '®¢' => 'æ�¥',
+  '®£' => 'æ��',
+  '®¤' => 'æ�•',
+  '®¥' => 'æ�­',
+  '®¦' => 'æ�©',
+  '®§' => 'æ�¯',
+  '®¨' => 'æ‚„',
+  '®©' => 'æ‚Ÿ',
+  '®ª' => 'æ‚š',
+  '®«' => 'æ‚�',
+  '®¬' => 'æ‚”',
+  '®­' => 'æ‚Œ',
+  '®®' => 'æ‚…',
+  '®¯' => 'æ‚–',
+  '®°' => '扇',
+  '®±' => '拳',
+  '®²' => '挈',
+  '®³' => 'æ‹¿',
+  '®´' => 'æ�Ž',
+  '®µ' => '挾',
+  '®¶' => '振',
+  '®·' => 'æ�•',
+  '®¸' => 'æ�‚',
+  '®¹' => 'æ�†',
+  '®º' => 'æ��',
+  '®»' => 'æ�‰',
+  '®¼' => '挺',
+  '®½' => 'æ��',
+  '®¾' => '挽',
+  '®¿' => '挪',
+  '®À' => '挫',
+  '®Á' => '挨',
+  '®Â' => 'æ��',
+  '®Ã' => 'æ�Œ',
+  '®Ä' => '效',
+  '®Å' => '敉',
+  '®Æ' => 'æ–™',
+  '®Ç' => 'æ—�',
+  '®È' => 'æ—…',
+  '®É' => '時',
+  '®Ê' => '晉',
+  '®Ë' => 'æ™�',
+  '®Ì' => '晃',
+  '®Í' => 'æ™’',
+  '®Î' => '晌',
+  '®Ï' => 'æ™…',
+  '®Ð' => 'æ™�',
+  '®Ñ' => '書',
+  '®Ò' => '朔',
+  '®Ó' => '朕',
+  '®Ô' => '朗',
+  '®Õ' => 'æ ¡',
+  '®Ö' => 'æ ¸',
+  '®×' => '案',
+  '®Ø' => '框',
+  '®Ù' => 'æ¡“',
+  '®Ú' => 'æ ¹',
+  '®Û' => 'æ¡‚',
+  '®Ü' => 'æ¡”',
+  '®Ý' => 'æ ©',
+  '®Þ' => '梳',
+  '®ß' => 'æ —',
+  '®à' => 'æ¡Œ',
+  '®á' => 'æ¡‘',
+  '®â' => 'æ ½',
+  '®ã' => '柴',
+  '®ä' => 'æ¡�',
+  '®å' => 'æ¡€',
+  '®æ' => 'æ ¼',
+  '®ç' => '桃',
+  '®è' => 'æ ª',
+  '®é' => 'æ¡…',
+  '®ê' => 'æ “',
+  '®ë' => 'æ ˜',
+  '®ì' => 'æ¡�',
+  '®í' => '殊',
+  '®î' => '殉',
+  '®ï' => 'æ®·',
+  '®ð' => 'æ°£',
+  '®ñ' => 'æ°§',
+  '®ò' => 'æ°¨',
+  '®ó' => 'æ°¦',
+  '®ô' => 'æ°¤',
+  '®õ' => 'æ³°',
+  '®ö' => '浪',
+  '®÷' => '涕',
+  '®ø' => '消',
+  '®ù' => '涇',
+  '®ú' => '浦',
+  '®û' => '浸',
+  '®ü' => 'æµ·',
+  '®ý' => 'æµ™',
+  '®þ' => '涓',
+  '¯@' => '浬',
+  '¯A' => '涉',
+  '¯B' => 'æµ®',
+  '¯C' => '浚',
+  '¯D' => 'æµ´',
+  '¯E' => '浩',
+  '¯F' => '涌',
+  '¯G' => '涊',
+  '¯H' => 'æµ¹',
+  '¯I' => '涅',
+  '¯J' => 'æµ¥',
+  '¯K' => '涔',
+  '¯L' => '烊',
+  '¯M' => '烘',
+  '¯N' => '烤',
+  '¯O' => '烙',
+  '¯P' => '烈',
+  '¯Q' => 'çƒ�',
+  '¯R' => '爹',
+  '¯S' => '特',
+  '¯T' => '狼',
+  '¯U' => '狹',
+  '¯V' => '狽',
+  '¯W' => '狸',
+  '¯X' => 'ç‹·',
+  '¯Y' => '玆',
+  '¯Z' => 'ç�­',
+  '¯[' => 'ç�‰',
+  '¯\\' => 'ç�®',
+  '¯]' => 'ç� ',
+  '¯^' => 'ç�ª',
+  '¯_' => 'ç�ž',
+  '¯`' => 'ç•”',
+  '¯a' => 'ç•�',
+  '¯b' => 'ç•œ',
+  '¯c' => 'ç•š',
+  '¯d' => 'ç•™',
+  '¯e' => 'ç–¾',
+  '¯f' => 'ç—…',
+  '¯g' => 'ç—‡',
+  '¯h' => 'ç–²',
+  '¯i' => 'ç–³',
+  '¯j' => 'ç–½',
+  '¯k' => 'ç–¼',
+  '¯l' => 'ç–¹',
+  '¯m' => 'ç—‚',
+  '¯n' => 'ç–¸',
+  '¯o' => 'çš‹',
+  '¯p' => 'çš°',
+  '¯q' => '益',
+  '¯r' => 'ç›�',
+  '¯s' => '盎',
+  '¯t' => '眩',
+  '¯u' => '真',
+  '¯v' => '眠',
+  '¯w' => '眨',
+  '¯x' => '矩',
+  '¯y' => 'ç °',
+  '¯z' => 'ç §',
+  '¯{' => 'ç ¸',
+  '¯|' => 'ç �',
+  '¯}' => 'ç ´',
+  '¯~' => 'ç ·',
+  '¯¡' => 'ç ¥',
+  '¯¢' => 'ç ­',
+  '¯£' => 'ç  ',
+  '¯¤' => 'ç Ÿ',
+  '¯¥' => 'ç ²',
+  '¯¦' => '祕',
+  '¯§' => 'ç¥�',
+  '¯¨' => '祠',
+  '¯©' => '祟',
+  '¯ª' => '祖',
+  '¯«' => '神',
+  '¯¬' => 'ç¥�',
+  '¯­' => '祗',
+  '¯®' => '祚',
+  '¯¯' => '秤',
+  '¯°' => '秣',
+  '¯±' => '秧',
+  '¯²' => '租',
+  '¯³' => '秦',
+  '¯´' => '秩',
+  '¯µ' => '秘',
+  '¯¶' => '窄',
+  '¯·' => '窈',
+  '¯¸' => 'ç«™',
+  '¯¹' => '笆',
+  '¯º' => '笑',
+  '¯»' => '粉',
+  '¯¼' => 'ç´¡',
+  '¯½' => 'ç´—',
+  '¯¾' => 'ç´‹',
+  '¯¿' => 'ç´Š',
+  '¯À' => 'ç´ ',
+  '¯Á' => 'ç´¢',
+  '¯Â' => 'ç´”',
+  '¯Ã' => 'ç´�',
+  '¯Ä' => 'ç´•',
+  '¯Å' => 'ç´š',
+  '¯Æ' => 'ç´œ',
+  '¯Ç' => 'ç´�',
+  '¯È' => 'ç´™',
+  '¯É' => 'ç´›',
+  '¯Ê' => '缺',
+  '¯Ë' => '罟',
+  '¯Ì' => 'ç¾”',
+  '¯Í' => 'ç¿…',
+  '¯Î' => 'ç¿�',
+  '¯Ï' => '耆',
+  '¯Ð' => '耘',
+  '¯Ñ' => '耕',
+  '¯Ò' => '耙',
+  '¯Ó' => '耗',
+  '¯Ô' => '耽',
+  '¯Õ' => '耿',
+  '¯Ö' => '胱',
+  '¯×' => 'è„‚',
+  '¯Ø' => '胰',
+  '¯Ù' => 'è„…',
+  '¯Ú' => '胭',
+  '¯Û' => '胴',
+  '¯Ü' => '脆',
+  '¯Ý' => '胸',
+  '¯Þ' => '胳',
+  '¯ß' => '脈',
+  '¯à' => '能',
+  '¯á' => 'è„Š',
+  '¯â' => '胼',
+  '¯ã' => '胯',
+  '¯ä' => '臭',
+  '¯å' => '臬',
+  '¯æ' => '舀',
+  '¯ç' => 'èˆ�',
+  '¯è' => '航',
+  '¯é' => '舫',
+  '¯ê' => '舨',
+  '¯ë' => '般',
+  '¯ì' => '芻',
+  '¯í' => '茫',
+  '¯î' => 'è�’',
+  '¯ï' => 'è�”',
+  '¯ð' => 'è�Š',
+  '¯ñ' => '茸',
+  '¯ò' => 'è��',
+  '¯ó' => 'è�‰',
+  '¯ô' => '茵',
+  '¯õ' => '茴',
+  '¯ö' => 'è��',
+  '¯÷' => '茲',
+  '¯ø' => '茹',
+  '¯ù' => '茶',
+  '¯ú' => '茗',
+  '¯û' => 'è�€',
+  '¯ü' => '茱',
+  '¯ý' => '茨',
+  '¯þ' => 'è�ƒ',
+  '°@' => 'è™”',
+  '°A' => '蚊',
+  '°B' => '蚪',
+  '°C' => 'èš“',
+  '°D' => '蚤',
+  '°E' => 'èš©',
+  '°F' => '蚌',
+  '°G' => '蚣',
+  '°H' => 'èšœ',
+  '°I' => 'è¡°',
+  '°J' => 'è¡·',
+  '°K' => 'è¢�',
+  '°L' => '袂',
+  '°M' => '衽',
+  '°N' => '衹',
+  '°O' => '記',
+  '°P' => 'è¨�',
+  '°Q' => '討',
+  '°R' => '訌',
+  '°S' => '訕',
+  '°T' => '訊',
+  '°U' => '託',
+  '°V' => '訓',
+  '°W' => '訖',
+  '°X' => 'è¨�',
+  '°Y' => '訑',
+  '°Z' => '豈',
+  '°[' => '豺',
+  '°\\' => 'è±¹',
+  '°]' => '財',
+  '°^' => 'è²¢',
+  '°_' => 'èµ·',
+  '°`' => '躬',
+  '°a' => 'è»’',
+  '°b' => 'è»”',
+  '°c' => 'è»�',
+  '°d' => 'è¾±',
+  '°e' => 'é€�',
+  '°f' => '逆',
+  '°g' => 'è¿·',
+  '°h' => '退',
+  '°i' => '迺',
+  '°j' => 'è¿´',
+  '°k' => '逃',
+  '°l' => '追',
+  '°m' => '逅',
+  '°n' => '迸',
+  '°o' => 'é‚•',
+  '°p' => '郡',
+  '°q' => 'éƒ�',
+  '°r' => '郢',
+  '°s' => 'é…’',
+  '°t' => 'é…�',
+  '°u' => 'é…Œ',
+  '°v' => '釘',
+  '°w' => 'é‡�',
+  '°x' => '釗',
+  '°y' => '釜',
+  '°z' => '釙',
+  '°{' => 'é–ƒ',
+  '°|' => '院',
+  '°}' => '陣',
+  '°~' => '陡',
+  '°¡' => 'é™›',
+  '°¢' => 'é™�',
+  '°£' => '除',
+  '°¤' => '陘',
+  '°¥' => '陞',
+  '°¦' => 'éš»',
+  '°§' => '飢',
+  '°¨' => '馬',
+  '°©' => '骨',
+  '°ª' => '高',
+  '°«' => '鬥',
+  '°¬' => '鬲',
+  '°­' => '鬼',
+  '°®' => 'ä¹¾',
+  '°¯' => 'å�º',
+  '°°' => 'å�½',
+  '°±' => 'å�œ',
+  '°²' => 'å�‡',
+  '°³' => 'å�ƒ',
+  '°´' => 'å�Œ',
+  '°µ' => 'å�š',
+  '°¶' => 'å�‰',
+  '°·' => 'å�¥',
+  '°¸' => 'å�¶',
+  '°¹' => 'å�Ž',
+  '°º' => 'å�•',
+  '°»' => 'å�µ',
+  '°¼' => 'å�´',
+  '°½' => 'å�·',
+  '°¾' => 'å��',
+  '°¿' => 'å€�',
+  '°À' => 'å�¯',
+  '°Á' => 'å�­',
+  '°Â' => 'å…œ',
+  '°Ã' => '冕',
+  '°Ä' => '凰',
+  '°Å' => '剪',
+  '°Æ' => '副',
+  '°Ç' => 'å‹’',
+  '°È' => 'å‹™',
+  '°É' => '勘',
+  '°Ê' => 'å‹•',
+  '°Ë' => 'åŒ�',
+  '°Ì' => 'åŒ�',
+  '°Í' => '匙',
+  '°Î' => '匿',
+  '°Ï' => 'å�€',
+  '°Ð' => '匾',
+  '°Ñ' => 'å�ƒ',
+  '°Ò' => '曼',
+  '°Ó' => '商',
+  '°Ô' => '啪',
+  '°Õ' => '啦',
+  '°Ö' => 'å•„',
+  '°×' => 'å•ž',
+  '°Ø' => 'å•¡',
+  '°Ù' => '啃',
+  '°Ú' => 'å•Š',
+  '°Û' => 'å”±',
+  '°Ü' => 'å•–',
+  '°Ý' => 'å•�',
+  '°Þ' => 'å••',
+  '°ß' => '唯',
+  '°à' => '啤',
+  '°á' => '唸',
+  '°â' => 'å”®',
+  '°ã' => 'å•œ',
+  '°ä' => '唬',
+  '°å' => 'å•£',
+  '°æ' => '唳',
+  '°ç' => 'å•�',
+  '°è' => 'å•—',
+  '°é' => '圈',
+  '°ê' => '國',
+  '°ë' => '圉',
+  '°ì' => '域',
+  '°í' => 'å …',
+  '°î' => 'å Š',
+  '°ï' => 'å †',
+  '°ð' => '埠',
+  '°ñ' => '埤',
+  '°ò' => '基',
+  '°ó' => 'å ‚',
+  '°ô' => 'å µ',
+  '°õ' => '執',
+  '°ö' => '培',
+  '°÷' => '夠',
+  '°ø' => '奢',
+  '°ù' => '娶',
+  '°ú' => 'å©�',
+  '°û' => '婉',
+  '°ü' => '婦',
+  '°ý' => '婪',
+  '°þ' => 'å©€',
+  '±@' => '娼',
+  '±A' => 'å©¢',
+  '±B' => 'å©š',
+  '±C' => '婆',
+  '±D' => 'å©Š',
+  '±E' => 'å­°',
+  '±F' => '寇',
+  '±G' => '寅',
+  '±H' => '寄',
+  '±I' => '寂',
+  '±J' => '宿',
+  '±K' => '密',
+  '±L' => 'å°‰',
+  '±M' => 'å°ˆ',
+  '±N' => 'å°‡',
+  '±O' => 'å± ',
+  '±P' => '屜',
+  '±Q' => 'å±�',
+  '±R' => 'å´‡',
+  '±S' => 'å´†',
+  '±T' => 'å´Ž',
+  '±U' => 'å´›',
+  '±V' => 'å´–',
+  '±W' => 'å´¢',
+  '±X' => 'å´‘',
+  '±Y' => 'å´©',
+  '±Z' => 'å´”',
+  '±[' => 'å´™',
+  '±\\' => 'å´¤',
+  '±]' => 'å´§',
+  '±^' => 'å´—',
+  '±_' => 'å·¢',
+  '±`' => '常',
+  '±a' => '帶',
+  '±b' => '帳',
+  '±c' => '帷',
+  '±d' => '康',
+  '±e' => '庸',
+  '±f' => '庶',
+  '±g' => '庵',
+  '±h' => '庾',
+  '±i' => 'å¼µ',
+  '±j' => 'å¼·',
+  '±k' => 'å½—',
+  '±l' => '彬',
+  '±m' => '彩',
+  '±n' => '彫',
+  '±o' => 'å¾—',
+  '±p' => 'å¾™',
+  '±q' => '從',
+  '±r' => '徘',
+  '±s' => '御',
+  '±t' => 'å¾ ',
+  '±u' => '徜',
+  '±v' => 'æ�¿',
+  '±w' => 'æ‚£',
+  '±x' => '悉',
+  '±y' => 'æ‚ ',
+  '±z' => '您',
+  '±{' => '惋',
+  '±|' => 'æ‚´',
+  '±}' => '惦',
+  '±~' => '悽',
+  '±¡' => '情',
+  '±¢' => 'æ‚»',
+  '±£' => '悵',
+  '±¤' => '惜',
+  '±¥' => '悼',
+  '±¦' => '惘',
+  '±§' => '惕',
+  '±¨' => '惆',
+  '±©' => '惟',
+  '±ª' => '悸',
+  '±«' => '惚',
+  '±¬' => '惇',
+  '±­' => '戚',
+  '±®' => '戛',
+  '±¯' => '扈',
+  '±°' => '掠',
+  '±±' => '控',
+  '±²' => 'æ�²',
+  '±³' => '掖',
+  '±´' => '探',
+  '±µ' => '接',
+  '±¶' => 'æ�·',
+  '±·' => 'æ�§',
+  '±¸' => '掘',
+  '±¹' => '措',
+  '±º' => 'æ�±',
+  '±»' => '掩',
+  '±¼' => '掉',
+  '±½' => '掃',
+  '±¾' => '掛',
+  '±¿' => 'æ�«',
+  '±À' => '推',
+  '±Á' => '掄',
+  '±Â' => '授',
+  '±Ã' => '掙',
+  '±Ä' => '採',
+  '±Å' => '掬',
+  '±Æ' => '排',
+  '±Ç' => 'æŽ�',
+  '±È' => '掀',
+  '±É' => 'æ�»',
+  '±Ê' => 'æ�©',
+  '±Ë' => 'æ�¨',
+  '±Ì' => 'æ�º',
+  '±Í' => 'æ•�',
+  '±Î' => 'æ•–',
+  '±Ï' => 'æ•‘',
+  '±Ð' => 'æ•™',
+  '±Ñ' => 'æ•—',
+  '±Ò' => 'å•Ÿ',
+  '±Ó' => 'æ•�',
+  '±Ô' => '敘',
+  '±Õ' => 'æ••',
+  '±Ö' => 'æ•”',
+  '±×' => 'æ–œ',
+  '±Ø' => 'æ–›',
+  '±Ù' => 'æ–¬',
+  '±Ú' => 'æ—�',
+  '±Û' => 'æ—‹',
+  '±Ü' => 'æ—Œ',
+  '±Ý' => 'æ—Ž',
+  '±Þ' => 'æ™�',
+  '±ß' => '晚',
+  '±à' => '晤',
+  '±á' => '晨',
+  '±â' => '晦',
+  '±ã' => '晞',
+  '±ä' => '曹',
+  '±å' => 'å‹—',
+  '±æ' => '望',
+  '±ç' => 'æ¢�',
+  '±è' => '梯',
+  '±é' => '梢',
+  '±ê' => '梓',
+  '±ë' => '梵',
+  '±ì' => 'æ¡¿',
+  '±í' => '桶',
+  '±î' => '梱',
+  '±ï' => '梧',
+  '±ð' => '梗',
+  '±ñ' => '械',
+  '±ò' => '梃',
+  '±ó' => '棄',
+  '±ô' => '梭',
+  '±õ' => '梆',
+  '±ö' => '梅',
+  '±÷' => '梔',
+  '±ø' => 'æ¢�',
+  '±ù' => '梨',
+  '±ú' => '梟',
+  '±û' => '梡',
+  '±ü' => '梂',
+  '±ý' => '欲',
+  '±þ' => '殺',
+  '²@' => '毫',
+  '²A' => '毬',
+  '²B' => 'æ°«',
+  '²C' => '涎',
+  '²D' => '涼',
+  '²E' => 'æ·³',
+  '²F' => 'æ·™',
+  '²G' => '液',
+  '²H' => 'æ·¡',
+  '²I' => 'æ·Œ',
+  '²J' => 'æ·¤',
+  '²K' => 'æ·»',
+  '²L' => 'æ·º',
+  '²M' => '清',
+  '²N' => 'æ·‡',
+  '²O' => 'æ·‹',
+  '²P' => '涯',
+  '²Q' => 'æ·‘',
+  '²R' => '涮',
+  '²S' => 'æ·ž',
+  '²T' => 'æ·¹',
+  '²U' => '涸',
+  '²V' => 'æ··',
+  '²W' => 'æ·µ',
+  '²X' => 'æ·…',
+  '²Y' => 'æ·’',
+  '²Z' => '渚',
+  '²[' => '涵',
+  '²\\' => 'æ·š',
+  '²]' => 'æ·«',
+  '²^' => 'æ·˜',
+  '²_' => 'æ·ª',
+  '²`' => 'æ·±',
+  '²a' => 'æ·®',
+  '²b' => 'æ·¨',
+  '²c' => 'æ·†',
+  '²d' => 'æ·„',
+  '²e' => '涪',
+  '²f' => 'æ·¬',
+  '²g' => '涿',
+  '²h' => 'æ·¦',
+  '²i' => '烹',
+  '²j' => '焉',
+  '²k' => 'ç„Š',
+  '²l' => '烽',
+  '²m' => '烯',
+  '²n' => '爽',
+  '²o' => '牽',
+  '²p' => 'çŠ�',
+  '²q' => '猜',
+  '²r' => '猛',
+  '²s' => '猖',
+  '²t' => '猓',
+  '²u' => '猙',
+  '²v' => '率',
+  '²w' => 'ç�…',
+  '²x' => 'ç�Š',
+  '²y' => 'ç�ƒ',
+  '²z' => 'ç�†',
+  '²{' => 'ç�¾',
+  '²|' => 'ç��',
+  '²}' => 'ç“ ',
+  '²~' => '瓶',
+  '²¡' => 'ç“·',
+  '²¢' => '甜',
+  '²£' => '產',
+  '²¤' => 'ç•¥',
+  '²¥' => '畦',
+  '²¦' => 'ç•¢',
+  '²§' => 'ç•°',
+  '²¨' => 'ç–�',
+  '²©' => 'ç—”',
+  '²ª' => 'ç—•',
+  '²«' => 'ç–µ',
+  '²¬' => 'ç—Š',
+  '²­' => 'ç—�',
+  '²®' => '皎',
+  '²¯' => 'ç›”',
+  '²°' => 'ç›’',
+  '²±' => 'ç››',
+  '²²' => '眷',
+  '²³' => '眾',
+  '²´' => '眼',
+  '²µ' => '眶',
+  '²¶' => '眸',
+  '²·' => '眺',
+  '²¸' => 'ç¡«',
+  '²¹' => '硃',
+  '²º' => 'ç¡Ž',
+  '²»' => '祥',
+  '²¼' => '票',
+  '²½' => '祭',
+  '²¾' => '移',
+  '²¿' => '窒',
+  '²À' => '窕',
+  '²Á' => '笠',
+  '²Â' => '笨',
+  '²Ã' => '笛',
+  '²Ä' => '第',
+  '²Å' => '符',
+  '²Æ' => '笙',
+  '²Ç' => '笞',
+  '²È' => '笮',
+  '²É' => 'ç²’',
+  '²Ê' => 'ç²—',
+  '²Ë' => '粕',
+  '²Ì' => '絆',
+  '²Í' => '絃',
+  '²Î' => 'çµ±',
+  '²Ï' => 'ç´®',
+  '²Ð' => 'ç´¹',
+  '²Ñ' => 'ç´¼',
+  '²Ò' => 'çµ€',
+  '²Ó' => 'ç´°',
+  '²Ô' => 'ç´³',
+  '²Õ' => '組',
+  '²Ö' => 'ç´¯',
+  '²×' => '終',
+  '²Ø' => 'ç´²',
+  '²Ù' => 'ç´±',
+  '²Ú' => 'ç¼½',
+  '²Û' => '羞',
+  '²Ü' => '羚',
+  '²Ý' => 'ç¿Œ',
+  '²Þ' => 'ç¿Ž',
+  '²ß' => 'ç¿’',
+  '²à' => '耜',
+  '²á' => 'è�Š',
+  '²â' => 'è�†',
+  '²ã' => '脯',
+  '²ä' => 'è„–',
+  '²å' => 'è„£',
+  '²æ' => 'è„«',
+  '²ç' => 'è„©',
+  '²è' => 'è„°',
+  '²é' => '脤',
+  '²ê' => '舂',
+  '²ë' => '舵',
+  '²ì' => '舷',
+  '²í' => '舶',
+  '²î' => '船',
+  '²ï' => '莎',
+  '²ð' => '莞',
+  '²ñ' => '莘',
+  '²ò' => 'è�¸',
+  '²ó' => '莢',
+  '²ô' => '莖',
+  '²õ' => '莽',
+  '²ö' => '莫',
+  '²÷' => '莒',
+  '²ø' => '莊',
+  '²ù' => '莓',
+  '²ú' => '莉',
+  '²û' => '莠',
+  '²ü' => 'è�·',
+  '²ý' => 'è�»',
+  '²þ' => 'è�¼',
+  '³@' => '莆',
+  '³A' => '莧',
+  '³B' => '處',
+  '³C' => '彪',
+  '³D' => '蛇',
+  '³E' => '蛀',
+  '³F' => '蚶',
+  '³G' => '蛄',
+  '³H' => 'èšµ',
+  '³I' => '蛆',
+  '³J' => '蛋',
+  '³K' => 'èš±',
+  '³L' => '蚯',
+  '³M' => '蛉',
+  '³N' => 'è¡“',
+  '³O' => '袞',
+  '³P' => '袈',
+  '³Q' => '被',
+  '³R' => '袒',
+  '³S' => '袖',
+  '³T' => 'è¢�',
+  '³U' => '袋',
+  '³V' => '覓',
+  '³W' => 'è¦�',
+  '³X' => '訪',
+  '³Y' => 'è¨�',
+  '³Z' => '訣',
+  '³[' => '訥',
+  '³\\' => '許',
+  '³]' => '設',
+  '³^' => '訟',
+  '³_' => '訛',
+  '³`' => '訢',
+  '³a' => '豉',
+  '³b' => '豚',
+  '³c' => '販',
+  '³d' => '責',
+  '³e' => '貫',
+  '³f' => '貨',
+  '³g' => '貪',
+  '³h' => '貧',
+  '³i' => '赧',
+  '³j' => '赦',
+  '³k' => '趾',
+  '³l' => '趺',
+  '³m' => 'è»›',
+  '³n' => '軟',
+  '³o' => '這',
+  '³p' => 'é€�',
+  '³q' => '通',
+  '³r' => '逗',
+  '³s' => '連',
+  '³t' => '速',
+  '³u' => 'é€�',
+  '³v' => 'é€�',
+  '³w' => '逕',
+  '³x' => '逞',
+  '³y' => '造',
+  '³z' => 'é€�',
+  '³{' => '逢',
+  '³|' => '逖',
+  '³}' => '逛',
+  '³~' => '途',
+  '³¡' => '部',
+  '³¢' => '郭',
+  '³£' => '都',
+  '³¤' => 'é…—',
+  '³¥' => '野',
+  '³¦' => '釵',
+  '³§' => '釦',
+  '³¨' => '釣',
+  '³©' => '釧',
+  '³ª' => '釭',
+  '³«' => '釩',
+  '³¬' => 'é–‰',
+  '³­' => '陪',
+  '³®' => '陵',
+  '³¯' => '陳',
+  '³°' => '陸',
+  '³±' => 'é™°',
+  '³²' => 'é™´',
+  '³³' => '陶',
+  '³´' => 'é™·',
+  '³µ' => '陬',
+  '³¶' => '雀',
+  '³·' => '雪',
+  '³¸' => '雩',
+  '³¹' => 'ç« ',
+  '³º' => 'ç«Ÿ',
+  '³»' => 'é ‚',
+  '³¼' => 'é ƒ',
+  '³½' => 'é­š',
+  '³¾' => 'é³¥',
+  '³¿' => 'é¹µ',
+  '³À' => '鹿',
+  '³Á' => '麥',
+  '³Â' => '麻',
+  '³Ã' => 'å‚¢',
+  '³Ä' => 'å‚�',
+  '³Å' => 'å‚…',
+  '³Æ' => 'å‚™',
+  '³Ç' => 'å‚‘',
+  '³È' => 'å‚€',
+  '³É' => 'å‚–',
+  '³Ê' => '傘',
+  '³Ë' => 'å‚š',
+  '³Ì' => '最',
+  '³Í' => '凱',
+  '³Î' => '割',
+  '³Ï' => '剴',
+  '³Ð' => '創',
+  '³Ñ' => '剩',
+  '³Ò' => 'å‹ž',
+  '³Ó' => 'å‹�',
+  '³Ô' => 'å‹›',
+  '³Õ' => 'å�š',
+  '³Ö' => '厥',
+  '³×' => 'å•»',
+  '³Ø' => 'å–€',
+  '³Ù' => 'å–§',
+  '³Ú' => '啼',
+  '³Û' => 'å–Š',
+  '³Ü' => 'å–�',
+  '³Ý' => 'å–˜',
+  '³Þ' => 'å–‚',
+  '³ß' => 'å–œ',
+  '³à' => 'å–ª',
+  '³á' => 'å–”',
+  '³â' => 'å–‡',
+  '³ã' => 'å–‹',
+  '³ä' => 'å–ƒ',
+  '³å' => 'å–³',
+  '³æ' => 'å–®',
+  '³ç' => 'å–Ÿ',
+  '³è' => '唾',
+  '³é' => 'å–²',
+  '³ê' => 'å–š',
+  '³ë' => 'å–»',
+  '³ì' => 'å–¬',
+  '³í' => 'å–±',
+  '³î' => '啾',
+  '³ï' => 'å–‰',
+  '³ð' => 'å–«',
+  '³ñ' => 'å–™',
+  '³ò' => 'åœ�',
+  '³ó' => 'å ¯',
+  '³ô' => 'å ª',
+  '³õ' => 'å ´',
+  '³ö' => 'å ¤',
+  '³÷' => 'å °',
+  '³ø' => 'å ±',
+  '³ù' => 'å ¡',
+  '³ú' => 'å �',
+  '³û' => 'å  ',
+  '³ü' => '壹',
+  '³ý' => '壺',
+  '³þ' => '奠',
+  '´@' => 'å©·',
+  '´A' => '媚',
+  '´B' => 'å©¿',
+  '´C' => '媒',
+  '´D' => '媛',
+  '´E' => '媧',
+  '´F' => 'å­³',
+  '´G' => 'å­±',
+  '´H' => '寒',
+  '´I' => '富',
+  '´J' => '寓',
+  '´K' => 'å¯�',
+  '´L' => 'å°Š',
+  '´M' => 'å°‹',
+  '´N' => 'å°±',
+  '´O' => '嵌',
+  '´P' => 'åµ�',
+  '´Q' => 'å´´',
+  '´R' => '嵇',
+  '´S' => 'å·½',
+  '´T' => 'å¹…',
+  '´U' => '帽',
+  '´V' => 'å¹€',
+  '´W' => '幃',
+  '´X' => 'å¹¾',
+  '´Y' => '廊',
+  '´Z' => 'å»�',
+  '´[' => '廂',
+  '´\\' => '廄',
+  '´]' => 'å¼¼',
+  '´^' => 'å½­',
+  '´_' => '復',
+  '´`' => '循',
+  '´a' => '徨',
+  '´b' => '惑',
+  '´c' => '惡',
+  '´d' => '悲',
+  '´e' => '悶',
+  '´f' => '惠',
+  '´g' => 'æ„œ',
+  '´h' => 'æ„£',
+  '´i' => '惺',
+  '´j' => 'æ„•',
+  '´k' => '惰',
+  '´l' => '惻',
+  '´m' => '惴',
+  '´n' => 'æ…¨',
+  '´o' => '惱',
+  '´p' => 'æ„Ž',
+  '´q' => '惶',
+  '´r' => '愉',
+  '´s' => 'æ„€',
+  '´t' => 'æ„’',
+  '´u' => '戟',
+  '´v' => '扉',
+  '´w' => '掣',
+  '´x' => '掌',
+  '´y' => 'æ��',
+  '´z' => 'æ�€',
+  '´{' => 'æ�©',
+  '´|' => 'æ�‰',
+  '´}' => 'æ�†',
+  '´~' => 'æ��',
+  '´¡' => 'æ�’',
+  '´¢' => 'æ�£',
+  '´£' => 'æ��',
+  '´¤' => 'æ�¡',
+  '´¥' => 'æ�–',
+  '´¦' => 'æ�­',
+  '´§' => 'æ�®',
+  '´¨' => 'æ�¶',
+  '´©' => 'æ�´',
+  '´ª' => 'æ�ª',
+  '´«' => 'æ�›',
+  '´¬' => 'æ‘’',
+  '´­' => 'æ�š',
+  '´®' => 'æ�¹',
+  '´¯' => 'æ•ž',
+  '´°' => '敦',
+  '´±' => 'æ•¢',
+  '´²' => 'æ•£',
+  '´³' => 'æ–‘',
+  '´´' => 'æ–�',
+  '´µ' => 'æ–¯',
+  '´¶' => 'æ™®',
+  '´·' => 'æ™°',
+  '´¸' => 'æ™´',
+  '´¹' => '晶',
+  '´º' => '景',
+  '´»' => 'æš‘',
+  '´¼' => '智',
+  '´½' => '晾',
+  '´¾' => 'æ™·',
+  '´¿' => '曾',
+  '´À' => '替',
+  '´Á' => '期',
+  '´Â' => 'æœ�',
+  '´Ã' => '棺',
+  '´Ä' => '棕',
+  '´Å' => '棠',
+  '´Æ' => '棘',
+  '´Ç' => '棗',
+  '´È' => '椅',
+  '´É' => '棟',
+  '´Ê' => '棵',
+  '´Ë' => '森',
+  '´Ì' => '棧',
+  '´Í' => '棹',
+  '´Î' => '棒',
+  '´Ï' => '棲',
+  '´Ð' => '棣',
+  '´Ñ' => '棋',
+  '´Ò' => 'æ£�',
+  '´Ó' => 'æ¤�',
+  '´Ô' => '椒',
+  '´Õ' => '椎',
+  '´Ö' => '棉',
+  '´×' => '棚',
+  '´Ø' => '楮',
+  '´Ù' => '棻',
+  '´Ú' => '款',
+  '´Û' => '欺',
+  '´Ü' => '欽',
+  '´Ý' => '殘',
+  '´Þ' => 'æ®–',
+  '´ß' => '殼',
+  '´à' => '毯',
+  '´á' => 'æ°®',
+  '´â' => 'æ°¯',
+  '´ã' => 'æ°¬',
+  '´ä' => '港',
+  '´å' => '游',
+  '´æ' => 'æ¹”',
+  '´ç' => '渡',
+  '´è' => '渲',
+  '´é' => '湧',
+  '´ê' => '湊',
+  '´ë' => '渠',
+  '´ì' => '渥',
+  '´í' => '渣',
+  '´î' => '減',
+  '´ï' => 'æ¹›',
+  '´ð' => '湘',
+  '´ñ' => '渤',
+  '´ò' => 'æ¹–',
+  '´ó' => 'æ¹®',
+  '´ô' => '渭',
+  '´õ' => '渦',
+  '´ö' => '湯',
+  '´÷' => '渴',
+  '´ø' => 'æ¹�',
+  '´ù' => '渺',
+  '´ú' => '測',
+  '´û' => '湃',
+  '´ü' => 'æ¸�',
+  '´ý' => '渾',
+  '´þ' => '滋',
+  'µ@' => '溉',
+  'µA' => '渙',
+  'µB' => '湎',
+  'µC' => 'æ¹£',
+  'µD' => '湄',
+  'µE' => 'æ¹²',
+  'µF' => '湩',
+  'µG' => '湟',
+  'µH' => 'ç„™',
+  'µI' => 'ç„š',
+  'µJ' => '焦',
+  'µK' => 'ç„°',
+  'µL' => 'ç„¡',
+  'µM' => '然',
+  'µN' => 'ç…®',
+  'µO' => 'ç„œ',
+  'µP' => '牌',
+  'µQ' => '犄',
+  'µR' => '犀',
+  'µS' => '猶',
+  'µT' => '猥',
+  'µU' => '猴',
+  'µV' => '猩',
+  'µW' => 'ç�º',
+  'µX' => 'ç�ª',
+  'µY' => 'ç�³',
+  'µZ' => 'ç�¢',
+  'µ[' => 'ç�¥',
+  'µ\\' => 'ç�µ',
+  'µ]' => 'ç�¶',
+  'µ^' => 'ç�´',
+  'µ_' => 'ç�¯',
+  'µ`' => 'ç�›',
+  'µa' => 'ç�¦',
+  'µb' => 'ç�¨',
+  'µc' => '甥',
+  'µd' => '甦',
+  'µe' => 'ç•«',
+  'µf' => '番',
+  'µg' => 'ç—¢',
+  'µh' => 'ç—›',
+  'µi' => 'ç—£',
+  'µj' => 'ç—™',
+  'µk' => 'ç—˜',
+  'µl' => 'ç—ž',
+  'µm' => 'ç— ',
+  'µn' => 'ç™»',
+  'µo' => '發',
+  'µp' => 'çš–',
+  'µq' => 'çš“',
+  'µr' => 'çš´',
+  'µs' => '盜',
+  'µt' => 'ç��',
+  'µu' => '短',
+  'µv' => 'ç¡�',
+  'µw' => '硬',
+  'µx' => '硯',
+  'µy' => 'ç¨�',
+  'µz' => '稈',
+  'µ{' => '程',
+  'µ|' => '稅',
+  'µ}' => '稀',
+  'µ~' => '窘',
+  'µ¡' => '窗',
+  'µ¢' => '窖',
+  'µ£' => 'ç«¥',
+  'µ¤' => 'ç«£',
+  'µ¥' => 'ç­‰',
+  'µ¦' => 'ç­–',
+  'µ§' => 'ç­†',
+  'µ¨' => 'ç­�',
+  'µ©' => 'ç­’',
+  'µª' => 'ç­”',
+  'µ«' => 'ç­�',
+  'µ¬' => 'ç­‹',
+  'µ­' => 'ç­�',
+  'µ®' => 'ç­‘',
+  'µ¯' => '粟',
+  'µ°' => 'ç²¥',
+  'µ±' => '絞',
+  'µ²' => 'çµ�',
+  'µ³' => '絨',
+  'µ´' => '絕',
+  'µµ' => 'ç´«',
+  'µ¶' => 'çµ®',
+  'µ·' => 'çµ²',
+  'µ¸' => '絡',
+  'µ¹' => '給',
+  'µº' => 'çµ¢',
+  'µ»' => 'çµ°',
+  'µ¼' => 'çµ³',
+  'µ½' => 'å–„',
+  'µ¾' => 'ç¿”',
+  'µ¿' => 'ç¿•',
+  'µÀ' => '耋',
+  'µÁ' => 'è�’',
+  'µÂ' => 'è‚…',
+  'µÃ' => 'è…•',
+  'µÄ' => 'è…”',
+  'µÅ' => 'è…‹',
+  'µÆ' => 'è…‘',
+  'µÇ' => 'è…Ž',
+  'µÈ' => '脹',
+  'µÉ' => 'è…†',
+  'µÊ' => '脾',
+  'µË' => 'è…Œ',
+  'µÌ' => 'è…“',
+  'µÍ' => 'è…´',
+  'µÎ' => '舒',
+  'µÏ' => '舜',
+  'µÐ' => 'è�©',
+  'µÑ' => 'è�ƒ',
+  'µÒ' => 'è�¸',
+  'µÓ' => 'è��',
+  'µÔ' => 'è� ',
+  'µÕ' => 'è�…',
+  'µÖ' => 'è�‹',
+  'µ×' => 'è��',
+  'µØ' => 'è�¯',
+  'µÙ' => 'è�±',
+  'µÚ' => 'è�´',
+  'µÛ' => 'è‘—',
+  'µÜ' => 'è�Š',
+  'µÝ' => 'è�°',
+  'µÞ' => 'è�Œ',
+  'µß' => 'è�Œ',
+  'µà' => 'è�½',
+  'µá' => 'è�²',
+  'µâ' => 'è�Š',
+  'µã' => 'è�¸',
+  'µä' => 'è�Ž',
+  'µå' => 'è�„',
+  'µæ' => 'è�œ',
+  'µç' => 'è�‡',
+  'µè' => 'è�”',
+  'µé' => 'è�Ÿ',
+  'µê' => 'è™›',
+  'µë' => '蛟',
+  'µì' => 'è›™',
+  'µí' => 'è›­',
+  'µî' => 'è›”',
+  'µï' => 'è››',
+  'µð' => '蛤',
+  'µñ' => 'è›�',
+  'µò' => '蛞',
+  'µó' => 'è¡—',
+  'µô' => 'è£�',
+  'µõ' => '裂',
+  'µö' => '袱',
+  'µ÷' => '覃',
+  'µø' => '視',
+  'µù' => '註',
+  'µú' => 'è© ',
+  'µû' => 'è©•',
+  'µü' => 'è©ž',
+  'µý' => '証',
+  'µþ' => 'è©�',
+  '¶@' => 'è©”',
+  '¶A' => 'è©›',
+  '¶B' => 'è©�',
+  '¶C' => '詆',
+  '¶D' => '訴',
+  '¶E' => '診',
+  '¶F' => '訶',
+  '¶G' => 'è©–',
+  '¶H' => '象',
+  '¶I' => '貂',
+  '¶J' => '貯',
+  '¶K' => 'è²¼',
+  '¶L' => 'è²³',
+  '¶M' => 'è²½',
+  '¶N' => 'è³�',
+  '¶O' => 'è²»',
+  '¶P' => 'è³€',
+  '¶Q' => 'è²´',
+  '¶R' => 'è²·',
+  '¶S' => '貶',
+  '¶T' => '貿',
+  '¶U' => '貸',
+  '¶V' => '越',
+  '¶W' => '超',
+  '¶X' => 'è¶�',
+  '¶Y' => 'è·Ž',
+  '¶Z' => 'è·�',
+  '¶[' => 'è·‹',
+  '¶\\' => 'è·š',
+  '¶]' => 'è·‘',
+  '¶^' => 'è·Œ',
+  '¶_' => 'è·›',
+  '¶`' => 'è·†',
+  '¶a' => 'è»»',
+  '¶b' => '軸',
+  '¶c' => '軼',
+  '¶d' => '辜',
+  '¶e' => '逮',
+  '¶f' => '逵',
+  '¶g' => '週',
+  '¶h' => '逸',
+  '¶i' => '進',
+  '¶j' => '逶',
+  '¶k' => 'é„‚',
+  '¶l' => '郵',
+  '¶m' => '鄉',
+  '¶n' => '郾',
+  '¶o' => 'é…£',
+  '¶p' => 'é…¥',
+  '¶q' => 'é‡�',
+  '¶r' => '鈔',
+  '¶s' => '鈕',
+  '¶t' => '鈣',
+  '¶u' => '鈉',
+  '¶v' => '鈞',
+  '¶w' => 'éˆ�',
+  '¶x' => 'éˆ�',
+  '¶y' => '鈇',
+  '¶z' => '鈑',
+  '¶{' => 'é–”',
+  '¶|' => 'é–�',
+  '¶}' => 'é–‹',
+  '¶~' => 'é–‘',
+  '¶¡' => 'é–“',
+  '¶¢' => 'é–’',
+  '¶£' => 'é–Ž',
+  '¶¤' => '隊',
+  '¶¥' => '階',
+  '¶¦' => 'éš‹',
+  '¶§' => '陽',
+  '¶¨' => 'éš…',
+  '¶©' => '隆',
+  '¶ª' => 'éš�',
+  '¶«' => '陲',
+  '¶¬' => 'éš„',
+  '¶­' => 'é›�',
+  '¶®' => 'é›…',
+  '¶¯' => '雄',
+  '¶°' => '集',
+  '¶±' => '雇',
+  '¶²' => '雯',
+  '¶³' => '雲',
+  '¶´' => '韌',
+  '¶µ' => 'é …',
+  '¶¶' => 'é †',
+  '¶·' => 'é ˆ',
+  '¶¸' => '飧',
+  '¶¹' => '飪',
+  '¶º' => '飯',
+  '¶»' => '飩',
+  '¶¼' => '飲',
+  '¶½' => '飭',
+  '¶¾' => '馮',
+  '¶¿' => '馭',
+  '¶À' => '黃',
+  '¶Á' => 'é»�',
+  '¶Â' => '黑',
+  '¶Ã' => '亂',
+  '¶Ä' => 'å‚­',
+  '¶Å' => '債',
+  '¶Æ' => '傲',
+  '¶Ç' => '傳',
+  '¶È' => '僅',
+  '¶É' => '傾',
+  '¶Ê' => '催',
+  '¶Ë' => 'å‚·',
+  '¶Ì' => 'å‚»',
+  '¶Í' => '傯',
+  '¶Î' => '僇',
+  '¶Ï' => '剿',
+  '¶Ð' => '剷',
+  '¶Ñ' => '剽',
+  '¶Ò' => 'å‹Ÿ',
+  '¶Ó' => '勦',
+  '¶Ô' => '勤',
+  '¶Õ' => 'å‹¢',
+  '¶Ö' => 'å‹£',
+  '¶×' => '匯',
+  '¶Ø' => 'å—Ÿ',
+  '¶Ù' => 'å—¨',
+  '¶Ú' => 'å—“',
+  '¶Û' => 'å—¦',
+  '¶Ü' => 'å—Ž',
+  '¶Ý' => 'å—œ',
+  '¶Þ' => 'å—‡',
+  '¶ß' => 'å—‘',
+  '¶à' => 'å—£',
+  '¶á' => 'å—¤',
+  '¶â' => 'å—¯',
+  '¶ã' => 'å—š',
+  '¶ä' => 'å—¡',
+  '¶å' => 'å—…',
+  '¶æ' => 'å—†',
+  '¶ç' => 'å—¥',
+  '¶è' => 'å—‰',
+  '¶é' => '園',
+  '¶ê' => '圓',
+  '¶ë' => 'å¡ž',
+  '¶ì' => 'å¡‘',
+  '¶í' => '塘',
+  '¶î' => 'å¡—',
+  '¶ï' => 'å¡š',
+  '¶ð' => 'å¡”',
+  '¶ñ' => 'å¡«',
+  '¶ò' => 'å¡Œ',
+  '¶ó' => 'å¡­',
+  '¶ô' => 'å¡Š',
+  '¶õ' => 'å¡¢',
+  '¶ö' => 'å¡’',
+  '¶÷' => 'å¡‹',
+  '¶ø' => '奧',
+  '¶ù' => 'å«�',
+  '¶ú' => '嫉',
+  '¶û' => 'å«Œ',
+  '¶ü' => '媾',
+  '¶ý' => '媽',
+  '¶þ' => '媼',
+  '·@' => '媳',
+  '·A' => 'å«‚',
+  '·B' => '媲',
+  '·C' => '嵩',
+  '·D' => '嵯',
+  '·E' => '幌',
+  '·F' => 'å¹¹',
+  '·G' => '廉',
+  '·H' => '廈',
+  '·I' => 'å¼’',
+  '·J' => 'å½™',
+  '·K' => '徬',
+  '·L' => 'å¾®',
+  '·M' => 'æ„š',
+  '·N' => 'æ„�',
+  '·O' => 'æ…ˆ',
+  '·P' => 'æ„Ÿ',
+  '·Q' => '想',
+  '·R' => 'æ„›',
+  '·S' => '惹',
+  '·T' => 'æ„�',
+  '·U' => '愈',
+  '·V' => 'æ…Ž',
+  '·W' => 'æ…Œ',
+  '·X' => 'æ…„',
+  '·Y' => 'æ…�',
+  '·Z' => '愾',
+  '·[' => 'æ„´',
+  '·\\' => '愧',
+  '·]' => 'æ„�',
+  '·^' => '愆',
+  '·_' => 'æ„·',
+  '·`' => '戡',
+  '·a' => '戢',
+  '·b' => 'æ�“',
+  '·c' => 'æ�¾',
+  '·d' => 'æ�ž',
+  '·e' => 'æ�ª',
+  '·f' => 'æ�­',
+  '·g' => 'æ�½',
+  '·h' => 'æ�¬',
+  '·i' => 'æ��',
+  '·j' => 'æ�œ',
+  '·k' => 'æ�”',
+  '·l' => 'æ��',
+  '·m' => 'æ�¶',
+  '·n' => 'æ�–',
+  '·o' => 'æ�—',
+  '·p' => 'æ�†',
+  '·q' => '敬',
+  '·r' => 'æ–Ÿ',
+  '·s' => 'æ–°',
+  '·t' => 'æš—',
+  '·u' => '暉',
+  '·v' => '暇',
+  '·w' => '暈',
+  '·x' => 'æš–',
+  '·y' => 'æš„',
+  '·z' => '暘',
+  '·{' => 'æš�',
+  '·|' => '會',
+  '·}' => '榔',
+  '·~' => '業',
+  '·¡' => '楚',
+  '·¢' => '楷',
+  '·£' => '楠',
+  '·¤' => '楔',
+  '·¥' => '極',
+  '·¦' => '椰',
+  '·§' => '概',
+  '·¨' => '楊',
+  '·©' => '楨',
+  '·ª' => '楫',
+  '·«' => '楞',
+  '·¬' => '楓',
+  '·­' => '楹',
+  '·®' => '榆',
+  '·¯' => 'æ¥�',
+  '·°' => '楣',
+  '·±' => '楛',
+  '·²' => 'æ­‡',
+  '·³' => 'æ­²',
+  '·´' => '毀',
+  '·µ' => '殿',
+  '·¶' => '毓',
+  '··' => '毽',
+  '·¸' => '溢',
+  '·¹' => '溯',
+  '·º' => '滓',
+  '·»' => '溶',
+  '·¼' => '滂',
+  '·½' => 'æº�',
+  '·¾' => 'æº�',
+  '·¿' => '滇',
+  '·À' => 'æ»…',
+  '·Á' => '溥',
+  '·Â' => '溘',
+  '·Ã' => '溼',
+  '·Ä' => '溺',
+  '·Å' => '溫',
+  '·Æ' => '滑',
+  '·Ç' => '準',
+  '·È' => '溜',
+  '·É' => '滄',
+  '·Ê' => 'æ»”',
+  '·Ë' => '溪',
+  '·Ì' => '溧',
+  '·Í' => '溴',
+  '·Î' => 'ç…Ž',
+  '·Ï' => 'ç…™',
+  '·Ð' => 'ç…©',
+  '·Ñ' => 'ç…¤',
+  '·Ò' => 'ç…‰',
+  '·Ó' => 'ç…§',
+  '·Ô' => 'ç…œ',
+  '·Õ' => 'ç…¬',
+  '·Ö' => 'ç…¦',
+  '·×' => 'ç…Œ',
+  '·Ø' => 'ç…¥',
+  '·Ù' => 'ç…ž',
+  '·Ú' => 'ç…†',
+  '·Û' => 'ç…¨',
+  '·Ü' => 'ç…–',
+  '·Ý' => '爺',
+  '·Þ' => '牒',
+  '·ß' => '猷',
+  '·à' => 'ç�…',
+  '·á' => '猿',
+  '·â' => '猾',
+  '·ã' => '瑯',
+  '·ä' => 'ç‘š',
+  '·å' => 'ç‘•',
+  '·æ' => 'ç‘Ÿ',
+  '·ç' => 'ç‘ž',
+  '·è' => 'ç‘�',
+  '·é' => 'ç�¿',
+  '·ê' => 'ç‘™',
+  '·ë' => 'ç‘›',
+  '·ì' => 'ç‘œ',
+  '·í' => '當',
+  '·î' => '畸',
+  '·ï' => '瘀',
+  '·ð' => 'ç—°',
+  '·ñ' => 'ç˜�',
+  '·ò' => 'ç—²',
+  '·ó' => 'ç—±',
+  '·ô' => 'ç—º',
+  '·õ' => 'ç—¿',
+  '·ö' => 'ç—´',
+  '·÷' => 'ç—³',
+  '·ø' => '盞',
+  '·ù' => '盟',
+  '·ú' => 'ç�›',
+  '·û' => 'ç�«',
+  '·ü' => 'ç�¦',
+  '·ý' => 'ç�ž',
+  '·þ' => 'ç�£',
+  '¸@' => 'ç�¹',
+  '¸A' => 'ç�ª',
+  '¸B' => 'ç�¬',
+  '¸C' => 'ç�œ',
+  '¸D' => 'ç�¥',
+  '¸E' => 'ç�¨',
+  '¸F' => 'ç�¢',
+  '¸G' => '矮',
+  '¸H' => '碎',
+  '¸I' => '碰',
+  '¸J' => '碗',
+  '¸K' => '碘',
+  '¸L' => '碌',
+  '¸M' => '碉',
+  '¸N' => '硼',
+  '¸O' => '碑',
+  '¸P' => '碓',
+  '¸Q' => 'ç¡¿',
+  '¸R' => '祺',
+  '¸S' => '祿',
+  '¸T' => 'ç¦�',
+  '¸U' => 'è�¬',
+  '¸V' => '禽',
+  '¸W' => '稜',
+  '¸X' => '稚',
+  '¸Y' => '稠',
+  '¸Z' => '稔',
+  '¸[' => '稟',
+  '¸\\' => '稞',
+  '¸]' => '窟',
+  '¸^' => '窠',
+  '¸_' => 'ç­·',
+  '¸`' => '節',
+  '¸a' => 'ç­ ',
+  '¸b' => 'ç­®',
+  '¸c' => 'ç­§',
+  '¸d' => 'ç²±',
+  '¸e' => 'ç²³',
+  '¸f' => 'ç²µ',
+  '¸g' => '經',
+  '¸h' => 'çµ¹',
+  '¸i' => '綑',
+  '¸j' => 'ç¶�',
+  '¸k' => 'ç¶�',
+  '¸l' => 'çµ›',
+  '¸m' => 'ç½®',
+  '¸n' => '罩',
+  '¸o' => '罪',
+  '¸p' => 'ç½²',
+  '¸q' => '義',
+  '¸r' => '羨',
+  '¸s' => '群',
+  '¸t' => 'è�–',
+  '¸u' => 'è�˜',
+  '¸v' => '肆',
+  '¸w' => 'è‚„',
+  '¸x' => 'è…±',
+  '¸y' => 'è…°',
+  '¸z' => 'è…¸',
+  '¸{' => 'è…¥',
+  '¸|' => 'è…®',
+  '¸}' => 'è…³',
+  '¸~' => 'è…«',
+  '¸¡' => 'è…¹',
+  '¸¢' => 'è…º',
+  '¸£' => 'è…¦',
+  '¸¤' => '舅',
+  '¸¥' => '艇',
+  '¸¦' => 'è’‚',
+  '¸§' => 'è‘·',
+  '¸¨' => 'è�½',
+  '¸©' => 'è�±',
+  '¸ª' => '葵',
+  '¸«' => '葦',
+  '¸¬' => 'è‘«',
+  '¸­' => '葉',
+  '¸®' => '葬',
+  '¸¯' => 'è‘›',
+  '¸°' => 'è�¼',
+  '¸±' => 'è�µ',
+  '¸²' => 'è‘¡',
+  '¸³' => 'è‘£',
+  '¸´' => 'è‘©',
+  '¸µ' => 'è‘­',
+  '¸¶' => '葆',
+  '¸·' => '虞',
+  '¸¸' => '虜',
+  '¸¹' => '號',
+  '¸º' => '蛹',
+  '¸»' => '蜓',
+  '¸¼' => '蜈',
+  '¸½' => '蜇',
+  '¸¾' => '蜀',
+  '¸¿' => '蛾',
+  '¸À' => 'è›»',
+  '¸Á' => '蜂',
+  '¸Â' => '蜃',
+  '¸Ã' => '蜆',
+  '¸Ä' => '蜊',
+  '¸Å' => 'è¡™',
+  '¸Æ' => '裟',
+  '¸Ç' => '裔',
+  '¸È' => '裙',
+  '¸É' => '補',
+  '¸Ê' => '裘',
+  '¸Ë' => 'è£�',
+  '¸Ì' => '裡',
+  '¸Í' => '裊',
+  '¸Î' => '裕',
+  '¸Ï' => '裒',
+  '¸Ð' => '覜',
+  '¸Ñ' => '解',
+  '¸Ò' => 'è©«',
+  '¸Ó' => '該',
+  '¸Ô' => '詳',
+  '¸Õ' => '試',
+  '¸Ö' => 'è©©',
+  '¸×' => 'è©°',
+  '¸Ø' => '誇',
+  '¸Ù' => '詼',
+  '¸Ú' => 'è©£',
+  '¸Û' => '誠',
+  '¸Ü' => '話',
+  '¸Ý' => '誅',
+  '¸Þ' => 'è©­',
+  '¸ß' => 'è©¢',
+  '¸à' => 'è©®',
+  '¸á' => '詬',
+  '¸â' => '詹',
+  '¸ã' => 'è©»',
+  '¸ä' => '訾',
+  '¸å' => '詨',
+  '¸æ' => 'è±¢',
+  '¸ç' => '貊',
+  '¸è' => '貉',
+  '¸é' => '賊',
+  '¸ê' => '資',
+  '¸ë' => '賈',
+  '¸ì' => '賄',
+  '¸í' => 'è²²',
+  '¸î' => '賃',
+  '¸ï' => '賂',
+  '¸ð' => 'è³…',
+  '¸ñ' => 'è·¡',
+  '¸ò' => 'è·Ÿ',
+  '¸ó' => 'è·¨',
+  '¸ô' => 'è·¯',
+  '¸õ' => 'è·³',
+  '¸ö' => 'è·º',
+  '¸÷' => 'è·ª',
+  '¸ø' => 'è·¤',
+  '¸ù' => 'è·¦',
+  '¸ú' => '躲',
+  '¸û' => '較',
+  '¸ü' => '載',
+  '¸ý' => '軾',
+  '¸þ' => '輊',
+  '¹@' => '辟',
+  '¹A' => 'è¾²',
+  '¹B' => 'é�‹',
+  '¹C' => 'é�Š',
+  '¹D' => 'é�“',
+  '¹E' => 'é�‚',
+  '¹F' => 'é�”',
+  '¹G' => '逼',
+  '¹H' => 'é�•',
+  '¹I' => 'é��',
+  '¹J' => 'é�‡',
+  '¹K' => 'é��',
+  '¹L' => 'é�Ž',
+  '¹M' => 'é��',
+  '¹N' => 'é�‘',
+  '¹O' => '逾',
+  '¹P' => 'é��',
+  '¹Q' => 'é„’',
+  '¹R' => 'é„—',
+  '¹S' => 'é…¬',
+  '¹T' => 'é…ª',
+  '¹U' => 'é…©',
+  '¹V' => '釉',
+  '¹W' => '鈷',
+  '¹X' => '鉗',
+  '¹Y' => '鈸',
+  '¹Z' => '鈽',
+  '¹[' => '鉀',
+  '¹\\' => '鈾',
+  '¹]' => '鉛',
+  '¹^' => '鉋',
+  '¹_' => '鉤',
+  '¹`' => '鉑',
+  '¹a' => '鈴',
+  '¹b' => '鉉',
+  '¹c' => 'é‰�',
+  '¹d' => '鉅',
+  '¹e' => '鈹',
+  '¹f' => '鈿',
+  '¹g' => '鉚',
+  '¹h' => 'é–˜',
+  '¹i' => '隘',
+  '¹j' => 'éš”',
+  '¹k' => 'éš•',
+  '¹l' => 'é›�',
+  '¹m' => '雋',
+  '¹n' => '雉',
+  '¹o' => '雊',
+  '¹p' => 'é›·',
+  '¹q' => 'é›»',
+  '¹r' => '雹',
+  '¹s' => '零',
+  '¹t' => 'é�–',
+  '¹u' => 'é�´',
+  '¹v' => 'é�¶',
+  '¹w' => 'é �',
+  '¹x' => 'é ‘',
+  '¹y' => 'é “',
+  '¹z' => 'é Š',
+  '¹{' => 'é ’',
+  '¹|' => 'é Œ',
+  '¹}' => '飼',
+  '¹~' => '飴',
+  '¹¡' => '飽',
+  '¹¢' => '飾',
+  '¹£' => '馳',
+  '¹¤' => '馱',
+  '¹¥' => '馴',
+  '¹¦' => 'é«¡',
+  '¹§' => '鳩',
+  '¹¨' => '麂',
+  '¹©' => '鼎',
+  '¹ª' => '鼓',
+  '¹«' => 'é¼ ',
+  '¹¬' => '僧',
+  '¹­' => '僮',
+  '¹®' => '僥',
+  '¹¯' => '僖',
+  '¹°' => '僭',
+  '¹±' => '僚',
+  '¹²' => '僕',
+  '¹³' => 'åƒ�',
+  '¹´' => '僑',
+  '¹µ' => '僱',
+  '¹¶' => '僎',
+  '¹·' => '僩',
+  '¹¸' => 'å…¢',
+  '¹¹' => '凳',
+  '¹º' => '劃',
+  '¹»' => '劂',
+  '¹¼' => '匱',
+  '¹½' => '厭',
+  '¹¾' => 'å—¾',
+  '¹¿' => '嘀',
+  '¹À' => '嘛',
+  '¹Á' => '嘗',
+  '¹Â' => 'å—½',
+  '¹Ã' => '嘔',
+  '¹Ä' => '嘆',
+  '¹Å' => '嘉',
+  '¹Æ' => 'å˜�',
+  '¹Ç' => '嘎',
+  '¹È' => 'å—·',
+  '¹É' => '嘖',
+  '¹Ê' => '嘟',
+  '¹Ë' => '嘈',
+  '¹Ì' => 'å˜�',
+  '¹Í' => 'å—¶',
+  '¹Î' => '團',
+  '¹Ï' => '圖',
+  '¹Ð' => '塵',
+  '¹Ñ' => '塾',
+  '¹Ò' => '境',
+  '¹Ó' => '墓',
+  '¹Ô' => '墊',
+  '¹Õ' => '塹',
+  '¹Ö' => '墅',
+  '¹×' => '塽',
+  '¹Ø' => '壽',
+  '¹Ù' => '夥',
+  '¹Ú' => '夢',
+  '¹Û' => '夤',
+  '¹Ü' => '奪',
+  '¹Ý' => '奩',
+  '¹Þ' => 'å«¡',
+  '¹ß' => '嫦',
+  '¹à' => 'å«©',
+  '¹á' => 'å«—',
+  '¹â' => 'å«–',
+  '¹ã' => '嫘',
+  '¹ä' => 'å«£',
+  '¹å' => 'å­µ',
+  '¹æ' => '寞',
+  '¹ç' => '寧',
+  '¹è' => '寡',
+  '¹é' => '寥',
+  '¹ê' => '實',
+  '¹ë' => '寨',
+  '¹ì' => '寢',
+  '¹í' => '寤',
+  '¹î' => '察',
+  '¹ï' => 'å°�',
+  '¹ð' => 'å±¢',
+  '¹ñ' => '嶄',
+  '¹ò' => '嶇',
+  '¹ó' => 'å¹›',
+  '¹ô' => 'å¹£',
+  '¹õ' => '幕',
+  '¹ö' => 'å¹—',
+  '¹÷' => 'å¹”',
+  '¹ø' => '廓',
+  '¹ù' => 'å»–',
+  '¹ú' => '弊',
+  '¹û' => '彆',
+  '¹ü' => 'å½°',
+  '¹ý' => 'å¾¹',
+  '¹þ' => 'æ…‡',
+  'º@' => 'æ„¿',
+  'ºA' => 'æ…‹',
+  'ºB' => 'æ…·',
+  'ºC' => 'æ…¢',
+  'ºD' => 'æ…£',
+  'ºE' => 'æ…Ÿ',
+  'ºF' => 'æ…š',
+  'ºG' => 'æ…˜',
+  'ºH' => 'æ…µ',
+  'ºI' => '截',
+  'ºJ' => 'æ’‡',
+  'ºK' => '摘',
+  'ºL' => 'æ‘”',
+  'ºM' => 'æ’¤',
+  'ºN' => '摸',
+  'ºO' => 'æ‘Ÿ',
+  'ºP' => '摺',
+  'ºQ' => 'æ‘‘',
+  'ºR' => '摧',
+  'ºS' => 'æ�´',
+  'ºT' => 'æ‘­',
+  'ºU' => 'æ‘»',
+  'ºV' => '敲',
+  'ºW' => 'æ–¡',
+  'ºX' => 'æ——',
+  'ºY' => 'æ—–',
+  'ºZ' => '暢',
+  'º[' => '暨',
+  'º\\' => 'æš�',
+  'º]' => '榜',
+  'º^' => '榨',
+  'º_' => '榕',
+  'º`' => 'æ§�',
+  'ºa' => '榮',
+  'ºb' => '槓',
+  'ºc' => '構',
+  'ºd' => '榛',
+  'ºe' => '榷',
+  'ºf' => '榻',
+  'ºg' => '榫',
+  'ºh' => '榴',
+  'ºi' => 'æ§�',
+  'ºj' => 'æ§�',
+  'ºk' => '榭',
+  'ºl' => '槌',
+  'ºm' => '榦',
+  'ºn' => '槃',
+  'ºo' => '榣',
+  'ºp' => 'æ­‰',
+  'ºq' => 'æ­Œ',
+  'ºr' => 'æ°³',
+  'ºs' => 'æ¼³',
+  'ºt' => 'æ¼”',
+  'ºu' => '滾',
+  'ºv' => '漓',
+  'ºw' => 'æ»´',
+  'ºx' => '漩',
+  'ºy' => 'æ¼¾',
+  'ºz' => 'æ¼ ',
+  'º{' => '漬',
+  'º|' => 'æ¼�',
+  'º}' => '漂',
+  'º~' => 'æ¼¢',
+  'º¡' => '滿',
+  'º¢' => '滯',
+  'º£' => '漆',
+  'º¤' => 'æ¼±',
+  'º¥' => '漸',
+  'º¦' => 'æ¼²',
+  'º§' => 'æ¼£',
+  'º¨' => '漕',
+  'º©' => '漫',
+  'ºª' => '漯',
+  'º«' => '澈',
+  'º¬' => '漪',
+  'º­' => '滬',
+  'º®' => 'æ¼�',
+  'º¯' => '滲',
+  'º°' => '滌',
+  'º±' => 'æ»·',
+  'º²' => '熔',
+  'º³' => '熙',
+  'º´' => 'ç…½',
+  'ºµ' => '熊',
+  'º¶' => '熄',
+  'º·' => '熒',
+  'º¸' => '爾',
+  'º¹' => '犒',
+  'ºº' => '犖',
+  'º»' => 'ç�„',
+  'º¼' => 'ç��',
+  'º½' => '瑤',
+  'º¾' => 'ç‘£',
+  'º¿' => '瑪',
+  'ºÀ' => 'ç‘°',
+  'ºÁ' => 'ç‘­',
+  'ºÂ' => '甄',
+  'ºÃ' => 'ç–‘',
+  'ºÄ' => '瘧',
+  'ºÅ' => 'ç˜�',
+  'ºÆ' => '瘋',
+  'ºÇ' => '瘉',
+  'ºÈ' => '瘓',
+  'ºÉ' => '盡',
+  'ºÊ' => '監',
+  'ºË' => 'çž„',
+  'ºÌ' => 'ç�½',
+  'ºÍ' => 'ç�¿',
+  'ºÎ' => 'ç�¡',
+  'ºÏ' => 'ç£�',
+  'ºÐ' => '碟',
+  'ºÑ' => '碧',
+  'ºÒ' => '碳',
+  'ºÓ' => '碩',
+  'ºÔ' => '碣',
+  'ºÕ' => '禎',
+  'ºÖ' => 'ç¦�',
+  'º×' => 'ç¦�',
+  'ºØ' => '種',
+  'ºÙ' => '稱',
+  'ºÚ' => '窪',
+  'ºÛ' => '窩',
+  'ºÜ' => 'ç«­',
+  'ºÝ' => '端',
+  'ºÞ' => '管',
+  'ºß' => '箕',
+  'ºà' => '箋',
+  'ºá' => 'ç­µ',
+  'ºâ' => 'ç®—',
+  'ºã' => 'ç®�',
+  'ºä' => 'ç®”',
+  'ºå' => 'ç®�',
+  'ºæ' => '箸',
+  'ºç' => '箇',
+  'ºè' => '箄',
+  'ºé' => 'ç²¹',
+  'ºê' => 'ç²½',
+  'ºë' => 'ç²¾',
+  'ºì' => '綻',
+  'ºí' => '綰',
+  'ºî' => '綜',
+  'ºï' => '綽',
+  'ºð' => '綾',
+  'ºñ' => '綠',
+  'ºò' => 'ç·Š',
+  'ºó' => '綴',
+  'ºô' => '網',
+  'ºõ' => '綱',
+  'ºö' => '綺',
+  'º÷' => '綢',
+  'ºø' => '綿',
+  'ºù' => '綵',
+  'ºú' => '綸',
+  'ºû' => '維',
+  'ºü' => 'ç·’',
+  'ºý' => 'ç·‡',
+  'ºþ' => '綬',
+  '»@' => 'ç½°',
+  '»A' => 'ç¿ ',
+  '»B' => 'ç¿¡',
+  '»C' => 'ç¿Ÿ',
+  '»D' => 'è�ž',
+  '»E' => 'è�š',
+  '»F' => '肇',
+  '»G' => 'è…�',
+  '»H' => '膀',
+  '»I' => 'è†�',
+  '»J' => '膈',
+  '»K' => '膊',
+  '»L' => 'è…¿',
+  '»M' => '膂',
+  '»N' => '臧',
+  '»O' => '臺',
+  '»P' => '與',
+  '»Q' => '舔',
+  '»R' => '舞',
+  '»S' => '艋',
+  '»T' => '蓉',
+  '»U' => 'è’¿',
+  '»V' => '蓆',
+  '»W' => 'è“„',
+  '»X' => 'è’™',
+  '»Y' => 'è’ž',
+  '»Z' => 'è’²',
+  '»[' => 'è’œ',
+  '»\\' => 'è“‹',
+  '»]' => 'è’¸',
+  '»^' => 'è“€',
+  '»_' => 'è““',
+  '»`' => 'è’�',
+  '»a' => 'è’¼',
+  '»b' => 'è“‘',
+  '»c' => 'è“Š',
+  '»d' => '蜿',
+  '»e' => '蜜',
+  '»f' => '蜻',
+  '»g' => '蜢',
+  '»h' => '蜥',
+  '»i' => '蜴',
+  '»j' => '蜘',
+  '»k' => 'è�•',
+  '»l' => '蜷',
+  '»m' => '蜩',
+  '»n' => '裳',
+  '»o' => '褂',
+  '»p' => '裴',
+  '»q' => '裹',
+  '»r' => '裸',
+  '»s' => '製',
+  '»t' => '裨',
+  '»u' => '褚',
+  '»v' => '裯',
+  '»w' => '誦',
+  '»x' => '誌',
+  '»y' => '語',
+  '»z' => '誣',
+  '»{' => 'èª�',
+  '»|' => '誡',
+  '»}' => '誓',
+  '»~' => '誤',
+  '»¡' => '說',
+  '»¢' => '誥',
+  '»£' => '誨',
+  '»¤' => '誘',
+  '»¥' => '誑',
+  '»¦' => '誚',
+  '»§' => '誧',
+  '»¨' => '豪',
+  '»©' => 'è²�',
+  '»ª' => '貌',
+  '»«' => '賓',
+  '»¬' => '賑',
+  '»­' => 'è³’',
+  '»®' => '赫',
+  '»¯' => '趙',
+  '»°' => '趕',
+  '»±' => 'è·¼',
+  '»²' => 'è¼”',
+  '»³' => 'è¼’',
+  '»´' => '輕',
+  '»µ' => '輓',
+  '»¶' => 'è¾£',
+  '»·' => 'é� ',
+  '»¸' => 'é�˜',
+  '»¹' => 'é�œ',
+  '»º' => 'é�£',
+  '»»' => 'é�™',
+  '»¼' => 'é�ž',
+  '»½' => 'é�¢',
+  '»¾' => 'é��',
+  '»¿' => 'é�›',
+  '»À' => 'é„™',
+  '»Á' => '鄘',
+  '»Â' => 'é„ž',
+  '»Ã' => 'é…µ',
+  '»Ä' => 'é…¸',
+  '»Å' => 'é…·',
+  '»Æ' => 'é…´',
+  '»Ç' => '鉸',
+  '»È' => '銀',
+  '»É' => '銅',
+  '»Ê' => '銘',
+  '»Ë' => '銖',
+  '»Ì' => '鉻',
+  '»Í' => '銓',
+  '»Î' => '銜',
+  '»Ï' => '銨',
+  '»Ð' => '鉼',
+  '»Ñ' => '銑',
+  '»Ò' => 'é–¡',
+  '»Ó' => 'é–¨',
+  '»Ô' => 'é–©',
+  '»Õ' => 'é–£',
+  '»Ö' => 'é–¥',
+  '»×' => 'é–¤',
+  '»Ø' => 'éš™',
+  '»Ù' => 'éšœ',
+  '»Ú' => 'éš›',
+  '»Û' => '雌',
+  '»Ü' => 'é›’',
+  '»Ý' => '需',
+  '»Þ' => 'é�¼',
+  '»ß' => 'éž…',
+  '»à' => '韶',
+  '»á' => 'é —',
+  '»â' => 'é ˜',
+  '»ã' => '颯',
+  '»ä' => '颱',
+  '»å' => '餃',
+  '»æ' => '餅',
+  '»ç' => '餌',
+  '»è' => '餉',
+  '»é' => 'é§�',
+  '»ê' => '骯',
+  '»ë' => '骰',
+  '»ì' => '髦',
+  '»í' => 'é­�',
+  '»î' => 'é­‚',
+  '»ï' => 'é³´',
+  '»ð' => '鳶',
+  '»ñ' => 'é³³',
+  '»ò' => '麼',
+  '»ó' => 'é¼»',
+  '»ô' => '齊',
+  '»õ' => 'å„„',
+  '»ö' => 'å„€',
+  '»÷' => '僻',
+  '»ø' => '僵',
+  '»ù' => '價',
+  '»ú' => 'å„‚',
+  '»û' => '儈',
+  '»ü' => '儉',
+  '»ý' => 'å„…',
+  '»þ' => '凜',
+  '¼@' => '劇',
+  '¼A' => '劈',
+  '¼B' => '劉',
+  '¼C' => 'åŠ�',
+  '¼D' => '劊',
+  '¼E' => 'å‹°',
+  '¼F' => '厲',
+  '¼G' => '嘮',
+  '¼H' => '嘻',
+  '¼I' => '嘹',
+  '¼J' => '嘲',
+  '¼K' => '嘿',
+  '¼L' => '嘴',
+  '¼M' => '嘩',
+  '¼N' => '噓',
+  '¼O' => '噎',
+  '¼P' => 'å™—',
+  '¼Q' => 'å™´',
+  '¼R' => '嘶',
+  '¼S' => '嘯',
+  '¼T' => '嘰',
+  '¼U' => '墀',
+  '¼V' => '墟',
+  '¼W' => '增',
+  '¼X' => '墳',
+  '¼Y' => '墜',
+  '¼Z' => '墮',
+  '¼[' => '墩',
+  '¼\\' => '墦',
+  '¼]' => '奭',
+  '¼^' => '嬉',
+  '¼_' => 'å«»',
+  '¼`' => '嬋',
+  '¼a' => '嫵',
+  '¼b' => '嬌',
+  '¼c' => '嬈',
+  '¼d' => '寮',
+  '¼e' => '寬',
+  '¼f' => '審',
+  '¼g' => '寫',
+  '¼h' => '層',
+  '¼i' => 'å±¥',
+  '¼j' => 'å¶�',
+  '¼k' => '嶔',
+  '¼l' => 'å¹¢',
+  '¼m' => '幟',
+  '¼n' => '幡',
+  '¼o' => '廢',
+  '¼p' => '廚',
+  '¼q' => '廟',
+  '¼r' => 'å»�',
+  '¼s' => '廣',
+  '¼t' => 'å» ',
+  '¼u' => '彈',
+  '¼v' => 'å½±',
+  '¼w' => 'å¾·',
+  '¼x' => 'å¾µ',
+  '¼y' => 'æ…¶',
+  '¼z' => 'æ…§',
+  '¼{' => 'æ…®',
+  '¼|' => 'æ…�',
+  '¼}' => 'æ…•',
+  '¼~' => '憂',
+  '¼¡' => 'æ…¼',
+  '¼¢' => 'æ…°',
+  '¼£' => 'æ…«',
+  '¼¤' => 'æ…¾',
+  '¼¥' => '憧',
+  '¼¦' => 'æ†�',
+  '¼§' => '憫',
+  '¼¨' => '憎',
+  '¼©' => '憬',
+  '¼ª' => '憚',
+  '¼«' => '憤',
+  '¼¬' => '憔',
+  '¼­' => '憮',
+  '¼®' => '戮',
+  '¼¯' => 'æ‘©',
+  '¼°' => '摯',
+  '¼±' => '摹',
+  '¼²' => 'æ’ž',
+  '¼³' => 'æ’²',
+  '¼´' => 'æ’ˆ',
+  '¼µ' => 'æ’�',
+  '¼¶' => 'æ’°',
+  '¼·' => 'æ’¥',
+  '¼¸' => 'æ’“',
+  '¼¹' => 'æ’•',
+  '¼º' => 'æ’©',
+  '¼»' => 'æ’’',
+  '¼¼' => 'æ’®',
+  '¼½' => 'æ’­',
+  '¼¾' => 'æ’«',
+  '¼¿' => 'æ’š',
+  '¼À' => 'æ’¬',
+  '¼Á' => 'æ’™',
+  '¼Â' => 'æ’¢',
+  '¼Ã' => 'æ’³',
+  '¼Ä' => '敵',
+  '¼Å' => 'æ•·',
+  '¼Æ' => '數',
+  '¼Ç' => 'æš®',
+  '¼È' => 'æš«',
+  '¼É' => 'æš´',
+  '¼Ê' => 'æš±',
+  '¼Ë' => '樣',
+  '¼Ì' => '樟',
+  '¼Í' => '槨',
+  '¼Î' => 'æ¨�',
+  '¼Ï' => '樞',
+  '¼Ð' => '標',
+  '¼Ñ' => '槽',
+  '¼Ò' => '模',
+  '¼Ó' => '樓',
+  '¼Ô' => '樊',
+  '¼Õ' => '槳',
+  '¼Ö' => '樂',
+  '¼×' => '樅',
+  '¼Ø' => '槭',
+  '¼Ù' => '樑',
+  '¼Ú' => 'æ­�',
+  '¼Û' => 'æ­Ž',
+  '¼Ü' => '殤',
+  '¼Ý' => '毅',
+  '¼Þ' => '毆',
+  '¼ß' => '漿',
+  '¼à' => 'æ½¼',
+  '¼á' => '澄',
+  '¼â' => '潑',
+  '¼ã' => '潦',
+  '¼ä' => 'æ½”',
+  '¼å' => '澆',
+  '¼æ' => 'æ½­',
+  '¼ç' => 'æ½›',
+  '¼è' => '潸',
+  '¼é' => 'æ½®',
+  '¼ê' => '澎',
+  '¼ë' => '潺',
+  '¼ì' => 'æ½°',
+  '¼í' => '潤',
+  '¼î' => 'æ¾—',
+  '¼ï' => '潘',
+  '¼ð' => '滕',
+  '¼ñ' => '潯',
+  '¼ò' => 'æ½ ',
+  '¼ó' => '潟',
+  '¼ô' => '熟',
+  '¼õ' => '熬',
+  '¼ö' => '熱',
+  '¼÷' => '熨',
+  '¼ø' => '牖',
+  '¼ù' => '犛',
+  '¼ú' => 'ç�Ž',
+  '¼û' => 'ç�—',
+  '¼ü' => 'ç‘©',
+  '¼ý' => 'ç’‹',
+  '¼þ' => 'ç’ƒ',
+  '½@' => '瑾',
+  '½A' => 'ç’€',
+  '½B' => 'ç•¿',
+  '½C' => '瘠',
+  '½D' => '瘩',
+  '½E' => '瘟',
+  '½F' => '瘤',
+  '½G' => '瘦',
+  '½H' => '瘡',
+  '½I' => '瘢',
+  '½J' => 'çšš',
+  '½K' => '皺',
+  '½L' => '盤',
+  '½M' => '瞎',
+  '½N' => '瞇',
+  '½O' => '瞌',
+  '½P' => 'çž‘',
+  '½Q' => 'çž‹',
+  '½R' => '磋',
+  '½S' => '磅',
+  '½T' => '確',
+  '½U' => '磊',
+  '½V' => '碾',
+  '½W' => '磕',
+  '½X' => '碼',
+  '½Y' => 'ç£�',
+  '½Z' => '稿',
+  '½[' => '稼',
+  '½\\' => 'ç©€',
+  '½]' => '稽',
+  '½^' => '稷',
+  '½_' => '稻',
+  '½`' => '窯',
+  '½a' => '窮',
+  '½b' => 'ç®­',
+  '½c' => 'ç®±',
+  '½d' => '範',
+  '½e' => 'ç®´',
+  '½f' => '篆',
+  '½g' => '篇',
+  '½h' => 'ç¯�',
+  '½i' => 'ç® ',
+  '½j' => '篌',
+  '½k' => '糊',
+  '½l' => 'ç· ',
+  '½m' => 'ç·´',
+  '½n' => 'ç·¯',
+  '½o' => 'ç·»',
+  '½p' => 'ç·˜',
+  '½q' => 'ç·¬',
+  '½r' => 'ç·�',
+  '½s' => 'ç·¨',
+  '½t' => 'ç·£',
+  '½u' => 'ç·š',
+  '½v' => 'ç·ž',
+  '½w' => 'ç·©',
+  '½x' => '綞',
+  '½y' => 'ç·™',
+  '½z' => 'ç·²',
+  '½{' => 'ç·¹',
+  '½|' => 'ç½µ',
+  '½}' => 'ç½·',
+  '½~' => '羯',
+  '½¡' => 'ç¿©',
+  '½¢' => '耦',
+  '½£' => '膛',
+  '½¤' => '膜',
+  '½¥' => 'è†�',
+  '½¦' => '膠',
+  '½§' => '膚',
+  '½¨' => '膘',
+  '½©' => 'è”—',
+  '½ª' => '蔽',
+  '½«' => '蔚',
+  '½¬' => 'è“®',
+  '½­' => '蔬',
+  '½®' => 'è”­',
+  '½¯' => '蔓',
+  '½°' => '蔑',
+  '½±' => '蔣',
+  '½²' => '蔡',
+  '½³' => 'è””',
+  '½´' => '蓬',
+  '½µ' => '蔥',
+  '½¶' => 'è“¿',
+  '½·' => '蔆',
+  '½¸' => 'èž‚',
+  '½¹' => 'è�´',
+  '½º' => 'è�¶',
+  '½»' => 'è� ',
+  '½¼' => 'è�¦',
+  '½½' => 'è�¸',
+  '½¾' => 'è�¨',
+  '½¿' => 'è�™',
+  '½À' => 'è�—',
+  '½Á' => 'è�Œ',
+  '½Â' => 'è�“',
+  '½Ã' => 'è¡›',
+  '½Ä' => 'è¡�',
+  '½Å' => 'è¤�',
+  '½Æ' => '複',
+  '½Ç' => '褒',
+  '½È' => '褓',
+  '½É' => '褕',
+  '½Ê' => '褊',
+  '½Ë' => '誼',
+  '½Ì' => 'è«’',
+  '½Í' => '談',
+  '½Î' => 'è«„',
+  '½Ï' => '誕',
+  '½Ð' => 'è«‹',
+  '½Ñ' => '諸',
+  '½Ò' => '課',
+  '½Ó' => '諉',
+  '½Ô' => 'è«‚',
+  '½Õ' => '調',
+  '½Ö' => '誰',
+  '½×' => 'è«–',
+  '½Ø' => 'è«�',
+  '½Ù' => '誶',
+  '½Ú' => '誹',
+  '½Û' => 'è«›',
+  '½Ü' => '豌',
+  '½Ý' => '豎',
+  '½Þ' => '豬',
+  '½ß' => 'è³ ',
+  '½à' => '賞',
+  '½á' => '賦',
+  '½â' => '賤',
+  '½ã' => '賬',
+  '½ä' => 'è³­',
+  '½å' => 'è³¢',
+  '½æ' => 'è³£',
+  '½ç' => '賜',
+  '½è' => '質',
+  '½é' => '賡',
+  '½ê' => 'èµ­',
+  '½ë' => '趟',
+  '½ì' => '趣',
+  '½í' => '踫',
+  '½î' => 'è¸�',
+  '½ï' => 'è¸�',
+  '½ð' => '踢',
+  '½ñ' => 'è¸�',
+  '½ò' => '踩',
+  '½ó' => '踟',
+  '½ô' => '踡',
+  '½õ' => '踞',
+  '½ö' => '躺',
+  '½÷' => 'è¼�',
+  '½ø' => 'è¼›',
+  '½ù' => '輟',
+  '½ú' => '輩',
+  '½û' => '輦',
+  '½ü' => '輪',
+  '½ý' => '輜',
+  '½þ' => '輞',
+  '¾@' => 'è¼¥',
+  '¾A' => 'é�©',
+  '¾B' => 'é�®',
+  '¾C' => 'é�¨',
+  '¾D' => 'é�­',
+  '¾E' => 'é�·',
+  '¾F' => 'é„°',
+  '¾G' => 'é„­',
+  '¾H' => '鄧',
+  '¾I' => '鄱',
+  '¾J' => '醇',
+  '¾K' => '醉',
+  '¾L' => '醋',
+  '¾M' => '醃',
+  '¾N' => 'é‹…',
+  '¾O' => '銻',
+  '¾P' => '銷',
+  '¾Q' => '鋪',
+  '¾R' => '銬',
+  '¾S' => '鋤',
+  '¾T' => 'é‹�',
+  '¾U' => '銳',
+  '¾V' => '銼',
+  '¾W' => 'é‹’',
+  '¾X' => '鋇',
+  '¾Y' => 'é‹°',
+  '¾Z' => '銲',
+  '¾[' => 'é–­',
+  '¾\\' => 'é–±',
+  '¾]' => '霄',
+  '¾^' => '霆',
+  '¾_' => '震',
+  '¾`' => '霉',
+  '¾a' => 'é� ',
+  '¾b' => 'éž�',
+  '¾c' => 'éž‹',
+  '¾d' => 'éž�',
+  '¾e' => 'é ¡',
+  '¾f' => 'é «',
+  '¾g' => 'é œ',
+  '¾h' => '颳',
+  '¾i' => '養',
+  '¾j' => '餓',
+  '¾k' => '餒',
+  '¾l' => '餘',
+  '¾m' => 'é§�',
+  '¾n' => 'é§�',
+  '¾o' => '駟',
+  '¾p' => '駛',
+  '¾q' => '駑',
+  '¾r' => '駕',
+  '¾s' => '駒',
+  '¾t' => '駙',
+  '¾u' => '骷',
+  '¾v' => 'é«®',
+  '¾w' => '髯',
+  '¾x' => '鬧',
+  '¾y' => 'é­…',
+  '¾z' => 'é­„',
+  '¾{' => 'é­·',
+  '¾|' => 'é­¯',
+  '¾}' => 'é´†',
+  '¾~' => 'é´‰',
+  '¾¡' => 'é´ƒ',
+  '¾¢' => '麩',
+  '¾£' => '麾',
+  '¾¤' => '黎',
+  '¾¥' => '墨',
+  '¾¦' => 'é½’',
+  '¾§' => 'å„’',
+  '¾¨' => '儘',
+  '¾©' => 'å„”',
+  '¾ª' => 'å„�',
+  '¾«' => 'å„•',
+  '¾¬' => '冀',
+  '¾­' => '冪',
+  '¾®' => 'å‡�',
+  '¾¯' => '劑',
+  '¾°' => '劓',
+  '¾±' => '勳',
+  '¾²' => 'å™™',
+  '¾³' => '噫',
+  '¾´' => '噹',
+  '¾µ' => '噩',
+  '¾¶' => '噤',
+  '¾·' => '噸',
+  '¾¸' => '噪',
+  '¾¹' => '器',
+  '¾º' => '噥',
+  '¾»' => 'å™±',
+  '¾¼' => '噯',
+  '¾½' => '噬',
+  '¾¾' => '噢',
+  '¾¿' => '噶',
+  '¾À' => 'å£�',
+  '¾Á' => '墾',
+  '¾Â' => '壇',
+  '¾Ã' => '壅',
+  '¾Ä' => '奮',
+  '¾Å' => 'å¬�',
+  '¾Æ' => '嬴',
+  '¾Ç' => 'å­¸',
+  '¾È' => '寰',
+  '¾É' => 'å°Ž',
+  '¾Ê' => '彊',
+  '¾Ë' => '憲',
+  '¾Ì' => '憑',
+  '¾Í' => '憩',
+  '¾Î' => '憊',
+  '¾Ï' => 'æ‡�',
+  '¾Ð' => '憶',
+  '¾Ñ' => '憾',
+  '¾Ò' => '懊',
+  '¾Ó' => '懈',
+  '¾Ô' => '戰',
+  '¾Õ' => 'æ“…',
+  '¾Ö' => 'æ“�',
+  '¾×' => 'æ“‹',
+  '¾Ø' => 'æ’»',
+  '¾Ù' => 'æ’¼',
+  '¾Ú' => 'æ“š',
+  '¾Û' => 'æ“„',
+  '¾Ü' => '擇',
+  '¾Ý' => 'æ“‚',
+  '¾Þ' => 'æ“�',
+  '¾ß' => 'æ’¿',
+  '¾à' => 'æ“’',
+  '¾á' => 'æ“”',
+  '¾â' => 'æ’¾',
+  '¾ã' => 'æ•´',
+  '¾ä' => '曆',
+  '¾å' => '曉',
+  '¾æ' => 'æš¹',
+  '¾ç' => '曄',
+  '¾è' => '曇',
+  '¾é' => '暸',
+  '¾ê' => '樽',
+  '¾ë' => '樸',
+  '¾ì' => '樺',
+  '¾í' => 'æ©™',
+  '¾î' => 'æ©«',
+  '¾ï' => '橘',
+  '¾ð' => '樹',
+  '¾ñ' => 'æ©„',
+  '¾ò' => 'æ©¢',
+  '¾ó' => 'æ©¡',
+  '¾ô' => 'æ©‹',
+  '¾õ' => '橇',
+  '¾ö' => '樵',
+  '¾÷' => 'æ©Ÿ',
+  '¾ø' => '橈',
+  '¾ù' => 'æ­™',
+  '¾ú' => 'æ­·',
+  '¾û' => 'æ°…',
+  '¾ü' => 'æ¿‚',
+  '¾ý' => 'æ¾±',
+  '¾þ' => '澡',
+  '¿@' => '濃',
+  '¿A' => '澤',
+  '¿B' => 'æ¿�',
+  '¿C' => '澧',
+  '¿D' => 'æ¾³',
+  '¿E' => 'æ¿€',
+  '¿F' => 'æ¾¹',
+  '¿G' => '澶',
+  '¿H' => '澦',
+  '¿I' => 'æ¾ ',
+  '¿J' => 'æ¾´',
+  '¿K' => '熾',
+  '¿L' => '燉',
+  '¿M' => 'ç‡�',
+  '¿N' => '燒',
+  '¿O' => '燈',
+  '¿P' => '燕',
+  '¿Q' => '熹',
+  '¿R' => '燎',
+  '¿S' => '燙',
+  '¿T' => '燜',
+  '¿U' => '燃',
+  '¿V' => '燄',
+  '¿W' => 'ç�¨',
+  '¿X' => 'ç’œ',
+  '¿Y' => 'ç’£',
+  '¿Z' => 'ç’˜',
+  '¿[' => 'ç’Ÿ',
+  '¿\\' => 'ç’ž',
+  '¿]' => 'ç“¢',
+  '¿^' => '甌',
+  '¿_' => 'ç”�',
+  '¿`' => '瘴',
+  '¿a' => '瘸',
+  '¿b' => '瘺',
+  '¿c' => '盧',
+  '¿d' => '盥',
+  '¿e' => 'çž ',
+  '¿f' => 'çžž',
+  '¿g' => '瞟',
+  '¿h' => '瞥',
+  '¿i' => '磨',
+  '¿j' => '磚',
+  '¿k' => '磬',
+  '¿l' => '磧',
+  '¿m' => '禦',
+  '¿n' => 'ç©�',
+  '¿o' => 'ç©Ž',
+  '¿p' => '穆',
+  '¿q' => 'ç©Œ',
+  '¿r' => 'ç©‹',
+  '¿s' => '窺',
+  '¿t' => '篙',
+  '¿u' => 'ç°‘',
+  '¿v' => '築',
+  '¿w' => '篤',
+  '¿x' => '篛',
+  '¿y' => '篡',
+  '¿z' => '篩',
+  '¿{' => '篦',
+  '¿|' => '糕',
+  '¿}' => 'ç³–',
+  '¿~' => '縊',
+  '¿¡' => '縑',
+  '¿¢' => '縈',
+  '¿£' => '縛',
+  '¿¤' => '縣',
+  '¿¥' => '縞',
+  '¿¦' => 'ç¸�',
+  '¿§' => '縉',
+  '¿¨' => 'ç¸�',
+  '¿©' => 'ç½¹',
+  '¿ª' => 'ç¾²',
+  '¿«' => 'ç¿°',
+  '¿¬' => '翱',
+  '¿­' => 'ç¿®',
+  '¿®' => '耨',
+  '¿¯' => '膳',
+  '¿°' => '膩',
+  '¿±' => '膨',
+  '¿²' => '臻',
+  '¿³' => '興',
+  '¿´' => '艘',
+  '¿µ' => '艙',
+  '¿¶' => 'è•Š',
+  '¿·' => 'è•™',
+  '¿¸' => '蕈',
+  '¿¹' => '蕨',
+  '¿º' => 'è•©',
+  '¿»' => '蕃',
+  '¿¼' => '蕉',
+  '¿½' => 'è•­',
+  '¿¾' => '蕪',
+  '¿¿' => 'è•ž',
+  '¿À' => '螃',
+  '¿Á' => '螟',
+  '¿Â' => 'èžž',
+  '¿Ã' => '螢',
+  '¿Ä' => 'èž�',
+  '¿Å' => 'è¡¡',
+  '¿Æ' => '褪',
+  '¿Ç' => '褲',
+  '¿È' => '褥',
+  '¿É' => '褫',
+  '¿Ê' => '褡',
+  '¿Ë' => '親',
+  '¿Ì' => '覦',
+  '¿Í' => '諦',
+  '¿Î' => '諺',
+  '¿Ï' => 'è««',
+  '¿Ð' => '諱',
+  '¿Ñ' => '謀',
+  '¿Ò' => 'è«œ',
+  '¿Ó' => '諧',
+  '¿Ô' => 'è«®',
+  '¿Õ' => '諾',
+  '¿Ö' => 'è¬�',
+  '¿×' => '謂',
+  '¿Ø' => 'è«·',
+  '¿Ù' => 'è«­',
+  '¿Ú' => '諳',
+  '¿Û' => '諶',
+  '¿Ü' => '諼',
+  '¿Ý' => '豫',
+  '¿Þ' => 'è±­',
+  '¿ß' => '貓',
+  '¿à' => 'è³´',
+  '¿á' => '蹄',
+  '¿â' => '踱',
+  '¿ã' => '踴',
+  '¿ä' => '蹂',
+  '¿å' => '踹',
+  '¿æ' => '踵',
+  '¿ç' => 'è¼»',
+  '¿è' => '輯',
+  '¿é' => '輸',
+  '¿ê' => 'è¼³',
+  '¿ë' => '辨',
+  '¿ì' => '辦',
+  '¿í' => 'é�µ',
+  '¿î' => 'é�´',
+  '¿ï' => 'é�¸',
+  '¿ð' => 'é�²',
+  '¿ñ' => 'é�¼',
+  '¿ò' => 'é�º',
+  '¿ó' => 'é„´',
+  '¿ô' => '醒',
+  '¿õ' => '錠',
+  '¿ö' => '錶',
+  '¿÷' => '鋸',
+  '¿ø' => '錳',
+  '¿ù' => '錯',
+  '¿ú' => '錢',
+  '¿û' => '鋼',
+  '¿ü' => '錫',
+  '¿ý' => '錄',
+  '¿þ' => '錚',
+  'À@' => 'éŒ�',
+  'ÀA' => '錦',
+  'ÀB' => '錡',
+  'ÀC' => '錕',
+  'ÀD' => '錮',
+  'ÀE' => '錙',
+  'ÀF' => 'é–»',
+  'ÀG' => '隧',
+  'ÀH' => '隨',
+  'ÀI' => '險',
+  'ÀJ' => '雕',
+  'ÀK' => '霎',
+  'ÀL' => '霑',
+  'ÀM' => '霖',
+  'ÀN' => 'éœ�',
+  'ÀO' => '霓',
+  'ÀP' => 'éœ�',
+  'ÀQ' => 'é�›',
+  'ÀR' => 'é�œ',
+  'ÀS' => 'é�¦',
+  'ÀT' => '鞘',
+  'ÀU' => 'é °',
+  'ÀV' => 'é ¸',
+  'ÀW' => 'é »',
+  'ÀX' => 'é ·',
+  'ÀY' => 'é ­',
+  'ÀZ' => 'é ¹',
+  'À[' => 'é ¤',
+  'À\\' => 'é¤�',
+  'À]' => '館',
+  'À^' => '餞',
+  'À_' => '餛',
+  'À`' => '餡',
+  'Àa' => '餚',
+  'Àb' => '駭',
+  'Àc' => '駢',
+  'Àd' => '駱',
+  'Àe' => '骸',
+  'Àf' => '骼',
+  'Àg' => 'é«»',
+  'Àh' => 'é«­',
+  'Ài' => '鬨',
+  'Àj' => '鮑',
+  'Àk' => 'é´•',
+  'Àl' => 'é´£',
+  'Àm' => 'é´¦',
+  'Àn' => 'é´¨',
+  'Ào' => 'é´’',
+  'Àp' => 'é´›',
+  'Àq' => '默',
+  'Àr' => 'é»”',
+  'Às' => 'é¾�',
+  'Àt' => '龜',
+  'Àu' => '優',
+  'Àv' => 'å„Ÿ',
+  'Àw' => 'å„¡',
+  'Àx' => '儲',
+  'Ày' => '勵',
+  'Àz' => '嚎',
+  'À{' => '嚀',
+  'À|' => 'åš�',
+  'À}' => 'åš…',
+  'À~' => '嚇',
+  'À¡' => 'åš�',
+  'À¢' => '壕',
+  'À£' => '壓',
+  'À¤' => '壑',
+  'À¥' => '壎',
+  'À¦' => '嬰',
+  'À§' => '嬪',
+  'À¨' => '嬤',
+  'À©' => 'å­º',
+  'Àª' => 'å°·',
+  'À«' => '屨',
+  'À¬' => '嶼',
+  'À­' => '嶺',
+  'À®' => '嶽',
+  'À¯' => '嶸',
+  'À°' => '幫',
+  'À±' => '彌',
+  'À²' => 'å¾½',
+  'À³' => '應',
+  'À´' => '懂',
+  'Àµ' => '懇',
+  'À¶' => '懦',
+  'À·' => '懋',
+  'À¸' => '戲',
+  'À¹' => '戴',
+  'Àº' => 'æ“Ž',
+  'À»' => 'æ“Š',
+  'À¼' => '擘',
+  'À½' => 'æ“ ',
+  'À¾' => 'æ“°',
+  'À¿' => '擦',
+  'ÀÀ' => '擬',
+  'ÀÁ' => '擱',
+  'ÀÂ' => 'æ“¢',
+  'ÀÃ' => 'æ“­',
+  'ÀÄ' => 'æ–‚',
+  'ÀÅ' => 'æ–ƒ',
+  'ÀÆ' => 'æ›™',
+  'ÀÇ' => 'æ›–',
+  'ÀÈ' => '檀',
+  'ÀÉ' => '檔',
+  'ÀÊ' => '檄',
+  'ÀË' => '檢',
+  'ÀÌ' => '檜',
+  'ÀÍ' => 'æ«›',
+  'ÀÎ' => '檣',
+  'ÀÏ' => '橾',
+  'ÀÐ' => '檗',
+  'ÀÑ' => 'æª�',
+  'ÀÒ' => '檠',
+  'ÀÓ' => 'æ­œ',
+  'ÀÔ' => 'æ®®',
+  'ÀÕ' => '毚',
+  'ÀÖ' => 'æ°ˆ',
+  'À×' => '濘',
+  'ÀØ' => '濱',
+  'ÀÙ' => 'æ¿Ÿ',
+  'ÀÚ' => 'æ¿ ',
+  'ÀÛ' => 'æ¿›',
+  'ÀÜ' => '濤',
+  'ÀÝ' => 'æ¿«',
+  'ÀÞ' => '濯',
+  'Àß' => 'æ¾€',
+  'Àà' => '濬',
+  'Àá' => 'æ¿¡',
+  'Àâ' => 'æ¿©',
+  'Àã' => 'æ¿•',
+  'Àä' => 'æ¿®',
+  'Àå' => 'æ¿°',
+  'Àæ' => '燧',
+  'Àç' => '營',
+  'Àè' => '燮',
+  'Àé' => '燦',
+  'Àê' => '燥',
+  'Àë' => '燭',
+  'Àì' => '燬',
+  'Àí' => '燴',
+  'Àî' => '燠',
+  'Àï' => '爵',
+  'Àð' => '牆',
+  'Àñ' => 'ç�°',
+  'Àò' => 'ç�²',
+  'Àó' => 'ç’©',
+  'Àô' => 'ç’°',
+  'Àõ' => 'ç’¦',
+  'Àö' => 'ç’¨',
+  'À÷' => '癆',
+  'Àø' => '療',
+  'Àù' => '癌',
+  'Àú' => '盪',
+  'Àû' => 'çž³',
+  'Àü' => '瞪',
+  'Àý' => 'çž°',
+  'Àþ' => '瞬',
+  'Á@' => '瞧',
+  'ÁA' => 'çž­',
+  'ÁB' => '矯',
+  'ÁC' => '磷',
+  'ÁD' => '磺',
+  'ÁE' => '磴',
+  'ÁF' => '磯',
+  'ÁG' => 'ç¤�',
+  'ÁH' => '禧',
+  'ÁI' => '禪',
+  'ÁJ' => 'ç©—',
+  'ÁK' => '窿',
+  'ÁL' => 'ç°‡',
+  'ÁM' => 'ç°�',
+  'ÁN' => '篾',
+  'ÁO' => '篷',
+  'ÁP' => 'ç°Œ',
+  'ÁQ' => '篠',
+  'ÁR' => 'ç³ ',
+  'ÁS' => '糜',
+  'ÁT' => '糞',
+  'ÁU' => 'ç³¢',
+  'ÁV' => '糟',
+  'ÁW' => 'ç³™',
+  'ÁX' => 'ç³�',
+  'ÁY' => '縮',
+  'ÁZ' => '績',
+  'Á[' => '繆',
+  'Á\\' => '縷',
+  'Á]' => '縲',
+  'Á^' => '繃',
+  'Á_' => '縫',
+  'Á`' => '總',
+  'Áa' => '縱',
+  'Áb' => 'ç¹…',
+  'Ác' => 'ç¹�',
+  'Ád' => '縴',
+  'Áe' => '縹',
+  'Áf' => '繈',
+  'Ág' => '縵',
+  'Áh' => '縿',
+  'Ái' => '縯',
+  'Áj' => '罄',
+  'Ák' => '翳',
+  'Ál' => '翼',
+  'Ám' => 'è�±',
+  'Án' => 'è�²',
+  'Áo' => 'è�°',
+  'Áp' => 'è�¯',
+  'Áq' => 'è�³',
+  'Ár' => '臆',
+  'Ás' => '臃',
+  'Át' => '膺',
+  'Áu' => '臂',
+  'Áv' => '臀',
+  'Áw' => '膿',
+  'Áx' => '膽',
+  'Áy' => '臉',
+  'Áz' => '膾',
+  'Á{' => '臨',
+  'Á|' => '舉',
+  'Á}' => '艱',
+  'Á~' => 'è–ª',
+  'Á¡' => 'è–„',
+  'Á¢' => '蕾',
+  'Á£' => 'è–œ',
+  'Á¤' => 'è–‘',
+  'Á¥' => 'è–”',
+  'Á¦' => 'è–¯',
+  'Á§' => 'è–›',
+  'Á¨' => 'è–‡',
+  'Á©' => 'è–¨',
+  'Áª' => 'è–Š',
+  'Á«' => '虧',
+  'Á¬' => '蟀',
+  'Á­' => '蟑',
+  'Á®' => 'èž³',
+  'Á¯' => '蟒',
+  'Á°' => '蟆',
+  'Á±' => 'èž«',
+  'Á²' => 'èž»',
+  'Á³' => '螺',
+  'Á´' => '蟈',
+  'Áµ' => '蟋',
+  'Á¶' => '褻',
+  'Á·' => '褶',
+  'Á¸' => '襄',
+  'Á¹' => '褸',
+  'Áº' => '褽',
+  'Á»' => '覬',
+  'Á¼' => '謎',
+  'Á½' => '謗',
+  'Á¾' => '謙',
+  'Á¿' => '講',
+  'ÁÀ' => '謊',
+  'ÁÁ' => '謠',
+  'ÁÂ' => 'è¬�',
+  'ÁÃ' => '謄',
+  'ÁÄ' => 'è¬�',
+  'ÁÅ' => 'è±�',
+  'ÁÆ' => 'è°¿',
+  'ÁÇ' => 'è±³',
+  'ÁÈ' => '賺',
+  'ÁÉ' => 'è³½',
+  'ÁÊ' => 'è³¼',
+  'ÁË' => '賸',
+  'ÁÌ' => 'è³»',
+  'ÁÍ' => '趨',
+  'ÁÎ' => '蹉',
+  'ÁÏ' => '蹋',
+  'ÁÐ' => '蹈',
+  'ÁÑ' => '蹊',
+  'ÁÒ' => '轄',
+  'ÁÓ' => 'è¼¾',
+  'ÁÔ' => '轂',
+  'ÁÕ' => 'è½…',
+  'ÁÖ' => '輿',
+  'Á×' => 'é�¿',
+  'ÁØ' => 'é�½',
+  'ÁÙ' => 'é‚„',
+  'ÁÚ' => 'é‚�',
+  'ÁÛ' => 'é‚‚',
+  'ÁÜ' => 'é‚€',
+  'ÁÝ' => '鄹',
+  'ÁÞ' => '醣',
+  'Áß' => '醞',
+  'Áà' => '醜',
+  'Áá' => 'é��',
+  'Áâ' => '鎂',
+  'Áã' => '錨',
+  'Áä' => 'é�µ',
+  'Áå' => 'é�Š',
+  'Áæ' => 'é�¥',
+  'Áç' => 'é�‹',
+  'Áè' => '錘',
+  'Áé' => 'é�¾',
+  'Áê' => 'é�¬',
+  'Áë' => 'é�›',
+  'Áì' => 'é�°',
+  'Áí' => 'é�š',
+  'Áî' => 'é�”',
+  'Áï' => 'é—Š',
+  'Áð' => 'é—‹',
+  'Áñ' => 'é—Œ',
+  'Áò' => 'é—ˆ',
+  'Áó' => 'é—†',
+  'Áô' => 'éš±',
+  'Áõ' => '隸',
+  'Áö' => 'é›–',
+  'Á÷' => '霜',
+  'Áø' => '霞',
+  'Áù' => 'éž ',
+  'Áú' => '韓',
+  'Áû' => '顆',
+  'Áü' => '颶',
+  'Áý' => '餵',
+  'Áþ' => 'é¨�',
+  'Â@' => '駿',
+  'ÂA' => 'é®®',
+  'ÂB' => '鮫',
+  'ÂC' => '鮪',
+  'ÂD' => 'é®­',
+  'ÂE' => 'é´»',
+  'ÂF' => 'é´¿',
+  'ÂG' => '麋',
+  'ÂH' => 'é»�',
+  'ÂI' => '點',
+  'ÂJ' => '黜',
+  'ÂK' => 'é»�',
+  'ÂL' => 'é»›',
+  'ÂM' => 'é¼¾',
+  'ÂN' => '齋',
+  'ÂO' => 'å�¢',
+  'ÂP' => 'åš•',
+  'ÂQ' => 'åš®',
+  'ÂR' => '壙',
+  'ÂS' => '壘',
+  'ÂT' => '嬸',
+  'ÂU' => 'å½�',
+  'ÂV' => '懣',
+  'ÂW' => '戳',
+  'ÂX' => 'æ“´',
+  'ÂY' => '擲',
+  'ÂZ' => '擾',
+  'Â[' => '攆',
+  'Â\\' => '擺',
+  'Â]' => 'æ“»',
+  'Â^' => 'æ“·',
+  'Â_' => 'æ–·',
+  'Â`' => '曜',
+  'Âa' => '朦',
+  'Âb' => '檳',
+  'Âc' => '檬',
+  'Âd' => '櫃',
+  'Âe' => '檻',
+  'Âf' => '檸',
+  'Âg' => 'æ«‚',
+  'Âh' => '檮',
+  'Âi' => '檯',
+  'Âj' => 'æ­Ÿ',
+  'Âk' => 'æ­¸',
+  'Âl' => '殯',
+  'Âm' => '瀉',
+  'Ân' => '瀋',
+  'Âo' => '濾',
+  'Âp' => '瀆',
+  'Âq' => '濺',
+  'Âr' => '瀑',
+  'Âs' => 'ç€�',
+  'Ât' => '燻',
+  'Âu' => '燼',
+  'Âv' => '燾',
+  'Âw' => '燸',
+  'Âx' => 'ç�·',
+  'Ây' => 'ç�µ',
+  'Âz' => 'ç’§',
+  'Â{' => 'ç’¿',
+  'Â|' => '甕',
+  'Â}' => 'ç™–',
+  'Â~' => '癘',
+  '¡' => '癒',
+  '¢' => '瞽',
+  '£' => '瞿',
+  '¤' => '瞻',
+  'Â¥' => 'çž¼',
+  '¦' => '礎',
+  '§' => '禮',
+  '¨' => '穡',
+  '©' => '穢',
+  'ª' => '穠',
+  '«' => '竄',
+  '¬' => '竅',
+  '­' => '簫',
+  '®' => '簧',
+  '¯' => '簪',
+  '°' => '簞',
+  '±' => '簣',
+  '²' => '簡',
+  '³' => '糧',
+  '´' => '織',
+  'µ' => '繕',
+  '¶' => '繞',
+  '·' => '繚',
+  '¸' => '繡',
+  '¹' => '繒',
+  'º' => '繙',
+  '»' => '罈',
+  '¼' => '翹',
+  '½' => '翻',
+  '¾' => '�',
+  '¿' => '�',
+  'ÂÀ' => 'è‡�',
+  'ÂÁ' => 'è‡�',
+  'ÂÂ' => '舊',
+  'ÂÃ' => 'è—�',
+  'ÂÄ' => 'è–©',
+  'ÂÅ' => 'è—�',
+  'ÂÆ' => 'è—�',
+  'ÂÇ' => 'è—‰',
+  'ÂÈ' => 'è–°',
+  'ÂÉ' => 'è–º',
+  'ÂÊ' => 'è–¹',
+  'ÂË' => 'è–¦',
+  'ÂÌ' => '蟯',
+  'ÂÍ' => '蟬',
+  'ÂÎ' => '蟲',
+  'ÂÏ' => '蟠',
+  'ÂÐ' => '覆',
+  'ÂÑ' => '覲',
+  'ÂÒ' => '觴',
+  'ÂÓ' => '謨',
+  'ÂÔ' => '謹',
+  'ÂÕ' => '謬',
+  'ÂÖ' => '謫',
+  'Â×' => 'è±�',
+  'ÂØ' => 'è´…',
+  'ÂÙ' => 'è¹™',
+  'ÂÚ' => 'è¹£',
+  'ÂÛ' => '蹦',
+  'ÂÜ' => '蹤',
+  'ÂÝ' => '蹟',
+  'ÂÞ' => '蹕',
+  'Âß' => '軀',
+  'Âà' => '轉',
+  'Âá' => 'è½�',
+  'Ââ' => '邇',
+  'Âã' => '邃',
+  'Âä' => '邈',
+  'Âå' => '醫',
+  'Âæ' => '醬',
+  'Âç' => 'é‡�',
+  'Âè' => '鎔',
+  'Âé' => '鎊',
+  'Âê' => '鎖',
+  'Âë' => '鎢',
+  'Âì' => '鎳',
+  'Âí' => '鎮',
+  'Âî' => '鎬',
+  'Âï' => '鎰',
+  'Âð' => '鎘',
+  'Âñ' => '鎚',
+  'Âò' => '鎗',
+  'Âó' => 'é—”',
+  'Âô' => 'é—–',
+  'Âõ' => 'é—�',
+  'Âö' => 'é—•',
+  'Â÷' => '離',
+  'Âø' => '雜',
+  'Âù' => 'é›™',
+  'Âú' => 'é››',
+  'Âû' => '雞',
+  'Âü' => '霤',
+  'Âý' => '鞣',
+  'Âþ' => '鞦',
+  'Ã@' => 'éž­',
+  'ÃA' => '韹',
+  'ÃB' => 'é¡�',
+  'ÃC' => 'é¡�',
+  'ÃD' => 'é¡Œ',
+  'ÃE' => 'é¡Ž',
+  'ÃF' => 'é¡“',
+  'ÃG' => '颺',
+  'ÃH' => '餾',
+  'ÃI' => '餿',
+  'ÃJ' => '餽',
+  'ÃK' => '餮',
+  'ÃL' => '馥',
+  'ÃM' => '騎',
+  'ÃN' => 'é«�',
+  'ÃO' => '鬃',
+  'ÃP' => '鬆',
+  'ÃQ' => 'é­�',
+  'ÃR' => 'é­Ž',
+  'ÃS' => 'é­�',
+  'ÃT' => '鯊',
+  'ÃU' => '鯉',
+  'ÃV' => '鯽',
+  'ÃW' => '鯈',
+  'ÃX' => '鯀',
+  'ÃY' => '鵑',
+  'ÃZ' => 'éµ�',
+  'Ã[' => 'éµ ',
+  'Ã\\' => 'é» ',
+  'Ã]' => '鼕',
+  'Ã^' => '鼬',
+  'Ã_' => '儳',
+  'Ã`' => '嚥',
+  'Ãa' => '壞',
+  'Ãb' => '壟',
+  'Ãc' => '壢',
+  'Ãd' => '寵',
+  'Ãe' => 'é¾�',
+  'Ãf' => '廬',
+  'Ãg' => '懲',
+  'Ãh' => '懷',
+  'Ãi' => '懶',
+  'Ãj' => '懵',
+  'Ãk' => '攀',
+  'Ãl' => 'æ”�',
+  'Ãm' => 'æ› ',
+  'Ãn' => 'æ›�',
+  'Ão' => 'æ«¥',
+  'Ãp' => 'æ«�',
+  'Ãq' => 'æ«š',
+  'Ãr' => 'æ«“',
+  'Ãs' => '瀛',
+  'Ãt' => '瀟',
+  'Ãu' => '瀨',
+  'Ãv' => '瀚',
+  'Ãw' => 'ç€�',
+  'Ãx' => '瀕',
+  'Ãy' => '瀘',
+  'Ãz' => '爆',
+  'Ã{' => 'çˆ�',
+  'Ã|' => '牘',
+  'Ã}' => '犢',
+  'Ã~' => 'ç�¸',
+  'á' => '�',
+  'â' => '璽',
+  'ã' => '瓊',
+  'ä' => '瓣',
+  'Ã¥' => 'ç–‡',
+  'æ' => '疆',
+  'ç' => '癟',
+  'è' => '癡',
+  'é' => '矇',
+  'ê' => '礙',
+  'ë' => '禱',
+  'ì' => '穫',
+  'í' => '穩',
+  'î' => '簾',
+  'ï' => '簿',
+  'ð' => '簸',
+  'ñ' => '簽',
+  'ò' => '簷',
+  'ó' => '籀',
+  'ô' => '繫',
+  'õ' => '繭',
+  'ö' => '繹',
+  '÷' => '繩',
+  'ø' => '繪',
+  'ù' => '羅',
+  'ú' => '繳',
+  'û' => '羶',
+  'ü' => '羹',
+  'ý' => '羸',
+  'þ' => '臘',
+  'ÿ' => '藩',
+  'ÃÀ' => 'è—�',
+  'ÃÁ' => 'è—ª',
+  'ÃÂ' => 'è—•',
+  'ÃÃ' => 'è—¤',
+  'ÃÄ' => 'è—¥',
+  'ÃÅ' => 'è—·',
+  'ÃÆ' => '蟻',
+  'ÃÇ' => 'è …',
+  'ÃÈ' => 'è �',
+  'ÃÉ' => '蟹',
+  'ÃÊ' => '蟾',
+  'ÃË' => '襠',
+  'ÃÌ' => '襟',
+  'ÃÍ' => '襖',
+  'ÃÎ' => '襞',
+  'ÃÏ' => 'è­�',
+  'ÃÐ' => 'è­œ',
+  'ÃÑ' => 'è­˜',
+  'ÃÒ' => 'è­‰',
+  'ÃÓ' => 'è­š',
+  'ÃÔ' => 'è­Ž',
+  'ÃÕ' => 'è­�',
+  'ÃÖ' => 'è­†',
+  'Ã×' => 'è­™',
+  'ÃØ' => 'è´ˆ',
+  'ÃÙ' => 'è´Š',
+  'ÃÚ' => 'è¹¼',
+  'ÃÛ' => 'è¹²',
+  'ÃÜ' => '躇',
+  'ÃÝ' => '蹶',
+  'ÃÞ' => '蹬',
+  'Ãß' => '蹺',
+  'Ãà' => 'è¹´',
+  'Ãá' => 'è½”',
+  'Ãâ' => '轎',
+  'Ãã' => 'è¾­',
+  'Ãä' => 'é‚Š',
+  'Ãå' => 'é‚‹',
+  'Ãæ' => '醱',
+  'Ãç' => '醮',
+  'Ãè' => 'é�¡',
+  'Ãé' => 'é�‘',
+  'Ãê' => 'é�Ÿ',
+  'Ãë' => 'é�ƒ',
+  'Ãì' => 'é�ˆ',
+  'Ãí' => 'é�œ',
+  'Ãî' => 'é��',
+  'Ãï' => 'é�–',
+  'Ãð' => 'é�¢',
+  'Ãñ' => 'é��',
+  'Ãò' => 'é�˜',
+  'Ãó' => 'é�¤',
+  'Ãô' => 'é�—',
+  'Ãõ' => 'é�¨',
+  'Ãö' => 'é—œ',
+  'Ã÷' => 'éš´',
+  'Ãø' => '難',
+  'Ãù' => '霪',
+  'Ãú' => '霧',
+  'Ãû' => 'é�¡',
+  'Ãü' => '韜',
+  'Ãý' => '韻',
+  'Ãþ' => 'é¡ž',
+  'Ä@' => '願',
+  'ÄA' => 'é¡›',
+  'ÄB' => '颼',
+  'ÄC' => '饅',
+  'ÄD' => '饉',
+  'ÄE' => '騖',
+  'ÄF' => '騙',
+  'ÄG' => 'é¬�',
+  'ÄH' => '鯨',
+  'ÄI' => '鯧',
+  'ÄJ' => '鯖',
+  'ÄK' => '鯛',
+  'ÄL' => '鶉',
+  'ÄM' => '鵡',
+  'ÄN' => 'éµ²',
+  'ÄO' => '鵪',
+  'ÄP' => '鵬',
+  'ÄQ' => '麒',
+  'ÄR' => '麗',
+  'ÄS' => '麓',
+  'ÄT' => '麴',
+  'ÄU' => '勸',
+  'ÄV' => '嚨',
+  'ÄW' => 'åš·',
+  'ÄX' => '嚶',
+  'ÄY' => 'åš´',
+  'ÄZ' => 'åš¼',
+  'Ä[' => '壤',
+  'Ä\\' => 'å­€',
+  'Ä]' => 'å­ƒ',
+  'Ä^' => 'å­½',
+  'Ä_' => '寶',
+  'Ä`' => 'å·‰',
+  'Äa' => '懸',
+  'Äb' => '懺',
+  'Äc' => '攘',
+  'Äd' => 'æ””',
+  'Äe' => 'æ”™',
+  'Äf' => '曦',
+  'Äg' => '朧',
+  'Äh' => '櫬',
+  'Äi' => '瀾',
+  'Äj' => '瀰',
+  'Äk' => '瀲',
+  'Äl' => 'çˆ�',
+  'Äm' => 'ç�»',
+  'Än' => 'ç“�',
+  'Äo' => '癢',
+  'Äp' => '癥',
+  'Äq' => '礦',
+  'Är' => '礪',
+  'Äs' => '礬',
+  'Ät' => '礫',
+  'Äu' => '竇',
+  'Äv' => '競',
+  'Äw' => '籌',
+  'Äx' => '籃',
+  'Äy' => 'ç±�',
+  'Äz' => '糯',
+  'Ä{' => 'ç³°',
+  'Ä|' => 'è¾®',
+  'Ä}' => 'ç¹½',
+  'Ä~' => 'ç¹¼',
+  'ġ' => '纂',
+  'Ģ' => '罌',
+  'ģ' => '耀',
+  'Ĥ' => '臚',
+  'ĥ' => '艦',
+  'Ħ' => '藻',
+  'ħ' => '藹',
+  'Ĩ' => '蘑',
+  'Ä©' => 'è—º',
+  'Ī' => '蘆',
+  'ī' => '蘋',
+  'Ĭ' => '蘇',
+  'ĭ' => '蘊',
+  'Ä®' => 'è ”',
+  'į' => '蠕',
+  'İ' => '襤',
+  'ı' => '覺',
+  'IJ' => '觸',
+  'ij' => '議',
+  'Ä´' => 'è­¬',
+  'ĵ' => '警',
+  'Ķ' => '譯',
+  'Ä·' => 'è­Ÿ',
+  'ĸ' => '譫',
+  'Ĺ' => '�',
+  'ĺ' => '�',
+  'Ļ' => '躉',
+  'ļ' => '�',
+  'Ľ' => '躅',
+  'ľ' => '躂',
+  'Ŀ' => '醴',
+  'ÄÀ' => '釋',
+  'ÄÁ' => 'é�˜',
+  'ÄÂ' => 'é�ƒ',
+  'ÄÃ' => 'é�½',
+  'ÄÄ' => 'é—¡',
+  'ÄÅ' => '霰',
+  'ÄÆ' => '飄',
+  'ÄÇ' => '饒',
+  'ÄÈ' => '饑',
+  'ÄÉ' => '馨',
+  'ÄÊ' => '騫',
+  'ÄË' => '騰',
+  'ÄÌ' => '騷',
+  'ÄÍ' => '騵',
+  'ÄÎ' => 'é°“',
+  'ÄÏ' => 'é°�',
+  'ÄÐ' => 'é¹¹',
+  'ÄÑ' => '麵',
+  'ÄÒ' => '黨',
+  'ÄÓ' => '鼯',
+  'ÄÔ' => '齟',
+  'ÄÕ' => 'é½£',
+  'ÄÖ' => '齡',
+  'Ä×' => 'å„·',
+  'ÄØ' => '儸',
+  'ÄÙ' => 'å›�',
+  'ÄÚ' => '囀',
+  'ÄÛ' => '囂',
+  'ÄÜ' => '夔',
+  'ÄÝ' => '屬',
+  'ÄÞ' => 'å·�',
+  'Äß' => '懼',
+  'Äà' => '懾',
+  'Äá' => 'æ”�',
+  'Äâ' => '攜',
+  'Äã' => 'æ–•',
+  'Ää' => '曩',
+  'Äå' => 'æ«»',
+  'Äæ' => '欄',
+  'Äç' => '櫺',
+  'Äè' => '殲',
+  'Äé' => 'ç�Œ',
+  'Äê' => '爛',
+  'Äë' => '犧',
+  'Äì' => 'ç“–',
+  'Äí' => 'ç“”',
+  'Äî' => '癩',
+  'Äï' => '矓',
+  'Äð' => 'ç±�',
+  'Äñ' => 'çº�',
+  'Äò' => '續',
+  'Äó' => 'ç¾¼',
+  'Äô' => '蘗',
+  'Äõ' => '蘭',
+  'Äö' => '蘚',
+  'Ä÷' => 'è £',
+  'Äø' => 'è ¢',
+  'Äù' => 'è ¡',
+  'Äú' => 'è Ÿ',
+  'Äû' => '襪',
+  'Äü' => '襬',
+  'Äý' => '覽',
+  'Äþ' => 'è­´',
+  'Å@' => 'è­·',
+  'ÅA' => 'è­½',
+  'ÅB' => 'è´“',
+  'ÅC' => '躊',
+  'ÅD' => 'èº�',
+  'ÅE' => '躋',
+  'ÅF' => '轟',
+  'ÅG' => '辯',
+  'ÅH' => '醺',
+  'ÅI' => 'é�®',
+  'ÅJ' => 'é�³',
+  'ÅK' => 'é�µ',
+  'ÅL' => 'é�º',
+  'ÅM' => 'é�¸',
+  'ÅN' => 'é�²',
+  'ÅO' => 'é�«',
+  'ÅP' => 'é—¢',
+  'ÅQ' => '霸',
+  'ÅR' => '霹',
+  'ÅS' => '露',
+  'ÅT' => '響',
+  'ÅU' => '顧',
+  'ÅV' => 'é¡¥',
+  'ÅW' => '饗',
+  'ÅX' => 'é©…',
+  'ÅY' => '驃',
+  'ÅZ' => 'é©€',
+  'Å[' => '騾',
+  'Å\\' => 'é«�',
+  'Å]' => 'é­”',
+  'Å^' => 'é­‘',
+  'Å_' => 'é°­',
+  'Å`' => 'é°¥',
+  'Åa' => '鶯',
+  'Åb' => '鶴',
+  'Åc' => 'é·‚',
+  'Åd' => '鶸',
+  'Åe' => 'éº�',
+  'Åf' => '黯',
+  'Åg' => 'é¼™',
+  'Åh' => '齜',
+  'Åi' => '齦',
+  'Åj' => '齧',
+  'Åk' => '儼',
+  'Ål' => 'å„»',
+  'Åm' => '囈',
+  'Ån' => '囊',
+  'Åo' => '囉',
+  'Åp' => 'å­¿',
+  'Åq' => 'å·”',
+  'År' => 'å·’',
+  'Ås' => '彎',
+  'Åt' => '懿',
+  'Åu' => '攤',
+  'Åv' => '權',
+  'Åw' => 'æ­¡',
+  'Åx' => 'ç�‘',
+  'Åy' => 'ç�˜',
+  'Åz' => '玀',
+  'Å{' => '瓤',
+  'Å|' => 'ç–Š',
+  'Å}' => 'ç™®',
+  'Å~' => '癬',
+  'š' => '禳',
+  'Å¢' => 'ç± ',
+  'ţ' => '籟',
+  'Ť' => '�',
+  'ť' => '�',
+  'Ŧ' => '臟',
+  'ŧ' => '襲',
+  'Ũ' => '襯',
+  'ũ' => '觼',
+  'Ū' => '讀',
+  'Å«' => 'è´–',
+  'Ŭ' => '贗',
+  'ŭ' => '躑',
+  'Ů' => '躓',
+  'ů' => '轡',
+  'Å°' => 'é…ˆ',
+  'ű' => '鑄',
+  'Ų' => '鑑',
+  'ų' => '鑒',
+  'Ŵ' => '霽',
+  'ŵ' => '霾',
+  'Ŷ' => '韃',
+  'ŷ' => '�',
+  'Ÿ' => '顫',
+  'Ź' => '饕',
+  'ź' => '驕',
+  'Ż' => '�',
+  'ż' => '髒',
+  'Ž' => '鬚',
+  'ž' => '鱉',
+  'Å¿' => 'é°±',
+  'ÅÀ' => 'é°¾',
+  'ÅÁ' => 'é°»',
+  'ÅÂ' => 'é·“',
+  'ÅÃ' => 'é·—',
+  'ÅÄ' => 'é¼´',
+  'ÅÅ' => '齬',
+  'ÅÆ' => '齪',
+  'ÅÇ' => 'é¾”',
+  'ÅÈ' => '囌',
+  'ÅÉ' => 'å·–',
+  'ÅÊ' => '戀',
+  'ÅË' => '攣',
+  'ÅÌ' => '攫',
+  'ÅÍ' => '攪',
+  'ÅÎ' => '曬',
+  'ÅÏ' => 'æ¬�',
+  'ÅÐ' => 'ç“š',
+  'ÅÑ' => 'ç«Š',
+  'ÅÒ' => '籤',
+  'ÅÓ' => 'ç±£',
+  'ÅÔ' => 'ç±¥',
+  'ÅÕ' => '纓',
+  'ÅÖ' => '纖',
+  'Å×' => '纔',
+  'ÅØ' => '臢',
+  'ÅÙ' => '蘸',
+  'ÅÚ' => '蘿',
+  'ÅÛ' => 'è ±',
+  'ÅÜ' => '變',
+  'ÅÝ' => 'é‚�',
+  'ÅÞ' => 'é‚�',
+  'Åß' => 'é‘£',
+  'Åà' => 'é‘ ',
+  'Åá' => '鑤',
+  'Åâ' => 'é�¨',
+  'Åã' => '顯',
+  'Åä' => '饜',
+  'Åå' => 'é©š',
+  'Åæ' => 'é©›',
+  'Åç' => 'é©—',
+  'Åè' => 'é«“',
+  'Åé' => 'é«”',
+  'Åê' => 'é«‘',
+  'Åë' => 'é±”',
+  'Åì' => 'é±—',
+  'Åí' => 'é±–',
+  'Åî' => 'é·¥',
+  'Åï' => '麟',
+  'Åð' => 'é»´',
+  'Åñ' => '囑',
+  'Åò' => '壩',
+  'Åó' => '攬',
+  'Åô' => 'ç�ž',
+  'Åõ' => 'ç™±',
+  'Åö' => '癲',
+  'Å÷' => '矗',
+  'Åø' => 'ç½�',
+  'Åù' => '羈',
+  'Åú' => 'è ¶',
+  'Åû' => 'è ¹',
+  'Åü' => 'è¡¢',
+  'Åý' => '讓',
+  'Åþ' => 'è®’',
+  'Æ@' => 'è®–',
+  'ÆA' => '艷',
+  'ÆB' => 'è´›',
+  'ÆC' => '釀',
+  'ÆD' => '鑪',
+  'ÆE' => 'é�‚',
+  'ÆF' => 'é�ˆ',
+  'ÆG' => 'é�„',
+  'ÆH' => '韆',
+  'ÆI' => 'é¡°',
+  'ÆJ' => 'é©Ÿ',
+  'ÆK' => '鬢',
+  'ÆL' => 'é­˜',
+  'ÆM' => '鱟',
+  'ÆN' => 'é·¹',
+  'ÆO' => 'é·º',
+  'ÆP' => 'é¹¼',
+  'ÆQ' => 'é¹½',
+  'ÆR' => '鼇',
+  'ÆS' => 'é½·',
+  'ÆT' => 'é½²',
+  'ÆU' => '廳',
+  'ÆV' => '欖',
+  'ÆW' => 'ç�£',
+  'ÆX' => '籬',
+  'ÆY' => 'ç±®',
+  'ÆZ' => 'è »',
+  'Æ[' => '觀',
+  'Æ\\' => '躡',
+  'Æ]' => 'é‡�',
+  'Æ^' => '鑲',
+  'Æ_' => 'é‘°',
+  'Æ`' => '顱',
+  'Æa' => '饞',
+  'Æb' => 'é«–',
+  'Æc' => '鬣',
+  'Æd' => '黌',
+  'Æe' => 'ç�¤',
+  'Æf' => '矚',
+  'Æg' => '讚',
+  'Æh' => 'é‘·',
+  'Æi' => '韉',
+  'Æj' => 'é©¢',
+  'Æk' => 'é©¥',
+  'Æl' => '纜',
+  'Æm' => '讜',
+  'Æn' => '躪',
+  'Æo' => '釅',
+  'Æp' => '鑽',
+  'Æq' => '鑾',
+  'Ær' => '鑼',
+  'Æs' => 'é±·',
+  'Æt' => '鱸',
+  'Æu' => 'é»·',
+  'Æv' => 'è±”',
+  'Æw' => 'é‘¿',
+  'Æx' => '鸚',
+  'Æy' => '爨',
+  'Æz' => '驪',
+  'Æ{' => '鬱',
+  'Æ|' => '鸛',
+  'Æ}' => '鸞',
+  'Æ~' => 'ç±²',
+  'ơ' => 'ヾ',
+  'Ƣ' => '�',
+  'Æ£' => 'ã‚ž',
+  'Ƥ' => '々',
+  'ƥ' => '�',
+  'Ʀ' => '�',
+  'Ƨ' => '�',
+  'ƨ' => '�',
+  'Ʃ' => '�',
+  'ƪ' => '�',
+  'ƫ' => '�',
+  'Ƭ' => '�',
+  'ƭ' => '�',
+  'Ʈ' => '�',
+  'Ư' => '�',
+  'ư' => '�',
+  'Ʊ' => '�',
+  'Ʋ' => '�',
+  'Ƴ' => '�',
+  'ƴ' => '�',
+  'Ƶ' => '�',
+  'ƶ' => '�',
+  'Ʒ' => '�',
+  'Ƹ' => '�',
+  'ƹ' => '�',
+  'ƺ' => '�',
+  'ƻ' => '�',
+  'Ƽ' => '�',
+  'ƽ' => '�',
+  'ƾ' => '�',
+  'ƿ' => '�',
+  'ÆÀ' => 'ã�œ',
+  'ÆÁ' => 'ã��',
+  'ÆÂ' => 'ã�ž',
+  'ÆÃ' => 'ã�Ÿ',
+  'ÆÄ' => 'ã� ',
+  'ÆÅ' => 'ã�¡',
+  'ÆÆ' => 'ã�¢',
+  'ÆÇ' => 'ã�£',
+  'ÆÈ' => 'ã�¤',
+  'ÆÉ' => 'ã�¥',
+  'ÆÊ' => 'ã�¦',
+  'ÆË' => 'ã�§',
+  'ÆÌ' => 'ã�¨',
+  'ÆÍ' => 'ã�©',
+  'ÆÎ' => 'ã�ª',
+  'ÆÏ' => 'ã�«',
+  'ÆÐ' => 'ã�¬',
+  'ÆÑ' => 'ã�­',
+  'ÆÒ' => 'ã�®',
+  'ÆÓ' => 'ã�¯',
+  'ÆÔ' => 'ã�°',
+  'ÆÕ' => 'ã�±',
+  'ÆÖ' => 'ã�²',
+  'Æ×' => 'ã�³',
+  'ÆØ' => 'ã�´',
+  'ÆÙ' => 'ã�µ',
+  'ÆÚ' => 'ã�¶',
+  'ÆÛ' => 'ã�·',
+  'ÆÜ' => 'ã�¸',
+  'ÆÝ' => 'ã�¹',
+  'ÆÞ' => 'ã�º',
+  'Æß' => 'ã�»',
+  'Æà' => 'ã�¼',
+  'Æá' => 'ã�½',
+  'Æâ' => 'ã�¾',
+  'Æã' => 'ã�¿',
+  'Æä' => 'ã‚€',
+  'Æå' => 'ã‚�',
+  'Ææ' => 'ã‚‚',
+  'Æç' => 'ゃ',
+  'Æè' => 'ã‚„',
+  'Æé' => 'ã‚…',
+  'Æê' => 'ゆ',
+  'Æë' => 'ょ',
+  'Æì' => 'よ',
+  'Æí' => 'ら',
+  'Æî' => 'ã‚Š',
+  'Æï' => 'ã‚‹',
+  'Æð' => 'ã‚Œ',
+  'Æñ' => 'ã‚�',
+  'Æò' => 'ã‚Ž',
+  'Æó' => 'ã‚�',
+  'Æô' => 'ã‚�',
+  'Æõ' => 'ã‚‘',
+  'Æö' => 'ã‚’',
+  'Æ÷' => 'ã‚“',
+  'Æø' => 'ã‚¡',
+  'Æù' => 'ã‚¢',
+  'Æú' => 'ã‚£',
+  'Æû' => 'イ',
+  'Æü' => 'ã‚¥',
+  'Æý' => 'ウ',
+  'Æþ' => 'ェ',
+  'Ç@' => 'エ',
+  'ÇA' => 'ã‚©',
+  'ÇB' => 'オ',
+  'ÇC' => 'ã‚«',
+  'ÇD' => 'ガ',
+  'ÇE' => 'ã‚­',
+  'ÇF' => 'ã‚®',
+  'ÇG' => 'ク',
+  'ÇH' => 'ã‚°',
+  'ÇI' => 'ケ',
+  'ÇJ' => 'ゲ',
+  'ÇK' => 'コ',
+  'ÇL' => 'ã‚´',
+  'ÇM' => 'サ',
+  'ÇN' => 'ザ',
+  'ÇO' => 'ã‚·',
+  'ÇP' => 'ジ',
+  'ÇQ' => 'ス',
+  'ÇR' => 'ズ',
+  'ÇS' => 'ã‚»',
+  'ÇT' => 'ゼ',
+  'ÇU' => 'ソ',
+  'ÇV' => 'ゾ',
+  'ÇW' => 'ã‚¿',
+  'ÇX' => 'ダ',
+  'ÇY' => 'ãƒ�',
+  'ÇZ' => 'ヂ',
+  'Ç[' => 'ッ',
+  'Ç\\' => 'ツ',
+  'Ç]' => 'ヅ',
+  'Ç^' => 'テ',
+  'Ç_' => 'デ',
+  'Ç`' => 'ト',
+  'Ça' => 'ド',
+  'Çb' => 'ナ',
+  'Çc' => 'ニ',
+  'Çd' => 'ヌ',
+  'Çe' => 'ãƒ�',
+  'Çf' => 'ノ',
+  'Çg' => 'ãƒ�',
+  'Çh' => 'ãƒ�',
+  'Çi' => 'パ',
+  'Çj' => 'ヒ',
+  'Çk' => 'ビ',
+  'Çl' => 'ピ',
+  'Çm' => 'フ',
+  'Çn' => 'ブ',
+  'Ço' => 'プ',
+  'Çp' => 'ヘ',
+  'Çq' => 'ベ',
+  'Çr' => 'ペ',
+  'Çs' => 'ホ',
+  'Çt' => 'ボ',
+  'Çu' => 'ãƒ�',
+  'Çv' => 'マ',
+  'Çw' => 'ミ',
+  'Çx' => 'ム',
+  'Çy' => 'メ',
+  'Çz' => 'モ',
+  'Ç{' => 'ャ',
+  'Ç|' => 'ヤ',
+  'Ç}' => 'ュ',
+  'Ç~' => 'ユ',
+  'ǡ' => 'ョ',
+  'Ǣ' => 'ヨ',
+  'ǣ' => 'ラ',
+  'Ǥ' => 'リ',
+  'ǥ' => 'ル',
+  'Ǧ' => 'レ',
+  'ǧ' => 'ロ',
+  'Ǩ' => 'ヮ',
+  'ǩ' => 'ワ',
+  'Ǫ' => 'ヰ',
+  'ǫ' => 'ヱ',
+  'Ǭ' => 'ヲ',
+  'ǭ' => 'ン',
+  'Ǯ' => 'ヴ',
+  'ǯ' => 'ヵ',
+  'ǰ' => 'ヶ',
+  'DZ' => 'Д',
+  'Dz' => 'Е',
+  'dz' => '�',
+  'Ǵ' => 'Ж',
+  'ǵ' => 'З',
+  'Ƕ' => 'И',
+  'Ƿ' => 'Й',
+  'Ǹ' => 'К',
+  'ǹ' => 'Л',
+  'Ǻ' => 'М',
+  'ǻ' => 'У',
+  'Ǽ' => 'Ф',
+  'ǽ' => 'Х',
+  'Ǿ' => 'Ц',
+  'ǿ' => 'Ч',
+  'ÇÀ' => 'Ш',
+  'ÇÁ' => 'Щ',
+  'ÇÂ' => 'Ъ',
+  'ÇÃ' => 'Ы',
+  'ÇÄ' => 'Ь',
+  'ÇÅ' => 'Э',
+  'ÇÆ' => 'Ю',
+  'ÇÇ' => 'Я',
+  'ÇÈ' => 'а',
+  'ÇÉ' => 'б',
+  'ÇÊ' => 'в',
+  'ÇË' => 'г',
+  'ÇÌ' => 'д',
+  'ÇÍ' => 'е',
+  'ÇÎ' => 'Ñ‘',
+  'ÇÏ' => 'ж',
+  'ÇÐ' => 'з',
+  'ÇÑ' => 'и',
+  'ÇÒ' => 'й',
+  'ÇÓ' => 'к',
+  'ÇÔ' => 'л',
+  'ÇÕ' => 'м',
+  'ÇÖ' => 'н',
+  'Ç×' => 'о',
+  'ÇØ' => 'п',
+  'ÇÙ' => 'Ñ€',
+  'ÇÚ' => 'Ñ�',
+  'ÇÛ' => 'Ñ‚',
+  'ÇÜ' => 'у',
+  'ÇÝ' => 'Ñ„',
+  'ÇÞ' => 'Ñ…',
+  'Çß' => 'ц',
+  'Çà' => 'ч',
+  'Çá' => 'ш',
+  'Çâ' => 'щ',
+  'Çã' => 'ÑŠ',
+  'Çä' => 'Ñ‹',
+  'Çå' => 'ÑŒ',
+  'Çæ' => 'Ñ�',
+  'Çç' => 'ÑŽ',
+  'Çè' => 'Ñ�',
+  'Çé' => 'â‘ ',
+  'Çê' => 'â‘¡',
+  'Çë' => 'â‘¢',
+  'Çì' => 'â‘£',
+  'Çí' => '⑤',
+  'Çî' => 'â‘¥',
+  'Çï' => '⑦',
+  'Çð' => '⑧',
+  'Çñ' => '⑨',
+  'Çò' => 'â‘©',
+  'Çó' => 'â‘´',
+  'Çô' => '⑵',
+  'Çõ' => '⑶',
+  'Çö' => 'â‘·',
+  'Ç÷' => '⑸',
+  'Çø' => '⑹',
+  'Çù' => '⑺',
+  'Çú' => 'â‘»',
+  'Çû' => '⑼',
+  'Çü' => '⑽',
+  'É@' => '乂',
+  'ÉA' => '乜',
+  'ÉB' => '凵',
+  'ÉC' => '匚',
+  'ÉD' => '厂',
+  'ÉE' => '万',
+  'ÉF' => '丌',
+  'ÉG' => '乇',
+  'ÉH' => 'äº�',
+  'ÉI' => 'å›—',
+  'ÉJ' => '兀',
+  'ÉK' => 'å±®',
+  'ÉL' => 'å½³',
+  'ÉM' => 'ä¸�',
+  'ÉN' => '冇',
+  'ÉO' => '与',
+  'ÉP' => '丮',
+  'ÉQ' => '亓',
+  'ÉR' => '仂',
+  'ÉS' => '仉',
+  'ÉT' => '仈',
+  'ÉU' => '冘',
+  'ÉV' => '勼',
+  'ÉW' => 'å�¬',
+  'ÉX' => '厹',
+  'ÉY' => '圠',
+  'ÉZ' => '夃',
+  'É[' => '夬',
+  'É\\' => 'å°�',
+  'É]' => 'å·¿',
+  'É^' => 'æ—¡',
+  'É_' => '殳',
+  'É`' => '毌',
+  'Éa' => 'æ°”',
+  'Éb' => '爿',
+  'Éc' => '丱',
+  'Éd' => '丼',
+  'Ée' => '仨',
+  'Éf' => '仜',
+  'Ég' => '仩',
+  'Éh' => '仡',
+  'Éi' => 'ä»�',
+  'Éj' => '仚',
+  'Ék' => '刌',
+  'Él' => '匜',
+  'Ém' => 'å�Œ',
+  'Én' => '圢',
+  'Éo' => '圣',
+  'Ép' => '夗',
+  'Éq' => '夯',
+  'Ér' => 'å®�',
+  'És' => '宄',
+  'Ét' => 'å°’',
+  'Éu' => 'å°»',
+  'Év' => 'å±´',
+  'Éw' => 'å±³',
+  'Éx' => '帄',
+  'Éy' => '庀',
+  'Éz' => '庂',
+  'É{' => '忉',
+  'É|' => '戉',
+  'É}' => 'æ‰�',
+  'É~' => 'æ°•',
+  'É¡' => 'æ°¶',
+  'ɢ' => '汃',
+  'É£' => 'æ°¿',
+  'ɤ' => '氻',
+  'ɥ' => '犮',
+  'ɦ' => '犰',
+  'ɧ' => '玊',
+  'ɨ' => '禸',
+  'É©' => 'è‚Š',
+  'ɪ' => '阞',
+  'ɫ' => '伎',
+  'ɬ' => '优',
+  'ɭ' => '伬',
+  'ɮ' => '仵',
+  'ɯ' => '伔',
+  'É°' => 'ä»±',
+  'ɱ' => '伀',
+  'ɲ' => '价',
+  'ɳ' => '伈',
+  'ɴ' => '�',
+  'ɵ' => '伂',
+  'ɶ' => '伅',
+  'É·' => 'ä¼¢',
+  'ɸ' => '伓',
+  'ɹ' => '伄',
+  'ɺ' => '仴',
+  'É»' => 'ä¼’',
+  'ɼ' => '冱',
+  'ɽ' => '刓',
+  'ɾ' => '刉',
+  'ɿ' => '�',
+  'ÉÀ' => '劦',
+  'ÉÁ' => '匢',
+  'ÉÂ' => '匟',
+  'ÉÃ' => 'å��',
+  'ÉÄ' => '厊',
+  'ÉÅ' => 'å�‡',
+  'ÉÆ' => '囡',
+  'ÉÇ' => '囟',
+  'ÉÈ' => '圮',
+  'ÉÉ' => '圪',
+  'ÉÊ' => '圴',
+  'ÉË' => '夼',
+  'ÉÌ' => '妀',
+  'ÉÍ' => '奼',
+  'ÉÎ' => '妅',
+  'ÉÏ' => '奻',
+  'ÉÐ' => '奾',
+  'ÉÑ' => '奷',
+  'ÉÒ' => '奿',
+  'ÉÓ' => 'å­–',
+  'ÉÔ' => 'å°•',
+  'ÉÕ' => 'å°¥',
+  'ÉÖ' => 'å±¼',
+  'É×' => '屺',
+  'ÉØ' => 'å±»',
+  'ÉÙ' => 'å±¾',
+  'ÉÚ' => 'å·Ÿ',
+  'ÉÛ' => 'å¹µ',
+  'ÉÜ' => '庄',
+  'ÉÝ' => '异',
+  'ÉÞ' => '弚',
+  'Éß' => 'å½´',
+  'Éà' => 'å¿•',
+  'Éá' => 'å¿”',
+  'Éâ' => 'å¿�',
+  'Éã' => '扜',
+  'Éä' => '扞',
+  'Éå' => '扤',
+  'Éæ' => '扡',
+  'Éç' => '扦',
+  'Éè' => '扢',
+  'Éé' => '扙',
+  'Éê' => '扠',
+  'Éë' => '扚',
+  'Éì' => '扥',
+  'Éí' => 'æ—¯',
+  'Éî' => 'æ—®',
+  'Éï' => '朾',
+  'Éð' => '朹',
+  'Éñ' => '朸',
+  'Éò' => '朻',
+  'Éó' => '机',
+  'Éô' => '朿',
+  'Éõ' => '朼',
+  'Éö' => '朳',
+  'É÷' => 'æ°˜',
+  'Éø' => '汆',
+  'Éù' => 'æ±’',
+  'Éú' => '汜',
+  'Éû' => 'æ±�',
+  'Éü' => '汊',
+  'Éý' => 'æ±”',
+  'Éþ' => '汋',
+  'Ê@' => '汌',
+  'ÊA' => 'ç�±',
+  'ÊB' => '牞',
+  'ÊC' => '犴',
+  'ÊD' => '犵',
+  'ÊE' => '玎',
+  'ÊF' => '甪',
+  'ÊG' => '癿',
+  'ÊH' => '穵',
+  'ÊI' => '网',
+  'ÊJ' => '艸',
+  'ÊK' => '艼',
+  'ÊL' => '芀',
+  'ÊM' => '艽',
+  'ÊN' => '艿',
+  'ÊO' => 'è™�',
+  'ÊP' => '襾',
+  'ÊQ' => 'é‚™',
+  'ÊR' => 'é‚—',
+  'ÊS' => '邘',
+  'ÊT' => 'é‚›',
+  'ÊU' => 'é‚”',
+  'ÊV' => '阢',
+  'ÊW' => '阤',
+  'ÊX' => '阠',
+  'ÊY' => '阣',
+  'ÊZ' => 'ä½–',
+  'Ê[' => 'ä¼»',
+  'Ê\\' => 'ä½¢',
+  'Ê]' => '佉',
+  'Ê^' => '体',
+  'Ê_' => '佤',
+  'Ê`' => 'ä¼¾',
+  'Êa' => '佧',
+  'Êb' => 'ä½’',
+  'Êc' => '佟',
+  'Êd' => 'ä½�',
+  'Êe' => '佘',
+  'Êf' => 'ä¼­',
+  'Êg' => 'ä¼³',
+  'Êh' => '伿',
+  'Êi' => '佡',
+  'Êj' => 'å†�',
+  'Êk' => '冹',
+  'Êl' => '刜',
+  'Êm' => '刞',
+  'Ên' => '刡',
+  'Êo' => '劭',
+  'Êp' => '劮',
+  'Êq' => '匉',
+  'Êr' => 'å�£',
+  'Ês' => 'å�²',
+  'Êt' => '厎',
+  'Êu' => 'åŽ�',
+  'Êv' => 'å�°',
+  'Êw' => 'å�·',
+  'Êx' => 'å�ª',
+  'Êy' => 'å‘”',
+  'Êz' => 'å‘…',
+  'Ê{' => 'å�™',
+  'Ê|' => 'å�œ',
+  'Ê}' => 'å�¥',
+  'Ê~' => 'å�˜',
+  'ʡ' => '�',
+  'ʢ' => '�',
+  'ʣ' => '�',
+  'ʤ' => '�',
+  'ʥ' => '�',
+  'ʦ' => '呇',
+  'ʧ' => '囮',
+  'ʨ' => '囧',
+  'ʩ' => '囥',
+  'ʪ' => '�',
+  'ʫ' => '�',
+  'ʬ' => '�',
+  'ʭ' => '�',
+  'ʮ' => '�',
+  'ʯ' => '�',
+  'ʰ' => '夆',
+  'ʱ' => '奀',
+  'ʲ' => '妦',
+  'ʳ' => '妘',
+  'ʴ' => '妠',
+  'ʵ' => '妗',
+  'ʶ' => '妎',
+  'ʷ' => '妢',
+  'ʸ' => '�',
+  'ʹ' => '�',
+  'ʺ' => '妧',
+  'ʻ' => '妡',
+  'ʼ' => '宎',
+  'ʽ' => '宒',
+  'ʾ' => '尨',
+  'Ê¿' => 'å°ª',
+  'ÊÀ' => 'å²�',
+  'ÊÁ' => 'å²�',
+  'ÊÂ' => '岈',
+  'ÊÃ' => '岋',
+  'ÊÄ' => '岉',
+  'ÊÅ' => 'å²’',
+  'ÊÆ' => '岊',
+  'ÊÇ' => '岆',
+  'ÊÈ' => '岓',
+  'ÊÉ' => '岕',
+  'ÊÊ' => 'å· ',
+  'ÊË' => '帊',
+  'ÊÌ' => '帎',
+  'ÊÍ' => '庋',
+  'ÊÎ' => '庉',
+  'ÊÏ' => '庌',
+  'ÊÐ' => '庈',
+  'ÊÑ' => 'åº�',
+  'ÊÒ' => 'å¼…',
+  'ÊÓ' => 'å¼�',
+  'ÊÔ' => '彸',
+  'ÊÕ' => '彶',
+  'ÊÖ' => 'å¿’',
+  'Ê×' => 'å¿‘',
+  'ÊØ' => 'å¿�',
+  'ÊÙ' => 'å¿­',
+  'ÊÚ' => '忨',
+  'ÊÛ' => 'å¿®',
+  'ÊÜ' => '忳',
+  'ÊÝ' => 'å¿¡',
+  'ÊÞ' => '忤',
+  'Êß' => 'å¿£',
+  'Êà' => '忺',
+  'Êá' => '忯',
+  'Êâ' => 'å¿·',
+  'Êã' => 'å¿»',
+  'Êä' => '怀',
+  'Êå' => 'å¿´',
+  'Êæ' => '戺',
+  'Êç' => '抃',
+  'Êè' => '抌',
+  'Êé' => '抎',
+  'Êê' => 'æŠ�',
+  'Êë' => '抔',
+  'Êì' => '抇',
+  'Êí' => '扱',
+  'Êî' => '扻',
+  'Êï' => '扺',
+  'Êð' => '扰',
+  'Êñ' => 'æŠ�',
+  'Êò' => '抈',
+  'Êó' => '扷',
+  'Êô' => '扽',
+  'Êõ' => '扲',
+  'Êö' => '扴',
+  'Ê÷' => 'æ”·',
+  'Êø' => 'æ—°',
+  'Êù' => 'æ—´',
+  'Êú' => 'æ—³',
+  'Êû' => 'æ—²',
+  'Êü' => 'æ—µ',
+  'Êý' => 'æ�…',
+  'Êþ' => 'æ�‡',
+  'Ë@' => 'æ�™',
+  'ËA' => 'æ�•',
+  'ËB' => 'æ�Œ',
+  'ËC' => 'æ�ˆ',
+  'ËD' => 'æ��',
+  'ËE' => 'æ��',
+  'ËF' => 'æ�š',
+  'ËG' => 'æ�‹',
+  'ËH' => 'æ¯�',
+  'ËI' => 'æ°™',
+  'ËJ' => 'æ°š',
+  'ËK' => '汸',
+  'ËL' => '汧',
+  'ËM' => '汫',
+  'ËN' => '沄',
+  'ËO' => '沋',
+  'ËP' => 'æ²�',
+  'ËQ' => 'æ±±',
+  'ËR' => '汯',
+  'ËS' => '汩',
+  'ËT' => '沚',
+  'ËU' => 'æ±­',
+  'ËV' => '沇',
+  'ËW' => '沕',
+  'ËX' => '沜',
+  'ËY' => '汦',
+  'ËZ' => 'æ±³',
+  'Ë[' => 'æ±¥',
+  'Ë\\' => 'æ±»',
+  'Ë]' => '沎',
+  'Ë^' => 'ç�´',
+  'Ë_' => 'ç�º',
+  'Ë`' => '牣',
+  'Ëa' => '犿',
+  'Ëb' => '犽',
+  'Ëc' => '狃',
+  'Ëd' => '狆',
+  'Ëe' => 'ç‹�',
+  'Ëf' => '犺',
+  'Ëg' => 'ç‹…',
+  'Ëh' => '玕',
+  'Ëi' => '玗',
+  'Ëj' => '玓',
+  'Ëk' => '玔',
+  'Ël' => '玒',
+  'Ëm' => '町',
+  'Ën' => '甹',
+  'Ëo' => 'ç–”',
+  'Ëp' => 'ç–•',
+  'Ëq' => 'çš�',
+  'Ër' => '礽',
+  'Ës' => '耴',
+  'Ët' => 'è‚•',
+  'Ëu' => 'è‚™',
+  'Ëv' => 'è‚�',
+  'Ëw' => 'è‚’',
+  'Ëx' => 'è‚œ',
+  'Ëy' => 'èŠ�',
+  'Ëz' => 'èŠ�',
+  'Ë{' => '芅',
+  'Ë|' => '芎',
+  'Ë}' => '芑',
+  'Ë~' => '芓',
+  'ˡ' => '芊',
+  'ˢ' => '芃',
+  'ˣ' => '芄',
+  'ˤ' => '豸',
+  '˥' => '迉',
+  '˦' => '辿',
+  '˧' => '邟',
+  '˨' => '邡',
+  'Ë©' => 'é‚¥',
+  '˪' => '邞',
+  '˫' => '邧',
+  'ˬ' => '邠',
+  '˭' => '阰',
+  'ˮ' => '阨',
+  '˯' => '阯',
+  '˰' => '阭',
+  '˱' => '丳',
+  '˲' => '侘',
+  '˳' => '佼',
+  'Ë´' => 'ä¾…',
+  '˵' => '佽',
+  '˶' => '侀',
+  '˷' => '侇',
+  '˸' => '佶',
+  '˹' => '佴',
+  '˺' => '侉',
+  '˻' => '侄',
+  '˼' => '佷',
+  '˽' => '佌',
+  '˾' => '侗',
+  '˿' => '佪',
+  'ËÀ' => '侚',
+  'ËÁ' => 'ä½¹',
+  'ËÂ' => 'ä¾�',
+  'ËÃ' => '佸',
+  'ËÄ' => 'ä¾�',
+  'ËÅ' => '侜',
+  'ËÆ' => 'ä¾”',
+  'ËÇ' => '侞',
+  'ËÈ' => 'ä¾’',
+  'ËÉ' => '侂',
+  'ËÊ' => '侕',
+  'ËË' => '佫',
+  'ËÌ' => 'ä½®',
+  'ËÍ' => '冞',
+  'ËÎ' => '冼',
+  'ËÏ' => '冾',
+  'ËÐ' => '刵',
+  'ËÑ' => '刲',
+  'ËÒ' => '刳',
+  'ËÓ' => '剆',
+  'ËÔ' => '刱',
+  'ËÕ' => '劼',
+  'ËÖ' => '匊',
+  'Ë×' => '匋',
+  'ËØ' => '匼',
+  'ËÙ' => '厒',
+  'ËÚ' => '厔',
+  'ËÛ' => 'å’‡',
+  'ËÜ' => 'å‘¿',
+  'ËÝ' => 'å’�',
+  'ËÞ' => 'å’‘',
+  'Ëß' => 'å’‚',
+  'Ëà' => 'å’ˆ',
+  'Ëá' => 'å‘«',
+  'Ëâ' => '呺',
+  'Ëã' => '呾',
+  'Ëä' => 'å‘¥',
+  'Ëå' => '呬',
+  'Ëæ' => 'å‘´',
+  'Ëç' => '呦',
+  'Ëè' => 'å’�',
+  'Ëé' => '呯',
+  'Ëê' => 'å‘¡',
+  'Ëë' => 'å‘ ',
+  'Ëì' => 'å’˜',
+  'Ëí' => 'å‘£',
+  'Ëî' => '呧',
+  'Ëï' => '呤',
+  'Ëð' => 'å›·',
+  'Ëñ' => '囹',
+  'Ëò' => 'å�¯',
+  'Ëó' => 'å�²',
+  'Ëô' => 'å�­',
+  'Ëõ' => 'å�«',
+  'Ëö' => 'å�±',
+  'Ë÷' => 'å�°',
+  'Ëø' => 'å�¶',
+  'Ëù' => '垀',
+  'Ëú' => 'å�µ',
+  'Ëû' => 'å�»',
+  'Ëü' => 'å�³',
+  'Ëý' => 'å�´',
+  'Ëþ' => 'å�¢',
+  'Ì@' => 'å�¨',
+  'ÌA' => 'å�½',
+  'ÌB' => '夌',
+  'ÌC' => '奅',
+  'ÌD' => '妵',
+  'ÌE' => '妺',
+  'ÌF' => 'å§�',
+  'ÌG' => '姎',
+  'ÌH' => '妲',
+  'ÌI' => '姌',
+  'ÌJ' => 'å§�',
+  'ÌK' => '妶',
+  'ÌL' => '妼',
+  'ÌM' => '姃',
+  'ÌN' => '姖',
+  'ÌO' => '妱',
+  'ÌP' => '妽',
+  'ÌQ' => '姀',
+  'ÌR' => '姈',
+  'ÌS' => '妴',
+  'ÌT' => '姇',
+  'ÌU' => 'å­¢',
+  'ÌV' => 'å­¥',
+  'ÌW' => '宓',
+  'ÌX' => '宕',
+  'ÌY' => '屄',
+  'ÌZ' => '屇',
+  'Ì[' => 'å²®',
+  'Ì\\' => '岤',
+  'Ì]' => 'å² ',
+  'Ì^' => 'å²µ',
+  'Ì_' => '岯',
+  'Ì`' => '岨',
+  'Ìa' => '岬',
+  'Ìb' => '岟',
+  'Ìc' => 'å²£',
+  'Ìd' => 'å²­',
+  'Ìe' => 'å²¢',
+  'Ìf' => '岪',
+  'Ìg' => '岧',
+  'Ìh' => 'å²�',
+  'Ìi' => 'å²¥',
+  'Ìj' => '岶',
+  'Ìk' => 'å²°',
+  'Ìl' => '岦',
+  'Ìm' => '帗',
+  'Ìn' => '帔',
+  'Ìo' => '帙',
+  'Ìp' => '弨',
+  'Ìq' => 'å¼¢',
+  'Ìr' => 'å¼£',
+  'Ìs' => '弤',
+  'Ìt' => 'å½”',
+  'Ìu' => '徂',
+  'Ìv' => 'å½¾',
+  'Ìw' => 'å½½',
+  'Ìx' => 'å¿ž',
+  'Ìy' => 'å¿¥',
+  'Ìz' => '怭',
+  'Ì{' => '怦',
+  'Ì|' => '怙',
+  'Ì}' => '怲',
+  'Ì~' => '怋',
+  '̡' => '怴',
+  '̢' => '怊',
+  '̣' => '怗',
+  '̤' => '怳',
+  '̥' => '怚',
+  '̦' => '怞',
+  '̧' => '怬',
+  '̨' => '怢',
+  '̩' => '�',
+  '̪' => '�',
+  '̫' => '怮',
+  '̬' => '怓',
+  '̭' => '怑',
+  '̮' => '怌',
+  '̯' => '怉',
+  '̰' => '怜',
+  '̱' => '戔',
+  '̲' => '戽',
+  '̳' => '抭',
+  '̴' => '抴',
+  '̵' => '拑',
+  '̶' => '抾',
+  '̷' => '抪',
+  '̸' => '抶',
+  '̹' => '拊',
+  '̺' => '抮',
+  '̻' => '抳',
+  '̼' => '抯',
+  '̽' => '抻',
+  '̾' => '抩',
+  '̿' => '抰',
+  'ÌÀ' => '抸',
+  'ÌÁ' => '攽',
+  'ÌÂ' => 'æ–¨',
+  'ÌÃ' => 'æ–»',
+  'ÌÄ' => '昉',
+  'ÌÅ' => 'æ—¼',
+  'ÌÆ' => '昄',
+  'ÌÇ' => '昒',
+  'ÌÈ' => '昈',
+  'ÌÉ' => 'æ—»',
+  'ÌÊ' => '昃',
+  'ÌË' => '昋',
+  'ÌÌ' => 'æ˜�',
+  'ÌÍ' => '昅',
+  'ÌÎ' => 'æ—½',
+  'ÌÏ' => '昑',
+  'ÌÐ' => 'æ˜�',
+  'ÌÑ' => '曶',
+  'ÌÒ' => '朊',
+  'ÌÓ' => 'æž…',
+  'ÌÔ' => 'æ�¬',
+  'ÌÕ' => '枎',
+  'ÌÖ' => 'æž’',
+  'Ì×' => 'æ�¶',
+  'ÌØ' => 'æ�»',
+  'ÌÙ' => '枘',
+  'ÌÚ' => '枆',
+  'ÌÛ' => 'æž„',
+  'ÌÜ' => 'æ�´',
+  'ÌÝ' => 'æž�',
+  'ÌÞ' => '枌',
+  'Ìß' => 'æ�º',
+  'Ìà' => '枟',
+  'Ìá' => 'æž‘',
+  'Ìâ' => 'æž™',
+  'Ìã' => '枃',
+  'Ìä' => 'æ�½',
+  'Ìå' => 'æž�',
+  'Ìæ' => 'æ�¸',
+  'Ìç' => 'æ�¹',
+  'Ìè' => 'æž”',
+  'Ìé' => '欥',
+  'Ìê' => '殀',
+  'Ìë' => 'æ­¾',
+  'Ìì' => '毞',
+  'Ìí' => 'æ°�',
+  'Ìî' => '沓',
+  'Ìï' => '泬',
+  'Ìð' => '泫',
+  'Ìñ' => 'æ³®',
+  'Ìò' => 'æ³™',
+  'Ìó' => '沶',
+  'Ìô' => 'æ³”',
+  'Ìõ' => 'æ²­',
+  'Ìö' => '泧',
+  'Ì÷' => 'æ²·',
+  'Ìø' => 'æ³�',
+  'Ìù' => '泂',
+  'Ìú' => '沺',
+  'Ìû' => '泃',
+  'Ìü' => '泆',
+  'Ìý' => 'æ³­',
+  'Ìþ' => 'æ³²',
+  'Í@' => 'æ³’',
+  'ÍA' => 'æ³�',
+  'ÍB' => 'æ²´',
+  'ÍC' => '沊',
+  'ÍD' => 'æ²�',
+  'ÍE' => 'æ²€',
+  'ÍF' => '泞',
+  'ÍG' => 'æ³€',
+  'ÍH' => 'æ´°',
+  'ÍI' => 'æ³�',
+  'ÍJ' => '泇',
+  'ÍK' => 'æ²°',
+  'ÍL' => 'æ³¹',
+  'ÍM' => 'æ³�',
+  'ÍN' => '泩',
+  'ÍO' => '泑',
+  'ÍP' => 'ç‚”',
+  'ÍQ' => '炘',
+  'ÍR' => 'ç‚…',
+  'ÍS' => 'ç‚“',
+  'ÍT' => '炆',
+  'ÍU' => 'ç‚„',
+  'ÍV' => 'ç‚‘',
+  'ÍW' => 'ç‚–',
+  'ÍX' => 'ç‚‚',
+  'ÍY' => 'ç‚š',
+  'ÍZ' => '炃',
+  'Í[' => '牪',
+  'Í\\' => 'ç‹–',
+  'Í]' => 'ç‹‹',
+  'Í^' => '狘',
+  'Í_' => '狉',
+  'Í`' => 'ç‹œ',
+  'Ía' => 'ç‹’',
+  'Íb' => 'ç‹”',
+  'Íc' => 'ç‹š',
+  'Íd' => 'ç‹Œ',
+  'Íe' => 'ç‹‘',
+  'Íf' => '玤',
+  'Íg' => '玡',
+  'Íh' => '玭',
+  'Íi' => '玦',
+  'Íj' => '玢',
+  'Ík' => '玠',
+  'Íl' => '玬',
+  'Ím' => 'çŽ�',
+  'Ín' => 'ç“�',
+  'Ío' => '瓨',
+  'Íp' => '甿',
+  'Íq' => 'ç•€',
+  'Ír' => '甾',
+  'Ís' => 'ç–Œ',
+  'Ít' => 'ç–˜',
+  'Íu' => '皯',
+  'Ív' => '盳',
+  'Íw' => 'ç›±',
+  'Íx' => 'ç›°',
+  'Íy' => '盵',
+  'Íz' => '矸',
+  'Í{' => '矼',
+  'Í|' => '矹',
+  'Í}' => '矻',
+  'Í~' => '矺',
+  '͡' => '矷',
+  '͢' => '祂',
+  'ͣ' => '礿',
+  'ͤ' => '秅',
+  'ͥ' => '穸',
+  'ͦ' => '穻',
+  'ͧ' => '竻',
+  'ͨ' => '籵',
+  'Í©' => 'ç³½',
+  'ͪ' => '耵',
+  'ͫ' => '�',
+  'ͬ' => '肮',
+  'Í­' => 'è‚£',
+  'ͮ' => '肸',
+  'ͯ' => '肵',
+  'Í°' => 'è‚­',
+  'ͱ' => '舠',
+  'Ͳ' => '芠',
+  'ͳ' => '苀',
+  'ʹ' => '芫',
+  '͵' => '芚',
+  'Ͷ' => '芘',
+  'ͷ' => '芛',
+  '͸' => '芵',
+  '͹' => '芧',
+  'ͺ' => '芮',
+  'ͻ' => '芼',
+  'ͼ' => '芞',
+  'ͽ' => '芺',
+  ';' => '芴',
+  'Ϳ' => '芨',
+  'ÍÀ' => '芡',
+  'ÍÁ' => '芩',
+  'ÍÂ' => 'è‹‚',
+  'ÍÃ' => '芤',
+  'ÍÄ' => '苃',
+  'ÍÅ' => '芶',
+  'ÍÆ' => '芢',
+  'ÍÇ' => 'è™°',
+  'ÍÈ' => '虯',
+  'ÍÉ' => 'è™­',
+  'ÍÊ' => 'è™®',
+  'ÍË' => 'è±–',
+  'ÍÌ' => 'è¿’',
+  'ÍÍ' => 'è¿‹',
+  'ÍÎ' => 'è¿“',
+  'ÍÏ' => 'è¿�',
+  'ÍÐ' => 'è¿–',
+  'ÍÑ' => 'è¿•',
+  'ÍÒ' => 'è¿—',
+  'ÍÓ' => '邲',
+  'ÍÔ' => 'é‚´',
+  'ÍÕ' => '邯',
+  'ÍÖ' => '邳',
+  'Í×' => 'é‚°',
+  'ÍØ' => '阹',
+  'ÍÙ' => '阽',
+  'ÍÚ' => '阼',
+  'ÍÛ' => '阺',
+  'ÍÜ' => '陃',
+  'ÍÝ' => 'ä¿�',
+  'ÍÞ' => 'ä¿…',
+  'Íß' => 'ä¿“',
+  'Íà' => 'ä¾²',
+  'Íá' => '俉',
+  'Íâ' => 'ä¿‹',
+  'Íã' => 'ä¿�',
+  'Íä' => 'ä¿”',
+  'Íå' => 'ä¿œ',
+  'Íæ' => 'ä¿™',
+  'Íç' => 'ä¾»',
+  'Íè' => 'ä¾³',
+  'Íé' => 'ä¿›',
+  'Íê' => '俇',
+  'Íë' => 'ä¿–',
+  'Íì' => '侺',
+  'Íí' => 'ä¿€',
+  'Íî' => 'ä¾¹',
+  'Íï' => '俬',
+  'Íð' => '剄',
+  'Íñ' => '剉',
+  'Íò' => 'å‹€',
+  'Íó' => 'å‹‚',
+  'Íô' => '匽',
+  'Íõ' => 'å�¼',
+  'Íö' => '厗',
+  'Í÷' => '厖',
+  'Íø' => '厙',
+  'Íù' => '厘',
+  'Íú' => 'å’º',
+  'Íû' => 'å’¡',
+  'Íü' => 'å’­',
+  'Íý' => 'å’¥',
+  'Íþ' => 'å“�',
+  'Î@' => '哃',
+  'ÎA' => 'èŒ�',
+  'ÎB' => 'å’·',
+  'ÎC' => 'å’®',
+  'ÎD' => 'å“–',
+  'ÎE' => 'å’¶',
+  'ÎF' => 'å“…',
+  'ÎG' => '哆',
+  'ÎH' => 'å’ ',
+  'ÎI' => 'å‘°',
+  'ÎJ' => 'å’¼',
+  'ÎK' => 'å’¢',
+  'ÎL' => 'å’¾',
+  'ÎM' => '呲',
+  'ÎN' => 'å“ž',
+  'ÎO' => 'å’°',
+  'ÎP' => 'åžµ',
+  'ÎQ' => 'åžž',
+  'ÎR' => '垟',
+  'ÎS' => '垤',
+  'ÎT' => '垌',
+  'ÎU' => 'åž—',
+  'ÎV' => 'åž�',
+  'ÎW' => 'åž›',
+  'ÎX' => 'åž”',
+  'ÎY' => '垘',
+  'ÎZ' => 'åž�',
+  'Î[' => 'åž™',
+  'Î\\' => '垥',
+  'Î]' => 'åžš',
+  'Î^' => 'åž•',
+  'Î_' => '壴',
+  'Î`' => 'å¤�',
+  'Îa' => '奓',
+  'Îb' => '姡',
+  'Îc' => '姞',
+  'Îd' => '姮',
+  'Îe' => '娀',
+  'Îf' => '姱',
+  'Îg' => 'å§�',
+  'Îh' => '姺',
+  'Îi' => '姽',
+  'Îj' => '姼',
+  'Îk' => '姶',
+  'Îl' => '姤',
+  'Îm' => '姲',
+  'În' => '姷',
+  'Îo' => '姛',
+  'Îp' => '姩',
+  'Îq' => '姳',
+  'Îr' => '姵',
+  'Îs' => '姠',
+  'Ît' => '姾',
+  'Îu' => '姴',
+  'Îv' => '姭',
+  'Îw' => '宨',
+  'Îx' => '屌',
+  'Îy' => 'å³�',
+  'Îz' => '峘',
+  'Î{' => '峌',
+  'Î|' => 'å³—',
+  'Î}' => '峋',
+  'Î~' => 'å³›',
+  'Ρ' => '峞',
+  '΢' => '峚',
+  'Σ' => '峉',
+  'Τ' => '峇',
+  'Υ' => '峊',
+  'Φ' => '峖',
+  'Χ' => '峓',
+  'Ψ' => '峔',
+  'Ω' => '�',
+  'Ϊ' => '峈',
+  'Ϋ' => '峆',
+  'ά' => '峎',
+  'έ' => '峟',
+  'ή' => '峸',
+  'ί' => '巹',
+  'ΰ' => '帡',
+  'α' => '帢',
+  'β' => '帣',
+  'γ' => '帠',
+  'δ' => '帤',
+  'ε' => '庰',
+  'ζ' => '庤',
+  'η' => '庢',
+  'θ' => '庛',
+  'ι' => '庣',
+  'κ' => '庥',
+  'λ' => '弇',
+  'μ' => '弮',
+  'ν' => '彖',
+  'ξ' => '徆',
+  'ο' => '怷',
+  'ÎÀ' => '怹',
+  'ÎÁ' => 'æ�”',
+  'ÎÂ' => 'æ�²',
+  'ÎÃ' => 'æ�ž',
+  'ÎÄ' => 'æ�…',
+  'ÎÅ' => 'æ�“',
+  'ÎÆ' => 'æ�‡',
+  'ÎÇ' => 'æ�‰',
+  'ÎÈ' => 'æ�›',
+  'ÎÉ' => 'æ�Œ',
+  'ÎÊ' => 'æ�€',
+  'ÎË' => 'æ�‚',
+  'ÎÌ' => 'æ�Ÿ',
+  'ÎÍ' => '怤',
+  'ÎÎ' => 'æ�„',
+  'ÎÏ' => 'æ�˜',
+  'ÎÐ' => 'æ�¦',
+  'ÎÑ' => 'æ�®',
+  'ÎÒ' => '扂',
+  'ÎÓ' => '扃',
+  'ÎÔ' => 'æ‹�',
+  'ÎÕ' => 'æŒ�',
+  'ÎÖ' => '挋',
+  'Î×' => '拵',
+  'ÎØ' => '挎',
+  'ÎÙ' => '挃',
+  'ÎÚ' => 'æ‹«',
+  'ÎÛ' => '拹',
+  'ÎÜ' => 'æŒ�',
+  'ÎÝ' => '挌',
+  'ÎÞ' => '拸',
+  'Îß' => '拶',
+  'Îà' => '挀',
+  'Îá' => '挓',
+  'Îâ' => '挔',
+  'Îã' => '拺',
+  'Îä' => '挕',
+  'Îå' => 'æ‹»',
+  'Îæ' => 'æ‹°',
+  'Îç' => 'æ•�',
+  'Îè' => '敃',
+  'Îé' => 'æ–ª',
+  'Îê' => 'æ–¿',
+  'Îë' => '昶',
+  'Îì' => '昡',
+  'Îí' => '昲',
+  'Îî' => '昵',
+  'Îï' => '昜',
+  'Îð' => '昦',
+  'Îñ' => '昢',
+  'Îò' => '昳',
+  'Îó' => '昫',
+  'Îô' => '昺',
+  'Îõ' => 'æ˜�',
+  'Îö' => '昴',
+  'Î÷' => '昹',
+  'Îø' => '昮',
+  'Îù' => 'æœ�',
+  'Îú' => 'æœ�',
+  'Îû' => 'æŸ�',
+  'Îü' => '柲',
+  'Îý' => '柈',
+  'Îþ' => '枺',
+  'Ï@' => '柜',
+  'ÏA' => 'æž»',
+  'ÏB' => '柸',
+  'ÏC' => '柘',
+  'ÏD' => '柀',
+  'ÏE' => 'æž·',
+  'ÏF' => '柅',
+  'ÏG' => '柫',
+  'ÏH' => '柤',
+  'ÏI' => '柟',
+  'ÏJ' => 'æžµ',
+  'ÏK' => 'æŸ�',
+  'ÏL' => 'æž³',
+  'ÏM' => '柷',
+  'ÏN' => '柶',
+  'ÏO' => '柮',
+  'ÏP' => '柣',
+  'ÏQ' => '柂',
+  'ÏR' => 'æž¹',
+  'ÏS' => '柎',
+  'ÏT' => '柧',
+  'ÏU' => '柰',
+  'ÏV' => 'æž²',
+  'ÏW' => '柼',
+  'ÏX' => '柆',
+  'ÏY' => '柭',
+  'ÏZ' => '柌',
+  'Ï[' => 'æž®',
+  'Ï\\' => '柦',
+  'Ï]' => '柛',
+  'Ï^' => '柺',
+  'Ï_' => '柉',
+  'Ï`' => '柊',
+  'Ïa' => '柃',
+  'Ïb' => '柪',
+  'Ïc' => '柋',
+  'Ïd' => '欨',
+  'Ïe' => '殂',
+  'Ïf' => '殄',
+  'Ïg' => '殶',
+  'Ïh' => '毖',
+  'Ïi' => '毘',
+  'Ïj' => '毠',
+  'Ïk' => 'æ° ',
+  'Ïl' => 'æ°¡',
+  'Ïm' => 'æ´¨',
+  'Ïn' => 'æ´´',
+  'Ïo' => 'æ´­',
+  'Ïp' => 'æ´Ÿ',
+  'Ïq' => 'æ´¼',
+  'Ïr' => 'æ´¿',
+  'Ïs' => 'æ´’',
+  'Ït' => 'æ´Š',
+  'Ïu' => '泚',
+  'Ïv' => 'æ´³',
+  'Ïw' => 'æ´„',
+  'Ïx' => 'æ´™',
+  'Ïy' => 'æ´º',
+  'Ïz' => 'æ´š',
+  'Ï{' => 'æ´‘',
+  'Ï|' => 'æ´€',
+  'Ï}' => 'æ´�',
+  'Ï~' => '浂',
+  'Ï¡' => 'æ´�',
+  'Ï¢' => 'æ´˜',
+  'Ï£' => 'æ´·',
+  'Ϥ' => '洃',
+  'Ï¥' => 'æ´�',
+  'Ϧ' => '浀',
+  'ϧ' => '洇',
+  'Ϩ' => '洠',
+  'Ï©' => 'æ´¬',
+  'Ϫ' => '洈',
+  'Ï«' => 'æ´¢',
+  'Ϭ' => '洉',
+  'Ï­' => 'æ´�',
+  'Ï®' => 'ç‚·',
+  'ϯ' => '炟',
+  'ϰ' => '炾',
+  'ϱ' => '炱',
+  'ϲ' => '炰',
+  'ϳ' => '炡',
+  'Ï´' => 'ç‚´',
+  'ϵ' => '炵',
+  '϶' => '炩',
+  'Ϸ' => '�',
+  'ϸ' => '牉',
+  'Ϲ' => '牊',
+  'Ϻ' => '牬',
+  'ϻ' => '牰',
+  'ϼ' => '牳',
+  'Ͻ' => '牮',
+  'Ͼ' => '狊',
+  'Ͽ' => '狤',
+  'ÏÀ' => '狨',
+  'ÏÁ' => 'ç‹«',
+  'ÏÂ' => 'ç‹Ÿ',
+  'ÏÃ' => '狪',
+  'ÏÄ' => '狦',
+  'ÏÅ' => 'ç‹£',
+  'ÏÆ' => '玅',
+  'ÏÇ' => 'ç�Œ',
+  'ÏÈ' => 'ç�‚',
+  'ÏÉ' => 'ç�ˆ',
+  'ÏÊ' => 'ç�…',
+  'ÏË' => '玹',
+  'ÏÌ' => '玶',
+  'ÏÍ' => '玵',
+  'ÏÎ' => '玴',
+  'ÏÏ' => 'ç�«',
+  'ÏÐ' => '玿',
+  'ÏÑ' => 'ç�‡',
+  'ÏÒ' => '玾',
+  'ÏÓ' => 'ç�ƒ',
+  'ÏÔ' => 'ç�†',
+  'ÏÕ' => '玸',
+  'ÏÖ' => 'ç�‹',
+  'Ï×' => '瓬',
+  'ÏØ' => 'ç“®',
+  'ÏÙ' => 'ç”®',
+  'ÏÚ' => '畇',
+  'ÏÛ' => '畈',
+  'ÏÜ' => 'ç–§',
+  'ÏÝ' => 'ç–ª',
+  'ÏÞ' => '癹',
+  'Ïß' => '盄',
+  'Ïà' => '眈',
+  'Ïá' => '眃',
+  'Ïâ' => '眄',
+  'Ïã' => '眅',
+  'Ïä' => '眊',
+  'Ïå' => 'ç›·',
+  'Ïæ' => 'ç›»',
+  'Ïç' => '盺',
+  'Ïè' => '矧',
+  'Ïé' => '矨',
+  'Ïê' => 'ç †',
+  'Ïë' => 'ç ‘',
+  'Ïì' => 'ç ’',
+  'Ïí' => 'ç …',
+  'Ïî' => 'ç �',
+  'Ïï' => 'ç �',
+  'Ïð' => 'ç Ž',
+  'Ïñ' => 'ç ‰',
+  'Ïò' => 'ç ƒ',
+  'Ïó' => 'ç “',
+  'Ïô' => '祊',
+  'Ïõ' => '祌',
+  'Ïö' => '祋',
+  'Ï÷' => '祅',
+  'Ïø' => '祄',
+  'Ïù' => '秕',
+  'Ïú' => 'ç§�',
+  'Ïû' => 'ç§�',
+  'Ïü' => '秖',
+  'Ïý' => '秎',
+  'Ïþ' => '窀',
+  'Ð@' => '穾',
+  'ÐA' => 'ç«‘',
+  'ÐB' => '笀',
+  'ÐC' => 'ç¬�',
+  'ÐD' => '籺',
+  'ÐE' => '籸',
+  'ÐF' => 'ç±¹',
+  'ÐG' => '籿',
+  'ÐH' => 'ç²€',
+  'ÐI' => 'ç²�',
+  'ÐJ' => 'ç´ƒ',
+  'ÐK' => 'ç´ˆ',
+  'ÐL' => 'ç´�',
+  'ÐM' => '罘',
+  'ÐN' => '羑',
+  'ÐO' => 'ç¾�',
+  'ÐP' => 'ç¾¾',
+  'ÐQ' => '耇',
+  'ÐR' => '耎',
+  'ÐS' => 'è€�',
+  'ÐT' => '耔',
+  'ÐU' => '耷',
+  'ÐV' => '胘',
+  'ÐW' => '胇',
+  'ÐX' => '胠',
+  'ÐY' => '胑',
+  'ÐZ' => '胈',
+  'Ð[' => '胂',
+  'Ð\\' => 'èƒ�',
+  'Ð]' => '胅',
+  'Ð^' => '胣',
+  'Ð_' => '胙',
+  'Ð`' => '胜',
+  'Ða' => '胊',
+  'Ðb' => '胕',
+  'Ðc' => '胉',
+  'Ðd' => 'èƒ�',
+  'Ðe' => '胗',
+  'Ðf' => '胦',
+  'Ðg' => 'èƒ�',
+  'Ðh' => '臿',
+  'Ði' => '舡',
+  'Ðj' => '芔',
+  'Ðk' => 'è‹™',
+  'Ðl' => '苾',
+  'Ðm' => '苹',
+  'Ðn' => '茇',
+  'Ðo' => '苨',
+  'Ðp' => '茀',
+  'Ðq' => 'è‹•',
+  'Ðr' => '茺',
+  'Ðs' => 'è‹«',
+  'Ðt' => 'è‹–',
+  'Ðu' => 'è‹´',
+  'Ðv' => '苬',
+  'Ðw' => 'è‹¡',
+  'Ðx' => '苲',
+  'Ðy' => '苵',
+  'Ðz' => '茌',
+  'Ð{' => 'è‹»',
+  'Ð|' => '苶',
+  'Ð}' => 'è‹°',
+  'Ð~' => '苪',
+  'С' => '苤',
+  'Т' => '苠',
+  'У' => '苺',
+  'Ф' => '苳',
+  'Ð¥' => 'è‹­',
+  'Ц' => '虷',
+  'Ч' => '虴',
+  'Ш' => '虼',
+  'Щ' => '虳',
+  'Ъ' => '�',
+  'Ы' => '衎',
+  'Ь' => '衧',
+  'Э' => '衪',
+  'Ю' => '衩',
+  'Я' => '觓',
+  'а' => '訄',
+  'б' => '訇',
+  'в' => '赲',
+  'г' => '迣',
+  'д' => '迡',
+  'е' => '迮',
+  'ж' => '迠',
+  'з' => '郱',
+  'и' => '邽',
+  'й' => '邿',
+  'к' => '郕',
+  'л' => '郅',
+  'м' => '邾',
+  'н' => '郇',
+  'о' => '郋',
+  'п' => '郈',
+  'ÐÀ' => '釔',
+  'ÐÁ' => '釓',
+  'ÐÂ' => 'é™”',
+  'ÐÃ' => 'é™�',
+  'ÐÄ' => '陑',
+  'ÐÅ' => '陓',
+  'ÐÆ' => '陊',
+  'ÐÇ' => '陎',
+  'ÐÈ' => '倞',
+  'ÐÉ' => '倅',
+  'ÐÊ' => '倇',
+  'ÐË' => '倓',
+  'ÐÌ' => '倢',
+  'ÐÍ' => '倰',
+  'ÐÎ' => '倛',
+  'ÐÏ' => '俵',
+  'ÐÐ' => 'ä¿´',
+  'ÐÑ' => '倳',
+  'ÐÒ' => '倷',
+  'ÐÓ' => '倬',
+  'ÐÔ' => '俶',
+  'ÐÕ' => 'ä¿·',
+  'ÐÖ' => '倗',
+  'Ð×' => '倜',
+  'ÐØ' => '倠',
+  'ÐÙ' => '倧',
+  'ÐÚ' => '倵',
+  'ÐÛ' => '倯',
+  'ÐÜ' => '倱',
+  'ÐÝ' => '倎',
+  'ÐÞ' => 'å…š',
+  'Ðß' => '冔',
+  'Ðà' => '冓',
+  'Ðá' => '凊',
+  'Ðâ' => '凄',
+  'Ðã' => '凅',
+  'Ðä' => '凈',
+  'Ðå' => '凎',
+  'Ðæ' => '剡',
+  'Ðç' => '剚',
+  'Ðè' => '剒',
+  'Ðé' => '剞',
+  'Ðê' => '剟',
+  'Ðë' => '剕',
+  'Ðì' => '剢',
+  'Ðí' => 'å‹�',
+  'Ðî' => '匎',
+  'Ðï' => '厞',
+  'Ðð' => '唦',
+  'Ðñ' => 'å“¢',
+  'Ðò' => 'å”—',
+  'Ðó' => 'å”’',
+  'Ðô' => '哧',
+  'Ðõ' => '哳',
+  'Ðö' => '哤',
+  'Ð÷' => '唚',
+  'Ðø' => 'å“¿',
+  'Ðù' => '唄',
+  'Ðú' => '唈',
+  'Ðû' => 'å“«',
+  'Ðü' => '唑',
+  'Ðý' => 'å”…',
+  'Ðþ' => '哱',
+  'Ñ@' => '唊',
+  'ÑA' => 'å“»',
+  'ÑB' => 'å“·',
+  'ÑC' => '哸',
+  'ÑD' => 'å“ ',
+  'ÑE' => '唎',
+  'ÑF' => '唃',
+  'ÑG' => '唋',
+  'ÑH' => 'åœ�',
+  'ÑI' => '圂',
+  'ÑJ' => '埌',
+  'ÑK' => 'å ²',
+  'ÑL' => '埕',
+  'ÑM' => '埒',
+  'ÑN' => '垺',
+  'ÑO' => '埆',
+  'ÑP' => 'åž½',
+  'ÑQ' => 'åž¼',
+  'ÑR' => '垸',
+  'ÑS' => '垶',
+  'ÑT' => 'åž¿',
+  'ÑU' => '埇',
+  'ÑV' => 'åŸ�',
+  'ÑW' => 'åž¹',
+  'ÑX' => 'åŸ�',
+  'ÑY' => '夎',
+  'ÑZ' => '奊',
+  'Ñ[' => '娙',
+  'Ñ\\' => '娖',
+  'Ñ]' => '娭',
+  'Ñ^' => '娮',
+  'Ñ_' => '娕',
+  'Ñ`' => 'å¨�',
+  'Ña' => '娗',
+  'Ñb' => '娊',
+  'Ñc' => '娞',
+  'Ñd' => '娳',
+  'Ñe' => 'å­¬',
+  'Ñf' => '宧',
+  'Ñg' => 'å®­',
+  'Ñh' => '宬',
+  'Ñi' => 'å°ƒ',
+  'Ñj' => 'å±–',
+  'Ñk' => 'å±”',
+  'Ñl' => '峬',
+  'Ñm' => '峿',
+  'Ñn' => 'å³®',
+  'Ño' => 'å³±',
+  'Ñp' => 'å³·',
+  'Ñq' => 'å´€',
+  'Ñr' => 'å³¹',
+  'Ñs' => '帩',
+  'Ñt' => '帨',
+  'Ñu' => '庨',
+  'Ñv' => '庮',
+  'Ñw' => '庪',
+  'Ñx' => '庬',
+  'Ñy' => 'å¼³',
+  'Ñz' => 'å¼°',
+  'Ñ{' => '彧',
+  'Ñ|' => 'æ��',
+  'Ñ}' => 'æ�š',
+  'Ñ~' => 'æ�§',
+  'ѡ' => '�',
+  'Ñ¢' => 'æ‚¢',
+  'ѣ' => '悈',
+  'Ѥ' => '悀',
+  'Ñ¥' => 'æ‚’',
+  'Ѧ' => '�',
+  'ѧ' => '�',
+  'Ѩ' => '悃',
+  'Ñ©' => 'æ‚•',
+  'Ѫ' => '悛',
+  'Ñ«' => 'æ‚—',
+  'Ѭ' => '悇',
+  'ѭ' => '悜',
+  'Ñ®' => 'æ‚Ž',
+  'ѯ' => '戙',
+  'Ѱ' => '扆',
+  'ѱ' => '拲',
+  'Ѳ' => '�',
+  'ѳ' => '�',
+  'Ѵ' => '挬',
+  'ѵ' => '�',
+  'Ѷ' => '�',
+  'ѷ' => '挶',
+  'Ѹ' => '�',
+  'ѹ' => '�',
+  'Ѻ' => '挹',
+  'ѻ' => '�',
+  'Ѽ' => '�',
+  'ѽ' => '挼',
+  'Ѿ' => '挩',
+  'ѿ' => '�',
+  'ÑÀ' => '挴',
+  'ÑÁ' => 'æ�˜',
+  'ÑÂ' => 'æ�”',
+  'ÑÃ' => 'æ�™',
+  'ÑÄ' => '挭',
+  'ÑÅ' => 'æ�‡',
+  'ÑÆ' => '挳',
+  'ÑÇ' => 'æ�š',
+  'ÑÈ' => 'æ�‘',
+  'ÑÉ' => '挸',
+  'ÑÊ' => 'æ�—',
+  'ÑË' => 'æ�€',
+  'ÑÌ' => 'æ�ˆ',
+  'ÑÍ' => 'æ•Š',
+  'ÑÎ' => '敆',
+  'ÑÏ' => 'æ—†',
+  'ÑÐ' => 'æ—ƒ',
+  'ÑÑ' => 'æ—„',
+  'ÑÒ' => 'æ—‚',
+  'ÑÓ' => '晊',
+  'ÑÔ' => '晟',
+  'ÑÕ' => '晇',
+  'ÑÖ' => '晑',
+  'Ñ×' => '朒',
+  'ÑØ' => '朓',
+  'ÑÙ' => 'æ Ÿ',
+  'ÑÚ' => 'æ š',
+  'ÑÛ' => '桉',
+  'ÑÜ' => 'æ ²',
+  'ÑÝ' => 'æ ³',
+  'ÑÞ' => 'æ »',
+  'Ñß' => 'æ¡‹',
+  'Ñà' => 'æ¡�',
+  'Ñá' => 'æ –',
+  'Ñâ' => 'æ ±',
+  'Ñã' => 'æ œ',
+  'Ñä' => 'æ µ',
+  'Ñå' => 'æ «',
+  'Ñæ' => 'æ ­',
+  'Ñç' => 'æ ¯',
+  'Ñè' => 'æ¡Ž',
+  'Ñé' => 'æ¡„',
+  'Ñê' => 'æ ´',
+  'Ñë' => 'æ �',
+  'Ñì' => 'æ ’',
+  'Ñí' => 'æ ”',
+  'Ñî' => 'æ ¦',
+  'Ñï' => 'æ ¨',
+  'Ñð' => 'æ ®',
+  'Ññ' => 'æ¡�',
+  'Ñò' => 'æ º',
+  'Ñó' => 'æ ¥',
+  'Ñô' => 'æ  ',
+  'Ñõ' => '欬',
+  'Ñö' => '欯',
+  'Ñ÷' => '欭',
+  'Ñø' => '欱',
+  'Ñù' => '欴',
+  'Ñú' => 'æ­­',
+  'Ñû' => 'è‚‚',
+  'Ñü' => '殈',
+  'Ñý' => '毦',
+  'Ñþ' => '毤',
+  'Ò@' => '毨',
+  'ÒA' => '毣',
+  'ÒB' => '毢',
+  'ÒC' => '毧',
+  'ÒD' => 'æ°¥',
+  'ÒE' => '浺',
+  'ÒF' => 'æµ£',
+  'ÒG' => '浤',
+  'ÒH' => '浶',
+  'ÒI' => 'æ´�',
+  'ÒJ' => '浡',
+  'ÒK' => '涒',
+  'ÒL' => '浘',
+  'ÒM' => 'æµ¢',
+  'ÒN' => 'æµ­',
+  'ÒO' => '浯',
+  'ÒP' => '涑',
+  'ÒQ' => 'æ¶�',
+  'ÒR' => 'æ·¯',
+  'ÒS' => '浿',
+  'ÒT' => '涆',
+  'ÒU' => '浞',
+  'ÒV' => '浧',
+  'ÒW' => 'æµ ',
+  'ÒX' => '涗',
+  'ÒY' => 'æµ°',
+  'ÒZ' => 'æµ¼',
+  'Ò[' => '浟',
+  'Ò\\' => '涂',
+  'Ò]' => '涘',
+  'Ò^' => 'æ´¯',
+  'Ò_' => '浨',
+  'Ò`' => '涋',
+  'Òa' => 'æµ¾',
+  'Òb' => '涀',
+  'Òc' => '涄',
+  'Òd' => 'æ´–',
+  'Òe' => '涃',
+  'Òf' => 'æµ»',
+  'Òg' => 'æµ½',
+  'Òh' => 'æµµ',
+  'Òi' => 'æ¶�',
+  'Òj' => '烜',
+  'Òk' => '烓',
+  'Òl' => '烑',
+  'Òm' => 'çƒ�',
+  'Òn' => '烋',
+  'Òo' => 'ç¼¹',
+  'Òp' => '烢',
+  'Òq' => '烗',
+  'Òr' => '烒',
+  'Òs' => '烞',
+  'Òt' => '烠',
+  'Òu' => '烔',
+  'Òv' => 'çƒ�',
+  'Òw' => '烅',
+  'Òx' => '烆',
+  'Òy' => '烇',
+  'Òz' => '烚',
+  'Ò{' => '烎',
+  'Ò|' => '烡',
+  'Ò}' => '牂',
+  'Ò~' => '牸',
+  'ҡ' => '牷',
+  'Ң' => '牶',
+  'ң' => '猀',
+  'Ҥ' => '狺',
+  'Ò¥' => 'ç‹´',
+  'Ҧ' => '狾',
+  'ҧ' => '狶',
+  'Ҩ' => '狳',
+  'Ò©' => 'ç‹»',
+  'Ҫ' => '�',
+  'ҫ' => '�',
+  'Ҭ' => '�',
+  'ҭ' => '�',
+  'Ү' => '�',
+  'ү' => '玼',
+  'Ұ' => '�',
+  'ұ' => '�',
+  'Ҳ' => '�',
+  'ҳ' => '�',
+  'Ҵ' => '�',
+  'ҵ' => '�',
+  'Ҷ' => '�',
+  'ҷ' => '�',
+  'Ҹ' => '�',
+  'ҹ' => '�',
+  'Һ' => '�',
+  'һ' => '�',
+  'Ò¼' => 'ç“ž',
+  'Ò½' => 'ç“Ÿ',
+  'Ò¾' => 'ç“´',
+  'ҿ' => '瓵',
+  'ÒÀ' => '甡',
+  'ÒÁ' => 'ç•›',
+  'ÒÂ' => 'ç•Ÿ',
+  'ÒÃ' => 'ç–°',
+  'ÒÄ' => 'ç—�',
+  'ÒÅ' => 'ç–»',
+  'ÒÆ' => 'ç—„',
+  'ÒÇ' => 'ç—€',
+  'ÒÈ' => 'ç–¿',
+  'ÒÉ' => 'ç–¶',
+  'ÒÊ' => 'ç–º',
+  'ÒË' => '皊',
+  'ÒÌ' => '盉',
+  'ÒÍ' => 'çœ�',
+  'ÒÎ' => '眛',
+  'ÒÏ' => 'çœ�',
+  'ÒÐ' => '眓',
+  'ÒÑ' => '眒',
+  'ÒÒ' => '眣',
+  'ÒÓ' => '眑',
+  'ÒÔ' => '眕',
+  'ÒÕ' => '眙',
+  'ÒÖ' => '眚',
+  'Ò×' => '眢',
+  'ÒØ' => '眧',
+  'ÒÙ' => 'ç £',
+  'ÒÚ' => 'ç ¬',
+  'ÒÛ' => 'ç ¢',
+  'ÒÜ' => 'ç µ',
+  'ÒÝ' => 'ç ¯',
+  'ÒÞ' => 'ç ¨',
+  'Òß' => 'ç ®',
+  'Òà' => 'ç «',
+  'Òá' => 'ç ¡',
+  'Òâ' => 'ç ©',
+  'Òã' => 'ç ³',
+  'Òä' => 'ç ª',
+  'Òå' => 'ç ±',
+  'Òæ' => '祔',
+  'Òç' => '祛',
+  'Òè' => 'ç¥�',
+  'Òé' => '祜',
+  'Òê' => '祓',
+  'Òë' => '祒',
+  'Òì' => '祑',
+  'Òí' => '秫',
+  'Òî' => '秬',
+  'Òï' => '秠',
+  'Òð' => '秮',
+  'Òñ' => '秭',
+  'Òò' => '秪',
+  'Òó' => '秜',
+  'Òô' => '秞',
+  'Òõ' => 'ç§�',
+  'Òö' => '窆',
+  'Ò÷' => '窉',
+  'Òø' => '窅',
+  'Òù' => '窋',
+  'Òú' => '窌',
+  'Òû' => '窊',
+  'Òü' => '窇',
+  'Òý' => '竘',
+  'Òþ' => 'ç¬�',
+  'Ó@' => '笄',
+  'ÓA' => '笓',
+  'ÓB' => '笅',
+  'ÓC' => 'ç¬�',
+  'ÓD' => '笈',
+  'ÓE' => '笊',
+  'ÓF' => '笎',
+  'ÓG' => '笉',
+  'ÓH' => '笒',
+  'ÓI' => '粄',
+  'ÓJ' => '粑',
+  'ÓK' => '粊',
+  'ÓL' => '粌',
+  'ÓM' => '粈',
+  'ÓN' => 'ç²�',
+  'ÓO' => 'ç²…',
+  'ÓP' => 'ç´ž',
+  'ÓQ' => 'ç´�',
+  'ÓR' => 'ç´‘',
+  'ÓS' => 'ç´Ž',
+  'ÓT' => 'ç´˜',
+  'ÓU' => 'ç´–',
+  'ÓV' => 'ç´“',
+  'ÓW' => 'ç´Ÿ',
+  'ÓX' => 'ç´’',
+  'ÓY' => 'ç´�',
+  'ÓZ' => 'ç´Œ',
+  'Ó[' => '罜',
+  'Ó\\' => '罡',
+  'Ó]' => '罞',
+  'Ó^' => 'ç½ ',
+  'Ó_' => 'ç½�',
+  'Ó`' => 'ç½›',
+  'Óa' => 'ç¾–',
+  'Ób' => 'ç¾’',
+  'Óc' => '翃',
+  'Ód' => 'ç¿‚',
+  'Óe' => 'ç¿€',
+  'Óf' => '耖',
+  'Óg' => '耾',
+  'Óh' => '耹',
+  'Ói' => '胺',
+  'Ój' => '胲',
+  'Ók' => '胹',
+  'Ól' => '胵',
+  'Óm' => 'è„�',
+  'Ón' => '胻',
+  'Óo' => 'è„€',
+  'Óp' => 'èˆ�',
+  'Óq' => '舯',
+  'Ór' => '舥',
+  'Ós' => '茳',
+  'Ót' => '茭',
+  'Óu' => 'è�„',
+  'Óv' => '茙',
+  'Ów' => 'è�‘',
+  'Óx' => '茥',
+  'Óy' => 'è�–',
+  'Óz' => '茿',
+  'Ó{' => 'è��',
+  'Ó|' => '茦',
+  'Ó}' => '茜',
+  'Ó~' => '茢',
+  'ӡ' => '�',
+  'Ӣ' => '�',
+  'ӣ' => '茛',
+  'Ӥ' => '茪',
+  'ӥ' => '茈',
+  'Ӧ' => '茼',
+  'ӧ' => '�',
+  'Ө' => '茖',
+  'ө' => '茤',
+  'Ӫ' => '茠',
+  'ӫ' => '茷',
+  'Ӭ' => '茯',
+  'ӭ' => '茩',
+  'Ӯ' => '�',
+  'ӯ' => '�',
+  'Ӱ' => '�',
+  'ӱ' => '�',
+  'Ӳ' => '茞',
+  'ӳ' => '茬',
+  'Ӵ' => '�',
+  'ӵ' => '茧',
+  'Ӷ' => '�',
+  'ӷ' => '虓',
+  'Ó¸' => 'è™’',
+  'ӹ' => '蚢',
+  'Ӻ' => '蚨',
+  'Ó»' => 'èš–',
+  'Ӽ' => '�',
+  'Ó½' => 'èš‘',
+  'Ó¾' => 'èšž',
+  'ӿ' => '蚇',
+  'ÓÀ' => 'èš—',
+  'ÓÁ' => '蚆',
+  'ÓÂ' => 'èš‹',
+  'ÓÃ' => 'èšš',
+  'ÓÄ' => 'èš…',
+  'ÓÅ' => '蚥',
+  'ÓÆ' => 'èš™',
+  'ÓÇ' => 'èš¡',
+  'ÓÈ' => '蚧',
+  'ÓÉ' => 'èš•',
+  'ÓÊ' => '蚘',
+  'ÓË' => '蚎',
+  'ÓÌ' => 'èš�',
+  'ÓÍ' => 'èš�',
+  'ÓÎ' => 'èš”',
+  'ÓÏ' => '衃',
+  'ÓÐ' => 'è¡„',
+  'ÓÑ' => 'è¡­',
+  'ÓÒ' => '衵',
+  'ÓÓ' => '衶',
+  'ÓÔ' => '衲',
+  'ÓÕ' => '袀',
+  'ÓÖ' => '衱',
+  'Ó×' => 'è¡¿',
+  'ÓØ' => '衯',
+  'ÓÙ' => '袃',
+  'ÓÚ' => '衾',
+  'ÓÛ' => 'è¡´',
+  'ÓÜ' => '衼',
+  'ÓÝ' => '訒',
+  'ÓÞ' => '豇',
+  'Óß' => 'è±—',
+  'Óà' => 'è±»',
+  'Óá' => '貤',
+  'Óâ' => 'è²£',
+  'Óã' => '赶',
+  'Óä' => '赸',
+  'Óå' => '趵',
+  'Óæ' => '趷',
+  'Óç' => '趶',
+  'Óè' => '軑',
+  'Óé' => '軓',
+  'Óê' => '迾',
+  'Óë' => '迵',
+  'Óì' => '适',
+  'Óí' => 'è¿¿',
+  'Óî' => 'è¿»',
+  'Óï' => '逄',
+  'Óð' => '迼',
+  'Óñ' => '迶',
+  'Óò' => '郖',
+  'Óó' => '郠',
+  'Óô' => '郙',
+  'Óõ' => '郚',
+  'Óö' => '郣',
+  'Ó÷' => '郟',
+  'Óø' => '郥',
+  'Óù' => '郘',
+  'Óú' => '郛',
+  'Óû' => '郗',
+  'Óü' => '郜',
+  'Óý' => '郤',
+  'Óþ' => 'é…�',
+  'Ô@' => 'é…Ž',
+  'ÔA' => 'é…�',
+  'ÔB' => '釕',
+  'ÔC' => '釢',
+  'ÔD' => '釚',
+  'ÔE' => '陜',
+  'ÔF' => '陟',
+  'ÔG' => 'éš¼',
+  'ÔH' => '飣',
+  'ÔI' => 'é«Ÿ',
+  'ÔJ' => '鬯',
+  'ÔK' => '乿',
+  'ÔL' => 'å�°',
+  'ÔM' => 'å�ª',
+  'ÔN' => 'å�¡',
+  'ÔO' => 'å�ž',
+  'ÔP' => 'å� ',
+  'ÔQ' => 'å�“',
+  'ÔR' => 'å�‹',
+  'ÔS' => 'å��',
+  'ÔT' => 'å�²',
+  'ÔU' => 'å�ˆ',
+  'ÔV' => 'å��',
+  'ÔW' => 'å��',
+  'ÔX' => 'å�›',
+  'ÔY' => 'å�Š',
+  'ÔZ' => 'å�¢',
+  'Ô[' => '倕',
+  'Ô\\' => 'å�…',
+  'Ô]' => 'å�Ÿ',
+  'Ô^' => 'å�©',
+  'Ô_' => 'å�«',
+  'Ô`' => 'å�£',
+  'Ôa' => 'å�¤',
+  'Ôb' => 'å�†',
+  'Ôc' => 'å�€',
+  'Ôd' => 'å�®',
+  'Ôe' => 'å�³',
+  'Ôf' => 'å�—',
+  'Ôg' => 'å�‘',
+  'Ôh' => 'å‡�',
+  'Ôi' => '剫',
+  'Ôj' => '剭',
+  'Ôk' => '剬',
+  'Ôl' => '剮',
+  'Ôm' => 'å‹–',
+  'Ôn' => 'å‹“',
+  'Ôo' => '匭',
+  'Ôp' => '厜',
+  'Ôq' => '啵',
+  'Ôr' => '啶',
+  'Ôs' => '唼',
+  'Ôt' => 'å•�',
+  'Ôu' => 'å•�',
+  'Ôv' => 'å”´',
+  'Ôw' => '唪',
+  'Ôx' => 'å•‘',
+  'Ôy' => 'å•¢',
+  'Ôz' => '唶',
+  'Ô{' => '唵',
+  'Ô|' => 'å”°',
+  'Ô}' => 'å•’',
+  'Ô~' => 'å•…',
+  'ԡ' => '唌',
+  'Ԣ' => '唲',
+  'Ô£' => 'å•¥',
+  'Ô¤' => 'å•Ž',
+  'ԥ' => '唹',
+  'Ԧ' => '啈',
+  'Ô§' => 'å”­',
+  'Ô¨' => 'å”»',
+  'Ô©' => 'å•€',
+  'Ôª' => 'å•‹',
+  'ԫ' => '圊',
+  'Ԭ' => '圇',
+  'ԭ' => '埻',
+  'Ô®' => 'å ”',
+  'ԯ' => '埢',
+  '԰' => '埶',
+  'Ա' => '埜',
+  'Բ' => '埴',
+  'Ô³' => 'å €',
+  'Դ' => '埭',
+  'Ե' => '埽',
+  'Ô¶' => 'å ˆ',
+  'Է' => '埸',
+  'Ô¸' => 'å ‹',
+  'Թ' => '埳',
+  'Ժ' => '�',
+  'Ô»' => 'å ‡',
+  'Լ' => '埮',
+  'Խ' => '埣',
+  'Ծ' => '埲',
+  'Կ' => '埥',
+  'ÔÀ' => '埬',
+  'ÔÁ' => '埡',
+  'ÔÂ' => 'å Ž',
+  'ÔÃ' => '埼',
+  'ÔÄ' => 'å �',
+  'ÔÅ' => '埧',
+  'ÔÆ' => 'å �',
+  'ÔÇ' => 'å Œ',
+  'ÔÈ' => '埱',
+  'ÔÉ' => '埩',
+  'ÔÊ' => '埰',
+  'ÔË' => 'å �',
+  'ÔÌ' => 'å „',
+  'ÔÍ' => '奜',
+  'ÔÎ' => 'å© ',
+  'ÔÏ' => '婘',
+  'ÔÐ' => 'å©•',
+  'ÔÑ' => '婧',
+  'ÔÒ' => 'å©ž',
+  'ÔÓ' => '娸',
+  'ÔÔ' => '娵',
+  'ÔÕ' => 'å©­',
+  'ÔÖ' => 'å©�',
+  'Ô×' => 'å©Ÿ',
+  'ÔØ' => 'å©¥',
+  'ÔÙ' => '婬',
+  'ÔÚ' => 'å©“',
+  'ÔÛ' => '婤',
+  'ÔÜ' => 'å©—',
+  'ÔÝ' => '婃',
+  'ÔÞ' => 'å©�',
+  'Ôß' => 'å©’',
+  'Ôà' => 'å©„',
+  'Ôá' => 'å©›',
+  'Ôâ' => '婈',
+  'Ôã' => '媎',
+  'Ôä' => '娾',
+  'Ôå' => 'å©�',
+  'Ôæ' => '娹',
+  'Ôç' => 'å©Œ',
+  'Ôè' => 'å©°',
+  'Ôé' => 'å©©',
+  'Ôê' => '婇',
+  'Ôë' => 'å©‘',
+  'Ôì' => 'å©–',
+  'Ôí' => 'å©‚',
+  'Ôî' => 'å©œ',
+  'Ôï' => 'å­²',
+  'Ôð' => 'å­®',
+  'Ôñ' => 'å¯�',
+  'Ôò' => '寀',
+  'Ôó' => 'å±™',
+  'Ôô' => 'å´ž',
+  'Ôõ' => 'å´‹',
+  'Ôö' => 'å´�',
+  'Ô÷' => 'å´š',
+  'Ôø' => 'å´ ',
+  'Ôù' => 'å´Œ',
+  'Ôú' => 'å´¨',
+  'Ôû' => 'å´�',
+  'Ôü' => 'å´¦',
+  'Ôý' => 'å´¥',
+  'Ôþ' => 'å´�',
+  'Õ@' => 'å´°',
+  'ÕA' => 'å´’',
+  'ÕB' => 'å´£',
+  'ÕC' => 'å´Ÿ',
+  'ÕD' => 'å´®',
+  'ÕE' => '帾',
+  'ÕF' => '帴',
+  'ÕG' => '庱',
+  'ÕH' => '庴',
+  'ÕI' => '庹',
+  'ÕJ' => '庲',
+  'ÕK' => '庳',
+  'ÕL' => '弶',
+  'ÕM' => '弸',
+  'ÕN' => 'å¾›',
+  'ÕO' => 'å¾–',
+  'ÕP' => '徟',
+  'ÕQ' => 'æ‚Š',
+  'ÕR' => 'æ‚�',
+  'ÕS' => '悆',
+  'ÕT' => '悾',
+  'ÕU' => 'æ‚°',
+  'ÕV' => '悺',
+  'ÕW' => '惓',
+  'ÕX' => '惔',
+  'ÕY' => 'æƒ�',
+  'ÕZ' => '惤',
+  'Õ[' => '惙',
+  'Õ\\' => 'æƒ�',
+  'Õ]' => '惈',
+  'Õ^' => '悱',
+  'Õ_' => '惛',
+  'Õ`' => 'æ‚·',
+  'Õa' => '惊',
+  'Õb' => 'æ‚¿',
+  'Õc' => '惃',
+  'Õd' => 'æƒ�',
+  'Õe' => '惀',
+  'Õf' => '挲',
+  'Õg' => 'æ�¥',
+  'Õh' => '掊',
+  'Õi' => '掂',
+  'Õj' => 'æ�½',
+  'Õk' => '掽',
+  'Õl' => '掞',
+  'Õm' => '掭',
+  'Õn' => 'æŽ�',
+  'Õo' => '掗',
+  'Õp' => '掫',
+  'Õq' => '掎',
+  'Õr' => 'æ�¯',
+  'Õs' => '掇',
+  'Õt' => 'æŽ�',
+  'Õu' => 'æ�®',
+  'Õv' => '掯',
+  'Õw' => 'æ�µ',
+  'Õx' => '掜',
+  'Õy' => 'æ�­',
+  'Õz' => '掮',
+  'Õ{' => 'æ�¼',
+  'Õ|' => '掤',
+  'Õ}' => '挻',
+  'Õ~' => '掟',
+  'ա' => '�',
+  'բ' => '掅',
+  'գ' => '�',
+  'դ' => '掑',
+  'ե' => '�',
+  'զ' => '�',
+  'Õ§' => 'æ•“',
+  'Õ¨' => 'æ—�',
+  'թ' => '晥',
+  'ժ' => '晡',
+  'Õ«' => 'æ™›',
+  'Õ¬' => 'æ™™',
+  'խ' => '晜',
+  'ծ' => '晢',
+  'կ' => '朘',
+  'հ' => '桹',
+  'ձ' => '梇',
+  'ղ' => '�',
+  'ճ' => '梜',
+  'Õ´' => 'æ¡­',
+  'Õµ' => 'æ¡®',
+  'ն' => '梮',
+  'շ' => '梫',
+  'ո' => '楖',
+  'չ' => '桯',
+  'պ' => '梣',
+  'ջ' => '梬',
+  'ռ' => '梩',
+  'ս' => '桵',
+  'Õ¾' => 'æ¡´',
+  'տ' => '梲',
+  'ÕÀ' => 'æ¢�',
+  'ÕÁ' => 'æ¡·',
+  'ÕÂ' => '梒',
+  'ÕÃ' => '桼',
+  'ÕÄ' => 'æ¡«',
+  'ÕÅ' => '桲',
+  'ÕÆ' => '梪',
+  'ÕÇ' => '梀',
+  'ÕÈ' => '桱',
+  'ÕÉ' => '桾',
+  'ÕÊ' => '梛',
+  'ÕË' => '梖',
+  'ÕÌ' => '梋',
+  'ÕÍ' => '梠',
+  'ÕÎ' => '梉',
+  'ÕÏ' => '梤',
+  'ÕÐ' => '桸',
+  'ÕÑ' => 'æ¡»',
+  'ÕÒ' => '梑',
+  'ÕÓ' => '梌',
+  'ÕÔ' => '梊',
+  'ÕÕ' => '桽',
+  'ÕÖ' => '欶',
+  'Õ×' => '欳',
+  'ÕØ' => '欷',
+  'ÕÙ' => '欸',
+  'ÕÚ' => '殑',
+  'ÕÛ' => 'æ®�',
+  'ÕÜ' => 'æ®�',
+  'ÕÝ' => '殎',
+  'ÕÞ' => '殌',
+  'Õß' => 'æ°ª',
+  'Õà' => 'æ·€',
+  'Õá' => '涫',
+  'Õâ' => '涴',
+  'Õã' => '涳',
+  'Õä' => 'æ¹´',
+  'Õå' => '涬',
+  'Õæ' => 'æ·©',
+  'Õç' => 'æ·¢',
+  'Õè' => '涷',
+  'Õé' => 'æ·¶',
+  'Õê' => 'æ·”',
+  'Õë' => '渀',
+  'Õì' => 'æ·ˆ',
+  'Õí' => 'æ· ',
+  'Õî' => 'æ·Ÿ',
+  'Õï' => 'æ·–',
+  'Õð' => '涾',
+  'Õñ' => 'æ·¥',
+  'Õò' => 'æ·œ',
+  'Õó' => 'æ·�',
+  'Õô' => 'æ·›',
+  'Õõ' => 'æ·´',
+  'Õö' => 'æ·Š',
+  'Õ÷' => '涽',
+  'Õø' => 'æ·­',
+  'Õù' => 'æ·°',
+  'Õú' => '涺',
+  'Õû' => 'æ·•',
+  'Õü' => 'æ·‚',
+  'Õý' => 'æ·�',
+  'Õþ' => 'æ·‰',
+  'Ö@' => 'æ·�',
+  'ÖA' => 'æ·²',
+  'ÖB' => 'æ·“',
+  'ÖC' => 'æ·½',
+  'ÖD' => 'æ·—',
+  'ÖE' => 'æ·�',
+  'ÖF' => 'æ·£',
+  'ÖG' => '涻',
+  'ÖH' => '烺',
+  'ÖI' => 'ç„�',
+  'ÖJ' => '烷',
+  'ÖK' => 'ç„—',
+  'ÖL' => '烴',
+  'ÖM' => 'ç„Œ',
+  'ÖN' => '烰',
+  'ÖO' => 'ç„„',
+  'ÖP' => '烳',
+  'ÖQ' => 'ç„�',
+  'ÖR' => '烼',
+  'ÖS' => '烿',
+  'ÖT' => '焆',
+  'ÖU' => 'ç„“',
+  'ÖV' => 'ç„€',
+  'ÖW' => '烸',
+  'ÖX' => '烶',
+  'ÖY' => 'ç„‹',
+  'ÖZ' => 'ç„‚',
+  'Ö[' => 'ç„Ž',
+  'Ö\\' => '牾',
+  'Ö]' => '牻',
+  'Ö^' => '牼',
+  'Ö_' => '牿',
+  'Ö`' => 'çŒ�',
+  'Öa' => '猗',
+  'Öb' => '猇',
+  'Öc' => '猑',
+  'Öd' => '猘',
+  'Öe' => '猊',
+  'Öf' => '猈',
+  'Ög' => 'ç‹¿',
+  'Öh' => 'çŒ�',
+  'Öi' => '猞',
+  'Öj' => '玈',
+  'Ök' => 'ç�¶',
+  'Öl' => 'ç�¸',
+  'Öm' => 'ç�µ',
+  'Ön' => 'ç�„',
+  'Öo' => 'ç��',
+  'Öp' => 'ç�½',
+  'Öq' => 'ç�‡',
+  'Ör' => 'ç�€',
+  'Ös' => 'ç�º',
+  'Öt' => 'ç�¼',
+  'Öu' => 'ç�¿',
+  'Öv' => 'ç�Œ',
+  'Öw' => 'ç�‹',
+  'Öx' => 'ç�´',
+  'Öy' => 'ç�ˆ',
+  'Öz' => '畤',
+  'Ö{' => 'ç•£',
+  'Ö|' => 'ç—Ž',
+  'Ö}' => 'ç—’',
+  'Ö~' => 'ç—�',
+  'Ö¡' => 'ç—‹',
+  '֢' => '痌',
+  'Ö£' => 'ç—‘',
+  'Ö¤' => 'ç—�',
+  '֥' => '�',
+  '֦' => '皉',
+  '֧' => '盓',
+  '֨' => '眹',
+  '֩' => '眯',
+  '֪' => '眭',
+  '֫' => '眱',
+  '֬' => '眲',
+  '֭' => '眴',
+  '֮' => '眳',
+  '֯' => '眽',
+  'ְ' => '眥',
+  'ֱ' => '眻',
+  'ֲ' => '眵',
+  'ֳ' => '硈',
+  'Ö´' => 'ç¡’',
+  'ֵ' => '硉',
+  'ֶ' => '�',
+  'Ö·' => 'ç¡Š',
+  'ָ' => '硌',
+  'Ö¹' => 'ç ¦',
+  'Öº' => 'ç¡…',
+  'ֻ' => '�',
+  'ּ' => '祤',
+  'ֽ' => '祧',
+  '־' => '祩',
+  'ֿ' => '祪',
+  'ÖÀ' => '祣',
+  'ÖÁ' => '祫',
+  'ÖÂ' => '祡',
+  'ÖÃ' => '离',
+  'ÖÄ' => '秺',
+  'ÖÅ' => '秸',
+  'ÖÆ' => '秶',
+  'ÖÇ' => '秷',
+  'ÖÈ' => 'çª�',
+  'ÖÉ' => '窔',
+  'ÖÊ' => 'çª�',
+  'ÖË' => '笵',
+  'ÖÌ' => 'ç­‡',
+  'ÖÍ' => '笴',
+  'ÖÎ' => '笥',
+  'ÖÏ' => '笰',
+  'ÖÐ' => '笢',
+  'ÖÑ' => '笤',
+  'ÖÒ' => '笳',
+  'ÖÓ' => '笘',
+  'ÖÔ' => '笪',
+  'ÖÕ' => 'ç¬�',
+  'ÖÖ' => '笱',
+  'Ö×' => '笫',
+  'ÖØ' => '笭',
+  'ÖÙ' => '笯',
+  'ÖÚ' => '笲',
+  'ÖÛ' => '笸',
+  'ÖÜ' => '笚',
+  'ÖÝ' => '笣',
+  'ÖÞ' => 'ç²”',
+  'Öß' => '粘',
+  'Öà' => 'ç²–',
+  'Öá' => 'ç²£',
+  'Öâ' => 'ç´µ',
+  'Öã' => 'ç´½',
+  'Öä' => 'ç´¸',
+  'Öå' => 'ç´¶',
+  'Öæ' => 'ç´º',
+  'Öç' => 'çµ…',
+  'Öè' => 'ç´¬',
+  'Öé' => 'ç´©',
+  'Öê' => 'çµ�',
+  'Öë' => '絇',
+  'Öì' => 'ç´¾',
+  'Öí' => 'ç´¿',
+  'Öî' => '絊',
+  'Öï' => 'ç´»',
+  'Öð' => 'ç´¨',
+  'Öñ' => 'ç½£',
+  'Öò' => '羕',
+  'Öó' => '羜',
+  'Öô' => 'ç¾�',
+  'Öõ' => 'ç¾›',
+  'Öö' => 'ç¿Š',
+  'Ö÷' => 'ç¿‹',
+  'Öø' => 'ç¿�',
+  'Öù' => 'ç¿�',
+  'Öú' => 'ç¿‘',
+  'Öû' => '翇',
+  'Öü' => 'ç¿�',
+  'Öý' => '翉',
+  'Öþ' => '耟',
+  '×@' => '耞',
+  '×A' => '耛',
+  '×B' => 'è�‡',
+  '×C' => 'è�ƒ',
+  '×D' => 'è�ˆ',
+  '×E' => '脘',
+  '×F' => 'è„¥',
+  '×G' => 'è„™',
+  '×H' => 'è„›',
+  '×I' => 'è„­',
+  '×J' => 'è„Ÿ',
+  '×K' => '脬',
+  '×L' => 'è„ž',
+  '×M' => 'è„¡',
+  '×N' => 'è„•',
+  '×O' => '脧',
+  '×P' => 'è„�',
+  '×Q' => 'è„¢',
+  '×R' => '舑',
+  '×S' => '舸',
+  '×T' => '舳',
+  '×U' => '舺',
+  '×V' => '舴',
+  '×W' => '舲',
+  '×X' => '艴',
+  '×Y' => 'èŽ�',
+  '×Z' => '莣',
+  '×[' => '莨',
+  '×\\' => 'èŽ�',
+  '×]' => 'è�º',
+  '×^' => 'è�³',
+  '×_' => '莤',
+  '×`' => 'è�´',
+  '×a' => 'èŽ�',
+  '×b' => 'èŽ�',
+  '×c' => '莕',
+  '×d' => '莙',
+  '×e' => 'è�µ',
+  '×f' => '莔',
+  '×g' => '莩',
+  '×h' => 'è�½',
+  '×i' => '莃',
+  '×j' => '莌',
+  '×k' => 'èŽ�',
+  '×l' => '莛',
+  '×m' => '莪',
+  '×n' => '莋',
+  '×o' => 'è�¾',
+  '×p' => '莥',
+  '×q' => '莯',
+  '×r' => '莈',
+  '×s' => '莗',
+  '×t' => '莰',
+  '×u' => 'è�¿',
+  '×v' => '莦',
+  '×w' => '莇',
+  '×x' => '莮',
+  '×y' => 'è�¶',
+  '×z' => '莚',
+  '×{' => 'è™™',
+  '×|' => 'è™–',
+  '×}' => 'èš¿',
+  '×~' => 'èš·',
+  'ס' => '蛂',
+  'ע' => '�',
+  '×£' => 'è›…',
+  'פ' => '蚺',
+  '×¥' => 'èš°',
+  'צ' => '蛈',
+  'ק' => '蚹',
+  'ר' => '蚳',
+  'ש' => '蚸',
+  'ת' => '蛌',
+  '׫' => '蚴',
+  '׬' => '蚻',
+  '×­' => 'èš¼',
+  '׮' => '蛃',
+  'ׯ' => '蚽',
+  '×°' => 'èš¾',
+  '×±' => 'è¡’',
+  'ײ' => '袉',
+  '׳' => '袕',
+  '״' => '袨',
+  '׵' => '袢',
+  '׶' => '袪',
+  '׷' => '袚',
+  '׸' => '袑',
+  '׹' => '袡',
+  '׺' => '袟',
+  '׻' => '袘',
+  '׼' => '袧',
+  '׽' => '袙',
+  '׾' => '袛',
+  '׿' => '袗',
+  '×À' => '袤',
+  '×Á' => '袬',
+  '×Â' => '袌',
+  '×Ã' => '袓',
+  '×Ä' => '袎',
+  '×Å' => '覂',
+  '×Æ' => '觖',
+  '×Ç' => '觙',
+  '×È' => '觕',
+  '×É' => '訰',
+  '×Ê' => '訧',
+  '×Ë' => '訬',
+  '×Ì' => '訞',
+  '×Í' => 'è°¹',
+  '×Î' => 'è°»',
+  '×Ï' => '豜',
+  '×Ð' => 'è±�',
+  '×Ñ' => 'è±½',
+  '×Ò' => 'è²¥',
+  '×Ó' => 'èµ½',
+  '×Ô' => 'èµ»',
+  '×Õ' => 'èµ¹',
+  '×Ö' => '趼',
+  '××' => 'è·‚',
+  '×Ø' => '趹',
+  '×Ù' => '趿',
+  '×Ú' => 'è·�',
+  '×Û' => '軘',
+  '×Ü' => '軞',
+  '×Ý' => 'è»�',
+  '×Þ' => '軜',
+  '×ß' => 'è»—',
+  '×à' => 'è» ',
+  '×á' => '軡',
+  '×â' => '逤',
+  '×ã' => '逋',
+  '×ä' => '逑',
+  '×å' => '逜',
+  '×æ' => '逌',
+  '×ç' => '逡',
+  '×è' => '郯',
+  '×é' => '郪',
+  '×ê' => '郰',
+  '×ë' => '郴',
+  '×ì' => '郲',
+  '×í' => '郳',
+  '×î' => '郔',
+  '×ï' => '郫',
+  '×ð' => '郬',
+  '×ñ' => '郩',
+  '×ò' => 'é…–',
+  '×ó' => 'é…˜',
+  '×ô' => 'é…š',
+  '×õ' => 'é…“',
+  '×ö' => 'é…•',
+  '×÷' => '釬',
+  '×ø' => '釴',
+  '×ù' => '釱',
+  '×ú' => '釳',
+  '×û' => '釸',
+  '×ü' => '釤',
+  '×ý' => '釹',
+  '×þ' => '釪',
+  'Ø@' => '釫',
+  'ØA' => '釷',
+  'ØB' => '釨',
+  'ØC' => '釮',
+  'ØD' => '镺',
+  'ØE' => 'é–†',
+  'ØF' => 'é–ˆ',
+  'ØG' => '陼',
+  'ØH' => 'é™­',
+  'ØI' => '陫',
+  'ØJ' => 'é™±',
+  'ØK' => '陯',
+  'ØL' => 'éš¿',
+  'ØM' => 'é�ª',
+  'ØN' => 'é „',
+  'ØO' => '飥',
+  'ØP' => '馗',
+  'ØQ' => 'å‚›',
+  'ØR' => 'å‚•',
+  'ØS' => 'å‚”',
+  'ØT' => 'å‚ž',
+  'ØU' => 'å‚‹',
+  'ØV' => 'å‚£',
+  'ØW' => '傃',
+  'ØX' => 'å‚Œ',
+  'ØY' => 'å‚Ž',
+  'ØZ' => 'å‚�',
+  'Ø[' => 'å�¨',
+  'Ø\\' => 'å‚œ',
+  'Ø]' => 'å‚’',
+  'Ø^' => 'å‚‚',
+  'Ø_' => '傇',
+  'Ø`' => 'å…Ÿ',
+  'Øa' => '凔',
+  'Øb' => '匒',
+  'Øc' => '匑',
+  'Ød' => '厤',
+  'Øe' => '厧',
+  'Øf' => 'å–‘',
+  'Øg' => 'å–¨',
+  'Øh' => 'å–¥',
+  'Øi' => 'å–­',
+  'Øj' => 'å•·',
+  'Øk' => 'å™…',
+  'Øl' => 'å–¢',
+  'Øm' => 'å–“',
+  'Øn' => 'å–ˆ',
+  'Øo' => 'å–�',
+  'Øp' => 'å–µ',
+  'Øq' => 'å–�',
+  'Ør' => 'å–£',
+  'Øs' => 'å–’',
+  'Øt' => 'å–¤',
+  'Øu' => '啽',
+  'Øv' => 'å–Œ',
+  'Øw' => 'å–¦',
+  'Øx' => 'å•¿',
+  'Øy' => 'å–•',
+  'Øz' => 'å–¡',
+  'Ø{' => 'å–Ž',
+  'Ø|' => '圌',
+  'Ø}' => 'å ©',
+  'Ø~' => 'å ·',
+  'Ø¡' => 'å ™',
+  'Ø¢' => 'å ž',
+  'Ø£' => 'å §',
+  'ؤ' => '堣',
+  'Ø¥' => 'å ¨',
+  'ئ' => '埵',
+  'ا' => '塈',
+  'ب' => '堥',
+  'ة' => '堜',
+  'ت' => '堛',
+  'Ø«' => 'å ³',
+  'ج' => '堿',
+  'Ø­' => 'å ¶',
+  'Ø®' => 'å ®',
+  'د' => '堹',
+  'Ø°' => 'å ¸',
+  'ر' => '堭',
+  'ز' => '堬',
+  'س' => '堻',
+  'ش' => '奡',
+  'ص' => '媯',
+  'ض' => '媔',
+  'ط' => '媟',
+  'ظ' => '婺',
+  'ع' => '媢',
+  'غ' => '媞',
+  'ػ' => '婸',
+  'ؼ' => '媦',
+  'ؽ' => '婼',
+  'ؾ' => '媥',
+  'ؿ' => '媬',
+  'ØÀ' => '媕',
+  'ØÁ' => '媮',
+  'ØÂ' => '娷',
+  'ØÃ' => '媄',
+  'ØÄ' => '媊',
+  'ØÅ' => '媗',
+  'ØÆ' => '媃',
+  'ØÇ' => '媋',
+  'ØÈ' => '媩',
+  'ØÉ' => 'å©»',
+  'ØÊ' => '婽',
+  'ØË' => '媌',
+  'ØÌ' => '媜',
+  'ØÍ' => 'åª�',
+  'ØÎ' => '媓',
+  'ØÏ' => 'åª�',
+  'ØÐ' => '寪',
+  'ØÑ' => 'å¯�',
+  'ØÒ' => '寋',
+  'ØÓ' => '寔',
+  'ØÔ' => '寑',
+  'ØÕ' => '寊',
+  'ØÖ' => '寎',
+  'Ø×' => 'å°Œ',
+  'ØØ' => 'å°°',
+  'ØÙ' => 'å´·',
+  'ØÚ' => '嵃',
+  'ØÛ' => '嵫',
+  'ØÜ' => 'åµ�',
+  'ØÝ' => '嵋',
+  'ØÞ' => 'å´¿',
+  'Øß' => 'å´µ',
+  'Øà' => '嵑',
+  'Øá' => '嵎',
+  'Øâ' => '嵕',
+  'Øã' => 'å´³',
+  'Øä' => 'å´º',
+  'Øå' => 'åµ’',
+  'Øæ' => 'å´½',
+  'Øç' => 'å´±',
+  'Øè' => 'åµ™',
+  'Øé' => '嵂',
+  'Øê' => 'å´¹',
+  'Øë' => '嵉',
+  'Øì' => 'å´¸',
+  'Øí' => 'å´¼',
+  'Øî' => 'å´²',
+  'Øï' => 'å´¶',
+  'Øð' => 'åµ€',
+  'Øñ' => 'åµ…',
+  'Øò' => '幄',
+  'Øó' => 'å¹�',
+  'Øô' => '彘',
+  'Øõ' => '徦',
+  'Øö' => 'å¾¥',
+  'Ø÷' => '徫',
+  'Øø' => '惉',
+  'Øù' => '悹',
+  'Øú' => '惌',
+  'Øû' => '惢',
+  'Øü' => '惎',
+  'Øý' => '惄',
+  'Øþ' => 'æ„”',
+  'Ù@' => '惲',
+  'ÙA' => 'æ„Š',
+  'ÙB' => 'æ„–',
+  'ÙC' => 'æ„…',
+  'ÙD' => '惵',
+  'ÙE' => 'æ„“',
+  'ÙF' => '惸',
+  'ÙG' => '惼',
+  'ÙH' => '惾',
+  'ÙI' => 'æƒ�',
+  'ÙJ' => '愃',
+  'ÙK' => '愘',
+  'ÙL' => 'æ„�',
+  'ÙM' => 'æ„�',
+  'ÙN' => '惿',
+  'ÙO' => 'æ„„',
+  'ÙP' => 'æ„‹',
+  'ÙQ' => '扊',
+  'ÙR' => '掔',
+  'ÙS' => '掱',
+  'ÙT' => '掰',
+  'ÙU' => 'æ�Ž',
+  'ÙV' => 'æ�¥',
+  'ÙW' => 'æ�¨',
+  'ÙX' => 'æ�¯',
+  'ÙY' => 'æ�ƒ',
+  'ÙZ' => 'æ’�',
+  'Ù[' => 'æ�³',
+  'Ù\\' => 'æ�Š',
+  'Ù]' => 'æ� ',
+  'Ù^' => 'æ�¶',
+  'Ù_' => 'æ�•',
+  'Ù`' => 'æ�²',
+  'Ùa' => 'æ�µ',
+  'Ùb' => 'æ‘¡',
+  'Ùc' => 'æ�Ÿ',
+  'Ùd' => '掾',
+  'Ùe' => 'æ��',
+  'Ùf' => 'æ�œ',
+  'Ùg' => 'æ�„',
+  'Ùh' => 'æ�˜',
+  'Ùi' => 'æ�“',
+  'Ùj' => 'æ�‚',
+  'Ùk' => 'æ�‡',
+  'Ùl' => 'æ�Œ',
+  'Ùm' => 'æ�‹',
+  'Ùn' => 'æ�ˆ',
+  'Ùo' => 'æ�°',
+  'Ùp' => 'æ�—',
+  'Ùq' => 'æ�™',
+  'Ùr' => '攲',
+  'Ùs' => '敧',
+  'Ùt' => '敪',
+  'Ùu' => '敤',
+  'Ùv' => 'æ•œ',
+  'Ùw' => '敨',
+  'Ùx' => 'æ•¥',
+  'Ùy' => 'æ–Œ',
+  'Ùz' => 'æ–�',
+  'Ù{' => 'æ–ž',
+  'Ù|' => 'æ–®',
+  'Ù}' => 'æ—�',
+  'Ù~' => 'æ—’',
+  '١' => '晼',
+  '٢' => '晬',
+  'Ù£' => 'æ™»',
+  '٤' => '暀',
+  'Ù¥' => 'æ™±',
+  '٦' => '晹',
+  '٧' => '晪',
+  '٨' => '晲',
+  '٩' => '�',
+  '٪' => '椌',
+  '٫' => '棓',
+  '٬' => '椄',
+  '٭' => '棜',
+  'ٮ' => '椪',
+  'ٯ' => '棬',
+  'ٰ' => '棪',
+  'ٱ' => '棱',
+  'ٲ' => '�',
+  'ٳ' => '棖',
+  'ٴ' => '棷',
+  'ٵ' => '棫',
+  'ٶ' => '棤',
+  'ٷ' => '棶',
+  'ٸ' => '椓',
+  'ٹ' => '�',
+  'ٺ' => '棳',
+  'ٻ' => '棡',
+  'ټ' => '椇',
+  'ٽ' => '棌',
+  'پ' => '椈',
+  'ٿ' => '楰',
+  'ÙÀ' => '梴',
+  'ÙÁ' => '椑',
+  'ÙÂ' => '棯',
+  'ÙÃ' => '棆',
+  'ÙÄ' => '椔',
+  'ÙÅ' => '棸',
+  'ÙÆ' => 'æ£�',
+  'ÙÇ' => '棽',
+  'ÙÈ' => '棼',
+  'ÙÉ' => '棨',
+  'ÙÊ' => '椋',
+  'ÙË' => '椊',
+  'ÙÌ' => '椗',
+  'ÙÍ' => '棎',
+  'ÙÎ' => '棈',
+  'ÙÏ' => 'æ£�',
+  'ÙÐ' => '棞',
+  'ÙÑ' => '棦',
+  'ÙÒ' => '棴',
+  'ÙÓ' => '棑',
+  'ÙÔ' => '椆',
+  'ÙÕ' => '棔',
+  'ÙÖ' => '棩',
+  'Ù×' => '椕',
+  'ÙØ' => '椥',
+  'ÙÙ' => '棇',
+  'ÙÚ' => '欹',
+  'ÙÛ' => '欻',
+  'ÙÜ' => '欿',
+  'ÙÝ' => '欼',
+  'ÙÞ' => 'æ®”',
+  'Ùß' => 'æ®—',
+  'Ùà' => 'æ®™',
+  'Ùá' => '殕',
+  'Ùâ' => '殽',
+  'Ùã' => '毰',
+  'Ùä' => '毲',
+  'Ùå' => '毳',
+  'Ùæ' => 'æ°°',
+  'Ùç' => 'æ·¼',
+  'Ùè' => '湆',
+  'Ùé' => '湇',
+  'Ùê' => '渟',
+  'Ùë' => '湉',
+  'Ùì' => '溈',
+  'Ùí' => '渼',
+  'Ùî' => '渽',
+  'Ùï' => 'æ¹…',
+  'Ùð' => 'æ¹¢',
+  'Ùñ' => '渫',
+  'Ùò' => '渿',
+  'Ùó' => 'æ¹�',
+  'Ùô' => 'æ¹�',
+  'Ùõ' => 'æ¹³',
+  'Ùö' => '渜',
+  'Ù÷' => '渳',
+  'Ùø' => '湋',
+  'Ùù' => 'æ¹€',
+  'Ùú' => '湑',
+  'Ùû' => '渻',
+  'Ùü' => '渃',
+  'Ùý' => '渮',
+  'Ùþ' => '湞',
+  'Ú@' => '湨',
+  'ÚA' => '湜',
+  'ÚB' => '湡',
+  'ÚC' => '渱',
+  'ÚD' => '渨',
+  'ÚE' => 'æ¹ ',
+  'ÚF' => 'æ¹±',
+  'ÚG' => '湫',
+  'ÚH' => '渹',
+  'ÚI' => '渢',
+  'ÚJ' => '渰',
+  'ÚK' => '湓',
+  'ÚL' => 'æ¹¥',
+  'ÚM' => '渧',
+  'ÚN' => '湸',
+  'ÚO' => '湤',
+  'ÚP' => 'æ¹·',
+  'ÚQ' => '湕',
+  'ÚR' => 'æ¹¹',
+  'ÚS' => 'æ¹’',
+  'ÚT' => '湦',
+  'ÚU' => '渵',
+  'ÚV' => '渶',
+  'ÚW' => '湚',
+  'ÚX' => 'ç„ ',
+  'ÚY' => 'ç„ž',
+  'ÚZ' => '焯',
+  'Ú[' => '烻',
+  'Ú\\' => 'ç„®',
+  'Ú]' => '焱',
+  'Ú^' => 'ç„£',
+  'Ú_' => 'ç„¥',
+  'Ú`' => 'ç„¢',
+  'Úa' => '焲',
+  'Úb' => 'ç„Ÿ',
+  'Úc' => '焨',
+  'Úd' => '焺',
+  'Úe' => 'ç„›',
+  'Úf' => '牋',
+  'Úg' => '牚',
+  'Úh' => '犈',
+  'Úi' => '犉',
+  'Új' => '犆',
+  'Úk' => '犅',
+  'Úl' => '犋',
+  'Úm' => '猒',
+  'Ún' => '猋',
+  'Úo' => '猰',
+  'Úp' => '猢',
+  'Úq' => '猱',
+  'Úr' => '猳',
+  'Ús' => '猧',
+  'Út' => '猲',
+  'Úu' => '猭',
+  'Úv' => '猦',
+  'Úw' => '猣',
+  'Úx' => '猵',
+  'Úy' => '猌',
+  'Úz' => 'ç�®',
+  'Ú{' => 'ç�¬',
+  'Ú|' => 'ç�°',
+  'Ú}' => 'ç�«',
+  'Ú~' => 'ç�–',
+  'ڡ' => '�',
+  'ڢ' => '�',
+  'ڣ' => '�',
+  'ڤ' => '�',
+  'ڥ' => '�',
+  'ڦ' => '�',
+  'ڧ' => '�',
+  'ڨ' => '�',
+  'ک' => '�',
+  'ڪ' => '�',
+  'Ú«' => 'ç“»',
+  'ڬ' => '甯',
+  'ڭ' => '畯',
+  'ڮ' => '畬',
+  'Ú¯' => 'ç—§',
+  'Ú°' => 'ç—š',
+  'Ú±' => 'ç—¡',
+  'Ú²' => 'ç—¦',
+  'Ú³' => 'ç—�',
+  'Ú´' => 'ç—Ÿ',
+  'Úµ' => 'ç—¤',
+  'Ú¶' => 'ç——',
+  'Ú·' => 'çš•',
+  'Ú¸' => 'çš’',
+  'ڹ' => '盚',
+  'ں' => '�',
+  'ڻ' => '�',
+  'ڼ' => '�',
+  'ڽ' => '�',
+  'ھ' => '�',
+  'ڿ' => '�',
+  'ÚÀ' => 'ç�Ž',
+  'ÚÁ' => 'ç�‹',
+  'ÚÂ' => 'ç�Œ',
+  'ÚÃ' => '矞',
+  'ÚÄ' => '矬',
+  'ÚÅ' => 'ç¡ ',
+  'ÚÆ' => '硤',
+  'ÚÇ' => 'ç¡¥',
+  'ÚÈ' => 'ç¡œ',
+  'ÚÉ' => 'ç¡­',
+  'ÚÊ' => '硱',
+  'ÚË' => '硪',
+  'ÚÌ' => 'ç¡®',
+  'ÚÍ' => 'ç¡°',
+  'ÚÎ' => 'ç¡©',
+  'ÚÏ' => '硨',
+  'ÚÐ' => 'ç¡ž',
+  'ÚÑ' => 'ç¡¢',
+  'ÚÒ' => '祴',
+  'ÚÓ' => '祳',
+  'ÚÔ' => '祲',
+  'ÚÕ' => '祰',
+  'ÚÖ' => '稂',
+  'Ú×' => '稊',
+  'ÚØ' => '稃',
+  'ÚÙ' => '稌',
+  'ÚÚ' => '稄',
+  'ÚÛ' => '窙',
+  'ÚÜ' => '竦',
+  'ÚÝ' => '竤',
+  'ÚÞ' => 'ç­Š',
+  'Úß' => '笻',
+  'Úà' => 'ç­„',
+  'Úá' => 'ç­ˆ',
+  'Úâ' => 'ç­Œ',
+  'Úã' => 'ç­Ž',
+  'Úä' => 'ç­€',
+  'Úå' => 'ç­˜',
+  'Úæ' => 'ç­…',
+  'Úç' => 'ç²¢',
+  'Úè' => '粞',
+  'Úé' => '粨',
+  'Úê' => '粡',
+  'Úë' => '絘',
+  'Úì' => '絯',
+  'Úí' => 'çµ£',
+  'Úî' => '絓',
+  'Úï' => 'çµ–',
+  'Úð' => '絧',
+  'Úñ' => '絪',
+  'Úò' => 'çµ�',
+  'Úó' => 'çµ­',
+  'Úô' => '絜',
+  'Úõ' => '絫',
+  'Úö' => 'çµ’',
+  'Ú÷' => 'çµ”',
+  'Úø' => '絩',
+  'Úù' => '絑',
+  'Úú' => '絟',
+  'Úû' => '絎',
+  'Úü' => 'ç¼¾',
+  'Úý' => '缿',
+  'Úþ' => 'ç½¥',
+  'Û@' => '罦',
+  'ÛA' => 'ç¾¢',
+  'ÛB' => 'ç¾ ',
+  'ÛC' => '羡',
+  'ÛD' => 'ç¿—',
+  'ÛE' => 'è�‘',
+  'ÛF' => 'è��',
+  'ÛG' => 'è��',
+  'ÛH' => '胾',
+  'ÛI' => '胔',
+  'ÛJ' => 'è…ƒ',
+  'ÛK' => 'è…Š',
+  'ÛL' => 'è…’',
+  'ÛM' => 'è…�',
+  'ÛN' => 'è…‡',
+  'ÛO' => '脽',
+  'ÛP' => 'è…�',
+  'ÛQ' => '脺',
+  'ÛR' => '臦',
+  'ÛS' => '臮',
+  'ÛT' => '臷',
+  'ÛU' => '臸',
+  'ÛV' => '臹',
+  'ÛW' => '舄',
+  'ÛX' => '舼',
+  'ÛY' => '舽',
+  'ÛZ' => '舿',
+  'Û[' => '艵',
+  'Û\\' => '茻',
+  'Û]' => 'è��',
+  'Û^' => 'è�¹',
+  'Û_' => 'è�£',
+  'Û`' => 'è�€',
+  'Ûa' => 'è�¨',
+  'Ûb' => 'è�’',
+  'Ûc' => 'è�§',
+  'Ûd' => 'è�¤',
+  'Ûe' => 'è�¼',
+  'Ûf' => 'è�¶',
+  'Ûg' => 'è��',
+  'Ûh' => 'è�†',
+  'Ûi' => 'è�ˆ',
+  'Ûj' => 'è�«',
+  'Ûk' => 'è�£',
+  'Ûl' => '莿',
+  'Ûm' => 'è��',
+  'Ûn' => 'è��',
+  'Ûo' => 'è�¥',
+  'Ûp' => 'è�˜',
+  'Ûq' => 'è�¿',
+  'Ûr' => 'è�¡',
+  'Ûs' => 'è�‹',
+  'Ût' => 'è�Ž',
+  'Ûu' => 'è�–',
+  'Ûv' => 'è�µ',
+  'Ûw' => 'è�‰',
+  'Ûx' => 'è�‰',
+  'Ûy' => 'è��',
+  'Ûz' => 'è�ž',
+  'Û{' => 'è�‘',
+  'Û|' => 'è�†',
+  'Û}' => 'è�‚',
+  'Û~' => 'è�³',
+  'ۡ' => '�',
+  'ۢ' => '�',
+  'ۣ' => '�',
+  'ۤ' => '�',
+  'ۥ' => '�',
+  'ۦ' => '�',
+  'ۧ' => '�',
+  'ۨ' => '�',
+  '۩' => '�',
+  '۪' => '�',
+  '۫' => '�',
+  '۬' => '�',
+  'ۭ' => '�',
+  'ۮ' => '�',
+  'ۯ' => '�',
+  '۰' => '�',
+  '۱' => '蛘',
+  '۲' => '蛢',
+  '۳' => '蛦',
+  '۴' => '蛓',
+  '۵' => '蛣',
+  '۶' => '蛚',
+  '۷' => '蛪',
+  '۸' => '�',
+  '۹' => '蛫',
+  'ۺ' => '蛜',
+  'ۻ' => '蛬',
+  'ۼ' => '蛩',
+  'Û½' => 'è›—',
+  '۾' => '蛨',
+  'ۿ' => '蛑',
+  'ÛÀ' => '衈',
+  'ÛÁ' => 'è¡–',
+  'ÛÂ' => 'è¡•',
+  'ÛÃ' => '袺',
+  'ÛÄ' => '裗',
+  'ÛÅ' => '袹',
+  'ÛÆ' => '袸',
+  'ÛÇ' => '裀',
+  'ÛÈ' => '袾',
+  'ÛÉ' => '袶',
+  'ÛÊ' => '袼',
+  'ÛË' => '袷',
+  'ÛÌ' => '袽',
+  'ÛÍ' => '袲',
+  'ÛÎ' => 'è¤�',
+  'ÛÏ' => '裉',
+  'ÛÐ' => '覕',
+  'ÛÑ' => '覘',
+  'ÛÒ' => '覗',
+  'ÛÓ' => 'è§�',
+  'ÛÔ' => '觚',
+  'ÛÕ' => '觛',
+  'ÛÖ' => 'è©Ž',
+  'Û×' => 'è©�',
+  'ÛØ' => '訹',
+  'ÛÙ' => 'è©™',
+  'ÛÚ' => 'è©€',
+  'ÛÛ' => 'è©—',
+  'ÛÜ' => '詘',
+  'ÛÝ' => 'è©„',
+  'ÛÞ' => 'è©…',
+  'Ûß' => 'è©’',
+  'Ûà' => '詈',
+  'Ûá' => 'è©‘',
+  'Ûâ' => 'è©Š',
+  'Ûã' => 'è©Œ',
+  'Ûä' => 'è©�',
+  'Ûå' => '豟',
+  'Ûæ' => 'è²�',
+  'Ûç' => 'è²€',
+  'Ûè' => '貺',
+  'Ûé' => 'è²¾',
+  'Ûê' => 'è²°',
+  'Ûë' => 'è²¹',
+  'Ûì' => 'è²µ',
+  'Ûí' => '趄',
+  'Ûî' => '趀',
+  'Ûï' => '趉',
+  'Ûð' => 'è·˜',
+  'Ûñ' => 'è·“',
+  'Ûò' => 'è·�',
+  'Ûó' => 'è·‡',
+  'Ûô' => 'è·–',
+  'Ûõ' => 'è·œ',
+  'Ûö' => 'è·�',
+  'Û÷' => 'è·•',
+  'Ûø' => 'è·™',
+  'Ûù' => 'è·ˆ',
+  'Ûú' => 'è·—',
+  'Ûû' => 'è·…',
+  'Ûü' => '軯',
+  'Ûý' => 'è»·',
+  'Ûþ' => '軺',
+  'Ü@' => '軹',
+  'ÜA' => '軦',
+  'ÜB' => 'è»®',
+  'ÜC' => '軥',
+  'ÜD' => '軵',
+  'ÜE' => '軧',
+  'ÜF' => '軨',
+  'ÜG' => '軶',
+  'ÜH' => '軫',
+  'ÜI' => 'è»±',
+  'ÜJ' => '軬',
+  'ÜK' => 'è»´',
+  'ÜL' => '軩',
+  'ÜM' => '逭',
+  'ÜN' => '逴',
+  'ÜO' => '逯',
+  'ÜP' => '鄆',
+  'ÜQ' => '鄬',
+  'ÜR' => 'é„„',
+  'ÜS' => '郿',
+  'ÜT' => '郼',
+  'ÜU' => '鄈',
+  'ÜV' => '郹',
+  'ÜW' => '郻',
+  'ÜX' => 'é„�',
+  'ÜY' => 'é„€',
+  'ÜZ' => '鄇',
+  'Ü[' => 'é„…',
+  'Ü\\' => '鄃',
+  'Ü]' => 'é…¡',
+  'Ü^' => 'é…¤',
+  'Ü_' => 'é…Ÿ',
+  'Ü`' => 'é…¢',
+  'Üa' => 'é… ',
+  'Üb' => 'éˆ�',
+  'Üc' => '鈊',
+  'Üd' => '鈥',
+  'Üe' => '鈃',
+  'Üf' => '鈚',
+  'Üg' => '鈦',
+  'Üh' => 'éˆ�',
+  'Üi' => '鈌',
+  'Üj' => '鈀',
+  'Ük' => '鈒',
+  'Ül' => '釿',
+  'Üm' => '釽',
+  'Ün' => '鈆',
+  'Üo' => '鈄',
+  'Üp' => '鈧',
+  'Üq' => '鈂',
+  'Ür' => '鈜',
+  'Üs' => '鈤',
+  'Üt' => '鈙',
+  'Üu' => '鈗',
+  'Üv' => '鈅',
+  'Üw' => '鈖',
+  'Üx' => 'é•»',
+  'Üy' => 'é–�',
+  'Üz' => 'é–Œ',
+  'Ü{' => 'é–�',
+  'Ü|' => '隇',
+  'Ü}' => '陾',
+  'Ü~' => '隈',
+  'ܡ' => '隉',
+  'ܢ' => '隃',
+  'ܣ' => '隀',
+  'ܤ' => '雂',
+  'ܥ' => '雈',
+  'ܦ' => '雃',
+  'ܧ' => '雱',
+  'ܨ' => '雰',
+  'ܩ' => '�',
+  'ܪ' => '�',
+  'ܫ' => '�',
+  'ܬ' => '頇',
+  'ܭ' => '颩',
+  'ܮ' => '飫',
+  'ܯ' => '鳦',
+  'ܰ' => '黹',
+  'ܱ' => '亃',
+  'ܲ' => '亄',
+  'ܳ' => '亶',
+  'ܴ' => '傽',
+  'ܵ' => '傿',
+  'ܶ' => '僆',
+  'Ü·' => 'å‚®',
+  'ܸ' => '僄',
+  'ܹ' => '僊',
+  'ܺ' => '傴',
+  'ܻ' => '僈',
+  'ܼ' => '僂',
+  'ܽ' => '傰',
+  'ܾ' => '�',
+  'ܿ' => '傺',
+  'ÜÀ' => '傱',
+  'ÜÁ' => '僋',
+  'ÜÂ' => '僉',
+  'ÜÃ' => '傶',
+  'ÜÄ' => '傸',
+  'ÜÅ' => '凗',
+  'ÜÆ' => '剺',
+  'ÜÇ' => '剸',
+  'ÜÈ' => '剻',
+  'ÜÉ' => '剼',
+  'ÜÊ' => 'å—ƒ',
+  'ÜË' => 'å—›',
+  'ÜÌ' => 'å—Œ',
+  'ÜÍ' => 'å—�',
+  'ÜÎ' => 'å—‹',
+  'ÜÏ' => 'å—Š',
+  'ÜÐ' => 'å—�',
+  'ÜÑ' => 'å—€',
+  'ÜÒ' => 'å—”',
+  'ÜÓ' => 'å—„',
+  'ÜÔ' => 'å—©',
+  'ÜÕ' => 'å–¿',
+  'ÜÖ' => 'å—’',
+  'Ü×' => 'å–�',
+  'ÜØ' => 'å—�',
+  'ÜÙ' => 'å—•',
+  'ÜÚ' => 'å—¢',
+  'ÜÛ' => 'å—–',
+  'ÜÜ' => 'å—ˆ',
+  'ÜÝ' => 'å—²',
+  'ÜÞ' => 'å—�',
+  'Üß' => 'å—™',
+  'Üà' => 'å—‚',
+  'Üá' => '圔',
+  'Üâ' => 'å¡“',
+  'Üã' => '塨',
+  'Üä' => '塤',
+  'Üå' => 'å¡�',
+  'Üæ' => 'å¡�',
+  'Üç' => '塉',
+  'Üè' => '塯',
+  'Üé' => 'å¡•',
+  'Üê' => 'å¡Ž',
+  'Üë' => 'å¡�',
+  'Üì' => 'å¡™',
+  'Üí' => 'å¡¥',
+  'Üî' => 'å¡›',
+  'Üï' => 'å ½',
+  'Üð' => 'å¡£',
+  'Üñ' => '塱',
+  'Üò' => '壼',
+  'Üó' => '嫇',
+  'Üô' => 'å«„',
+  'Üõ' => 'å«‹',
+  'Üö' => '媺',
+  'Ü÷' => '媸',
+  'Üø' => '媱',
+  'Üù' => '媵',
+  'Üú' => '媰',
+  'Üû' => '媿',
+  'Üü' => '嫈',
+  'Üý' => '媻',
+  'Üþ' => '嫆',
+  'Ý@' => '媷',
+  'ÝA' => 'å«€',
+  'ÝB' => 'å«Š',
+  'ÝC' => '媴',
+  'ÝD' => '媶',
+  'ÝE' => 'å«�',
+  'ÝF' => '媹',
+  'ÝG' => 'åª�',
+  'ÝH' => '寖',
+  'ÝI' => '寘',
+  'ÝJ' => '寙',
+  'ÝK' => 'å°Ÿ',
+  'ÝL' => 'å°³',
+  'ÝM' => 'åµ±',
+  'ÝN' => 'åµ£',
+  'ÝO' => '嵊',
+  'ÝP' => 'åµ¥',
+  'ÝQ' => 'åµ²',
+  'ÝR' => '嵬',
+  'ÝS' => '嵞',
+  'ÝT' => '嵨',
+  'ÝU' => '嵧',
+  'ÝV' => 'åµ¢',
+  'ÝW' => 'å·°',
+  'ÝX' => 'å¹�',
+  'ÝY' => '幎',
+  'ÝZ' => '幊',
+  'Ý[' => 'å¹�',
+  'Ý\\' => '幋',
+  'Ý]' => 'å»…',
+  'Ý^' => '廌',
+  'Ý_' => '廆',
+  'Ý`' => '廋',
+  'Ýa' => '廇',
+  'Ýb' => 'å½€',
+  'Ýc' => '徯',
+  'Ýd' => 'å¾­',
+  'Ýe' => '惷',
+  'Ýf' => 'æ…‰',
+  'Ýg' => 'æ…Š',
+  'Ýh' => 'æ„«',
+  'Ýi' => 'æ……',
+  'Ýj' => '愶',
+  'Ýk' => '愲',
+  'Ýl' => 'æ„®',
+  'Ým' => 'æ…†',
+  'Ýn' => '愯',
+  'Ýo' => 'æ…�',
+  'Ýp' => 'æ„©',
+  'Ýq' => 'æ…€',
+  'Ýr' => '戠',
+  'Ýs' => 'é…¨',
+  'Ýt' => '戣',
+  'Ýu' => '戥',
+  'Ýv' => '戤',
+  'Ýw' => 'æ�…',
+  'Ýx' => 'æ�±',
+  'Ýy' => 'æ�«',
+  'Ýz' => 'æ��',
+  'Ý{' => 'æ�’',
+  'Ý|' => 'æ�‰',
+  'Ý}' => 'æ� ',
+  'Ý~' => 'æ�¤',
+  'ݡ' => '�',
+  'ݢ' => '摃',
+  'ݣ' => '�',
+  'ݤ' => '�',
+  'ݥ' => '�',
+  'ݦ' => '�',
+  'ݧ' => '�',
+  'ݨ' => '�',
+  'ݩ' => '�',
+  'ݪ' => '�',
+  'ݫ' => '�',
+  'ݬ' => '�',
+  'ݭ' => '�',
+  'ݮ' => '�',
+  'ݯ' => '�',
+  'ݰ' => '�',
+  'ݱ' => '�',
+  'ݲ' => '�',
+  'ݳ' => '摀',
+  'ݴ' => '�',
+  'ݵ' => '�',
+  'ݶ' => '�',
+  'ݷ' => '�',
+  'ݸ' => '�',
+  'ݹ' => '�',
+  'ݺ' => '�',
+  'ݻ' => '�',
+  'ݼ' => '敯',
+  'ݽ' => '斒',
+  'ݾ' => '旓',
+  'ݿ' => '暆',
+  'ÝÀ' => '暌',
+  'ÝÁ' => 'æš•',
+  'ÝÂ' => 'æš�',
+  'ÝÃ' => 'æš‹',
+  'ÝÄ' => '暊',
+  'ÝÅ' => 'æš™',
+  'ÝÆ' => 'æš”',
+  'ÝÇ' => '晸',
+  'ÝÈ' => '朠',
+  'ÝÉ' => '楦',
+  'ÝÊ' => '楟',
+  'ÝË' => '椸',
+  'ÝÌ' => '楎',
+  'ÝÍ' => '楢',
+  'ÝÎ' => '楱',
+  'ÝÏ' => '椿',
+  'ÝÐ' => '楅',
+  'ÝÑ' => '楪',
+  'ÝÒ' => '椹',
+  'ÝÓ' => '楂',
+  'ÝÔ' => '楗',
+  'ÝÕ' => '楙',
+  'ÝÖ' => '楺',
+  'Ý×' => '楈',
+  'ÝØ' => '楉',
+  'ÝÙ' => '椵',
+  'ÝÚ' => '楬',
+  'ÝÛ' => '椳',
+  'ÝÜ' => '椽',
+  'ÝÝ' => '楥',
+  'ÝÞ' => '棰',
+  'Ýß' => '楸',
+  'Ýà' => '椴',
+  'Ýá' => '楩',
+  'Ýâ' => '楀',
+  'Ýã' => '楯',
+  'Ýä' => '楄',
+  'Ýå' => '楶',
+  'Ýæ' => '楘',
+  'Ýç' => 'æ¥�',
+  'Ýè' => '楴',
+  'Ýé' => '楌',
+  'Ýê' => '椻',
+  'Ýë' => '楋',
+  'Ýì' => '椷',
+  'Ýí' => '楜',
+  'Ýî' => 'æ¥�',
+  'Ýï' => '楑',
+  'Ýð' => '椲',
+  'Ýñ' => '楒',
+  'Ýò' => '椯',
+  'Ýó' => '楻',
+  'Ýô' => '椼',
+  'Ýõ' => 'æ­†',
+  'Ýö' => 'æ­…',
+  'Ý÷' => 'æ­ƒ',
+  'Ýø' => 'æ­‚',
+  'Ýù' => 'æ­ˆ',
+  'Ýú' => 'æ­�',
+  'Ýû' => 'æ®›',
+  'Ýü' => 'ï¨�',
+  'Ýý' => '毻',
+  'Ýþ' => '毼',
+  'Þ@' => '毹',
+  'ÞA' => '毷',
+  'ÞB' => '毸',
+  'ÞC' => '溛',
+  'ÞD' => 'æ»–',
+  'ÞE' => '滈',
+  'ÞF' => 'æº�',
+  'ÞG' => '滀',
+  'ÞH' => '溟',
+  'ÞI' => '溓',
+  'ÞJ' => '溔',
+  'ÞK' => '溠',
+  'ÞL' => '溱',
+  'ÞM' => '溹',
+  'ÞN' => '滆',
+  'ÞO' => 'æ»’',
+  'ÞP' => '溽',
+  'ÞQ' => 'æ»�',
+  'ÞR' => '溞',
+  'ÞS' => '滉',
+  'ÞT' => '溷',
+  'ÞU' => '溰',
+  'ÞV' => 'æ»�',
+  'ÞW' => '溦',
+  'ÞX' => 'æ»�',
+  'ÞY' => '溲',
+  'ÞZ' => '溾',
+  'Þ[' => '滃',
+  'Þ\\' => '滜',
+  'Þ]' => '滘',
+  'Þ^' => '溙',
+  'Þ_' => '溒',
+  'Þ`' => '溎',
+  'Þa' => 'æº�',
+  'Þb' => '溤',
+  'Þc' => '溡',
+  'Þd' => '溿',
+  'Þe' => '溳',
+  'Þf' => 'æ»�',
+  'Þg' => '滊',
+  'Þh' => '溗',
+  'Þi' => '溮',
+  'Þj' => '溣',
+  'Þk' => 'ç…‡',
+  'Þl' => 'ç…”',
+  'Þm' => 'ç…’',
+  'Þn' => 'ç…£',
+  'Þo' => 'ç… ',
+  'Þp' => 'ç…�',
+  'Þq' => 'ç…�',
+  'Þr' => 'ç…¢',
+  'Þs' => 'ç…²',
+  'Þt' => 'ç…¸',
+  'Þu' => 'ç…ª',
+  'Þv' => 'ç…¡',
+  'Þw' => 'ç…‚',
+  'Þx' => 'ç…˜',
+  'Þy' => 'ç…ƒ',
+  'Þz' => 'ç…‹',
+  'Þ{' => 'ç…°',
+  'Þ|' => 'ç…Ÿ',
+  'Þ}' => 'ç…�',
+  'Þ~' => 'ç…“',
+  'Þ¡' => 'ç…„',
+  'Þ¢' => 'ç…�',
+  'Þ£' => 'ç…š',
+  'ޤ' => '�',
+  'ޥ' => '�',
+  'ަ' => '犌',
+  'ާ' => '犑',
+  'ި' => '�',
+  'ީ' => '犎',
+  'ު' => '猼',
+  'ޫ' => '�',
+  'ެ' => '猻',
+  'ޭ' => '猺',
+  'ޮ' => '�',
+  'ޯ' => '�',
+  'ް' => '�',
+  'Þ±' => 'ç‘„',
+  'Þ²' => 'ç‘Š',
+  'Þ³' => 'ç‘‹',
+  'Þ´' => 'ç‘’',
+  'Þµ' => 'ç‘‘',
+  'Þ¶' => 'ç‘—',
+  'Þ·' => 'ç‘€',
+  '޸' => '�',
+  '޹' => '�',
+  'Þº' => 'ç‘Ž',
+  'Þ»' => 'ç‘‚',
+  '޼' => '瑆',
+  '޽' => '�',
+  'Þ¾' => 'ç‘”',
+  'Þ¿' => 'ç“¡',
+  'ÞÀ' => 'ç“¿',
+  'ÞÁ' => '瓾',
+  'ÞÂ' => '瓽',
+  'ÞÃ' => 'ç”�',
+  'ÞÄ' => '畹',
+  'ÞÅ' => 'ç•·',
+  'ÞÆ' => '榃',
+  'ÞÇ' => 'ç—¯',
+  'ÞÈ' => 'ç˜�',
+  'ÞÉ' => '瘃',
+  'ÞÊ' => 'ç—·',
+  'ÞË' => 'ç—¾',
+  'ÞÌ' => 'ç—¼',
+  'ÞÍ' => 'ç—¹',
+  'ÞÎ' => 'ç—¸',
+  'ÞÏ' => 'ç˜�',
+  'ÞÐ' => 'ç—»',
+  'ÞÑ' => 'ç—¶',
+  'ÞÒ' => 'ç—­',
+  'ÞÓ' => 'ç—µ',
+  'ÞÔ' => 'ç—½',
+  'ÞÕ' => 'çš™',
+  'ÞÖ' => 'çšµ',
+  'Þ×' => 'ç›�',
+  'ÞØ' => 'ç�•',
+  'ÞÙ' => 'ç�Ÿ',
+  'ÞÚ' => 'ç� ',
+  'ÞÛ' => 'ç�’',
+  'ÞÜ' => 'ç�–',
+  'ÞÝ' => 'ç�š',
+  'ÞÞ' => 'ç�©',
+  'Þß' => 'ç�§',
+  'Þà' => 'ç�”',
+  'Þá' => 'ç�™',
+  'Þâ' => 'ç�­',
+  'Þã' => '矠',
+  'Þä' => '碇',
+  'Þå' => '碚',
+  'Þæ' => '碔',
+  'Þç' => 'ç¢�',
+  'Þè' => '碄',
+  'Þé' => '碕',
+  'Þê' => '碅',
+  'Þë' => '碆',
+  'Þì' => '碡',
+  'Þí' => '碃',
+  'Þî' => '硹',
+  'Þï' => '碙',
+  'Þð' => '碀',
+  'Þñ' => '碖',
+  'Þò' => 'ç¡»',
+  'Þó' => '祼',
+  'Þô' => '禂',
+  'Þõ' => '祽',
+  'Þö' => '祹',
+  'Þ÷' => '稑',
+  'Þø' => '稘',
+  'Þù' => '稙',
+  'Þú' => '稒',
+  'Þû' => '稗',
+  'Þü' => '稕',
+  'Þý' => '稢',
+  'Þþ' => '稓',
+  'ß@' => '稛',
+  'ßA' => 'ç¨�',
+  'ßB' => '窣',
+  'ßC' => '窢',
+  'ßD' => '窞',
+  'ßE' => 'ç««',
+  'ßF' => 'ç­¦',
+  'ßG' => 'ç­¤',
+  'ßH' => 'ç­­',
+  'ßI' => 'ç­´',
+  'ßJ' => 'ç­©',
+  'ßK' => 'ç­²',
+  'ßL' => 'ç­¥',
+  'ßM' => 'ç­³',
+  'ßN' => 'ç­±',
+  'ßO' => 'ç­°',
+  'ßP' => 'ç­¡',
+  'ßQ' => 'ç­¸',
+  'ßR' => 'ç­¶',
+  'ßS' => 'ç­£',
+  'ßT' => 'ç²²',
+  'ßU' => 'ç²´',
+  'ßV' => '粯',
+  'ßW' => '綈',
+  'ßX' => '綆',
+  'ßY' => '綀',
+  'ßZ' => 'ç¶�',
+  'ß[' => '絿',
+  'ß\\' => '綅',
+  'ß]' => '絺',
+  'ß^' => '綎',
+  'ß_' => 'çµ»',
+  'ß`' => '綃',
+  'ßa' => 'çµ¼',
+  'ßb' => '綌',
+  'ßc' => '綔',
+  'ßd' => '綄',
+  'ße' => 'çµ½',
+  'ßf' => '綒',
+  'ßg' => 'ç½­',
+  'ßh' => '罫',
+  'ßi' => '罧',
+  'ßj' => '罨',
+  'ßk' => '罬',
+  'ßl' => '羦',
+  'ßm' => 'ç¾¥',
+  'ßn' => '羧',
+  'ßo' => 'ç¿›',
+  'ßp' => 'ç¿œ',
+  'ßq' => '耡',
+  'ßr' => 'è…¤',
+  'ßs' => 'è… ',
+  'ßt' => 'è…·',
+  'ßu' => 'è…œ',
+  'ßv' => 'è…©',
+  'ßw' => 'è…›',
+  'ßx' => 'è…¢',
+  'ßy' => 'è…²',
+  'ßz' => '朡',
+  'ß{' => 'è…ž',
+  'ß|' => 'è…¶',
+  'ß}' => 'è…§',
+  'ß~' => 'è…¯',
+  'ß¡' => 'è…„',
+  'ߢ' => '腡',
+  'ߣ' => '�',
+  'ߤ' => '艉',
+  'ߥ' => '艄',
+  'ߦ' => '艀',
+  'ߧ' => '艂',
+  'ߨ' => '艅',
+  'ߩ' => '蓱',
+  'ߪ' => '�',
+  'ß«' => 'è‘–',
+  '߬' => '葶',
+  '߭' => '葹',
+  'ß®' => 'è’�',
+  '߯' => '�',
+  'ß°' => 'è‘¥',
+  'ß±' => 'è‘‘',
+  'ß²' => 'è‘€',
+  'ß³' => 'è’†',
+  'ߴ' => '葧',
+  'ߵ' => '�',
+  '߶' => '�',
+  '߷' => '葽',
+  '߸' => '葚',
+  'ß¹' => 'è‘™',
+  'ߺ' => '葴',
+  '߻' => '葳',
+  '߼' => '�',
+  '߽' => '蔇',
+  'ß¾' => 'è‘ž',
+  '߿' => '�',
+  'ßÀ' => 'è�º',
+  'ßÁ' => 'è�´',
+  'ßÂ' => '葺',
+  'ßÃ' => '葃',
+  'ßÄ' => '葸',
+  'ßÅ' => 'è�²',
+  'ßÆ' => 'è‘…',
+  'ßÇ' => 'è�©',
+  'ßÈ' => 'è�™',
+  'ßÉ' => 'è‘‹',
+  'ßÊ' => 'è�¯',
+  'ßË' => 'è‘‚',
+  'ßÌ' => 'è�­',
+  'ßÍ' => 'è‘Ÿ',
+  'ßÎ' => 'è‘°',
+  'ßÏ' => 'è�¹',
+  'ßÐ' => 'è‘Ž',
+  'ßÑ' => 'è‘Œ',
+  'ßÒ' => 'è‘’',
+  'ßÓ' => '葯',
+  'ßÔ' => 'è“…',
+  'ßÕ' => 'è’Ž',
+  'ßÖ' => 'è�»',
+  'ß×' => '葇',
+  'ßØ' => 'è�¶',
+  'ßÙ' => 'è�³',
+  'ßÚ' => '葨',
+  'ßÛ' => '葾',
+  'ßÜ' => 'è‘„',
+  'ßÝ' => 'è�«',
+  'ßÞ' => 'è‘ ',
+  'ßß' => 'è‘”',
+  'ßà' => 'è‘®',
+  'ßá' => 'è‘�',
+  'ßâ' => '蜋',
+  'ßã' => '蜄',
+  'ßä' => 'è›·',
+  'ßå' => '蜌',
+  'ßæ' => '蛺',
+  'ßç' => 'è›–',
+  'ßè' => '蛵',
+  'ßé' => 'è��',
+  'ßê' => '蛸',
+  'ßë' => '蜎',
+  'ßì' => '蜉',
+  'ßí' => 'èœ�',
+  'ßî' => '蛶',
+  'ßï' => 'èœ�',
+  'ßð' => '蜅',
+  'ßñ' => '裖',
+  'ßò' => '裋',
+  'ßó' => 'è£�',
+  'ßô' => '裎',
+  'ßõ' => '裞',
+  'ßö' => '裛',
+  'ß÷' => '裚',
+  'ßø' => '裌',
+  'ßù' => 'è£�',
+  'ßú' => '覅',
+  'ßû' => '覛',
+  'ßü' => '觟',
+  'ßý' => '觥',
+  'ßþ' => '觤',
+  'à@' => '觡',
+  'àA' => '觠',
+  'àB' => '觢',
+  'àC' => '觜',
+  'àD' => '触',
+  'àE' => '詶',
+  'àF' => '誆',
+  'àG' => 'è©¿',
+  'àH' => 'è©¡',
+  'àI' => '訿',
+  'àJ' => 'è©·',
+  'àK' => '誂',
+  'àL' => '誄',
+  'àM' => '詵',
+  'àN' => '誃',
+  'àO' => 'èª�',
+  'àP' => 'è©´',
+  'àQ' => '詺',
+  'àR' => 'è°¼',
+  'àS' => '豋',
+  'àT' => '豊',
+  'àU' => 'è±¥',
+  'àV' => '豤',
+  'àW' => '豦',
+  'àX' => '貆',
+  'àY' => '貄',
+  'àZ' => 'è²…',
+  'à[' => '賌',
+  'à\\' => '赨',
+  'à]' => '赩',
+  'à^' => '趑',
+  'à_' => '趌',
+  'à`' => '趎',
+  'àa' => 'è¶�',
+  'àb' => 'è¶�',
+  'àc' => '趓',
+  'àd' => '趔',
+  'àe' => 'è¶�',
+  'àf' => '趒',
+  'àg' => 'è·°',
+  'àh' => 'è· ',
+  'ài' => 'è·¬',
+  'àj' => 'è·±',
+  'àk' => 'è·®',
+  'àl' => 'è·�',
+  'àm' => 'è·©',
+  'àn' => 'è·£',
+  'ào' => 'è·¢',
+  'àp' => 'è·§',
+  'àq' => 'è·²',
+  'àr' => 'è·«',
+  'às' => 'è·´',
+  'àt' => '輆',
+  'àu' => '軿',
+  'àv' => 'è¼�',
+  'àw' => 'è¼€',
+  'àx' => 'è¼…',
+  'ày' => '輇',
+  'àz' => '輈',
+  'à{' => '輂',
+  'à|' => '輋',
+  'à}' => 'é�’',
+  'à~' => '逿',
+  'à¡' => 'é�„',
+  'à¢' => 'é�‰',
+  'à£' => '逽',
+  'à¤' => 'é„�',
+  'à¥' => 'é„�',
+  'à¦' => 'é„�',
+  'à§' => 'é„‘',
+  'à¨' => 'é„–',
+  'à©' => 'é„”',
+  'àª' => 'é„‹',
+  'à«' => 'é„Ž',
+  'à¬' => 'é…®',
+  'à­' => 'é…¯',
+  'à®' => '鉈',
+  'à¯' => '鉒',
+  'à°' => '鈰',
+  'à±' => '鈺',
+  'à²' => '鉦',
+  'à³' => '鈳',
+  'à´' => '鉥',
+  'àµ' => '鉞',
+  'à¶' => '銃',
+  'à·' => '鈮',
+  'à¸' => '鉊',
+  'à¹' => '鉆',
+  'àº' => '鉭',
+  'à»' => '鉬',
+  'à¼' => 'é‰�',
+  'à½' => '鉠',
+  'à¾' => '鉧',
+  'à¿' => '鉯',
+  'àÀ' => '鈶',
+  'àÁ' => '鉡',
+  'àÂ' => '鉰',
+  'àÃ' => '鈱',
+  'àÄ' => '鉔',
+  'àÅ' => '鉣',
+  'àÆ' => 'é‰�',
+  'àÇ' => '鉲',
+  'àÈ' => '鉎',
+  'àÉ' => '鉓',
+  'àÊ' => '鉌',
+  'àË' => '鉖',
+  'àÌ' => '鈲',
+  'àÍ' => 'é–Ÿ',
+  'àÎ' => 'é–œ',
+  'àÏ' => 'é–ž',
+  'àÐ' => 'é–›',
+  'àÑ' => 'éš’',
+  'àÒ' => 'éš“',
+  'àÓ' => 'éš‘',
+  'àÔ' => 'éš—',
+  'àÕ' => '雎',
+  'àÖ' => '雺',
+  'à×' => '雽',
+  'àØ' => '雸',
+  'àÙ' => '雵',
+  'àÚ' => 'é�³',
+  'àÛ' => 'é�·',
+  'àÜ' => 'é�¸',
+  'àÝ' => 'é�²',
+  'àÞ' => 'é �',
+  'àß' => 'é �',
+  'àà' => 'é Ž',
+  'àá' => '颬',
+  'àâ' => '飶',
+  'àã' => '飹',
+  'àä' => '馯',
+  'àå' => '馲',
+  'àæ' => '馰',
+  'àç' => '馵',
+  'àè' => '骭',
+  'àé' => '骫',
+  'àê' => 'é­›',
+  'àë' => '鳪',
+  'àì' => 'é³­',
+  'àí' => '鳧',
+  'àî' => '麀',
+  'àï' => '黽',
+  'àð' => '僦',
+  'àñ' => '僔',
+  'àò' => '僗',
+  'àó' => '僨',
+  'àô' => '僳',
+  'àõ' => '僛',
+  'àö' => '僪',
+  'à÷' => 'åƒ�',
+  'àø' => '僤',
+  'àù' => '僓',
+  'àú' => '僬',
+  'àû' => '僰',
+  'àü' => '僯',
+  'àý' => '僣',
+  'àþ' => '僠',
+  'á@' => '凘',
+  'áA' => '劀',
+  'áB' => 'åŠ�',
+  'áC' => 'å‹©',
+  'áD' => 'å‹«',
+  'áE' => '匰',
+  'áF' => '厬',
+  'áG' => '嘧',
+  'áH' => '嘕',
+  'áI' => '嘌',
+  'áJ' => '嘒',
+  'áK' => 'å—¼',
+  'áL' => 'å˜�',
+  'áM' => '嘜',
+  'áN' => 'å˜�',
+  'áO' => '嘓',
+  'áP' => '嘂',
+  'áQ' => 'å—º',
+  'áR' => 'å˜�',
+  'áS' => '嘄',
+  'áT' => 'å—¿',
+  'áU' => 'å—¹',
+  'áV' => '墉',
+  'áW' => '塼',
+  'áX' => 'å¢�',
+  'áY' => '墘',
+  'áZ' => '墆',
+  'á[' => 'å¢�',
+  'á\\' => 'å¡¿',
+  'á]' => 'å¡´',
+  'á^' => '墋',
+  'á_' => '塺',
+  'á`' => '墇',
+  'áa' => '墑',
+  'áb' => '墎',
+  'ác' => '塶',
+  'ád' => '墂',
+  'áe' => '墈',
+  'áf' => 'å¡»',
+  'ág' => '墔',
+  'áh' => 'å¢�',
+  'ái' => '壾',
+  'áj' => '奫',
+  'ák' => 'å«œ',
+  'ál' => 'å«®',
+  'ám' => 'å«¥',
+  'án' => 'å«•',
+  'áo' => '嫪',
+  'áp' => 'å«š',
+  'áq' => 'å«­',
+  'ár' => 'å««',
+  'ás' => '嫳',
+  'át' => 'å«¢',
+  'áu' => 'å« ',
+  'áv' => 'å«›',
+  'áw' => '嫬',
+  'áx' => 'å«ž',
+  'áy' => 'å«�',
+  'áz' => 'å«™',
+  'á{' => '嫨',
+  'á|' => 'å«Ÿ',
+  'á}' => 'å­·',
+  'á~' => '寠',
+  'á¡' => '寣',
+  'á¢' => 'å±£',
+  'á£' => '嶂',
+  'á¤' => '嶀',
+  'á¥' => 'åµ½',
+  'á¦' => '嶆',
+  'á§' => '嵺',
+  'á¨' => 'å¶�',
+  'á©' => 'åµ·',
+  'áª' => '嶊',
+  'á«' => '嶉',
+  'á¬' => '嶈',
+  'á­' => 'åµ¾',
+  'á®' => 'åµ¼',
+  'á¯' => 'å¶�',
+  'á°' => 'åµ¹',
+  'á±' => '嵿',
+  'á²' => '幘',
+  'á³' => 'å¹™',
+  'á´' => '幓',
+  'áµ' => '廘',
+  'á¶' => '廑',
+  'á·' => 'å»—',
+  'á¸' => '廎',
+  'á¹' => '廜',
+  'áº' => '廕',
+  'á»' => 'å»™',
+  'á¼' => 'å»’',
+  'á½' => 'å»”',
+  'á¾' => '彄',
+  'á¿' => '彃',
+  'áÀ' => '彯',
+  'áÁ' => '徶',
+  'áÂ' => '愬',
+  'áÃ' => '愨',
+  'áÄ' => 'æ…�',
+  'áÅ' => 'æ…ž',
+  'áÆ' => 'æ…±',
+  'áÇ' => 'æ…³',
+  'áÈ' => 'æ…’',
+  'áÉ' => 'æ…“',
+  'áÊ' => 'æ…²',
+  'áË' => 'æ…¬',
+  'áÌ' => '憀',
+  'áÍ' => 'æ…´',
+  'áÎ' => 'æ…”',
+  'áÏ' => 'æ…º',
+  'áÐ' => 'æ…›',
+  'áÑ' => 'æ…¥',
+  'áÒ' => 'æ„»',
+  'áÓ' => 'æ…ª',
+  'áÔ' => 'æ…¡',
+  'áÕ' => 'æ…–',
+  'áÖ' => '戩',
+  'á×' => '戧',
+  'áØ' => '戫',
+  'áÙ' => 'æ�«',
+  'áÚ' => 'æ‘�',
+  'áÛ' => 'æ‘›',
+  'áÜ' => 'æ‘�',
+  'áÝ' => 'æ‘´',
+  'áÞ' => '摶',
+  'áß' => '摲',
+  'áà' => '摳',
+  'áá' => '摽',
+  'áâ' => '摵',
+  'áã' => '摦',
+  'áä' => 'æ’¦',
+  'áå' => 'æ‘Ž',
+  'áæ' => 'æ’‚',
+  'áç' => 'æ‘ž',
+  'áè' => 'æ‘œ',
+  'áé' => 'æ‘‹',
+  'áê' => 'æ‘“',
+  'áë' => 'æ‘ ',
+  'áì' => 'æ‘�',
+  'áí' => 'æ‘¿',
+  'áî' => 'æ�¿',
+  'áï' => '摬',
+  'áð' => 'æ‘«',
+  'áñ' => 'æ‘™',
+  'áò' => 'æ‘¥',
+  'áó' => 'æ‘·',
+  'áô' => '敳',
+  'áõ' => 'æ– ',
+  'áö' => 'æš¡',
+  'á÷' => 'æš ',
+  'áø' => '暟',
+  'áù' => '朅',
+  'áú' => '朄',
+  'áû' => '朢',
+  'áü' => '榱',
+  'áý' => '榶',
+  'áþ' => '槉',
+  'â@' => '榠',
+  'âA' => '槎',
+  'âB' => '榖',
+  'âC' => '榰',
+  'âD' => '榬',
+  'âE' => '榼',
+  'âF' => '榑',
+  'âG' => '榙',
+  'âH' => '榎',
+  'âI' => '榧',
+  'âJ' => 'æ¦�',
+  'âK' => '榩',
+  'âL' => '榾',
+  'âM' => '榯',
+  'âN' => '榿',
+  'âO' => '槄',
+  'âP' => '榽',
+  'âQ' => '榤',
+  'âR' => '槔',
+  'âS' => '榹',
+  'âT' => '槊',
+  'âU' => '榚',
+  'âV' => 'æ§�',
+  'âW' => '榳',
+  'âX' => '榓',
+  'âY' => '榪',
+  'âZ' => '榡',
+  'â[' => '榞',
+  'â\\' => '槙',
+  'â]' => '榗',
+  'â^' => 'æ¦�',
+  'â_' => '槂',
+  'â`' => '榵',
+  'âa' => '榥',
+  'âb' => '槆',
+  'âc' => 'æ­Š',
+  'âd' => 'æ­�',
+  'âe' => 'æ­‹',
+  'âf' => '殞',
+  'âg' => '殟',
+  'âh' => 'æ® ',
+  'âi' => '毃',
+  'âj' => '毄',
+  'âk' => '毾',
+  'âl' => '滎',
+  'âm' => '滵',
+  'ân' => 'æ»±',
+  'âo' => '漃',
+  'âp' => 'æ¼¥',
+  'âq' => '滸',
+  'âr' => 'æ¼·',
+  'âs' => 'æ»»',
+  'ât' => 'æ¼®',
+  'âu' => '漉',
+  'âv' => '潎',
+  'âw' => 'æ¼™',
+  'âx' => '漚',
+  'ây' => '漧',
+  'âz' => '漘',
+  'â{' => 'æ¼»',
+  'â|' => 'æ¼’',
+  'â}' => 'æ»­',
+  'â~' => '漊',
+  'â¡' => '漶',
+  'â¢' => 'æ½³',
+  'â£' => '滹',
+  'â¤' => 'æ»®',
+  'â¥' => 'æ¼­',
+  'â¦' => 'æ½€',
+  'â§' => 'æ¼°',
+  'â¨' => 'æ¼¼',
+  'â©' => 'æ¼µ',
+  'âª' => '滫',
+  'â«' => '漇',
+  'â¬' => '漎',
+  'â­' => '潃',
+  'â®' => 'æ¼…',
+  'â¯' => '滽',
+  'â°' => '滶',
+  'â±' => 'æ¼¹',
+  'â²' => '漜',
+  'â³' => '滼',
+  'â´' => '漺',
+  'âµ' => '漟',
+  'â¶' => 'æ¼�',
+  'â·' => '漞',
+  'â¸' => '漈',
+  'â¹' => '漡',
+  'âº' => '熇',
+  'â»' => 'ç†�',
+  'â¼' => '熉',
+  'â½' => '熀',
+  'â¾' => '熅',
+  'â¿' => '熂',
+  'âÀ' => 'ç†�',
+  'âÁ' => 'ç…»',
+  'âÂ' => '熆',
+  'âÃ' => 'ç†�',
+  'âÄ' => '熗',
+  'âÅ' => '牄',
+  'âÆ' => '牓',
+  'âÇ' => '犗',
+  'âÈ' => '犕',
+  'âÉ' => '犓',
+  'âÊ' => 'ç�ƒ',
+  'âË' => 'ç��',
+  'âÌ' => 'ç�‘',
+  'âÍ' => 'ç�Œ',
+  'âÎ' => 'ç‘¢',
+  'âÏ' => '瑳',
+  'âÐ' => '瑱',
+  'âÑ' => '瑵',
+  'âÒ' => '瑲',
+  'âÓ' => '瑧',
+  'âÔ' => 'ç‘®',
+  'âÕ' => '甀',
+  'âÖ' => '甂',
+  'â×' => '甃',
+  'âØ' => '畽',
+  'âÙ' => 'ç–�',
+  'âÚ' => '瘖',
+  'âÛ' => '瘈',
+  'âÜ' => '瘌',
+  'âÝ' => '瘕',
+  'âÞ' => '瘑',
+  'âß' => '瘊',
+  'âà' => '瘔',
+  'âá' => '皸',
+  'ââ' => 'çž�',
+  'âã' => 'ç�¼',
+  'âä' => 'çž…',
+  'âå' => 'çž‚',
+  'âæ' => 'ç�®',
+  'âç' => '瞀',
+  'âè' => 'ç�¯',
+  'âé' => 'ç�¾',
+  'âê' => '瞃',
+  'âë' => '碲',
+  'âì' => '碪',
+  'âí' => '碴',
+  'âî' => '碭',
+  'âï' => '碨',
+  'âð' => '硾',
+  'âñ' => '碫',
+  'âò' => '碞',
+  'âó' => '碥',
+  'âô' => '碠',
+  'âõ' => '碬',
+  'âö' => '碢',
+  'â÷' => '碤',
+  'âø' => '禘',
+  'âù' => '禊',
+  'âú' => '禋',
+  'âû' => '禖',
+  'âü' => '禕',
+  'âý' => '禔',
+  'âþ' => '禓',
+  'ã@' => '禗',
+  'ãA' => '禈',
+  'ãB' => '禒',
+  'ãC' => 'ç¦�',
+  'ãD' => '稫',
+  'ãE' => 'ç©Š',
+  'ãF' => '稰',
+  'ãG' => '稯',
+  'ãH' => '稨',
+  'ãI' => '稦',
+  'ãJ' => '窨',
+  'ãK' => '窫',
+  'ãL' => '窬',
+  'ãM' => 'ç«®',
+  'ãN' => '箈',
+  'ãO' => '箜',
+  'ãP' => '箊',
+  'ãQ' => '箑',
+  'ãR' => 'ç®�',
+  'ãS' => 'ç®–',
+  'ãT' => 'ç®�',
+  'ãU' => '箌',
+  'ãV' => 'ç®›',
+  'ãW' => '箎',
+  'ãX' => 'ç®…',
+  'ãY' => '箘',
+  'ãZ' => '劄',
+  'ã[' => 'ç®™',
+  'ã\\' => '箤',
+  'ã]' => '箂',
+  'ã^' => 'ç²»',
+  'ã_' => '粿',
+  'ã`' => 'ç²¼',
+  'ãa' => '粺',
+  'ãb' => '綧',
+  'ãc' => '綷',
+  'ãd' => 'ç·‚',
+  'ãe' => '綣',
+  'ãf' => '綪',
+  'ãg' => 'ç·�',
+  'ãh' => 'ç·€',
+  'ãi' => 'ç·…',
+  'ãj' => 'ç¶�',
+  'ãk' => 'ç·Ž',
+  'ãl' => 'ç·„',
+  'ãm' => 'ç·†',
+  'ãn' => 'ç·‹',
+  'ão' => 'ç·Œ',
+  'ãp' => '綯',
+  'ãq' => '綹',
+  'ãr' => '綖',
+  'ãs' => '綼',
+  'ãt' => '綟',
+  'ãu' => '綦',
+  'ãv' => '綮',
+  'ãw' => '綩',
+  'ãx' => '綡',
+  'ãy' => 'ç·‰',
+  'ãz' => 'ç½³',
+  'ã{' => 'ç¿¢',
+  'ã|' => 'ç¿£',
+  'ã}' => 'ç¿¥',
+  'ã~' => 'ç¿ž',
+  'ã¡' => '耤',
+  'ã¢' => 'è��',
+  'ã£' => 'è�œ',
+  'ã¤' => '膉',
+  'ã¥' => '膆',
+  'ã¦' => '膃',
+  'ã§' => '膇',
+  'ã¨' => 'è†�',
+  'ã©' => '膌',
+  'ãª' => '膋',
+  'ã«' => '舕',
+  'ã¬' => 'è’—',
+  'ã­' => 'è’¤',
+  'ã®' => 'è’¡',
+  'ã¯' => 'è’Ÿ',
+  'ã°' => 'è’º',
+  'ã±' => 'è“Ž',
+  'ã²' => 'è“‚',
+  'ã³' => 'è’¬',
+  'ã´' => 'è’®',
+  'ãµ' => 'è’«',
+  'ã¶' => 'è’¹',
+  'ã·' => 'è’´',
+  'ã¸' => 'è“�',
+  'ã¹' => 'è“�',
+  'ãº' => 'è’ª',
+  'ã»' => 'è’š',
+  'ã¼' => 'è’±',
+  'ã½' => 'è“�',
+  'ã¾' => 'è’�',
+  'ã¿' => 'è’§',
+  'ãÀ' => 'è’»',
+  'ãÁ' => 'è’¢',
+  'ãÂ' => 'è’”',
+  'ãÃ' => '蓇',
+  'ãÄ' => 'è“Œ',
+  'ãÅ' => 'è’›',
+  'ãÆ' => 'è’©',
+  'ãÇ' => 'è’¯',
+  'ãÈ' => 'è’¨',
+  'ãÉ' => 'è“–',
+  'ãÊ' => 'è’˜',
+  'ãË' => 'è’¶',
+  'ãÌ' => 'è“�',
+  'ãÍ' => 'è’ ',
+  'ãÎ' => 'è“—',
+  'ãÏ' => 'è“”',
+  'ãÐ' => 'è“’',
+  'ãÑ' => 'è“›',
+  'ãÒ' => 'è’°',
+  'ãÓ' => 'è’‘',
+  'ãÔ' => '虡',
+  'ãÕ' => '蜳',
+  'ãÖ' => '蜣',
+  'ã×' => '蜨',
+  'ãØ' => 'è�«',
+  'ãÙ' => 'è�€',
+  'ãÚ' => '蜮',
+  'ãÛ' => '蜞',
+  'ãÜ' => '蜡',
+  'ãÝ' => '蜙',
+  'ãÞ' => '蜛',
+  'ãß' => 'è�ƒ',
+  'ãà' => '蜬',
+  'ãá' => 'è��',
+  'ãâ' => '蜾',
+  'ãã' => 'è�†',
+  'ãä' => '蜠',
+  'ãå' => '蜲',
+  'ãæ' => '蜪',
+  'ãç' => '蜭',
+  'ãè' => '蜼',
+  'ãé' => '蜒',
+  'ãê' => '蜺',
+  'ãë' => '蜱',
+  'ãì' => '蜵',
+  'ãí' => 'è�‚',
+  'ãî' => '蜦',
+  'ãï' => '蜧',
+  'ãð' => '蜸',
+  'ãñ' => '蜤',
+  'ãò' => '蜚',
+  'ãó' => '蜰',
+  'ãô' => '蜑',
+  'ãõ' => '裷',
+  'ãö' => '裧',
+  'ã÷' => '裱',
+  'ãø' => '裲',
+  'ãù' => '裺',
+  'ãú' => '裾',
+  'ãû' => '裮',
+  'ãü' => '裼',
+  'ãý' => '裶',
+  'ãþ' => '裻',
+  'ä@' => '裰',
+  'äA' => '裬',
+  'äB' => '裫',
+  'äC' => 'è¦�',
+  'äD' => '覡',
+  'äE' => '覟',
+  'äF' => '覞',
+  'äG' => '觩',
+  'äH' => '觫',
+  'äI' => '觨',
+  'äJ' => '誫',
+  'äK' => '誙',
+  'äL' => '誋',
+  'äM' => '誒',
+  'äN' => 'èª�',
+  'äO' => '誖',
+  'äP' => 'è°½',
+  'äQ' => '豨',
+  'äR' => '豩',
+  'äS' => '賕',
+  'äT' => 'è³�',
+  'äU' => 'è³—',
+  'äV' => '趖',
+  'äW' => '踉',
+  'äX' => '踂',
+  'äY' => 'è·¿',
+  'äZ' => 'è¸�',
+  'ä[' => 'è·½',
+  'ä\\' => '踊',
+  'ä]' => '踃',
+  'ä^' => '踇',
+  'ä_' => '踆',
+  'ä`' => '踅',
+  'äa' => 'è·¾',
+  'äb' => '踀',
+  'äc' => '踄',
+  'äd' => 'è¼�',
+  'äe' => '輑',
+  'äf' => '輎',
+  'äg' => 'è¼�',
+  'äh' => 'é„£',
+  'äi' => 'é„œ',
+  'äj' => 'é„ ',
+  'äk' => 'é„¢',
+  'äl' => 'é„Ÿ',
+  'äm' => 'é„�',
+  'än' => 'é„š',
+  'äo' => '鄤',
+  'äp' => 'é„¡',
+  'äq' => 'é„›',
+  'är' => 'é…º',
+  'äs' => 'é…²',
+  'ät' => 'é…¹',
+  'äu' => 'é…³',
+  'äv' => '銥',
+  'äw' => '銤',
+  'äx' => '鉶',
+  'äy' => '銛',
+  'äz' => '鉺',
+  'ä{' => '銠',
+  'ä|' => '銔',
+  'ä}' => '銪',
+  'ä~' => 'éŠ�',
+  'ä¡' => '銦',
+  'ä¢' => '銚',
+  'ä£' => '銫',
+  'ä¤' => '鉹',
+  'ä¥' => '銗',
+  'ä¦' => '鉿',
+  'ä§' => '銣',
+  'ä¨' => 'é‹®',
+  'ä©' => '銎',
+  'äª' => '銂',
+  'ä«' => '銕',
+  'ä¬' => '銢',
+  'ä­' => '鉽',
+  'ä®' => '銈',
+  'ä¯' => '銡',
+  'ä°' => '銊',
+  'ä±' => '銆',
+  'ä²' => '銌',
+  'ä³' => '銙',
+  'ä´' => '銧',
+  'äµ' => '鉾',
+  'ä¶' => '銇',
+  'ä·' => '銩',
+  'ä¸' => 'éŠ�',
+  'ä¹' => '銋',
+  'äº' => '鈭',
+  'ä»' => 'éšž',
+  'ä¼' => 'éš¡',
+  'ä½' => '雿',
+  'ä¾' => 'é�˜',
+  'ä¿' => 'é�½',
+  'äÀ' => 'é�º',
+  'äÁ' => 'é�¾',
+  'äÂ' => '鞃',
+  'äÃ' => '鞀',
+  'äÄ' => 'éž‚',
+  'äÅ' => 'é�»',
+  'äÆ' => 'éž„',
+  'äÇ' => 'éž�',
+  'äÈ' => 'é�¿',
+  'äÉ' => '韎',
+  'äÊ' => 'éŸ�',
+  'äË' => 'é –',
+  'äÌ' => '颭',
+  'äÍ' => '颮',
+  'äÎ' => '餂',
+  'äÏ' => '餀',
+  'äÐ' => '餇',
+  'äÑ' => 'é¦�',
+  'äÒ' => '馜',
+  'äÓ' => '駃',
+  'äÔ' => '馹',
+  'äÕ' => '馻',
+  'äÖ' => '馺',
+  'ä×' => '駂',
+  'äØ' => '馽',
+  'äÙ' => '駇',
+  'äÚ' => '骱',
+  'äÛ' => 'é«£',
+  'äÜ' => '髧',
+  'äÝ' => '鬾',
+  'äÞ' => '鬿',
+  'äß' => 'é­ ',
+  'äà' => 'é­¡',
+  'äá' => 'é­Ÿ',
+  'äâ' => 'é³±',
+  'äã' => 'é³²',
+  'ää' => 'é³µ',
+  'äå' => '麧',
+  'äæ' => '僿',
+  'äç' => '儃',
+  'äè' => 'å„°',
+  'äé' => '僸',
+  'äê' => '儆',
+  'äë' => '儇',
+  'äì' => '僶',
+  'äí' => '僾',
+  'äî' => 'å„‹',
+  'äï' => 'å„Œ',
+  'äð' => '僽',
+  'äñ' => 'å„Š',
+  'äò' => '劋',
+  'äó' => '劌',
+  'äô' => '勱',
+  'äõ' => '勯',
+  'äö' => '噈',
+  'ä÷' => '噂',
+  'äø' => '噌',
+  'äù' => '嘵',
+  'äú' => 'å™�',
+  'äû' => '噊',
+  'äü' => '噉',
+  'äý' => '噆',
+  'äþ' => '噘',
+  'å@' => '噚',
+  'åA' => '噀',
+  'åB' => '嘳',
+  'åC' => '嘽',
+  'åD' => '嘬',
+  'åE' => '嘾',
+  'åF' => '嘸',
+  'åG' => '嘪',
+  'åH' => '嘺',
+  'åI' => '圚',
+  'åJ' => '墫',
+  'åK' => 'å¢�',
+  'åL' => '墱',
+  'åM' => '墠',
+  'åN' => '墣',
+  'åO' => '墯',
+  'åP' => '墬',
+  'åQ' => '墥',
+  'åR' => '墡',
+  'åS' => '壿',
+  'åT' => 'å«¿',
+  'åU' => 'å«´',
+  'åV' => '嫽',
+  'åW' => 'å«·',
+  'åX' => '嫶',
+  'åY' => '嬃',
+  'åZ' => '嫸',
+  'å[' => '嬂',
+  'å\\' => '嫹',
+  'å]' => 'å¬�',
+  'å^' => '嬇',
+  'å_' => '嬅',
+  'å`' => 'å¬�',
+  'åa' => '屧',
+  'åb' => '嶙',
+  'åc' => '嶗',
+  'åd' => '嶟',
+  'åe' => '嶒',
+  'åf' => '嶢',
+  'åg' => '嶓',
+  'åh' => '嶕',
+  'åi' => '嶠',
+  'åj' => '嶜',
+  'åk' => '嶡',
+  'ål' => '嶚',
+  'åm' => '嶞',
+  'ån' => '幩',
+  'åo' => 'å¹�',
+  'åp' => 'å¹ ',
+  'åq' => '幜',
+  'år' => 'ç·³',
+  'ås' => 'å»›',
+  'åt' => '廞',
+  'åu' => '廡',
+  'åv' => '彉',
+  'åw' => 'å¾²',
+  'åx' => '憋',
+  'åy' => '憃',
+  'åz' => 'æ…¹',
+  'å{' => '憱',
+  'å|' => '憰',
+  'å}' => '憢',
+  'å~' => '憉',
+  'å¡' => '憛',
+  'å¢' => '憓',
+  'å£' => '憯',
+  'å¤' => '憭',
+  'å¥' => '憟',
+  'å¦' => '憒',
+  'å§' => '憪',
+  'å¨' => '憡',
+  'å©' => 'æ†�',
+  'åª' => 'æ…¦',
+  'å«' => '憳',
+  'å¬' => '戭',
+  'å­' => 'æ‘®',
+  'å®' => 'æ‘°',
+  'å¯' => 'æ’–',
+  'å°' => 'æ’ ',
+  'å±' => 'æ’…',
+  'å²' => 'æ’—',
+  'å³' => 'æ’œ',
+  'å´' => 'æ’�',
+  'åµ' => 'æ’‹',
+  'å¶' => 'æ’Š',
+  'å·' => 'æ’Œ',
+  'å¸' => 'æ’£',
+  'å¹' => 'æ’Ÿ',
+  'åº' => '摨',
+  'å»' => 'æ’±',
+  'å¼' => 'æ’˜',
+  'å½' => '敶',
+  'å¾' => '敺',
+  'å¿' => '敹',
+  'åÀ' => 'æ•»',
+  'åÁ' => 'æ–²',
+  'åÂ' => 'æ–³',
+  'åÃ' => 'æšµ',
+  'åÄ' => 'æš°',
+  'åÅ' => 'æš©',
+  'åÆ' => 'æš²',
+  'åÇ' => 'æš·',
+  'åÈ' => '暪',
+  'åÉ' => '暯',
+  'åÊ' => '樀',
+  'åË' => '樆',
+  'åÌ' => '樗',
+  'åÍ' => '槥',
+  'åÎ' => '槸',
+  'åÏ' => '樕',
+  'åÐ' => '槱',
+  'åÑ' => '槤',
+  'åÒ' => '樠',
+  'åÓ' => '槿',
+  'åÔ' => '槬',
+  'åÕ' => '槢',
+  'åÖ' => '樛',
+  'å×' => 'æ¨�',
+  'åØ' => '槾',
+  'åÙ' => '樧',
+  'åÚ' => '槲',
+  'åÛ' => '槮',
+  'åÜ' => '樔',
+  'åÝ' => '槷',
+  'åÞ' => '槧',
+  'åß' => 'æ©€',
+  'åà' => '樈',
+  'åá' => '槦',
+  'åâ' => '槻',
+  'åã' => 'æ¨�',
+  'åä' => '槼',
+  'åå' => '槫',
+  'åæ' => '樉',
+  'åç' => '樄',
+  'åè' => '樘',
+  'åé' => '樥',
+  'åê' => 'æ¨�',
+  'åë' => '槶',
+  'åì' => '樦',
+  'åí' => '樇',
+  'åî' => '槴',
+  'åï' => '樖',
+  'åð' => 'æ­‘',
+  'åñ' => '殥',
+  'åò' => '殣',
+  'åó' => '殢',
+  'åô' => '殦',
+  'åõ' => 'æ°�',
+  'åö' => 'æ°€',
+  'å÷' => '毿',
+  'åø' => 'æ°‚',
+  'åù' => 'æ½�',
+  'åú' => '漦',
+  'åû' => 'æ½¾',
+  'åü' => '澇',
+  'åý' => '濆',
+  'åþ' => 'æ¾’',
+  'æ@' => 'æ¾�',
+  'æA' => '澉',
+  'æB' => '澌',
+  'æC' => 'æ½¢',
+  'æD' => 'æ½�',
+  'æE' => 'æ¾…',
+  'æF' => '潚',
+  'æG' => 'æ¾–',
+  'æH' => '潶',
+  'æI' => '潬',
+  'æJ' => '澂',
+  'æK' => '潕',
+  'æL' => 'æ½²',
+  'æM' => 'æ½’',
+  'æN' => 'æ½�',
+  'æO' => 'æ½—',
+  'æP' => 'æ¾”',
+  'æQ' => '澓',
+  'æR' => 'æ½�',
+  'æS' => 'æ¼€',
+  'æT' => '潡',
+  'æU' => '潫',
+  'æV' => 'æ½½',
+  'æW' => '潧',
+  'æX' => 'æ¾�',
+  'æY' => '潓',
+  'æZ' => '澋',
+  'æ[' => '潩',
+  'æ\\' => '潿',
+  'æ]' => '澕',
+  'æ^' => 'æ½£',
+  'æ_' => 'æ½·',
+  'æ`' => '潪',
+  'æa' => 'æ½»',
+  'æb' => '熲',
+  'æc' => '熯',
+  'æd' => '熛',
+  'æe' => '熰',
+  'æf' => '熠',
+  'æg' => '熚',
+  'æh' => '熩',
+  'æi' => '熵',
+  'æj' => 'ç†�',
+  'æk' => '熥',
+  'æl' => '熞',
+  'æm' => '熤',
+  'æn' => '熡',
+  'æo' => '熪',
+  'æp' => '熜',
+  'æq' => '熧',
+  'ær' => '熳',
+  'æs' => '犘',
+  'æt' => '犚',
+  'æu' => 'ç�˜',
+  'æv' => 'ç�’',
+  'æw' => 'ç�ž',
+  'æx' => 'ç�Ÿ',
+  'æy' => 'ç� ',
+  'æz' => 'ç��',
+  'æ{' => 'ç�›',
+  'æ|' => 'ç�¡',
+  'æ}' => 'ç�š',
+  'æ~' => 'ç�™',
+  'æ¡' => 'ç�¢',
+  'æ¢' => 'ç’‡',
+  'æ£' => 'ç’‰',
+  'æ¤' => 'ç’Š',
+  'æ¥' => 'ç’†',
+  'æ¦' => 'ç’�',
+  'æ§' => '瑽',
+  'æ¨' => 'ç’…',
+  'æ©' => 'ç’ˆ',
+  'æª' => '瑼',
+  'æ«' => '瑹',
+  'æ¬' => '甈',
+  'æ­' => '甇',
+  'æ®' => '畾',
+  'æ¯' => '瘥',
+  'æ°' => '瘞',
+  'æ±' => '瘙',
+  'æ²' => 'ç˜�',
+  'æ³' => '瘜',
+  'æ´' => '瘣',
+  'æµ' => '瘚',
+  'æ¶' => '瘨',
+  'æ·' => '瘛',
+  'æ¸' => 'çšœ',
+  'æ¹' => 'çš�',
+  'æº' => 'çšž',
+  'æ»' => 'çš›',
+  'æ¼' => 'çž�',
+  'æ½' => 'çž�',
+  'æ¾' => '瞉',
+  'æ¿' => '瞈',
+  'æÀ' => 'ç£�',
+  'æÁ' => '碻',
+  'æÂ' => 'ç£�',
+  'æÃ' => '磌',
+  'æÄ' => '磑',
+  'æÅ' => '磎',
+  'æÆ' => '磔',
+  'æÇ' => '磈',
+  'æÈ' => '磃',
+  'æÉ' => '磄',
+  'æÊ' => '磉',
+  'æË' => '禚',
+  'æÌ' => '禡',
+  'æÍ' => '禠',
+  'æÎ' => '禜',
+  'æÏ' => '禢',
+  'æÐ' => '禛',
+  'æÑ' => 'æ­¶',
+  'æÒ' => '稹',
+  'æÓ' => '窲',
+  'æÔ' => '窴',
+  'æÕ' => '窳',
+  'æÖ' => 'ç®·',
+  'æ×' => '篋',
+  'æØ' => '箾',
+  'æÙ' => '箬',
+  'æÚ' => '篎',
+  'æÛ' => '箯',
+  'æÜ' => '箹',
+  'æÝ' => '篊',
+  'æÞ' => '箵',
+  'æß' => 'ç³…',
+  'æà' => '糈',
+  'æá' => '糌',
+  'æâ' => '糋',
+  'æã' => 'ç··',
+  'æä' => 'ç·›',
+  'æå' => 'ç·ª',
+  'ææ' => 'ç·§',
+  'æç' => 'ç·—',
+  'æè' => 'ç·¡',
+  'æé' => '縃',
+  'æê' => 'ç·º',
+  'æë' => 'ç·¦',
+  'æì' => 'ç·¶',
+  'æí' => 'ç·±',
+  'æî' => 'ç·°',
+  'æï' => 'ç·®',
+  'æð' => 'ç·Ÿ',
+  'æñ' => '罶',
+  'æò' => '羬',
+  'æó' => 'ç¾°',
+  'æô' => 'ç¾­',
+  'æõ' => 'ç¿­',
+  'æö' => 'ç¿«',
+  'æ÷' => '翪',
+  'æø' => '翬',
+  'æù' => '翦',
+  'æú' => '翨',
+  'æû' => 'è�¤',
+  'æü' => 'è�§',
+  'æý' => '膣',
+  'æþ' => '膟',
+  'ç@' => '膞',
+  'çA' => '膕',
+  'çB' => '膢',
+  'çC' => '膙',
+  'çD' => '膗',
+  'çE' => '舖',
+  'çF' => 'è‰�',
+  'çG' => '艓',
+  'çH' => '艒',
+  'çI' => 'è‰�',
+  'çJ' => '艎',
+  'çK' => '艑',
+  'çL' => '蔤',
+  'çM' => 'è”»',
+  'çN' => 'è”�',
+  'çO' => '蔀',
+  'çP' => '蔩',
+  'çQ' => '蔎',
+  'çR' => '蔉',
+  'çS' => 'è”�',
+  'çT' => '蔟',
+  'çU' => '蔊',
+  'çV' => '蔧',
+  'çW' => '蔜',
+  'çX' => 'è“»',
+  'çY' => '蔫',
+  'çZ' => '蓺',
+  'ç[' => '蔈',
+  'ç\\' => '蔌',
+  'ç]' => 'è“´',
+  'ç^' => '蔪',
+  'ç_' => '蓲',
+  'ç`' => '蔕',
+  'ça' => 'è“·',
+  'çb' => 'è“«',
+  'çc' => '蓳',
+  'çd' => '蓼',
+  'çe' => 'è”’',
+  'çf' => '蓪',
+  'çg' => 'è“©',
+  'çh' => 'è”–',
+  'çi' => '蓾',
+  'çj' => '蔨',
+  'çk' => 'è”�',
+  'çl' => 'è”®',
+  'çm' => '蔂',
+  'çn' => '蓽',
+  'ço' => '蔞',
+  'çp' => '蓶',
+  'çq' => 'è”±',
+  'çr' => '蔦',
+  'çs' => '蓧',
+  'çt' => '蓨',
+  'çu' => 'è“°',
+  'çv' => '蓯',
+  'çw' => '蓹',
+  'çx' => '蔘',
+  'çy' => 'è” ',
+  'çz' => 'è”°',
+  'ç{' => '蔋',
+  'ç|' => 'è”™',
+  'ç}' => '蔯',
+  'ç~' => '虢',
+  'ç¡' => 'è�–',
+  'ç¢' => 'è�£',
+  'ç£' => 'è�¤',
+  'ç¤' => 'è�·',
+  'ç¥' => '蟡',
+  'ç¦' => 'è�³',
+  'ç§' => 'è�˜',
+  'ç¨' => 'è�”',
+  'ç©' => 'è�›',
+  'çª' => 'è�’',
+  'ç«' => 'è�¡',
+  'ç¬' => 'è�š',
+  'ç­' => 'è�‘',
+  'ç®' => 'è�ž',
+  'ç¯' => 'è�­',
+  'ç°' => 'è�ª',
+  'ç±' => 'è��',
+  'ç²' => 'è�Ž',
+  'ç³' => 'è�Ÿ',
+  'ç´' => 'è��',
+  'çµ' => 'è�¯',
+  'ç¶' => 'è�¬',
+  'ç·' => 'è�º',
+  'ç¸' => 'è�®',
+  'ç¹' => 'è�œ',
+  'çº' => 'è�¥',
+  'ç»' => 'è��',
+  'ç¼' => 'è�»',
+  'ç½' => 'è�µ',
+  'ç¾' => 'è�¢',
+  'ç¿' => 'è�§',
+  'çÀ' => 'è�©',
+  'çÁ' => 'è¡š',
+  'çÂ' => '褅',
+  'çÃ' => '褌',
+  'çÄ' => '褔',
+  'çÅ' => '褋',
+  'çÆ' => '褗',
+  'çÇ' => '褘',
+  'çÈ' => '褙',
+  'çÉ' => '褆',
+  'çÊ' => '褖',
+  'çË' => '褑',
+  'çÌ' => '褎',
+  'çÍ' => '褉',
+  'çÎ' => '覢',
+  'çÏ' => '覤',
+  'çÐ' => '覣',
+  'çÑ' => '觭',
+  'çÒ' => '觰',
+  'çÓ' => '觬',
+  'çÔ' => 'è«�',
+  'çÕ' => '諆',
+  'çÖ' => '誸',
+  'ç×' => 'è«“',
+  'çØ' => 'è«‘',
+  'çÙ' => 'è«”',
+  'çÚ' => 'è«•',
+  'çÛ' => '誻',
+  'çÜ' => 'è«—',
+  'çÝ' => '誾',
+  'çÞ' => 'è«€',
+  'çß' => 'è«…',
+  'çà' => '諘',
+  'çá' => '諃',
+  'çâ' => '誺',
+  'çã' => '誽',
+  'çä' => 'è«™',
+  'çå' => 'è°¾',
+  'çæ' => 'è±�',
+  'çç' => 'è²�',
+  'çè' => 'è³¥',
+  'çé' => '賟',
+  'çê' => 'è³™',
+  'çë' => '賨',
+  'çì' => '賚',
+  'çí' => 'è³�',
+  'çî' => '賧',
+  'çï' => '趠',
+  'çð' => '趜',
+  'çñ' => '趡',
+  'çò' => '趛',
+  'çó' => '踠',
+  'çô' => '踣',
+  'çõ' => '踥',
+  'çö' => '踤',
+  'ç÷' => '踮',
+  'çø' => '踕',
+  'çù' => '踛',
+  'çú' => '踖',
+  'çû' => '踑',
+  'çü' => '踙',
+  'çý' => '踦',
+  'çþ' => '踧',
+  'è@' => '踔',
+  'èA' => '踒',
+  'èB' => '踘',
+  'èC' => '踓',
+  'èD' => '踜',
+  'èE' => '踗',
+  'èF' => '踚',
+  'èG' => '輬',
+  'èH' => '輤',
+  'èI' => '輘',
+  'èJ' => '輚',
+  'èK' => 'è¼ ',
+  'èL' => 'è¼£',
+  'èM' => 'è¼–',
+  'èN' => 'è¼—',
+  'èO' => 'é�³',
+  'èP' => 'é�°',
+  'èQ' => 'é�¯',
+  'èR' => 'é�§',
+  'èS' => 'é�«',
+  'èT' => '鄯',
+  'èU' => 'é„«',
+  'èV' => 'é„©',
+  'èW' => '鄪',
+  'èX' => '鄲',
+  'èY' => '鄦',
+  'èZ' => 'é„®',
+  'è[' => '醅',
+  'è\\' => '醆',
+  'è]' => '醊',
+  'è^' => 'é†�',
+  'è_' => '醂',
+  'è`' => '醄',
+  'èa' => '醀',
+  'èb' => 'é‹�',
+  'èc' => '鋃',
+  'èd' => 'é‹„',
+  'èe' => 'é‹€',
+  'èf' => 'é‹™',
+  'èg' => '銶',
+  'èh' => 'é‹�',
+  'èi' => '鋱',
+  'èj' => 'é‹Ÿ',
+  'èk' => '鋘',
+  'èl' => 'é‹©',
+  'èm' => 'é‹—',
+  'èn' => 'é‹�',
+  'èo' => 'é‹Œ',
+  'èp' => '鋯',
+  'èq' => 'é‹‚',
+  'èr' => '鋨',
+  'ès' => 'é‹Š',
+  'èt' => '鋈',
+  'èu' => 'é‹Ž',
+  'èv' => '鋦',
+  'èw' => 'é‹�',
+  'èx' => 'é‹•',
+  'èy' => '鋉',
+  'èz' => 'é‹ ',
+  'è{' => 'é‹ž',
+  'è|' => '鋧',
+  'è}' => 'é‹‘',
+  'è~' => 'é‹“',
+  'è¡' => '銵',
+  'è¢' => 'é‹¡',
+  'è£' => '鋆',
+  'è¤' => '銴',
+  'è¥' => '镼',
+  'è¦' => 'é–¬',
+  'è§' => 'é–«',
+  'è¨' => 'é–®',
+  'è©' => 'é–°',
+  'èª' => '隤',
+  'è«' => '隢',
+  'è¬' => '雓',
+  'è­' => '霅',
+  'è®' => '霈',
+  'è¯' => '霂',
+  'è°' => 'é�š',
+  'è±' => '鞊',
+  'è²' => '鞎',
+  'è³' => '鞈',
+  'è´' => 'éŸ�',
+  'èµ' => 'éŸ�',
+  'è¶' => 'é ž',
+  'è·' => 'é �',
+  'è¸' => 'é ¦',
+  'è¹' => 'é ©',
+  'èº' => 'é ¨',
+  'è»' => 'é  ',
+  'è¼' => 'é ›',
+  'è½' => 'é §',
+  'è¾' => '颲',
+  'è¿' => '餈',
+  'èÀ' => '飺',
+  'èÁ' => '餑',
+  'èÂ' => '餔',
+  'èÃ' => '餖',
+  'èÄ' => '餗',
+  'èÅ' => '餕',
+  'èÆ' => '駜',
+  'èÇ' => 'é§�',
+  'èÈ' => 'é§�',
+  'èÉ' => '駓',
+  'èÊ' => '駔',
+  'èË' => '駎',
+  'èÌ' => '駉',
+  'èÍ' => '駖',
+  'èÎ' => '駘',
+  'èÏ' => '駋',
+  'èÐ' => '駗',
+  'èÑ' => '駌',
+  'èÒ' => '骳',
+  'èÓ' => '髬',
+  'èÔ' => 'é««',
+  'èÕ' => '髳',
+  'èÖ' => '髲',
+  'è×' => '髱',
+  'èØ' => 'é­†',
+  'èÙ' => 'é­ƒ',
+  'èÚ' => 'é­§',
+  'èÛ' => 'é­´',
+  'èÜ' => 'é­±',
+  'èÝ' => 'é­¦',
+  'èÞ' => 'é­¶',
+  'èß' => 'é­µ',
+  'èà' => 'é­°',
+  'èá' => 'é­¨',
+  'èâ' => 'é­¤',
+  'èã' => 'é­¬',
+  'èä' => 'é³¼',
+  'èå' => '鳺',
+  'èæ' => 'é³½',
+  'èç' => '鳿',
+  'èè' => 'é³·',
+  'èé' => 'é´‡',
+  'èê' => 'é´€',
+  'èë' => 'é³¹',
+  'èì' => 'é³»',
+  'èí' => 'é´ˆ',
+  'èî' => 'é´…',
+  'èï' => 'é´„',
+  'èð' => '麃',
+  'èñ' => '黓',
+  'èò' => 'é¼�',
+  'èó' => 'é¼�',
+  'èô' => 'å„œ',
+  'èõ' => 'å„“',
+  'èö' => 'å„—',
+  'è÷' => 'å„š',
+  'èø' => 'å„‘',
+  'èù' => '凞',
+  'èú' => '匴',
+  'èû' => 'å�¡',
+  'èü' => 'å™°',
+  'èý' => 'å™ ',
+  'èþ' => 'å™®',
+  'é@' => '噳',
+  'éA' => '噦',
+  'éB' => '噣',
+  'éC' => 'å™­',
+  'éD' => '噲',
+  'éE' => '噞',
+  'éF' => 'å™·',
+  'éG' => '圜',
+  'éH' => '圛',
+  'éI' => '壈',
+  'éJ' => '墽',
+  'éK' => '壉',
+  'éL' => '墿',
+  'éM' => '墺',
+  'éN' => '壂',
+  'éO' => '墼',
+  'éP' => '壆',
+  'éQ' => '嬗',
+  'éR' => '嬙',
+  'éS' => '嬛',
+  'éT' => '嬡',
+  'éU' => '嬔',
+  'éV' => '嬓',
+  'éW' => 'å¬�',
+  'éX' => '嬖',
+  'éY' => '嬨',
+  'éZ' => '嬚',
+  'é[' => '嬠',
+  'é\\' => '嬞',
+  'é]' => '寯',
+  'é^' => '嶬',
+  'é_' => '嶱',
+  'é`' => '嶩',
+  'éa' => '嶧',
+  'éb' => '嶵',
+  'éc' => '嶰',
+  'éd' => '嶮',
+  'ée' => '嶪',
+  'éf' => '嶨',
+  'ég' => '嶲',
+  'éh' => '嶭',
+  'éi' => '嶯',
+  'éj' => '嶴',
+  'ék' => '幧',
+  'él' => '幨',
+  'ém' => '幦',
+  'én' => '幯',
+  'éo' => '廩',
+  'ép' => '廧',
+  'éq' => '廦',
+  'ér' => '廨',
+  'és' => '廥',
+  'ét' => '彋',
+  'éu' => 'å¾¼',
+  'év' => 'æ†�',
+  'éw' => '憨',
+  'éx' => '憖',
+  'éy' => '懅',
+  'éz' => '憴',
+  'é{' => '懆',
+  'é|' => 'æ‡�',
+  'é}' => '懌',
+  'é~' => '憺',
+  'é¡' => '憿',
+  'é¢' => '憸',
+  'é£' => '憌',
+  'é¤' => 'æ“—',
+  'é¥' => 'æ“–',
+  'é¦' => 'æ“�',
+  'é§' => 'æ“�',
+  'é¨' => '擉',
+  'é©' => 'æ’½',
+  'éª' => 'æ’‰',
+  'é«' => '擃',
+  'é¬' => 'æ“›',
+  'é­' => '擳',
+  'é®' => 'æ“™',
+  'é¯' => '攳',
+  'é°' => 'æ•¿',
+  'é±' => '敼',
+  'é²' => 'æ–¢',
+  'é³' => '曈',
+  'é´' => 'æš¾',
+  'éµ' => '曀',
+  'é¶' => '曊',
+  'é·' => '曋',
+  'é¸' => 'æ›�',
+  'é¹' => 'æš½',
+  'éº' => 'æš»',
+  'é»' => '暺',
+  'é¼' => '曌',
+  'é½' => '朣',
+  'é¾' => '樴',
+  'é¿' => '橦',
+  'éÀ' => '橉',
+  'éÁ' => '橧',
+  'éÂ' => '樲',
+  'éÃ' => '橨',
+  'éÄ' => '樾',
+  'éÅ' => 'æ©�',
+  'éÆ' => 'æ©­',
+  'éÇ' => '橶',
+  'éÈ' => 'æ©›',
+  'éÉ' => 'æ©‘',
+  'éÊ' => '樨',
+  'éË' => 'æ©š',
+  'éÌ' => '樻',
+  'éÍ' => '樿',
+  'éÎ' => 'æ©�',
+  'éÏ' => '橪',
+  'éÐ' => '橤',
+  'éÑ' => 'æ©�',
+  'éÒ' => 'æ©�',
+  'éÓ' => 'æ©”',
+  'éÔ' => '橯',
+  'éÕ' => 'æ©©',
+  'éÖ' => 'æ© ',
+  'é×' => '樼',
+  'éØ' => 'æ©ž',
+  'éÙ' => 'æ©–',
+  'éÚ' => 'æ©•',
+  'éÛ' => 'æ©�',
+  'éÜ' => 'æ©Ž',
+  'éÝ' => '橆',
+  'éÞ' => 'æ­•',
+  'éß' => 'æ­”',
+  'éà' => 'æ­–',
+  'éá' => '殧',
+  'éâ' => '殪',
+  'éã' => '殫',
+  'éä' => '毈',
+  'éå' => '毇',
+  'éæ' => 'æ°„',
+  'éç' => 'æ°ƒ',
+  'éè' => 'æ°†',
+  'éé' => 'æ¾­',
+  'éê' => 'æ¿‹',
+  'éë' => 'æ¾£',
+  'éì' => '濇',
+  'éí' => 'æ¾¼',
+  'éî' => 'æ¿Ž',
+  'éï' => '濈',
+  'éð' => '潞',
+  'éñ' => 'æ¿„',
+  'éò' => 'æ¾½',
+  'éó' => '澞',
+  'éô' => 'æ¿Š',
+  'éõ' => '澨',
+  'éö' => '瀄',
+  'é÷' => 'æ¾¥',
+  'éø' => 'æ¾®',
+  'éù' => '澺',
+  'éú' => '澬',
+  'éû' => '澪',
+  'éü' => 'æ¿�',
+  'éý' => '澿',
+  'éþ' => '澸',
+  'ê@' => 'æ¾¢',
+  'êA' => '濉',
+  'êB' => '澫',
+  'êC' => 'æ¿�',
+  'êD' => '澯',
+  'êE' => 'æ¾²',
+  'êF' => 'æ¾°',
+  'êG' => '燅',
+  'êH' => '燂',
+  'êI' => '熿',
+  'êJ' => '熸',
+  'êK' => '燖',
+  'êL' => '燀',
+  'êM' => 'ç‡�',
+  'êN' => '燋',
+  'êO' => '燔',
+  'êP' => '燊',
+  'êQ' => '燇',
+  'êR' => 'ç‡�',
+  'êS' => '熽',
+  'êT' => '燘',
+  'êU' => '熼',
+  'êV' => '燆',
+  'êW' => '燚',
+  'êX' => '燛',
+  'êY' => 'çŠ�',
+  'êZ' => '犞',
+  'ê[' => 'ç�©',
+  'ê\\' => 'ç�¦',
+  'ê]' => 'ç�§',
+  'ê^' => 'ç�¬',
+  'ê_' => 'ç�¥',
+  'ê`' => 'ç�«',
+  'êa' => 'ç�ª',
+  'êb' => 'ç‘¿',
+  'êc' => 'ç’š',
+  'êd' => 'ç’ ',
+  'êe' => 'ç’”',
+  'êf' => 'ç’’',
+  'êg' => 'ç’•',
+  'êh' => 'ç’¡',
+  'êi' => '甋',
+  'êj' => 'ç–€',
+  'êk' => '瘯',
+  'êl' => '瘭',
+  'êm' => '瘱',
+  'ên' => '瘽',
+  'êo' => '瘳',
+  'êp' => '瘼',
+  'êq' => '瘵',
+  'êr' => '瘲',
+  'ês' => '瘰',
+  'êt' => 'çš»',
+  'êu' => '盦',
+  'êv' => 'çžš',
+  'êw' => 'çž�',
+  'êx' => 'çž¡',
+  'êy' => 'çžœ',
+  'êz' => 'çž›',
+  'ê{' => '瞢',
+  'ê|' => '瞣',
+  'ê}' => 'çž•',
+  'ê~' => 'çž™',
+  'ê¡' => 'çž—',
+  'ê¢' => 'ç£�',
+  'ê£' => '磩',
+  'ê¤' => '磥',
+  'ê¥' => '磪',
+  'ê¦' => '磞',
+  'ê§' => '磣',
+  'ê¨' => '磛',
+  'ê©' => '磡',
+  'êª' => '磢',
+  'ê«' => '磭',
+  'ê¬' => '磟',
+  'ê­' => '磠',
+  'ê®' => '禤',
+  'ê¯' => 'ç©„',
+  'ê°' => '穈',
+  'ê±' => '穇',
+  'ê²' => '窶',
+  'ê³' => '窸',
+  'ê´' => '窵',
+  'êµ' => '窱',
+  'ê¶' => '窷',
+  'ê·' => '篞',
+  'ê¸' => '篣',
+  'ê¹' => '篧',
+  'êº' => 'ç¯�',
+  'ê»' => '篕',
+  'ê¼' => '篥',
+  'ê½' => '篚',
+  'ê¾' => '篨',
+  'ê¿' => '篹',
+  'êÀ' => '篔',
+  'êÁ' => '篪',
+  'êÂ' => '篢',
+  'êÃ' => '篜',
+  'êÄ' => '篫',
+  'êÅ' => '篘',
+  'êÆ' => '篟',
+  'êÇ' => 'ç³’',
+  'êÈ' => 'ç³”',
+  'êÉ' => 'ç³—',
+  'êÊ' => 'ç³�',
+  'êË' => '糑',
+  'êÌ' => '縒',
+  'êÍ' => '縡',
+  'êÎ' => '縗',
+  'êÏ' => '縌',
+  'êÐ' => '縟',
+  'êÑ' => '縠',
+  'êÒ' => '縓',
+  'êÓ' => '縎',
+  'êÔ' => '縜',
+  'êÕ' => '縕',
+  'êÖ' => '縚',
+  'ê×' => '縢',
+  'êØ' => '縋',
+  'êÙ' => 'ç¸�',
+  'êÚ' => '縖',
+  'êÛ' => 'ç¸�',
+  'êÜ' => '縔',
+  'êÝ' => '縥',
+  'êÞ' => '縤',
+  'êß' => '罃',
+  'êà' => 'ç½»',
+  'êá' => 'ç½¼',
+  'êâ' => '罺',
+  'êã' => 'ç¾±',
+  'êä' => '翯',
+  'êå' => '耪',
+  'êæ' => '耩',
+  'êç' => 'è�¬',
+  'êè' => '膱',
+  'êé' => '膦',
+  'êê' => '膮',
+  'êë' => '膹',
+  'êì' => '膵',
+  'êí' => '膫',
+  'êî' => '膰',
+  'êï' => '膬',
+  'êð' => '膴',
+  'êñ' => '膲',
+  'êò' => '膷',
+  'êó' => '膧',
+  'êô' => '臲',
+  'êõ' => '艕',
+  'êö' => '艖',
+  'ê÷' => '艗',
+  'êø' => 'è•–',
+  'êù' => 'è•…',
+  'êú' => 'è•«',
+  'êû' => 'è•�',
+  'êü' => 'è•“',
+  'êý' => 'è•¡',
+  'êþ' => '蕘',
+  'ë@' => 'è•€',
+  'ëA' => '蕆',
+  'ëB' => '蕤',
+  'ëC' => 'è•�',
+  'ëD' => 'è•¢',
+  'ëE' => 'è•„',
+  'ëF' => 'è•‘',
+  'ëG' => '蕇',
+  'ëH' => 'è•£',
+  'ëI' => '蔾',
+  'ëJ' => 'è•›',
+  'ëK' => '蕱',
+  'ëL' => 'è•Ž',
+  'ëM' => 'è•®',
+  'ëN' => '蕵',
+  'ëO' => 'è••',
+  'ëP' => '蕧',
+  'ëQ' => 'è• ',
+  'ëR' => 'è–Œ',
+  'ëS' => '蕦',
+  'ëT' => 'è•�',
+  'ëU' => 'è•”',
+  'ëV' => 'è•¥',
+  'ëW' => '蕬',
+  'ëX' => '虣',
+  'ëY' => '虥',
+  'ëZ' => '虤',
+  'ë[' => 'èž›',
+  'ë\\' => 'èž�',
+  'ë]' => 'èž—',
+  'ë^' => 'èž“',
+  'ë_' => 'èž’',
+  'ë`' => '螈',
+  'ëa' => 'èž�',
+  'ëb' => 'èž–',
+  'ëc' => '螘',
+  'ëd' => 'è�¹',
+  'ëe' => '螇',
+  'ëf' => '螣',
+  'ëg' => 'èž…',
+  'ëh' => 'èž�',
+  'ëi' => 'èž‘',
+  'ëj' => 'èž�',
+  'ëk' => 'èž„',
+  'ël' => 'èž”',
+  'ëm' => 'èžœ',
+  'ën' => 'èžš',
+  'ëo' => '螉',
+  'ëp' => '褞',
+  'ëq' => '褦',
+  'ër' => '褰',
+  'ës' => '褭',
+  'ët' => '褮',
+  'ëu' => '褧',
+  'ëv' => '褱',
+  'ëw' => '褢',
+  'ëx' => '褩',
+  'ëy' => '褣',
+  'ëz' => '褯',
+  'ë{' => '褬',
+  'ë|' => '褟',
+  'ë}' => '觱',
+  'ë~' => 'è« ',
+  'ë¡' => 'è«¢',
+  'ë¢' => '諲',
+  'ë£' => 'è«´',
+  'ë¤' => '諵',
+  'ë¥' => 'è«�',
+  'ë¦' => '謔',
+  'ë§' => '諤',
+  'ë¨' => 'è«Ÿ',
+  'ë©' => 'è«°',
+  'ëª' => '諈',
+  'ë«' => 'è«ž',
+  'ë¬' => 'è«¡',
+  'ë­' => '諨',
+  'ë®' => 'è«¿',
+  'ë¯' => '諯',
+  'ë°' => 'è«»',
+  'ë±' => '貑',
+  'ë²' => 'è²’',
+  'ë³' => 'è²�',
+  'ë´' => 'è³µ',
+  'ëµ' => 'è³®',
+  'ë¶' => 'è³±',
+  'ë·' => 'è³°',
+  'ë¸' => 'è³³',
+  'ë¹' => '赬',
+  'ëº' => 'èµ®',
+  'ë»' => '趥',
+  'ë¼' => '趧',
+  'ë½' => '踳',
+  'ë¾' => '踾',
+  'ë¿' => '踸',
+  'ëÀ' => 'è¹€',
+  'ëÁ' => 'è¹…',
+  'ëÂ' => '踶',
+  'ëÃ' => '踼',
+  'ëÄ' => '踽',
+  'ëÅ' => 'è¹�',
+  'ëÆ' => '踰',
+  'ëÇ' => '踿',
+  'ëÈ' => '躽',
+  'ëÉ' => '輶',
+  'ëÊ' => 'è¼®',
+  'ëË' => 'è¼µ',
+  'ëÌ' => 'è¼²',
+  'ëÍ' => 'è¼¹',
+  'ëÎ' => 'è¼·',
+  'ëÏ' => 'è¼´',
+  'ëÐ' => 'é�¶',
+  'ëÑ' => 'é�¹',
+  'ëÒ' => 'é�»',
+  'ëÓ' => '邆',
+  'ëÔ' => '郺',
+  'ëÕ' => '鄳',
+  'ëÖ' => '鄵',
+  'ë×' => '鄶',
+  'ëØ' => '醓',
+  'ëÙ' => 'é†�',
+  'ëÚ' => '醑',
+  'ëÛ' => 'é†�',
+  'ëÜ' => 'é†�',
+  'ëÝ' => '錧',
+  'ëÞ' => '錞',
+  'ëß' => '錈',
+  'ëà' => '錟',
+  'ëá' => '錆',
+  'ëâ' => 'éŒ�',
+  'ëã' => 'é�º',
+  'ëä' => '錸',
+  'ëå' => '錼',
+  'ëæ' => '錛',
+  'ëç' => '錣',
+  'ëè' => '錒',
+  'ëé' => 'éŒ�',
+  'ëê' => 'é�†',
+  'ëë' => '錭',
+  'ëì' => '錎',
+  'ëí' => 'éŒ�',
+  'ëî' => 'é‹‹',
+  'ëï' => 'éŒ�',
+  'ëð' => '鋺',
+  'ëñ' => '錥',
+  'ëò' => '錓',
+  'ëó' => '鋹',
+  'ëô' => 'é‹·',
+  'ëõ' => '錴',
+  'ëö' => '錂',
+  'ë÷' => '錤',
+  'ëø' => 'é‹¿',
+  'ëù' => '錩',
+  'ëú' => '錹',
+  'ëû' => '錵',
+  'ëü' => '錪',
+  'ëý' => '錔',
+  'ëþ' => '錌',
+  'ì@' => '錋',
+  'ìA' => '鋾',
+  'ìB' => '錉',
+  'ìC' => '錀',
+  'ìD' => 'é‹»',
+  'ìE' => '錖',
+  'ìF' => 'é–¼',
+  'ìG' => 'é—�',
+  'ìH' => 'é–¾',
+  'ìI' => 'é–¹',
+  'ìJ' => 'é–º',
+  'ìK' => 'é–¶',
+  'ìL' => 'é–¿',
+  'ìM' => 'é–µ',
+  'ìN' => 'é–½',
+  'ìO' => 'éš©',
+  'ìP' => 'é›”',
+  'ìQ' => '霋',
+  'ìR' => '霒',
+  'ìS' => 'éœ�',
+  'ìT' => 'éž™',
+  'ìU' => 'éž—',
+  'ìV' => 'éž”',
+  'ìW' => '韰',
+  'ìX' => '韸',
+  'ìY' => 'é µ',
+  'ìZ' => 'é ¯',
+  'ì[' => 'é ²',
+  'ì\\' => '餤',
+  'ì]' => '餟',
+  'ì^' => '餧',
+  'ì_' => '餩',
+  'ì`' => '馞',
+  'ìa' => '駮',
+  'ìb' => '駬',
+  'ìc' => '駥',
+  'ìd' => '駤',
+  'ìe' => '駰',
+  'ìf' => '駣',
+  'ìg' => '駪',
+  'ìh' => '駩',
+  'ìi' => '駧',
+  'ìj' => '骹',
+  'ìk' => '骿',
+  'ìl' => '骴',
+  'ìm' => '骻',
+  'ìn' => '髶',
+  'ìo' => '髺',
+  'ìp' => '髹',
+  'ìq' => 'é«·',
+  'ìr' => '鬳',
+  'ìs' => '鮀',
+  'ìt' => 'é®…',
+  'ìu' => '鮇',
+  'ìv' => 'é­¼',
+  'ìw' => 'é­¾',
+  'ìx' => 'é­»',
+  'ìy' => '鮂',
+  'ìz' => '鮓',
+  'ì{' => 'é®’',
+  'ì|' => 'é®�',
+  'ì}' => 'é­º',
+  'ì~' => '鮕',
+  'ì¡' => 'é­½',
+  'ì¢' => '鮈',
+  'ì£' => 'é´¥',
+  'ì¤' => 'é´—',
+  'ì¥' => 'é´ ',
+  'ì¦' => 'é´ž',
+  'ì§' => 'é´”',
+  'ì¨' => 'é´©',
+  'ì©' => 'é´�',
+  'ìª' => 'é´˜',
+  'ì«' => 'é´¢',
+  'ì¬' => 'é´�',
+  'ì­' => 'é´™',
+  'ì®' => 'é´Ÿ',
+  'ì¯' => '麈',
+  'ì°' => '麆',
+  'ì±' => '麇',
+  'ì²' => '麮',
+  'ì³' => '麭',
+  'ì´' => '黕',
+  'ìµ' => 'é»–',
+  'ì¶' => '黺',
+  'ì·' => 'é¼’',
+  'ì¸' => 'é¼½',
+  'ì¹' => '儦',
+  'ìº' => 'å„¥',
+  'ì»' => 'å„¢',
+  'ì¼' => '儤',
+  'ì½' => 'å„ ',
+  'ì¾' => 'å„©',
+  'ì¿' => 'å‹´',
+  'ìÀ' => 'åš“',
+  'ìÁ' => '嚌',
+  'ìÂ' => 'åš�',
+  'ìÃ' => '嚆',
+  'ìÄ' => 'åš„',
+  'ìÅ' => '嚃',
+  'ìÆ' => '噾',
+  'ìÇ' => 'åš‚',
+  'ìÈ' => '噿',
+  'ìÉ' => 'åš�',
+  'ìÊ' => '壖',
+  'ìË' => '壔',
+  'ìÌ' => 'å£�',
+  'ìÍ' => '壒',
+  'ìÎ' => '嬭',
+  'ìÏ' => '嬥',
+  'ìÐ' => '嬲',
+  'ìÑ' => '嬣',
+  'ìÒ' => '嬬',
+  'ìÓ' => '嬧',
+  'ìÔ' => '嬦',
+  'ìÕ' => '嬯',
+  'ìÖ' => '嬮',
+  'ì×' => 'å­»',
+  'ìØ' => '寱',
+  'ìÙ' => '寲',
+  'ìÚ' => '嶷',
+  'ìÛ' => '幬',
+  'ìÜ' => '幪',
+  'ìÝ' => 'å¾¾',
+  'ìÞ' => 'å¾»',
+  'ìß' => '懃',
+  'ìà' => '憵',
+  'ìá' => '憼',
+  'ìâ' => '懧',
+  'ìã' => '懠',
+  'ìä' => '懥',
+  'ìå' => '懤',
+  'ìæ' => '懨',
+  'ìç' => '懞',
+  'ìè' => '擯',
+  'ìé' => 'æ“©',
+  'ìê' => 'æ“£',
+  'ìë' => 'æ“«',
+  'ìì' => '擤',
+  'ìí' => '擨',
+  'ìî' => 'æ–�',
+  'ìï' => 'æ–€',
+  'ìð' => 'æ–¶',
+  'ìñ' => 'æ—š',
+  'ìò' => 'æ›’',
+  'ìó' => 'æª�',
+  'ìô' => '檖',
+  'ìõ' => 'æª�',
+  'ìö' => '檥',
+  'ì÷' => '檉',
+  'ìø' => '檟',
+  'ìù' => '檛',
+  'ìú' => '檡',
+  'ìû' => '檞',
+  'ìü' => '檇',
+  'ìý' => '檓',
+  'ìþ' => '檎',
+  'í@' => '檕',
+  'íA' => '檃',
+  'íB' => '檨',
+  'íC' => '檤',
+  'íD' => '檑',
+  'íE' => 'æ©¿',
+  'íF' => '檦',
+  'íG' => '檚',
+  'íH' => '檅',
+  'íI' => '檌',
+  'íJ' => '檒',
+  'íK' => 'æ­›',
+  'íL' => 'æ®­',
+  'íM' => 'æ°‰',
+  'íN' => 'æ¿Œ',
+  'íO' => '澩',
+  'íP' => 'æ¿´',
+  'íQ' => 'æ¿”',
+  'íR' => 'æ¿£',
+  'íS' => 'æ¿œ',
+  'íT' => 'æ¿­',
+  'íU' => '濧',
+  'íV' => '濦',
+  'íW' => 'æ¿ž',
+  'íX' => '濲',
+  'íY' => 'æ¿�',
+  'íZ' => 'æ¿¢',
+  'í[' => '濨',
+  'í\\' => '燡',
+  'í]' => '燱',
+  'í^' => '燨',
+  'í_' => '燲',
+  'í`' => '燤',
+  'ía' => '燰',
+  'íb' => '燢',
+  'íc' => 'ç�³',
+  'íd' => 'ç�®',
+  'íe' => 'ç�¯',
+  'íf' => 'ç’—',
+  'íg' => 'ç’²',
+  'íh' => 'ç’«',
+  'íi' => 'ç’�',
+  'íj' => 'ç’ª',
+  'ík' => 'ç’­',
+  'íl' => 'ç’±',
+  'ím' => 'ç’¥',
+  'ín' => 'ç’¯',
+  'ío' => 'ç”�',
+  'íp' => '甑',
+  'íq' => 'ç”’',
+  'ír' => 'ç”�',
+  'ís' => 'ç–„',
+  'ít' => '癃',
+  'íu' => '癈',
+  'ív' => '癉',
+  'íw' => '癇',
+  'íx' => '皤',
+  'íy' => '盩',
+  'íz' => 'çžµ',
+  'í{' => 'çž«',
+  'í|' => 'çž²',
+  'í}' => 'çž·',
+  'í~' => '瞶',
+  'í¡' => 'çž´',
+  'í¢' => 'çž±',
+  'í£' => '瞨',
+  'í¤' => '矰',
+  'í¥' => '磳',
+  'í¦' => '磽',
+  'í§' => '礂',
+  'í¨' => '磻',
+  'í©' => '磼',
+  'íª' => '磲',
+  'í«' => '礅',
+  'í¬' => '磹',
+  'í­' => '磾',
+  'í®' => '礄',
+  'í¯' => '禫',
+  'í°' => '禨',
+  'í±' => 'ç©œ',
+  'í²' => 'ç©›',
+  'í³' => 'ç©–',
+  'í´' => '穘',
+  'íµ' => 'ç©”',
+  'í¶' => 'ç©š',
+  'í·' => '窾',
+  'í¸' => 'ç«€',
+  'í¹' => 'ç«�',
+  'íº' => 'ç°…',
+  'í»' => 'ç°�',
+  'í¼' => '篲',
+  'í½' => 'ç°€',
+  'í¾' => '篿',
+  'í¿' => '篻',
+  'íÀ' => 'ç°Ž',
+  'íÁ' => '篴',
+  'íÂ' => 'ç°‹',
+  'íÃ' => '篳',
+  'íÄ' => 'ç°‚',
+  'íÅ' => 'ç°‰',
+  'íÆ' => 'ç°ƒ',
+  'íÇ' => 'ç°�',
+  'íÈ' => '篸',
+  'íÉ' => '篽',
+  'íÊ' => 'ç°†',
+  'íË' => '篰',
+  'íÌ' => '篱',
+  'íÍ' => 'ç°�',
+  'íÎ' => 'ç°Š',
+  'íÏ' => '糨',
+  'íÐ' => '縭',
+  'íÑ' => '縼',
+  'íÒ' => '繂',
+  'íÓ' => '縳',
+  'íÔ' => '顈',
+  'íÕ' => '縸',
+  'íÖ' => '縪',
+  'í×' => '繉',
+  'íØ' => 'ç¹€',
+  'íÙ' => '繇',
+  'íÚ' => '縩',
+  'íÛ' => '繌',
+  'íÜ' => '縰',
+  'íÝ' => '縻',
+  'íÞ' => '縶',
+  'íß' => '繄',
+  'íà' => '縺',
+  'íá' => 'ç½…',
+  'íâ' => '罿',
+  'íã' => 'ç½¾',
+  'íä' => 'ç½½',
+  'íå' => 'ç¿´',
+  'íæ' => '翲',
+  'íç' => '耬',
+  'íè' => '膻',
+  'íé' => '臄',
+  'íê' => '臌',
+  'íë' => '臊',
+  'íì' => '臅',
+  'íí' => '臇',
+  'íî' => '膼',
+  'íï' => '臩',
+  'íð' => '艛',
+  'íñ' => '艚',
+  'íò' => '艜',
+  'íó' => 'è–ƒ',
+  'íô' => 'è–€',
+  'íõ' => 'è–�',
+  'íö' => 'è–§',
+  'í÷' => 'è–•',
+  'íø' => 'è– ',
+  'íù' => 'è–‹',
+  'íú' => 'è–£',
+  'íû' => 'è•»',
+  'íü' => 'è–¤',
+  'íý' => 'è–š',
+  'íþ' => 'è–ž',
+  'î@' => 'è•·',
+  'îA' => '蕼',
+  'îB' => 'è–‰',
+  'îC' => 'è–¡',
+  'îD' => '蕺',
+  'îE' => '蕸',
+  'îF' => 'è•—',
+  'îG' => 'è–Ž',
+  'îH' => 'è––',
+  'îI' => 'è–†',
+  'îJ' => 'è–�',
+  'îK' => 'è–™',
+  'îL' => 'è–�',
+  'îM' => 'è–�',
+  'îN' => 'è–¢',
+  'îO' => 'è–‚',
+  'îP' => 'è–ˆ',
+  'îQ' => 'è–…',
+  'îR' => '蕹',
+  'îS' => '蕶',
+  'îT' => 'è–˜',
+  'îU' => 'è–�',
+  'îV' => 'è–Ÿ',
+  'îW' => '虨',
+  'îX' => 'èž¾',
+  'îY' => '螪',
+  'îZ' => 'èž­',
+  'î[' => '蟅',
+  'î\\' => 'èž°',
+  'î]' => '螬',
+  'î^' => 'èž¹',
+  'î_' => 'èžµ',
+  'î`' => 'èž¼',
+  'îa' => 'èž®',
+  'îb' => '蟉',
+  'îc' => '蟃',
+  'îd' => '蟂',
+  'îe' => '蟌',
+  'îf' => 'èž·',
+  'îg' => '螯',
+  'îh' => '蟄',
+  'îi' => '蟊',
+  'îj' => 'èž´',
+  'îk' => '螶',
+  'îl' => 'èž¿',
+  'îm' => '螸',
+  'în' => 'èž½',
+  'îo' => '蟞',
+  'îp' => 'èž²',
+  'îq' => '褵',
+  'îr' => '褳',
+  'îs' => '褼',
+  'ît' => '褾',
+  'îu' => 'è¥�',
+  'îv' => '襒',
+  'îw' => '褷',
+  'îx' => '襂',
+  'îy' => '覭',
+  'îz' => '覯',
+  'î{' => '覮',
+  'î|' => '觲',
+  'î}' => '觳',
+  'î~' => '謞',
+  'î¡' => '謘',
+  'î¢' => '謖',
+  'î£' => '謑',
+  'î¤' => '謅',
+  'î¥' => '謋',
+  'î¦' => '謢',
+  'î§' => 'è¬�',
+  'î¨' => '謒',
+  'î©' => '謕',
+  'îª' => '謇',
+  'î«' => 'è¬�',
+  'î¬' => '謈',
+  'î­' => '謆',
+  'î®' => '謜',
+  'î¯' => '謓',
+  'î°' => '謚',
+  'î±' => 'è±�',
+  'î²' => 'è±°',
+  'î³' => 'è±²',
+  'î´' => 'è±±',
+  'îµ' => '豯',
+  'î¶' => '貕',
+  'î·' => 'è²”',
+  'î¸' => 'è³¹',
+  'î¹' => '赯',
+  'îº' => '蹎',
+  'î»' => 'è¹�',
+  'î¼' => '蹓',
+  'î½' => 'è¹�',
+  'î¾' => '蹌',
+  'î¿' => '蹇',
+  'îÀ' => '轃',
+  'îÁ' => 'è½€',
+  'îÂ' => 'é‚…',
+  'îÃ' => 'é�¾',
+  'îÄ' => '鄸',
+  'îÅ' => '醚',
+  'îÆ' => '醢',
+  'îÇ' => '醛',
+  'îÈ' => '醙',
+  'îÉ' => '醟',
+  'îÊ' => '醡',
+  'îË' => 'é†�',
+  'îÌ' => '醠',
+  'îÍ' => '鎡',
+  'îÎ' => '鎃',
+  'îÏ' => '鎯',
+  'îÐ' => 'é�¤',
+  'îÑ' => 'é�–',
+  'îÒ' => 'é�‡',
+  'îÓ' => 'é�¼',
+  'îÔ' => 'é�˜',
+  'îÕ' => 'é�œ',
+  'îÖ' => 'é�¶',
+  'î×' => 'é�‰',
+  'îØ' => 'é��',
+  'îÙ' => 'é�‘',
+  'îÚ' => 'é� ',
+  'îÛ' => 'é�­',
+  'îÜ' => 'éŽ�',
+  'îÝ' => 'é�Œ',
+  'îÞ' => 'é�ª',
+  'îß' => 'é�¹',
+  'îà' => 'é�—',
+  'îá' => 'é�•',
+  'îâ' => 'é�’',
+  'îã' => 'é��',
+  'îä' => 'é�±',
+  'îå' => 'é�·',
+  'îæ' => 'é�»',
+  'îç' => 'é�¡',
+  'îè' => 'é�ž',
+  'îé' => 'é�£',
+  'îê' => 'é�§',
+  'îë' => '鎀',
+  'îì' => 'é�Ž',
+  'îí' => 'é�™',
+  'îî' => 'é—‡',
+  'îï' => 'é—€',
+  'îð' => 'é—‰',
+  'îñ' => 'é—ƒ',
+  'îò' => 'é—…',
+  'îó' => 'é–·',
+  'îô' => 'éš®',
+  'îõ' => 'éš°',
+  'îö' => '隬',
+  'î÷' => '霠',
+  'îø' => '霟',
+  'îù' => '霘',
+  'îú' => 'éœ�',
+  'îû' => '霙',
+  'îü' => 'éžš',
+  'îý' => 'éž¡',
+  'îþ' => 'éžœ',
+  'ï@' => 'éžž',
+  'ïA' => 'éž�',
+  'ïB' => '韕',
+  'ïC' => '韔',
+  'ïD' => '韱',
+  'ïE' => 'é¡�',
+  'ïF' => 'é¡„',
+  'ïG' => 'é¡Š',
+  'ïH' => '顉',
+  'ïI' => 'é¡…',
+  'ïJ' => '顃',
+  'ïK' => '餥',
+  'ïL' => '餫',
+  'ïM' => '餬',
+  'ïN' => '餪',
+  'ïO' => '餳',
+  'ïP' => '餲',
+  'ïQ' => '餯',
+  'ïR' => '餭',
+  'ïS' => '餱',
+  'ïT' => '餰',
+  'ïU' => '馘',
+  'ïV' => '馣',
+  'ïW' => '馡',
+  'ïX' => '騂',
+  'ïY' => '駺',
+  'ïZ' => '駴',
+  'ï[' => '駷',
+  'ï\\' => '駹',
+  'ï]' => '駸',
+  'ï^' => '駶',
+  'ï_' => '駻',
+  'ï`' => '駽',
+  'ïa' => '駾',
+  'ïb' => '駼',
+  'ïc' => '騃',
+  'ïd' => '骾',
+  'ïe' => '髾',
+  'ïf' => '髽',
+  'ïg' => 'é¬�',
+  'ïh' => '髼',
+  'ïi' => 'é­ˆ',
+  'ïj' => '鮚',
+  'ïk' => '鮨',
+  'ïl' => '鮞',
+  'ïm' => 'é®›',
+  'ïn' => '鮦',
+  'ïo' => '鮡',
+  'ïp' => '鮥',
+  'ïq' => '鮤',
+  'ïr' => '鮆',
+  'ïs' => '鮢',
+  'ït' => 'é® ',
+  'ïu' => '鮯',
+  'ïv' => 'é´³',
+  'ïw' => 'éµ�',
+  'ïx' => '鵧',
+  'ïy' => 'é´¶',
+  'ïz' => 'é´®',
+  'ï{' => 'é´¯',
+  'ï|' => 'é´±',
+  'ï}' => 'é´¸',
+  'ï~' => 'é´°',
+  'ï¡' => 'éµ…',
+  'ï¢' => '鵂',
+  'ï£' => '鵃',
+  'ï¤' => 'é´¾',
+  'ï¥' => 'é´·',
+  'ï¦' => 'éµ€',
+  'ï§' => 'é´½',
+  'ï¨' => '翵',
+  'ï©' => 'é´­',
+  'ïª' => '麊',
+  'ï«' => '麉',
+  'ï¬' => 'éº�',
+  'ï­' => '麰',
+  'ï®' => '黈',
+  'ï¯' => '黚',
+  'ï°' => 'é»»',
+  'ï±' => '黿',
+  'ï²' => '鼤',
+  'ï³' => 'é¼£',
+  'ï´' => 'é¼¢',
+  'ïµ' => 'é½”',
+  'ï¶' => 'é¾ ',
+  'ï·' => '儱',
+  'ï¸' => 'å„­',
+  'ï¹' => 'å„®',
+  'ïº' => '嚘',
+  'ï»' => 'åšœ',
+  'ï¼' => 'åš—',
+  'ï½' => 'åšš',
+  'ï¾' => 'åš�',
+  'ï¿' => 'åš™',
+  'ïÀ' => '奰',
+  'ïÁ' => '嬼',
+  'ïÂ' => '屩',
+  'ïÃ' => '屪',
+  'ïÄ' => 'å·€',
+  'ïÅ' => 'å¹­',
+  'ïÆ' => 'å¹®',
+  'ïÇ' => '懘',
+  'ïÈ' => '懟',
+  'ïÉ' => '懭',
+  'ïÊ' => '懮',
+  'ïË' => '懱',
+  'ïÌ' => '懪',
+  'ïÍ' => '懰',
+  'ïÎ' => '懫',
+  'ïÏ' => '懖',
+  'ïÐ' => '懩',
+  'ïÑ' => 'æ“¿',
+  'ïÒ' => '攄',
+  'ïÓ' => '擽',
+  'ïÔ' => '擸',
+  'ïÕ' => 'æ”�',
+  'ïÖ' => '攃',
+  'ï×' => '擼',
+  'ïØ' => 'æ–”',
+  'ïÙ' => 'æ—›',
+  'ïÚ' => '曚',
+  'ïÛ' => 'æ››',
+  'ïÜ' => '曘',
+  'ïÝ' => 'æ«…',
+  'ïÞ' => '檹',
+  'ïß' => '檽',
+  'ïà' => 'æ«¡',
+  'ïá' => '櫆',
+  'ïâ' => '檺',
+  'ïã' => '檶',
+  'ïä' => '檷',
+  'ïå' => '櫇',
+  'ïæ' => '檴',
+  'ïç' => '檭',
+  'ïè' => 'æ­ž',
+  'ïé' => '毉',
+  'ïê' => 'æ°‹',
+  'ïë' => '瀇',
+  'ïì' => '瀌',
+  'ïí' => 'ç€�',
+  'ïî' => 'ç€�',
+  'ïï' => '瀅',
+  'ïð' => '瀔',
+  'ïñ' => '瀎',
+  'ïò' => 'æ¿¿',
+  'ïó' => '瀀',
+  'ïô' => 'æ¿»',
+  'ïõ' => '瀦',
+  'ïö' => '濼',
+  'ï÷' => 'æ¿·',
+  'ïø' => '瀊',
+  'ïù' => 'çˆ�',
+  'ïú' => '燿',
+  'ïû' => '燹',
+  'ïü' => '爃',
+  'ïý' => '燽',
+  'ïþ' => 'ç�¶',
+  'ð@' => 'ç’¸',
+  'ðA' => 'ç“€',
+  'ðB' => 'ç’µ',
+  'ðC' => 'ç“�',
+  'ðD' => 'ç’¾',
+  'ðE' => 'ç’¶',
+  'ðF' => 'ç’»',
+  'ðG' => 'ç“‚',
+  'ðH' => 'ç””',
+  'ðI' => '甓',
+  'ðJ' => '癜',
+  'ðK' => '癤',
+  'ðL' => 'ç™™',
+  'ðM' => 'ç™�',
+  'ðN' => '癓',
+  'ðO' => 'ç™—',
+  'ðP' => '癚',
+  'ðQ' => '皦',
+  'ðR' => 'çš½',
+  'ðS' => '盬',
+  'ðT' => '矂',
+  'ðU' => '瞺',
+  'ðV' => '磿',
+  'ðW' => '礌',
+  'ðX' => '礓',
+  'ðY' => '礔',
+  'ðZ' => '礉',
+  'ð[' => 'ç¤�',
+  'ð\\' => '礒',
+  'ð]' => '礑',
+  'ð^' => '禭',
+  'ð_' => '禬',
+  'ð`' => 'ç©Ÿ',
+  'ða' => 'ç°œ',
+  'ðb' => 'ç°©',
+  'ðc' => 'ç°™',
+  'ðd' => 'ç° ',
+  'ðe' => 'ç°Ÿ',
+  'ðf' => 'ç°­',
+  'ðg' => 'ç°�',
+  'ðh' => 'ç°¦',
+  'ði' => 'ç°¨',
+  'ðj' => 'ç°¢',
+  'ðk' => 'ç°¥',
+  'ðl' => 'ç°°',
+  'ðm' => '繜',
+  'ðn' => 'ç¹�',
+  'ðo' => 'ç¹–',
+  'ðp' => 'ç¹£',
+  'ðq' => '繘',
+  'ðr' => 'ç¹¢',
+  'ðs' => '繟',
+  'ðt' => '繑',
+  'ðu' => 'ç¹ ',
+  'ðv' => 'ç¹—',
+  'ðw' => '繓',
+  'ðx' => 'ç¾µ',
+  'ðy' => 'ç¾³',
+  'ðz' => 'ç¿·',
+  'ð{' => '翸',
+  'ð|' => 'è�µ',
+  'ð}' => '臑',
+  'ð~' => '臒',
+  'ð¡' => 'è‡�',
+  'ð¢' => '艟',
+  'ð£' => '艞',
+  'ð¤' => 'è–´',
+  'ð¥' => 'è—†',
+  'ð¦' => 'è—€',
+  'ð§' => 'è—ƒ',
+  'ð¨' => 'è—‚',
+  'ð©' => 'è–³',
+  'ðª' => 'è–µ',
+  'ð«' => 'è–½',
+  'ð¬' => 'è—‡',
+  'ð­' => 'è—„',
+  'ð®' => 'è–¿',
+  'ð¯' => 'è—‹',
+  'ð°' => 'è—Ž',
+  'ð±' => 'è—ˆ',
+  'ð²' => 'è—…',
+  'ð³' => 'è–±',
+  'ð´' => 'è–¶',
+  'ðµ' => 'è—’',
+  'ð¶' => '蘤',
+  'ð·' => 'è–¸',
+  'ð¸' => 'è–·',
+  'ð¹' => 'è–¾',
+  'ðº' => '虩',
+  'ð»' => '蟧',
+  'ð¼' => '蟦',
+  'ð½' => '蟢',
+  'ð¾' => '蟛',
+  'ð¿' => '蟫',
+  'ðÀ' => '蟪',
+  'ðÁ' => '蟥',
+  'ðÂ' => '蟟',
+  'ðÃ' => '蟳',
+  'ðÄ' => '蟤',
+  'ðÅ' => '蟔',
+  'ðÆ' => '蟜',
+  'ðÇ' => '蟓',
+  'ðÈ' => '蟭',
+  'ðÉ' => '蟘',
+  'ðÊ' => '蟣',
+  'ðË' => '螤',
+  'ðÌ' => '蟗',
+  'ðÍ' => '蟙',
+  'ðÎ' => 'è �',
+  'ðÏ' => '蟴',
+  'ðÐ' => '蟨',
+  'ðÑ' => 'èŸ�',
+  'ðÒ' => '襓',
+  'ðÓ' => '襋',
+  'ðÔ' => 'è¥�',
+  'ðÕ' => '襌',
+  'ðÖ' => '襆',
+  'ð×' => 'è¥�',
+  'ðØ' => '襑',
+  'ðÙ' => '襉',
+  'ðÚ' => '謪',
+  'ðÛ' => '謧',
+  'ðÜ' => '謣',
+  'ðÝ' => '謳',
+  'ðÞ' => '謰',
+  'ðß' => '謵',
+  'ðà' => 'è­‡',
+  'ðá' => '謯',
+  'ðâ' => '謼',
+  'ðã' => '謾',
+  'ðä' => '謱',
+  'ðå' => '謥',
+  'ðæ' => '謷',
+  'ðç' => '謦',
+  'ðè' => '謶',
+  'ðé' => '謮',
+  'ðê' => '謤',
+  'ðë' => '謻',
+  'ðì' => '謽',
+  'ðí' => '謺',
+  'ðî' => '豂',
+  'ðï' => 'è±µ',
+  'ðð' => 'è²™',
+  'ðñ' => '貘',
+  'ðò' => 'è²—',
+  'ðó' => 'è³¾',
+  'ðô' => 'è´„',
+  'ðõ' => 'è´‚',
+  'ðö' => 'è´€',
+  'ð÷' => '蹜',
+  'ðø' => 'è¹¢',
+  'ðù' => 'è¹ ',
+  'ðú' => 'è¹—',
+  'ðû' => 'è¹–',
+  'ðü' => '蹞',
+  'ðý' => 'è¹¥',
+  'ðþ' => '蹧',
+  'ñ@' => 'è¹›',
+  'ñA' => '蹚',
+  'ñB' => '蹡',
+  'ñC' => 'è¹�',
+  'ñD' => '蹩',
+  'ñE' => 'è¹”',
+  'ñF' => '轆',
+  'ñG' => '轇',
+  'ñH' => '轈',
+  'ñI' => '轋',
+  'ñJ' => '鄨',
+  'ñK' => '鄺',
+  'ñL' => 'é„»',
+  'ñM' => '鄾',
+  'ñN' => '醨',
+  'ñO' => '醥',
+  'ñP' => '醧',
+  'ñQ' => '醯',
+  'ñR' => '醪',
+  'ñS' => '鎵',
+  'ñT' => '鎌',
+  'ñU' => '鎒',
+  'ñV' => '鎷',
+  'ñW' => '鎛',
+  'ñX' => 'éŽ�',
+  'ñY' => '鎉',
+  'ñZ' => '鎧',
+  'ñ[' => '鎎',
+  'ñ\\' => '鎪',
+  'ñ]' => '鎞',
+  'ñ^' => '鎦',
+  'ñ_' => '鎕',
+  'ñ`' => '鎈',
+  'ña' => '鎙',
+  'ñb' => '鎟',
+  'ñc' => 'éŽ�',
+  'ñd' => '鎱',
+  'ñe' => '鎑',
+  'ñf' => '鎲',
+  'ñg' => '鎤',
+  'ñh' => '鎨',
+  'ñi' => '鎴',
+  'ñj' => '鎣',
+  'ñk' => '鎥',
+  'ñl' => 'é—’',
+  'ñm' => 'é—“',
+  'ñn' => 'é—‘',
+  'ño' => 'éš³',
+  'ñp' => 'é›—',
+  'ñq' => '雚',
+  'ñr' => 'å·‚',
+  'ñs' => '雟',
+  'ñt' => '雘',
+  'ñu' => 'é›�',
+  'ñv' => '霣',
+  'ñw' => '霢',
+  'ñx' => '霥',
+  'ñy' => '鞬',
+  'ñz' => 'éž®',
+  'ñ{' => '鞨',
+  'ñ|' => 'éž«',
+  'ñ}' => '鞤',
+  'ñ~' => '鞪',
+  'ñ¡' => '鞢',
+  'ñ¢' => '鞥',
+  'ñ£' => '韗',
+  'ñ¤' => '韙',
+  'ñ¥' => '韖',
+  'ñ¦' => '韘',
+  'ñ§' => '韺',
+  'ñ¨' => 'é¡�',
+  'ñ©' => 'é¡‘',
+  'ñª' => 'é¡’',
+  'ñ«' => '颸',
+  'ñ¬' => 'é¥�',
+  'ñ­' => '餼',
+  'ñ®' => '餺',
+  'ñ¯' => 'é¨�',
+  'ñ°' => '騋',
+  'ñ±' => '騉',
+  'ñ²' => 'é¨�',
+  'ñ³' => '騄',
+  'ñ´' => '騑',
+  'ñµ' => '騊',
+  'ñ¶' => '騅',
+  'ñ·' => '騇',
+  'ñ¸' => '騆',
+  'ñ¹' => 'é«€',
+  'ñº' => 'é«œ',
+  'ñ»' => '鬈',
+  'ñ¼' => '鬄',
+  'ñ½' => '鬅',
+  'ñ¾' => '鬩',
+  'ñ¿' => '鬵',
+  'ñÀ' => 'é­Š',
+  'ñÁ' => 'é­Œ',
+  'ñÂ' => 'é­‹',
+  'ñÃ' => '鯇',
+  'ñÄ' => '鯆',
+  'ñÅ' => '鯃',
+  'ñÆ' => '鮿',
+  'ñÇ' => 'é¯�',
+  'ñÈ' => '鮵',
+  'ñÉ' => '鮸',
+  'ñÊ' => '鯓',
+  'ñË' => '鮶',
+  'ñÌ' => '鯄',
+  'ñÍ' => '鮹',
+  'ñÎ' => '鮽',
+  'ñÏ' => '鵜',
+  'ñÐ' => '鵓',
+  'ñÑ' => 'éµ�',
+  'ñÒ' => '鵊',
+  'ñÓ' => 'éµ›',
+  'ñÔ' => '鵋',
+  'ñÕ' => 'éµ™',
+  'ñÖ' => 'éµ–',
+  'ñ×' => '鵌',
+  'ñØ' => 'éµ—',
+  'ñÙ' => 'éµ’',
+  'ñÚ' => 'éµ”',
+  'ñÛ' => '鵟',
+  'ñÜ' => '鵘',
+  'ñÝ' => '鵚',
+  'ñÞ' => '麎',
+  'ñß' => '麌',
+  'ñà' => '黟',
+  'ñá' => 'é¼�',
+  'ñâ' => 'é¼€',
+  'ñã' => 'é¼–',
+  'ñä' => 'é¼¥',
+  'ñå' => '鼫',
+  'ñæ' => '鼪',
+  'ñç' => '鼩',
+  'ñè' => '鼨',
+  'ñé' => '齌',
+  'ñê' => '齕',
+  'ñë' => 'å„´',
+  'ñì' => '儵',
+  'ñí' => '劖',
+  'ñî' => 'å‹·',
+  'ñï' => '厴',
+  'ñð' => 'åš«',
+  'ññ' => 'åš­',
+  'ñò' => '嚦',
+  'ñó' => '嚧',
+  'ñô' => '嚪',
+  'ñõ' => '嚬',
+  'ñö' => '壚',
+  'ñ÷' => 'å£�',
+  'ñø' => '壛',
+  'ñù' => '夒',
+  'ñú' => '嬽',
+  'ñû' => '嬾',
+  'ñü' => '嬿',
+  'ñý' => 'å·ƒ',
+  'ñþ' => 'å¹°',
+  'ò@' => '徿',
+  'òA' => '懻',
+  'òB' => '攇',
+  'òC' => 'æ”�',
+  'òD' => 'æ”�',
+  'òE' => '攉',
+  'òF' => '攌',
+  'òG' => '攎',
+  'òH' => 'æ–„',
+  'òI' => 'æ—ž',
+  'òJ' => 'æ—�',
+  'òK' => '曞',
+  'òL' => '櫧',
+  'òM' => 'æ« ',
+  'òN' => 'æ«Œ',
+  'òO' => 'æ«‘',
+  'òP' => 'æ«™',
+  'òQ' => 'æ«‹',
+  'òR' => 'æ«Ÿ',
+  'òS' => 'æ«œ',
+  'òT' => 'æ«�',
+  'òU' => 'æ««',
+  'òV' => 'æ«�',
+  'òW' => 'æ«�',
+  'òX' => 'æ«ž',
+  'òY' => 'æ­ ',
+  'òZ' => 'æ®°',
+  'ò[' => 'æ°Œ',
+  'ò\\' => '瀙',
+  'ò]' => '瀧',
+  'ò^' => '瀠',
+  'ò_' => '瀖',
+  'ò`' => '瀫',
+  'òa' => '瀡',
+  'òb' => '瀢',
+  'òc' => '瀣',
+  'òd' => '瀩',
+  'òe' => '瀗',
+  'òf' => '瀤',
+  'òg' => '瀜',
+  'òh' => '瀪',
+  'òi' => '爌',
+  'òj' => '爊',
+  'òk' => '爇',
+  'òl' => '爂',
+  'òm' => '爅',
+  'òn' => '犥',
+  'òo' => '犦',
+  'òp' => '犤',
+  'òq' => '犣',
+  'òr' => '犡',
+  'òs' => 'ç“‹',
+  'òt' => 'ç“…',
+  'òu' => 'ç’·',
+  'òv' => '瓃',
+  'òw' => 'ç”–',
+  'òx' => 'ç™ ',
+  'òy' => '矉',
+  'òz' => '矊',
+  'ò{' => '矄',
+  'ò|' => '矱',
+  'ò}' => 'ç¤�',
+  'ò~' => '礛',
+  'ò¡' => '礡',
+  'ò¢' => '礜',
+  'ò£' => '礗',
+  'ò¤' => '礞',
+  'ò¥' => '禰',
+  'ò¦' => '穧',
+  'ò§' => '穨',
+  'ò¨' => 'ç°³',
+  'ò©' => 'ç°¼',
+  'òª' => 'ç°¹',
+  'ò«' => 'ç°¬',
+  'ò¬' => 'ç°»',
+  'ò­' => '糬',
+  'ò®' => '糪',
+  'ò¯' => '繶',
+  'ò°' => 'ç¹µ',
+  'ò±' => '繸',
+  'ò²' => 'ç¹°',
+  'ò³' => 'ç¹·',
+  'ò´' => '繯',
+  'òµ' => '繺',
+  'ò¶' => 'ç¹²',
+  'ò·' => 'ç¹´',
+  'ò¸' => '繨',
+  'ò¹' => '罋',
+  'òº' => '罊',
+  'ò»' => '羃',
+  'ò¼' => '羆',
+  'ò½' => 'ç¾·',
+  'ò¾' => '翽',
+  'ò¿' => '翾',
+  'òÀ' => 'è�¸',
+  'òÁ' => '臗',
+  'òÂ' => '臕',
+  'òÃ' => '艤',
+  'òÄ' => '艡',
+  'òÅ' => '艣',
+  'òÆ' => 'è—«',
+  'òÇ' => 'è—±',
+  'òÈ' => 'è—­',
+  'òÉ' => 'è—™',
+  'òÊ' => 'è—¡',
+  'òË' => 'è—¨',
+  'òÌ' => 'è—š',
+  'òÍ' => 'è——',
+  'òÎ' => 'è—¬',
+  'òÏ' => 'è—²',
+  'òÐ' => 'è—¸',
+  'òÑ' => 'è—˜',
+  'òÒ' => 'è—Ÿ',
+  'òÓ' => 'è—£',
+  'òÔ' => 'è—œ',
+  'òÕ' => 'è—‘',
+  'òÖ' => 'è—°',
+  'ò×' => 'è—¦',
+  'òØ' => 'è—¯',
+  'òÙ' => 'è—ž',
+  'òÚ' => 'è—¢',
+  'òÛ' => 'è €',
+  'òÜ' => '蟺',
+  'òÝ' => 'è ƒ',
+  'òÞ' => '蟶',
+  'òß' => '蟷',
+  'òà' => 'è ‰',
+  'òá' => 'è Œ',
+  'òâ' => 'è ‹',
+  'òã' => 'è †',
+  'òä' => '蟼',
+  'òå' => 'è ˆ',
+  'òæ' => '蟿',
+  'òç' => 'è Š',
+  'òè' => 'è ‚',
+  'òé' => '襢',
+  'òê' => '襚',
+  'òë' => '襛',
+  'òì' => '襗',
+  'òí' => '襡',
+  'òî' => '襜',
+  'òï' => '襘',
+  'òð' => 'è¥�',
+  'òñ' => '襙',
+  'òò' => '覈',
+  'òó' => '覷',
+  'òô' => '覶',
+  'òõ' => '觶',
+  'òö' => 'è­�',
+  'ò÷' => 'è­ˆ',
+  'òø' => 'è­Š',
+  'òù' => 'è­€',
+  'òú' => 'è­“',
+  'òû' => 'è­–',
+  'òü' => 'è­”',
+  'òý' => 'è­‹',
+  'òþ' => 'è­•',
+  'ó@' => 'è­‘',
+  'óA' => 'è­‚',
+  'óB' => 'è­’',
+  'óC' => 'è­—',
+  'óD' => '豃',
+  'óE' => 'è±·',
+  'óF' => '豶',
+  'óG' => '貚',
+  'óH' => 'è´†',
+  'óI' => 'è´‡',
+  'óJ' => 'è´‰',
+  'óK' => '趬',
+  'óL' => '趪',
+  'óM' => '趭',
+  'óN' => '趫',
+  'óO' => 'è¹­',
+  'óP' => '蹸',
+  'óQ' => 'è¹³',
+  'óR' => '蹪',
+  'óS' => '蹯',
+  'óT' => 'è¹»',
+  'óU' => '軂',
+  'óV' => 'è½’',
+  'óW' => '轑',
+  'óX' => 'è½�',
+  'óY' => 'è½�',
+  'óZ' => '轓',
+  'ó[' => 'è¾´',
+  'ó\\' => 'é…€',
+  'ó]' => 'é„¿',
+  'ó^' => '醰',
+  'ó_' => '醭',
+  'ó`' => 'é�ž',
+  'óa' => 'é�‡',
+  'ób' => 'é��',
+  'óc' => 'é�‚',
+  'ód' => 'é�š',
+  'óe' => 'é��',
+  'óf' => 'é�¹',
+  'óg' => 'é�¬',
+  'óh' => 'é�Œ',
+  'ói' => 'é�™',
+  'ój' => '鎩',
+  'ók' => 'é�¦',
+  'ól' => 'é�Š',
+  'óm' => 'é�”',
+  'ón' => 'é�®',
+  'óo' => 'é�£',
+  'óp' => 'é�•',
+  'óq' => 'é�„',
+  'ór' => 'é�Ž',
+  'ós' => 'é�€',
+  'ót' => 'é�’',
+  'óu' => 'é�§',
+  'óv' => '镽',
+  'ów' => 'é—š',
+  'óx' => 'é—›',
+  'óy' => '雡',
+  'óz' => '霩',
+  'ó{' => '霫',
+  'ó|' => '霬',
+  'ó}' => '霨',
+  'ó~' => '霦',
+  'ó¡' => 'éž³',
+  'ó¢' => 'éž·',
+  'ó£' => '鞶',
+  'ó¤' => 'éŸ�',
+  'ó¥' => '韞',
+  'ó¦' => '韟',
+  'ó§' => 'é¡œ',
+  'ó¨' => 'é¡™',
+  'ó©' => 'é¡�',
+  'óª' => 'é¡—',
+  'ó«' => '颿',
+  'ó¬' => '颽',
+  'ó­' => '颻',
+  'ó®' => '颾',
+  'ó¯' => '饈',
+  'ó°' => '饇',
+  'ó±' => '饃',
+  'ó²' => '馦',
+  'ó³' => '馧',
+  'ó´' => '騚',
+  'óµ' => '騕',
+  'ó¶' => '騥',
+  'ó·' => 'é¨�',
+  'ó¸' => '騤',
+  'ó¹' => '騛',
+  'óº' => '騢',
+  'ó»' => '騠',
+  'ó¼' => '騧',
+  'ó½' => '騣',
+  'ó¾' => '騞',
+  'ó¿' => '騜',
+  'óÀ' => '騔',
+  'óÁ' => 'é«‚',
+  'óÂ' => '鬋',
+  'óÃ' => '鬊',
+  'óÄ' => '鬎',
+  'óÅ' => '鬌',
+  'óÆ' => '鬷',
+  'óÇ' => '鯪',
+  'óÈ' => '鯫',
+  'óÉ' => '鯠',
+  'óÊ' => '鯞',
+  'óË' => '鯤',
+  'óÌ' => '鯦',
+  'óÍ' => '鯢',
+  'óÎ' => '鯰',
+  'óÏ' => '鯔',
+  'óÐ' => '鯗',
+  'óÑ' => '鯬',
+  'óÒ' => '鯜',
+  'óÓ' => '鯙',
+  'óÔ' => '鯥',
+  'óÕ' => '鯕',
+  'óÖ' => '鯡',
+  'ó×' => '鯚',
+  'óØ' => 'éµ·',
+  'óÙ' => 'é¶�',
+  'óÚ' => '鶊',
+  'óÛ' => '鶄',
+  'óÜ' => '鶈',
+  'óÝ' => 'éµ±',
+  'óÞ' => '鶀',
+  'óß' => '鵸',
+  'óà' => '鶆',
+  'óá' => '鶋',
+  'óâ' => '鶌',
+  'óã' => 'éµ½',
+  'óä' => '鵫',
+  'óå' => 'éµ´',
+  'óæ' => 'éµµ',
+  'óç' => 'éµ°',
+  'óè' => '鵩',
+  'óé' => '鶅',
+  'óê' => 'éµ³',
+  'óë' => 'éµ»',
+  'óì' => '鶂',
+  'óí' => '鵯',
+  'óî' => 'éµ¹',
+  'óï' => '鵿',
+  'óð' => '鶇',
+  'óñ' => '鵨',
+  'óò' => '麔',
+  'óó' => '麑',
+  'óô' => '黀',
+  'óõ' => '黼',
+  'óö' => 'é¼­',
+  'ó÷' => 'é½€',
+  'óø' => 'é½�',
+  'óù' => 'é½�',
+  'óú' => 'é½–',
+  'óû' => 'é½—',
+  'óü' => '齘',
+  'óý' => '匷',
+  'óþ' => 'åš²',
+  'ô@' => 'åšµ',
+  'ôA' => 'åš³',
+  'ôB' => '壣',
+  'ôC' => 'å­…',
+  'ôD' => 'å·†',
+  'ôE' => 'å·‡',
+  'ôF' => 'å»®',
+  'ôG' => '廯',
+  'ôH' => 'å¿€',
+  'ôI' => 'å¿�',
+  'ôJ' => '懹',
+  'ôK' => 'æ”—',
+  'ôL' => 'æ”–',
+  'ôM' => '攕',
+  'ôN' => '攓',
+  'ôO' => 'æ—Ÿ',
+  'ôP' => '曨',
+  'ôQ' => '曣',
+  'ôR' => '曤',
+  'ôS' => '櫳',
+  'ôT' => 'æ«°',
+  'ôU' => '櫪',
+  'ôV' => '櫨',
+  'ôW' => '櫹',
+  'ôX' => '櫱',
+  'ôY' => 'æ«®',
+  'ôZ' => '櫯',
+  'ô[' => '瀼',
+  'ô\\' => '瀵',
+  'ô]' => '瀯',
+  'ô^' => '瀷',
+  'ô_' => '瀴',
+  'ô`' => '瀱',
+  'ôa' => 'ç�‚',
+  'ôb' => '瀸',
+  'ôc' => '瀿',
+  'ôd' => '瀺',
+  'ôe' => '瀹',
+  'ôf' => 'ç�€',
+  'ôg' => '瀻',
+  'ôh' => '瀳',
+  'ôi' => 'ç��',
+  'ôj' => '爓',
+  'ôk' => '爔',
+  'ôl' => '犨',
+  'ôm' => 'ç�½',
+  'ôn' => 'ç�¼',
+  'ôo' => 'ç’º',
+  'ôp' => 'çš«',
+  'ôq' => '皪',
+  'ôr' => 'çš¾',
+  'ôs' => 'ç›­',
+  'ôt' => '矌',
+  'ôu' => '矎',
+  'ôv' => 'çŸ�',
+  'ôw' => 'çŸ�',
+  'ôx' => '矲',
+  'ôy' => '礥',
+  'ôz' => '礣',
+  'ô{' => '礧',
+  'ô|' => '礨',
+  'ô}' => '礤',
+  'ô~' => '礩',
+  'ô¡' => '禲',
+  'ô¢' => 'ç©®',
+  'ô£' => '穬',
+  'ô¤' => 'ç©­',
+  'ô¥' => 'ç«·',
+  'ô¦' => '籉',
+  'ô§' => '籈',
+  'ô¨' => '籊',
+  'ô©' => '籇',
+  'ôª' => 'ç±…',
+  'ô«' => 'ç³®',
+  'ô¬' => 'ç¹»',
+  'ô­' => 'ç¹¾',
+  'ô®' => 'çº�',
+  'ô¯' => '纀',
+  'ô°' => '羺',
+  'ô±' => 'ç¿¿',
+  'ô²' => 'è�¹',
+  'ô³' => '臛',
+  'ô´' => '臙',
+  'ôµ' => '舋',
+  'ô¶' => '艨',
+  'ô·' => '艩',
+  'ô¸' => '蘢',
+  'ô¹' => 'è—¿',
+  'ôº' => 'è˜�',
+  'ô»' => 'è—¾',
+  'ô¼' => '蘛',
+  'ô½' => '蘀',
+  'ô¾' => 'è—¶',
+  'ô¿' => '蘄',
+  'ôÀ' => '蘉',
+  'ôÁ' => '蘅',
+  'ôÂ' => '蘌',
+  'ôÃ' => 'è—½',
+  'ôÄ' => 'è ™',
+  'ôÅ' => 'è �',
+  'ôÆ' => 'è ‘',
+  'ôÇ' => 'è —',
+  'ôÈ' => 'è “',
+  'ôÉ' => 'è –',
+  'ôÊ' => '襣',
+  'ôË' => '襦',
+  'ôÌ' => '覹',
+  'ôÍ' => '觷',
+  'ôÎ' => 'è­ ',
+  'ôÏ' => 'è­ª',
+  'ôÐ' => 'è­�',
+  'ôÑ' => 'è­¨',
+  'ôÒ' => 'è­£',
+  'ôÓ' => 'è­¥',
+  'ôÔ' => 'è­§',
+  'ôÕ' => 'è­­',
+  'ôÖ' => '趮',
+  'ô×' => '躆',
+  'ôØ' => '躈',
+  'ôÙ' => '躄',
+  'ôÚ' => 'è½™',
+  'ôÛ' => 'è½–',
+  'ôÜ' => 'è½—',
+  'ôÝ' => '轕',
+  'ôÞ' => '轘',
+  'ôß' => '轚',
+  'ôà' => 'é‚�',
+  'ôá' => 'é…ƒ',
+  'ôâ' => 'é…�',
+  'ôã' => '醷',
+  'ôä' => '醵',
+  'ôå' => '醲',
+  'ôæ' => '醳',
+  'ôç' => 'é�‹',
+  'ôè' => 'é�“',
+  'ôé' => 'é�»',
+  'ôê' => 'é� ',
+  'ôë' => 'é��',
+  'ôì' => 'é�”',
+  'ôí' => 'é�¾',
+  'ôî' => 'é�•',
+  'ôï' => 'é��',
+  'ôð' => 'é�¨',
+  'ôñ' => 'é�™',
+  'ôò' => 'é��',
+  'ôó' => 'é�µ',
+  'ôô' => 'é�€',
+  'ôõ' => 'é�·',
+  'ôö' => 'é�‡',
+  'ô÷' => 'é�Ž',
+  'ôø' => 'é�–',
+  'ôù' => 'é�’',
+  'ôú' => 'é�º',
+  'ôû' => 'é�‰',
+  'ôü' => 'é�¸',
+  'ôý' => 'é�Š',
+  'ôþ' => 'é�¿',
+  'õ@' => 'é�¼',
+  'õA' => 'é�Œ',
+  'õB' => 'é�¶',
+  'õC' => 'é�‘',
+  'õD' => 'é�†',
+  'õE' => 'é—ž',
+  'õF' => 'é— ',
+  'õG' => 'é—Ÿ',
+  'õH' => '霮',
+  'õI' => '霯',
+  'õJ' => 'éž¹',
+  'õK' => 'éž»',
+  'õL' => '韽',
+  'õM' => '韾',
+  'õN' => 'é¡ ',
+  'õO' => 'é¡¢',
+  'õP' => 'é¡£',
+  'õQ' => 'é¡Ÿ',
+  'õR' => 'é£�',
+  'õS' => '飂',
+  'õT' => 'é¥�',
+  'õU' => '饎',
+  'õV' => '饙',
+  'õW' => '饌',
+  'õX' => '饋',
+  'õY' => '饓',
+  'õZ' => '騲',
+  'õ[' => '騴',
+  'õ\\' => '騱',
+  'õ]' => '騬',
+  'õ^' => '騪',
+  'õ_' => '騶',
+  'õ`' => '騩',
+  'õa' => '騮',
+  'õb' => '騸',
+  'õc' => '騭',
+  'õd' => '髇',
+  'õe' => 'é«Š',
+  'õf' => '髆',
+  'õg' => 'é¬�',
+  'õh' => '鬒',
+  'õi' => '鬑',
+  'õj' => 'é°‹',
+  'õk' => 'é°ˆ',
+  'õl' => '鯷',
+  'õm' => 'é°…',
+  'õn' => 'é°’',
+  'õo' => '鯸',
+  'õp' => 'é±€',
+  'õq' => 'é°‡',
+  'õr' => 'é°Ž',
+  'õs' => 'é°†',
+  'õt' => 'é°—',
+  'õu' => 'é°”',
+  'õv' => 'é°‰',
+  'õw' => '鶟',
+  'õx' => '鶙',
+  'õy' => '鶤',
+  'õz' => 'é¶�',
+  'õ{' => '鶒',
+  'õ|' => '鶘',
+  'õ}' => 'é¶�',
+  'õ~' => '鶛',
+  'õ¡' => '鶠',
+  'õ¢' => '鶔',
+  'õ£' => '鶜',
+  'õ¤' => '鶪',
+  'õ¥' => '鶗',
+  'õ¦' => '鶡',
+  'õ§' => '鶚',
+  'õ¨' => '鶢',
+  'õ©' => '鶨',
+  'õª' => '鶞',
+  'õ«' => '鶣',
+  'õ¬' => '鶿',
+  'õ­' => '鶩',
+  'õ®' => '鶖',
+  'õ¯' => '鶦',
+  'õ°' => '鶧',
+  'õ±' => '麙',
+  'õ²' => '麛',
+  'õ³' => '麚',
+  'õ´' => '黥',
+  'õµ' => '黤',
+  'õ¶' => '黧',
+  'õ·' => '黦',
+  'õ¸' => 'é¼°',
+  'õ¹' => 'é¼®',
+  'õº' => 'é½›',
+  'õ»' => 'é½ ',
+  'õ¼' => '齞',
+  'õ½' => 'é½�',
+  'õ¾' => 'é½™',
+  'õ¿' => '龑',
+  'õÀ' => '儺',
+  'õÁ' => '儹',
+  'õÂ' => '劘',
+  'õÃ' => '劗',
+  'õÄ' => '囃',
+  'õÅ' => 'åš½',
+  'õÆ' => 'åš¾',
+  'õÇ' => 'å­ˆ',
+  'õÈ' => 'å­‡',
+  'õÉ' => 'å·‹',
+  'õÊ' => 'å·�',
+  'õË' => 'å»±',
+  'õÌ' => '懽',
+  'õÍ' => 'æ”›',
+  'õÎ' => '欂',
+  'õÏ' => '櫼',
+  'õÐ' => '欃',
+  'õÑ' => '櫸',
+  'õÒ' => '欀',
+  'õÓ' => 'ç�ƒ',
+  'õÔ' => 'ç�„',
+  'õÕ' => 'ç�Š',
+  'õÖ' => 'ç�ˆ',
+  'õ×' => 'ç�‰',
+  'õØ' => 'ç�…',
+  'õÙ' => 'ç�†',
+  'õÚ' => 'çˆ�',
+  'õÛ' => '爚',
+  'õÜ' => '爙',
+  'õÝ' => 'ç�¾',
+  'õÞ' => 'ç”—',
+  'õß' => '癪',
+  'õà' => 'çŸ�',
+  'õá' => '礭',
+  'õâ' => '礱',
+  'õã' => '礯',
+  'õä' => 'ç±”',
+  'õå' => '籓',
+  'õæ' => 'ç³²',
+  'õç' => '纊',
+  'õè' => '纇',
+  'õé' => '纈',
+  'õê' => '纋',
+  'õë' => '纆',
+  'õì' => 'çº�',
+  'õí' => 'ç½�',
+  'õî' => 'ç¾»',
+  'õï' => '耰',
+  'õð' => 'è‡�',
+  'õñ' => '蘘',
+  'õò' => '蘪',
+  'õó' => '蘦',
+  'õô' => '蘟',
+  'õõ' => '蘣',
+  'õö' => '蘜',
+  'õ÷' => '蘙',
+  'õø' => '蘧',
+  'õù' => '蘮',
+  'õú' => '蘡',
+  'õû' => '蘠',
+  'õü' => '蘩',
+  'õý' => '蘞',
+  'õþ' => '蘥',
+  'ö@' => 'è ©',
+  'öA' => 'è �',
+  'öB' => 'è ›',
+  'öC' => 'è  ',
+  'öD' => 'è ¤',
+  'öE' => 'è œ',
+  'öF' => 'è «',
+  'öG' => 'è¡Š',
+  'öH' => '襭',
+  'öI' => '襩',
+  'öJ' => '襮',
+  'öK' => '襫',
+  'öL' => '觺',
+  'öM' => 'è­¹',
+  'öN' => 'è­¸',
+  'öO' => 'è­…',
+  'öP' => 'è­º',
+  'öQ' => 'è­»',
+  'öR' => 'è´�',
+  'öS' => 'è´”',
+  'öT' => '趯',
+  'öU' => '躎',
+  'öV' => '躌',
+  'öW' => '轞',
+  'öX' => 'è½›',
+  'öY' => 'è½�',
+  'öZ' => 'é…†',
+  'ö[' => 'é…„',
+  'ö\\' => 'é……',
+  'ö]' => '醹',
+  'ö^' => 'é�¿',
+  'ö_' => 'é�»',
+  'ö`' => 'é�¶',
+  'öa' => 'é�©',
+  'öb' => 'é�½',
+  'öc' => 'é�¼',
+  'öd' => 'é�°',
+  'öe' => 'é�¹',
+  'öf' => 'é�ª',
+  'ög' => 'é�·',
+  'öh' => 'é�¬',
+  'öi' => 'é‘€',
+  'öj' => 'é�±',
+  'ök' => 'é—¥',
+  'öl' => 'é—¤',
+  'öm' => 'é—£',
+  'ön' => '霵',
+  'öo' => '霺',
+  'öp' => 'éž¿',
+  'öq' => '韡',
+  'ör' => '顤',
+  'ös' => '飉',
+  'öt' => '飆',
+  'öu' => '飀',
+  'öv' => '饘',
+  'öw' => '饖',
+  'öx' => '騹',
+  'öy' => '騽',
+  'öz' => '驆',
+  'ö{' => 'é©„',
+  'ö|' => 'é©‚',
+  'ö}' => 'é©�',
+  'ö~' => '騺',
+  'ö¡' => '騿',
+  'ö¢' => 'é«�',
+  'ö£' => '鬕',
+  'ö¤' => '鬗',
+  'ö¥' => '鬘',
+  'ö¦' => '鬖',
+  'ö§' => '鬺',
+  'ö¨' => 'é­’',
+  'ö©' => 'é°«',
+  'öª' => 'é°�',
+  'ö«' => 'é°œ',
+  'ö¬' => 'é°¬',
+  'ö­' => 'é°£',
+  'ö®' => 'é°¨',
+  'ö¯' => 'é°©',
+  'ö°' => 'é°¤',
+  'ö±' => 'é°¡',
+  'ö²' => '鶷',
+  'ö³' => '鶶',
+  'ö´' => '鶼',
+  'öµ' => 'é·�',
+  'ö¶' => 'é·‡',
+  'ö·' => 'é·Š',
+  'ö¸' => 'é·�',
+  'ö¹' => '鶾',
+  'öº' => 'é·…',
+  'ö»' => 'é·ƒ',
+  'ö¼' => '鶻',
+  'ö½' => '鶵',
+  'ö¾' => 'é·Ž',
+  'ö¿' => '鶹',
+  'öÀ' => '鶺',
+  'öÁ' => '鶬',
+  'öÂ' => 'é·ˆ',
+  'öÃ' => '鶱',
+  'öÄ' => '鶭',
+  'öÅ' => 'é·Œ',
+  'öÆ' => '鶳',
+  'öÇ' => 'é·�',
+  'öÈ' => '鶲',
+  'öÉ' => '鹺',
+  'öÊ' => '麜',
+  'öË' => '黫',
+  'öÌ' => 'é»®',
+  'öÍ' => 'é»­',
+  'öÎ' => 'é¼›',
+  'öÏ' => '鼘',
+  'öÐ' => '鼚',
+  'öÑ' => 'é¼±',
+  'öÒ' => '齎',
+  'öÓ' => 'é½¥',
+  'öÔ' => '齤',
+  'öÕ' => 'é¾’',
+  'öÖ' => '亹',
+  'ö×' => '囆',
+  'öØ' => 'å›…',
+  'öÙ' => '囋',
+  'öÚ' => '奱',
+  'öÛ' => 'å­‹',
+  'öÜ' => 'å­Œ',
+  'öÝ' => 'å·•',
+  'öÞ' => 'å·‘',
+  'öß' => '廲',
+  'öà' => '攡',
+  'öá' => 'æ” ',
+  'öâ' => '攦',
+  'öã' => '攢',
+  'öä' => '欋',
+  'öå' => '欈',
+  'öæ' => '欉',
+  'öç' => 'æ°�',
+  'öè' => 'ç�•',
+  'öé' => 'ç�–',
+  'öê' => 'ç�—',
+  'öë' => 'ç�’',
+  'öì' => '爞',
+  'öí' => '爟',
+  'öî' => '犩',
+  'öï' => 'ç�¿',
+  'öð' => '瓘',
+  'öñ' => 'ç“•',
+  'öò' => 'ç“™',
+  'öó' => 'ç“—',
+  'öô' => 'ç™­',
+  'öõ' => 'çš­',
+  'öö' => '礵',
+  'ö÷' => '禴',
+  'öø' => 'ç©°',
+  'öù' => '穱',
+  'öú' => 'ç±—',
+  'öû' => '籜',
+  'öü' => 'ç±™',
+  'öý' => 'ç±›',
+  'öþ' => '籚',
+  '÷@' => 'ç³´',
+  '÷A' => 'ç³±',
+  '÷B' => '纑',
+  '÷C' => 'ç½�',
+  '÷D' => '羇',
+  '÷E' => '臞',
+  '÷F' => '艫',
+  '÷G' => '蘴',
+  '÷H' => '蘵',
+  '÷I' => '蘳',
+  '÷J' => '蘬',
+  '÷K' => '蘲',
+  '÷L' => '蘶',
+  '÷M' => 'è ¬',
+  '÷N' => 'è ¨',
+  '÷O' => 'è ¦',
+  '÷P' => 'è ª',
+  '÷Q' => 'è ¥',
+  '÷R' => '襱',
+  '÷S' => '覿',
+  '÷T' => '覾',
+  '÷U' => '觻',
+  '÷V' => 'è­¾',
+  '÷W' => '讄',
+  '÷X' => '讂',
+  '÷Y' => '讆',
+  '÷Z' => 'è®…',
+  '÷[' => 'è­¿',
+  '÷\\' => 'è´•',
+  '÷]' => '躕',
+  '÷^' => '躔',
+  '÷_' => '躚',
+  '÷`' => '躒',
+  '÷a' => 'èº�',
+  '÷b' => '躖',
+  '÷c' => '躗',
+  '÷d' => 'è½ ',
+  '÷e' => 'è½¢',
+  '÷f' => 'é…‡',
+  '÷g' => 'é‘Œ',
+  '÷h' => 'é‘�',
+  '÷i' => 'é‘Š',
+  '÷j' => 'é‘‹',
+  '÷k' => 'é‘�',
+  '÷l' => '鑇',
+  '÷m' => 'é‘…',
+  '÷n' => '鑈',
+  '÷o' => '鑉',
+  '÷p' => '鑆',
+  '÷q' => '霿',
+  '÷r' => '韣',
+  '÷s' => '顪',
+  '÷t' => 'é¡©',
+  '÷u' => '飋',
+  '÷v' => '饔',
+  '÷w' => '饛',
+  '÷x' => 'é©Ž',
+  '÷y' => 'é©“',
+  '÷z' => 'é©”',
+  '÷{' => 'é©Œ',
+  '÷|' => 'é©�',
+  '÷}' => '驈',
+  '÷~' => 'é©Š',
+  '÷¡' => '驉',
+  '÷¢' => 'é©’',
+  '÷£' => 'é©�',
+  '÷¤' => 'é«�',
+  '÷¥' => '鬙',
+  '÷¦' => '鬫',
+  '÷§' => '鬻',
+  '÷¨' => 'é­–',
+  '÷©' => 'é­•',
+  '÷ª' => '鱆',
+  '÷«' => '鱈',
+  '÷¬' => 'é°¿',
+  '÷­' => '鱄',
+  '÷®' => 'é°¹',
+  '÷¯' => 'é°³',
+  '÷°' => 'é±�',
+  '÷±' => 'é°¼',
+  '÷²' => 'é°·',
+  '÷³' => 'é°´',
+  '÷´' => 'é°²',
+  '÷µ' => 'é°½',
+  '÷¶' => 'é°¶',
+  '÷·' => 'é·›',
+  '÷¸' => 'é·’',
+  '÷¹' => 'é·ž',
+  '÷º' => 'é·š',
+  '÷»' => 'é·‹',
+  '÷¼' => 'é·�',
+  '÷½' => 'é·œ',
+  '÷¾' => 'é·‘',
+  '÷¿' => 'é·Ÿ',
+  '÷À' => 'é·©',
+  '÷Á' => 'é·™',
+  '÷Â' => 'é·˜',
+  '÷Ã' => 'é·–',
+  '÷Ä' => 'é·µ',
+  '÷Å' => 'é·•',
+  '÷Æ' => 'é·�',
+  '÷Ç' => '麶',
+  '÷È' => 'é»°',
+  '÷É' => 'é¼µ',
+  '÷Ê' => 'é¼³',
+  '÷Ë' => 'é¼²',
+  '÷Ì' => '齂',
+  '÷Í' => '齫',
+  '÷Î' => '龕',
+  '÷Ï' => 'é¾¢',
+  '÷Ð' => '儽',
+  '÷Ñ' => '劙',
+  '÷Ò' => '壨',
+  '÷Ó' => '壧',
+  '÷Ô' => '奲',
+  '÷Õ' => 'å­�',
+  '÷Ö' => 'å·˜',
+  '÷×' => 'è ¯',
+  '÷Ø' => 'å½�',
+  '÷Ù' => 'æˆ�',
+  '÷Ú' => '戃',
+  '÷Û' => '戄',
+  '÷Ü' => '攩',
+  '÷Ý' => '攥',
+  '÷Þ' => 'æ––',
+  '÷ß' => '曫',
+  '÷à' => '欑',
+  '÷á' => '欒',
+  '÷â' => 'æ¬�',
+  '÷ã' => '毊',
+  '÷ä' => 'ç�›',
+  '÷å' => 'ç�š',
+  '÷æ' => '爢',
+  '÷ç' => '玂',
+  '÷è' => 'çŽ�',
+  '÷é' => '玃',
+  '÷ê' => 'ç™°',
+  '÷ë' => '矔',
+  '÷ì' => '籧',
+  '÷í' => '籦',
+  '÷î' => '纕',
+  '÷ï' => '艬',
+  '÷ð' => '蘺',
+  '÷ñ' => '虀',
+  '÷ò' => '蘹',
+  '÷ó' => '蘼',
+  '÷ô' => '蘱',
+  '÷õ' => '蘻',
+  '÷ö' => '蘾',
+  '÷÷' => 'è °',
+  '÷ø' => 'è ²',
+  '÷ù' => 'è ®',
+  '÷ú' => 'è ³',
+  '÷û' => '襶',
+  '÷ü' => '襴',
+  '÷ý' => '襳',
+  '÷þ' => '觾',
+  'ø@' => '讌',
+  'øA' => '讎',
+  'øB' => '讋',
+  'øC' => '讈',
+  'øD' => 'è±…',
+  'øE' => 'è´™',
+  'øF' => '躘',
+  'øG' => '轤',
+  'øH' => 'è½£',
+  'øI' => '醼',
+  'øJ' => 'é‘¢',
+  'øK' => 'é‘•',
+  'øL' => 'é‘�',
+  'øM' => 'é‘—',
+  'øN' => 'é‘ž',
+  'øO' => '韄',
+  'øP' => '韅',
+  'øQ' => 'é €',
+  'øR' => 'é©–',
+  'øS' => 'é©™',
+  'øT' => '鬞',
+  'øU' => '鬟',
+  'øV' => '鬠',
+  'øW' => 'é±’',
+  'øX' => '鱘',
+  'øY' => 'é±�',
+  'øZ' => '鱊',
+  'ø[' => 'é±�',
+  'ø\\' => '鱋',
+  'ø]' => '鱕',
+  'ø^' => 'é±™',
+  'ø_' => '鱌',
+  'ø`' => '鱎',
+  'øa' => 'é·»',
+  'øb' => 'é··',
+  'øc' => 'é·¯',
+  'ød' => 'é·£',
+  'øe' => 'é·«',
+  'øf' => 'é·¸',
+  'øg' => 'é·¤',
+  'øh' => 'é·¶',
+  'øi' => 'é·¡',
+  'øj' => 'é·®',
+  'øk' => 'é·¦',
+  'øl' => 'é·²',
+  'øm' => 'é·°',
+  'øn' => 'é·¢',
+  'øo' => 'é·¬',
+  'øp' => 'é·´',
+  'øq' => 'é·³',
+  'ør' => 'é·¨',
+  'øs' => 'é·­',
+  'øt' => '黂',
+  'øu' => 'é»�',
+  'øv' => '黲',
+  'øw' => '黳',
+  'øx' => '鼆',
+  'øy' => '鼜',
+  'øz' => '鼸',
+  'ø{' => 'é¼·',
+  'ø|' => '鼶',
+  'ø}' => '齃',
+  'ø~' => 'é½�',
+  'ø¡' => 'é½±',
+  'ø¢' => 'é½°',
+  'ø£' => 'é½®',
+  'ø¤' => '齯',
+  'ø¥' => '囓',
+  'ø¦' => 'å›�',
+  'ø§' => 'å­Ž',
+  'ø¨' => 'å±­',
+  'ø©' => 'æ”­',
+  'øª' => 'æ›­',
+  'ø«' => 'æ›®',
+  'ø¬' => '欓',
+  'ø­' => 'ç�Ÿ',
+  'ø®' => 'ç�¡',
+  'ø¯' => 'ç��',
+  'ø°' => 'ç� ',
+  'ø±' => '爣',
+  'ø²' => 'ç“›',
+  'ø³' => 'ç“¥',
+  'ø´' => '矕',
+  'øµ' => '礸',
+  'ø¶' => '禷',
+  'ø·' => '禶',
+  'ø¸' => '籪',
+  'ø¹' => '纗',
+  'øº' => '羉',
+  'ø»' => '艭',
+  'ø¼' => '虃',
+  'ø½' => 'è ¸',
+  'ø¾' => 'è ·',
+  'ø¿' => 'è µ',
+  'øÀ' => 'è¡‹',
+  'øÁ' => 'è®”',
+  'øÂ' => '讕',
+  'øÃ' => '躞',
+  'øÄ' => '躟',
+  'øÅ' => '躠',
+  'øÆ' => 'èº�',
+  'øÇ' => '醾',
+  'øÈ' => '醽',
+  'øÉ' => '釂',
+  'øÊ' => 'é‘«',
+  'øË' => '鑨',
+  'øÌ' => 'é‘©',
+  'øÍ' => '雥',
+  'øÎ' => 'é�†',
+  'øÏ' => 'é�ƒ',
+  'øÐ' => 'é�‡',
+  'øÑ' => '韇',
+  'øÒ' => '韥',
+  'øÓ' => 'é©ž',
+  'øÔ' => 'é«•',
+  'øÕ' => 'é­™',
+  'øÖ' => 'é±£',
+  'ø×' => '鱧',
+  'øØ' => '鱦',
+  'øÙ' => 'é±¢',
+  'øÚ' => '鱞',
+  'øÛ' => 'é± ',
+  'øÜ' => '鸂',
+  'øÝ' => 'é·¾',
+  'øÞ' => '鸇',
+  'øß' => '鸃',
+  'øà' => '鸆',
+  'øá' => '鸅',
+  'øâ' => '鸀',
+  'øã' => 'é¸�',
+  'øä' => '鸉',
+  'øå' => 'é·¿',
+  'øæ' => 'é·½',
+  'øç' => '鸄',
+  'øè' => '麠',
+  'øé' => '鼞',
+  'øê' => '齆',
+  'øë' => 'é½´',
+  'øì' => 'é½µ',
+  'øí' => '齶',
+  'øî' => 'å›”',
+  'øï' => 'æ”®',
+  'øð' => 'æ–¸',
+  'øñ' => '欘',
+  'øò' => '欙',
+  'øó' => '欗',
+  'øô' => '欚',
+  'øõ' => 'ç�¢',
+  'øö' => '爦',
+  'ø÷' => '犪',
+  'øø' => '矘',
+  'øù' => '矙',
+  'øú' => '礹',
+  'øû' => '籩',
+  'øü' => '籫',
+  'øý' => '糶',
+  'øþ' => '纚',
+  'ù@' => '纘',
+  'ùA' => '纛',
+  'ùB' => '纙',
+  'ùC' => '臠',
+  'ùD' => '臡',
+  'ùE' => '虆',
+  'ùF' => '虇',
+  'ùG' => '虈',
+  'ùH' => '襹',
+  'ùI' => '襺',
+  'ùJ' => '襼',
+  'ùK' => '襻',
+  'ùL' => '觿',
+  'ùM' => '讘',
+  'ùN' => 'è®™',
+  'ùO' => '躥',
+  'ùP' => '躤',
+  'ùQ' => '躣',
+  'ùR' => 'é‘®',
+  'ùS' => 'é‘­',
+  'ùT' => '鑯',
+  'ùU' => '鑱',
+  'ùV' => '鑳',
+  'ùW' => 'é�‰',
+  'ùX' => '顲',
+  'ùY' => '饟',
+  'ùZ' => '鱨',
+  'ù[' => 'é±®',
+  'ù\\' => 'é±­',
+  'ù]' => '鸋',
+  'ù^' => 'é¸�',
+  'ù_' => 'é¸�',
+  'ù`' => 'é¸�',
+  'ùa' => '鸒',
+  'ùb' => '鸑',
+  'ùc' => '麡',
+  'ùd' => '黵',
+  'ùe' => '鼉',
+  'ùf' => '齇',
+  'ùg' => '齸',
+  'ùh' => 'é½»',
+  'ùi' => '齺',
+  'ùj' => 'é½¹',
+  'ùk' => '圞',
+  'ùl' => 'ç�¦',
+  'ùm' => '籯',
+  'ùn' => 'è ¼',
+  'ùo' => '趲',
+  'ùp' => '躦',
+  'ùq' => '釃',
+  'ùr' => 'é‘´',
+  'ùs' => '鑸',
+  'ùt' => '鑶',
+  'ùu' => '鑵',
+  'ùv' => 'é© ',
+  'ùw' => 'é±´',
+  'ùx' => 'é±³',
+  'ùy' => 'é±±',
+  'ùz' => 'é±µ',
+  'ù{' => '鸔',
+  'ù|' => '鸓',
+  'ù}' => '黶',
+  'ù~' => '鼊',
+  'ù¡' => '龤',
+  'ù¢' => 'ç�¨',
+  'ù£' => 'ç�¥',
+  'ù¤' => 'ç³·',
+  'ù¥' => '虪',
+  'ù¦' => 'è ¾',
+  'ù§' => 'è ½',
+  'ù¨' => 'è ¿',
+  'ù©' => '讞',
+  'ùª' => '貜',
+  'ù«' => '躩',
+  'ù¬' => '軉',
+  'ù­' => 'é�‹',
+  'ù®' => '顳',
+  'ù¯' => 'é¡´',
+  'ù°' => '飌',
+  'ù±' => '饡',
+  'ù²' => '馫',
+  'ù³' => '驤',
+  'ù´' => '驦',
+  'ùµ' => '驧',
+  'ù¶' => '鬤',
+  'ù·' => '鸕',
+  'ù¸' => '鸗',
+  'ù¹' => '齈',
+  'ùº' => '戇',
+  'ù»' => '欞',
+  'ù¼' => '爧',
+  'ù½' => '虌',
+  'ù¾' => '躨',
+  'ù¿' => 'é’‚',
+  'ùÀ' => 'é’€',
+  'ùÁ' => 'é’�',
+  'ùÂ' => 'é©©',
+  'ùÃ' => '驨',
+  'ùÄ' => '鬮',
+  'ùÅ' => '鸙',
+  'ùÆ' => '爩',
+  'ùÇ' => '虋',
+  'ùÈ' => '讟',
+  'ùÉ' => 'é’ƒ',
+  'ùÊ' => 'é±¹',
+  'ùË' => '麷',
+  'ùÌ' => '癵',
+  'ùÍ' => 'é©«',
+  'ùÎ' => '鱺',
+  'ùÏ' => 'é¸�',
+  'ùÐ' => 'ç�©',
+  'ùÑ' => 'ç�ª',
+  'ùÒ' => '麤',
+  'ùÓ' => 'é½¾',
+  'ùÔ' => '齉',
+  'ùÕ' => '龘',
+);
+
+$result =& $data;
+unset($data);
+
+return $result;
diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp037.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp037.php
new file mode 100644
index 0000000000000000000000000000000000000000..a014e4b4595544e94b92b16655ec45eb6616c1a8
GIT binary patch
literal 3779
zcmXZfbyyT_6o&E7*0H;FRAfQ1+hxJ-?!Z`K6%-LSRP4kq1e8$h?(UfRy1To(yJ7C<
zFZOpmXV|%R&wI{nbZly3s$m3z-e6L^8J6G;dQFe%_4~bPW`tpyu7_NvC#L96RFR6I
zVyHMOj!K{ss3fxTVJTP+l~$Mz%fJ<=tis)}oVXPl;x<?wmPZv(1ym7LM3qn_R2fx9
zRZtaF6;(ymP&HH?RYx_DwHMYD*TGt_EUK+=J*)%kpt`6os;ANnSYO-@8^8vrA!>*k
zp+=}NYK%-|t%Oa)Rj{eJ8a5Nxz%X$wYz_?+j%uSg7pxB>bmayZDQ<)<#7(fJxEV%?
zTVN|#3bjV1Q5#goQCp{FtsM^9ft?Q8JE-Nn?m)21K}V43pcBY)&>3Vq=;ENH^SUd+
z9tYh(jssVB-FPl^i+L~_)<7Oq6UC@>AB=_dP!D9Ho+{lBdqMjk>@6OKeMA-a6%Ua1
z6A!`u;t@DNJO&4f7vLah>3s*o)`UY)G#ZK`&@j{z4M$7S2o#P+BKrg!C7y(%#Zz#M
zcpQ!u&%klwSvX!i2PcT9;Y6_jPJ&I)WE6(t;$RCn1x2E%$c?5UOK&nAwj%VRHfRR2
zbtvOSox%iB2ihm<K+hC)f@g`EO^KqWQIg0ham|L-QEp=nj6%t%Ihu>6p%fH@=Al@W
zitOufzNksy7c~h2q9#F5)D#Jc+6fCp?SzG*=H(($QzQ*e=Pnkb?q~^WhL)lpXc;OT
zZ_XxM4n1fEYKm4Oo6+D}1-*o;(G0W(#iO+-0j)zml#XVi^=KB_fD+M0l!P`ROUGlg
zc#Cukw9mt>;vKk6ybHJMTAlnIqORQuXH%Pj=Ad0D8D*lmC<~>aY%~w;MyY5InvZgj
zALSxTLm^MRNtzFBHS}JkYQ=p@(<v@cs?oV$yh3^aE=LDZ03AX>bQp!u5wrjuMGMg}
zv<MwXY3Kx6j7}m;gZq?tkMuOO*?g`uq8?AqirOvbbgf3=c{r8-bU~pu!bMRV;gWcb
z;>)7u^A%D1;;ML+;%nk<cwJP--4NArH{oPzZ=osZwn{a-?}(cFcg4#T--EUuD(}N3
zgbz?pWT9TjM!nI)s1JGs^+k`Oe&{jOA3cr+peN8k^dz#hp`L=aZv1IcpWZX#MXr5T
zyab;U)vC|KWrQ!FLFh#^7`=pspqJ55^a>h=UPZ&vYiI;|9gRe9pi$^eWZi&oL0e<!
zZBb3}j;P{yMIGk%L^b{Uuy6xAgZTrc>dg<~Xu^-s81yk3i#|c)(5GlT`V37#pQDNB
z3p5FRi7b6VUqL&Q^lLF2ej{eUZ$%zSUEhgWq~F7~=m*pe{fOG5pHK(%GwO(bL7mXA
zs5ANvbwR(QuILZc4gHBM_1$04&LjO>%!mJoIq+XG7ybvWf<i{R4I|9&3xtw`rYD@A
bqi!RV67U5hoZqHJ1%6*J<WDhG=QjQa^zbz^

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp1006.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp1006.php
new file mode 100644
index 0000000000000000000000000000000000000000..2b5e7beb9bff546a8698e3f02e3d8997d756d963
GIT binary patch
literal 3860
zcmZA4Wq4F)5QgF6u(&%c5F!xViQ(=pL6#685JK2&fZ*=#E~R+0xFmtnrtaR-Qg^5B
zEhXRc&Y%7|b6?*iIcMiRlWU{nQm3SPJZS-6ASuBcGSL_Cd1Jgjzu%YP4flAxVfTf3
zV`B3zk$K98@}c}FKPrF<pn|9%DufE5!l*DRf{LJ`s3<CiiXjj3pyH@FDuGI%lBgsq
zg-W5)s5B~r%Am5SEGmb}q4KCas(>n>il`#0gesxRs4}X8s-UW<DyoL6q3WnQs)1^t
zny4nKg=(SNs5bH<FRFv;pt`6os)y>K5EO#yqxvWmg`)T{c<<^m5)Q*r1d2cnPy^Hu
zHAImp5;a1NP-D~>H9<|Bn!0>8b#*gWH*<A!S2uTc3s<*rbxT*bbag9Nw{mrBSGRU`
z8&|h+bz4`rb#*&ew{vw^d+wq=ib7E+8bzZR6oX<>EQ&*Mr~~SNI--uK6Y7LIqt2)c
z>VmqWuBaR8hPtEfs0ZqSdZM1F7wUz2qu!_w>Vx{CzNjDShx()bXaE|32BLvz5E_IA
zqrqqh8iIzRp=cNyhK8fzXapL8Mxv2u6dHv_qtPfn9^SjUOpk$M&{#AUjYH$mcr+gQ
zkPl5j6Ho$5KoikKl!y}1Bs2+4Mw8JLGzBH0Bs3LGMbpqUl#G(mbTl2MpcFI%%|NLr
z70pC5kstX{8cIU}6hP@H9nC_s&}=jt%|UZe2FgHl(OfhS%|r9ie6#>9Knu}Av<NLi
zi&5@kxI|n6mx@c_GI1GPE-r^F#1(L*xDu`sSHacdYPd#R1J{ac;W}|0TraMN8^jH8
zqqq@n5;wuk;%2x-+yb|XTj4fw8{95#hdaa_aHqHv?h<#w-QsSzN8AJVihJQcaUa|-
z?uQ4&1Mr}D5FQc_!NcNVcm&=)2k#fp!=vH__<(p39uqIY<Kks_Lc9V`idW$&@ftiW
zX2CP?mInHusK?KQxtTNvb*cwE3-4qrvggc-!+EpvaN&QxXjVWjnH7o4a;D~b#jHtQ
zwSI-<npv^PGAjt#_VdSioE-B>eBJsLjT>ft8V{K@{+nif9uLcz+5Emo%-3<Q^&i2H
znvdeg%*XKK<`eh{^C|qK9Ml$g%FfSl{<K-+d&c@T>}T!#Ed9^fx!(Qf?OYjs!K_ri
zXjTqiGAns6o0YX!%sKqMSIsx@Yv!BybvZ}*dc&+W_oi8^>y}yf|CU+H>us~1|F&6q
zeaEc4zH3%K-!p52y>C`tKQJqgADWfNkIc&B$7bd26SMO6sT|Z!{LHK^___5fk6)OT
z$1ly=Kwp`azpu^8-#2nl`|MjgS02AJE01^NY|Z0)J6GO*kb`>Pel+WS`^l_4|7<?Z
z{C|<N^&j$Av*!JqS@Ztgta<+-=P18_nzdyAGAqx2%R#N^f6PJd=U+KX@AF-AUVbB@
pJf0ALVp@7~z#9|F_uD8>dP-ViAl!Y~&1>){2Gad0UiC$J{sW=Ke9`~_

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp1026.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp1026.php
new file mode 100644
index 0000000000000000000000000000000000000000..aba455b5ec97b2e9987a607421d5b571f3cea32e
GIT binary patch
literal 3779
zcmXZfbzBsC6vp9e>)72oDzc#1?XqBZcVMir3W|suDt2NQf(qE(-Ffc}+-uzK?(XiA
z`M!U#&*we6%<i0Xe!J1JsfnqE5eRyNN%3Y_f;Z?jJ*L<1_okT<hH1JUbD5r)f<I9O
zDufE5!l*DRf{LJ`$l3*q!BVKW!gN>yE<q&~?trDljnEJ`!P2laDuc?PvZyR7hsvSy
zs648GDxiv}BC3Qcp~|Q-s)DTDu&THUR)Zx`b%m>84Oj!!L^V+@m1e-&;$~O})<Jbq
zT~rU%L-kR8WFl)RY#=U!4aMcKk+=eei7R1aXrORZ9mTm|Z5W|vu7Q!_TG&Kf2b+rP
zVU)N5HiN}bb5tC)KqVZtbXwNh;-D4S>Y%lQYR=;}1lt_61(^=ofh-5@!FC57929jP
zcO=;9pcBY;;OeXk&w*|+7e>P>$b+h)7?tjUv9K2Ef=tv^rTbtvXdi&x#Y3=%sN$aD
ze$rmzLD*Y74Ew+ZsIS8Fu%D>5?hl(24nWapAc{bPP*XG*H9$j9I2wxV<8YXG0uC2X
z!V%&zI8r<fM~P?PXz?r@Bc6g|#l3JG%+swIFP<Zfi^EOe1QdxTA~%|ZCZfrx8S<hQ
zXbQ45l<}gbFhSHn`$P@&R8bQ=P1J5mgyZ=?NeUSf*L0Y#H$DSKQJah!qnT(DN<lGb
z7K%lw$i4<=i&_MJQHvlTY7qoQEs>C@BVmrHBVn$nbvaMe5=n!3YTx;=GZ(c$wG6v!
zA<WkuUj!d5IOi-}3_WOxo~rY1smOM4ErVWam!m0Y1&T*2Q36_pd?+1FMXS*?v<4-j
zwI~U#LzYHly?B#!16+hQqRD8JN{_(JqCUJWqDEjVoK9^9nt`^VWR!_!qAZkxwxd~S
z2TDad(QK5B{3r)mS_`@24bolE)*IQaRL!_YX*$Jwm1=kH6EBnQSMe2i00z)O6hwzm
z2pvXq&=E8j9YyodF_eamqxt9rvb4HSig!s*!3pRz3PWd57j#xn)G9nD>i9S>>O{C8
z>O{CGUgf1OiCWN?#iOKGM15XY#apD;#M|(?cn97PwUKYag@m^hYJ1-nwfXOemngmq
zZGEeJT+}r_0lQLbp>D`V-BBLuf$~vL^d#zqo<hCRJ=6!?M}5%)Wa*H42yI>Y({M4h
z&nUbApA|2{=R~#Y^Ds|~`~}#L+80rO^b#6?UPc4aD`*gU6%9tOp&{sXG!(sohM_l+
zbsfG1ZEc~q;iF^JS+4IWRq?x`rujWlP5-{Amij<ccYX+m^THpY5$Izy5`BV3p-<6h
z^cfn1K1XBG7ib*%5?Q)KUqL&Q^lR7%eWNe~ek<~w)b*X1MfyE#iGDz>(2uA!`U$l`
zKclwj7t{{@irS;!PzUro>WKb8ozS1iQs4ar?Of8oVMFwf!fg1jm;?WVRzZ(Ox(y@D
k?+b*IgQh2(pQCOgloId-Bb?u+1qFUzFyv1$Rp&PT2Vg`sAOHXW

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp424.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp424.php
new file mode 100644
index 0000000000000000000000000000000000000000..e8e2370303b50cecec4043f3e0a324155eee90e5
GIT binary patch
literal 3210
zcmXZfS6CER7{>9~aje+8qaXu{y}K;f#e%&dSXNjCMZ{%E#NK;i7klp|Rup5+kfv9u
zu6ku}SLy90k@J7Ac7D(M&9n2J=X__LiA%`I$g!;4pf8x2W=E#`f<D`8`vL)9z8!7Z
zw)25wd*e%fVoOvCl|rRaX;cQ4L1mG<7nXw+QF(={U<J4sg()n66~&LCC4K@c!Ahty
zs*I|jDyS-|imIV%s5+{S!cjP?foh<ds3xj~+<maNxDwWZVW_Uc)vz9{hw7vHsDVni
zz=q;R*a$X4jZtIN1T{fTQB!0icL{7JE``m-WiUcq4kN`Cum!YG6sn6-9oP^?>&`VW
zMqCS9itAu2aXpL`H^A1g9BPBgqqeAmQ9H9`-AxAV!DfRF26fDJM}n;eoxnDO&S1Mi
z7qG*it3g?F-Hl+UL3gmr!0Dj}-wi$D9vBB}Aup<p;#ImICcp-$C$dp56rxS1w@9N-
zA5nX#uSmB}KaqZ&{vsVa14Mdu5=9N<K#|6sLC`(SQw@e~&=3@dl29}nidvyzXaO3I
zqR<Ew(&~;BwYsB3t?p=12hSK$BRW>p`i>J1@JHjtgD_b<1Sh~|C<R5L)Ku6KPDC+i
z67rzQ$UO_Ez}Coz+M=l_q_s^GkC3K|N1<Ol2B(R~;dJo?%n(n)Oz{+)0bSiY6UGu|
zp%!QsnvAkhJerLX&>R#x4TI3tTF-^gmS~sd<0%x+Lp{)Z6oD3?o@gO@e+row)*|Rd
zi&1m56#39HG!-pJX=nvXM=OyZtwPh#YBU|KK^bT*%0%msdj_r-Z@`V>MYu`405`)K
zXbYN&wxTSw4b4K^Q8wCvW}^a>gLa}hXcr2geaJ0>2SjbdgJL1+A-D(~M!Dz+3ZkPZ
z4;@1vqT}czbOOyqCs95+h3292$o&*vfRoTgg&L<zqUPtac#YyKq9&wJ)Hq!guTp$X
zya|iMTkyJg8-4~;&<!*Z-Bjs$cuUmO-WIQr-hsuMpu2EB;peCqa#3$ojQXH2P+#;V
z>W98U{n6KG0Qv?cqI+l{x{us*@LRYLeTN32@6llN0~&&UL`mo;G!#8R!%zqfM-R~m
z^azbakCA&FK7sGgb8~(?g~i$h&)_J+=V&x~fySVhXe@e##-Z0}JbHtY(OWbDy+iIL
z_%m#WenIWguc!n14Ru7nqfY1#)EWJWx}d*MSM)dPhW<g_(Z9&O4F3~L-lQ=e%Zd#6
jbMvx-wl|8e3XheSo$C)qn@^0Af`C7m7s$3%=du0=GS;HS

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp437.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp437.php
new file mode 100644
index 0000000000000000000000000000000000000000..e3ebb45c900d56b0e9c0f6e3345f55a5ff528ebe
GIT binary patch
literal 3841
zcmXxnWq4Fa6o>KRu(&%c5F!xVNkVXUcUVXufe^xG0|a-HHf@n4xVt+PD{azJCw14<
z-CZb|_kTX!^Lx(By>sWBx%+HnbW&WB$CDiJ1>&cBgJOIEpEt_u^ZR|N-cXO%8**QW
zH>yj)CA>g|P$5(p6-Gr+5mXcvMa57tR2&sYB~S@e5|u=yP$}d=9#k5YMrBYLR2G#*
z<xn|P9+gKGPz6*GRYa9gB~%$zMpaN1R25Z4)lfB59aTp)Pz_WQ)kL*WEmRxTMs-jf
zR2S7n^-w)jAJs=*<V6io1Jn>TM2%1*6oi6MW7HT0qhK^K1m3&49tnk^C=7+6Ca4K&
zikhNu6posqW~e!8j#{7=PAy%3wsdhT7q@b8YZte6aT^!6adBH0w{>wl7q@e9dl$EN
zaR(Q7aB)W$cXV+l7k6@TNM}~j8AYH76p12H6pBJ!P!|-9qET1W6?H@1P<PZF^*}vP
zPt+6jLcLIL)Eo6deNbQ27xhE^P=C}P4L}3XKr|2yLW9s?G#Cv*L(ot(6b(be&~P*y
zjX)#NNHh|SLZi@VG#ZUTW6)SM7L7yW(0DW+O+XXS#EJ0U)%ElwI0;QglhG731x-a$
zkq`OMG&BuON7GRZib1g`7R^92&`dNF#i2M9kK)lRGz-l}vrz&{Ky%O>l!y}1Tr?LY
zp(Hd9%|m|VN69D|1yBH`pcFJ8%|{E+0<;h<M5!nhEkcXXVzd}7K}*n5v=l8v%g}PP
z9IZgP>)}fA23#c`gR8~;aE*8nt`+yfb>bnoUOWQR#N#ksJOS?)kHQDUGcZFu4IdOw
z!iU5)@L_Q++#sgIjpAXrNn8gvix*+0co}Ai=V7*Z9c~e?!mZ*hxJ}H4+r^!52h7nv
z?-UP^-6d*ccf<Tu+Sxt$_9jN}g}M9SKJgUXFJ6EL#B1=Ncn%&CH^Rd(M<qNWYVJ`{
zFMJH<XKY~daivwX6XH#>Cq=d4DN*lmT2!-~5w-DWVScujdCsg2Id9&~vo6S)tMEm$
z+WL~5rKevut2$TAs^uf*Ebe#JtnytmYkk+vTNr=CybIqnt2rJu?;w9m&eYC6X3ix4
zxLIACW7gK^nsxst%qy7xq*=wdEobc}|CD(Te%ibpKV#N<o;B;E@|;;`@OiVoBQKcs
zes|1Tf1X+W|DstRkC)7<=gVfDpI6M=SnsRmt@t&w`sa1C`sWR^+VM@Z&c$1DrtbH)
zIfMJZBWI`Kcg^~My=T_=_s!am56r69hxm>T?ME<I)yY>@i~ktrY3?V=s#QN#b~P*e
z4CY*dpDU|%exbQ4<Cmh|`YTaI|5{W}egpH<)KlN$Jbj11(`Y^TdmF8r{UE37g#L(g
zv;#j`S_S{vtcLhS&QQbsYS!(3!?{;@?cZ&>>h%ZCIZOIarPI_-e<`ime_L9o;~#mY
zzLWoIxPDarQ#xB~yQ_2o!y-JMAb)IfN<zRJ70jR62v164a%>>f{j)6?;ExTY_!GSv
H7vcFIjh|ty

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp500.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp500.php
new file mode 100644
index 0000000000000000000000000000000000000000..3771c8f624117ef901a2e0a79449a865ae717aef
GIT binary patch
literal 3779
zcmXZfbyQSq6vp9e>)73LRAfN0+hM@&?!Xvf6ciCBRP4kq1eCVByW^bO-QAsfy9>_m
z{cGk~@BU_;1^e53CMqT+A;sbF2RwnqI3qOP6Yv;r!{hULQjKtjVK^Ug8t&-gm&jt3
zKqXK~R1%d!rBG>P=D{+s0xGL84VHr|QF(=XU<Gj-bcowwMOYD4LX}WuR2fx4RZvw_
z6;(skP<2!t)j%~+O;i)rLS{a!Ev|=kV0lzm;RaX_)<gACebhju>9C==12%$<P-D~>
zH9<{K2ns<4GFQQ-;%eATTmzenYhkFk4z_>}6o%@eSSM@<!*y~aj1V`$mf~jEO56e?
z#jUV4EQ8vhvZyU8XRDpvvgS@3?ZGY^9c<LG-*+U~ZKD&&u+bT0+UNqZY;?6z+J4`S
zV6TntAlrtshaNl!y2M-<1#2NUs*R#mS^#5U1Jn~4sFzCj!QRk10Q-oCU|&(i{lxvG
z{l$ZDfOr@V6pz9|;(0h2PC-LZ8#EL}p<yT-4M(le2-FmfL}6$YvW~;i;t4oLJPF5&
z$KW{eG#oFUffK~DaH4n$P7({@WH=Q~L7^x%7Pf>_Q3RTXTxdF)hGwAF$b;IVnaI+W
zj1zSS<3(L(uc+%hOVs_HEow3)h?+%-B6q|&2bxECjJYrpC7~8*9-5AlQ8b#5Vo(aQ
zuE7PO=73Ms9Po>p0|8MpBq(YlEEKg77Kxgci$%?lR5*jDSb}<>rKmYthI*pqsA#y^
zdvFDGqm`%`T7@hIgL5_X5UxQp(OMLT)}eT`9(hq3nuRu?*=Qq5K$}n^+Kf!yjxFL%
z(yh=s2e*m0;db#3+@Z6&_d7+M-38}Rn~vt9-6#oVpm``0C8I1fAMHUYXfIlTvXKwv
zAX76TSG+-*2Q4*pzEZVffzmXJ3zcec?h`MQ?uRST0pv#qQ2-r6L39``L`TpfbQCQ{
z$51Ldj+USk$kf<ADc&VL1ugcT^R$>xdPXdOXLVMS@SLdaabDCyxFBjFTokYJQI|x`
z=gXqj#TD@i#aG2!@S3QWyDqBbZipJlH{mjl-cqRHeOuJvzaw6v_%5{crScwJN_Zdj
zLMG~sEYt@*iu$6*P(SoI>W`j41JILbAbJW7LQf-8E9x0&>A{~B_2+v|yujJ##f$I-
zQO)`yTu%5B8jM~>L(nT|D0&qQL$9IX=yfy#y@5ueH_<5c78;G-M&@<+4zx6g-WAmq
z?};jYU(|K}Kvdg*2#Z#*J(@pKs^<I{jv@R6jYXfLap*HN9(|4`pfAuw^d*{vzCx4H
z*T~dA=o@HdkbWy>!SBR$_(0?<sq>+jN%}o(hkiiq(T}JD`U!PJKci0Q7t|U3in^fR
zP*?Oj>W2P6-O-=ORNwsttz6Q-#XR_rm<|6GbKrl_EG%M#%i#$1dHunpfZ-0~=cvmO
YO!j*N;r4IS;sT#H5cDM*s&hI12mJdrGXMYp

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp737.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp737.php
new file mode 100644
index 0000000000000000000000000000000000000000..2d67d33f9ed9e1f8650061e59b0b04ee9942c21c
GIT binary patch
literal 3834
zcmXxnbyyT@6vy#v>)PEqDiVs_Qg(L-#tJAXA}+fsHYV7ytliz+buZoyxZTO^?hdcK
z-{1S!oX>OKnK?V}IkV41#-t{ux?E{qw>K%y35s`n-A<I__ITXsPN>UqLLLcmqM{29
z;RPy$3ZcTNFe-wIprWWKDu#-o;;1+(fl8o~s3a<dN+B0=q0*={Duc?PvZyR7hsvSy
zs648GDxiv}BC3Qcp~|Q-s)DMZs;DZehN_|Js5+{FYM`2^CaQ&Mq1vc6s)OpFx~MLy
zhw7pFs6KL#gBqX)s3B^I8lgrg2nC_Ws4)sg!6-HaK0KNp35B63427X4s0nI{nxb$N
zj+&uns5xqmTA&t2Elq#6G;u2vw=!{S6Sp>T8xyxNaa$9&HE}x=w=;2j6Sp^U2NQQN
zaYqw(G;t>rcQSEEXR7FoB2Wa1M3E>8MWJXEjbcy?>VmqUuBa>OhPt8ds5|O`dZ3=D
zC+dZIq28!B>Vx{AzNjzihx(!Zs6QHj2B3jxAR2@Qp}}Y{8iIzPp=c-?hK8ZxXgC^y
zMxc>sBpQWAq0wkG8iU55v1lwBhsL4tXgrFIg%6LWrzgM(Xd;@3CZS1aGMbFs$c?6;
zDJTxbp?DOJ5>Nt~il(AzXc|gHi6{vrq3LKknt^7ZWR#3%qM0ZKrJz}87D`2_Xf~RS
zJjjF6P#W?gFY+NDnuF$`xo9q$hvuPll#b@3`Dg)JfEJ>KXc1b37Nf;z30i`dqTJ0e
zL)-$FiCf`v(GORM*>I&8fUCr9aJ9G{W{NvtmbeqH5qH70;%>N3+ymE(d*KFgAKWPJ
zhnvI$aI<&_ZV?Z|t>O{r7mvbh@fZw<$Kf{d1l%rOfIGyCaHn_)?h-G<-QpFvN4yI6
zir3&i@jBcu-hc<hoA97`3my`0!^7eoctpGlkBax;F_^a$9v3s<32`|*DK3Mj#1-(g
zxDuWbSHZL5YIsh}gy&&?Kn;DtS{;4SS}lD^_N$c3)@p$(a<&@gs`Wwccg<Q|f8AO`
zal=|2cGFt*-Llr0+_qM8-?3Kj-?i3g+>`yAsOM2@&FEv+>ZKg()2zR5t?NH-t$lpL
zT0QZkoULhl%39<0w6!Mr8Ee(^thMIiIcp8o^VXWz7p(RBa;;T=p0%d%MQe@WOV--Y
zm#sC^uUP9v^s2SqQ?FU8e_pp%|GZ&+is$*J^-27e?AP_)wq8g69XX)>eb-vE@Se5S
zzi+MQ@qxAW>qDHE#pOSOxq4dp;u*3Zi)Y~{I(H5HRM~UzGi6oC=i+*@Ux;hrm*NKa
z70lHLe=X`ae<P~qZ$*{yov8bMFY3xah#R@lk1$8C*`Hv3mUjDRYjwjfI$N9dtEj#F
z4c^zA^>=%+%KiiAoafemDxIlL`b%k@{kKhPF#eG<^#1%;%k_`&pV9%%!2_iW7#87j
n1$h$Ee92xXDwwa>2$wG<Ex{XVK4}XUcoMumPl}^;5w8CMagAM_

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp775.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp775.php
new file mode 100644
index 0000000000000000000000000000000000000000..1fbc4cdc63d53747ce75c2c97bb62095362cf160
GIT binary patch
literal 3815
zcmXxnbzD?g7{>9nb?j~(6$!;|5wN>EFh)Q@5pft)Ol;iMT?4SY*6xnooteAc-7(wU
z9j=_;bN-t5`+47c=iGCi3!mv0pOKQ`a%K8FzSKl_Sdz!*amTtnUau$H9qDqrBkqfE
z$Ho<YL>H<EDuRllqNo@uhKi%&s01p3N}`ge6e@*Eqtd7hDuZ0eh03C`s2nPX%A@kA
z0;+&2qKc>zs)Q<|%BTvef~umbs2Zw<s-x<t2C9K-qME1{s)cH!+NchygX*HXs2-|^
z>ZAIo0cwC6qK3$g+^7+1gc_s9s0nI<!cZ7$ikhNu6pj)i;Jr_ikw_ScqEHlShMJ+~
zs5y#8(WnJ#fm))Ls1<5u)Y{~;wW-^fx{ayZn!2s2+nKtZsoR^ny{S8xx`U}Zn!2N@
zJDIwZsXLpxv#Gn7x{IkJy0VI{C<eu#Zm1iIMX@Lj#i4i<kGiAos0ZqSdZM1F7wUz2
zqu!_w>Vx{CzNjDShx()bXaE|32BLvz5E_IAqrqqh8iIzRp=cNyhK8fzXapL8Mxv2u
z6dHv_qtR##8iU57v1l9`hsLAvXabsmCZdUG5}Je(65zd0lj+HDGMa*>ps8ponuew!
z5AvYtXgW$ni6{vrp=6YdW}q2pCYp&-Pzp*#sc06Og=VAKC=I2dIcN?_N9kxTnu{_}
z2AYTFAusZxOq7Xy$cM5}7MhRdqXlRIT8I{+Y?O@_p+#shT8x&UC1@#Hik6{eXgOMr
za!_zBTmb{O;7aj0T&3X^aJ9OJ;Tm-h!L{lhf$P*=2Xmpb60TQwE4*Lb0{DQq4Q|lz
zNw`tn>+nGsSPdT%*T7BUdbn9U3b%;bjjhnxNH<U2D=;4h55fZI7q{u!opiU0yWkEO
z&;#xichlV^UW2=#UmLqe-R*SuirSog8rGrghrt|%4~Qq=L0x+h9)iwIcvw^zj)*tt
z9)+QtJ@^>*YbzfX6`kYa8HP`Yr{GEPHasQji%&yGu{)!#j{mHvMW2JAg3a9Py!94*
z!CFzfDCa4Om#npcmvK;Wx*~4iZdXN}#WhjKdL4%Hb#gbXwYHnqI=fre+S1!Ns7<>A
zo&9|GBbv_Jgdere!;e{C!hUOQdcaz#3tB5Hj<t^AaqL{+c29_k(vzCbSKyzr)@q)%
zRv@0SR$iX9*3&&_t*3k5TC0BnJBrMUFsRr3B~fqg%i<1}{)(t=e^oq7_ciDofUk>s
zN8S*XzBk1?48H|Kc?!ha*2>E}azQTh?^-Kf?^$d9eQWK)2i7{H4{<<Y{z%-%-9ymP
z%{~@a(fvfjm*J;kKKu;&)%{%8YMo!ep#BtoDPHB;uSC6)UyI7oH_*`^*>Ba=`}v)^
zI>_%~C`U*41NNWhn|>6}!=LQ5BK@=4I-Orct@>B-7#IHr1A2(xVJK%W?LRbq4*scj
zt`_!}+PeC0QU8?w5f!3;MZHS@!BBy+e^>27M#Z>XVcz7-tTdlHHk_ZVF|Mri%w%7r
T`Tbfr;7#^rdDGpRi*fxA$_!4T

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp850.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp850.php
new file mode 100644
index 0000000000000000000000000000000000000000..0b314c80bf4cb090e3973d71286a54e5d00cdf3f
GIT binary patch
literal 3809
zcmXxnWport6o%o&VQ_b7AVeUzGZEa~CCHEj5(ptoCP2{O?n!WWcemXcmUVaEoppzG
zXGy(Z{p$OiTRm0X_g3|psMxfmG?y#g=kX=SJ0S@kpT~)IJYKIS(+PJuPS|5%PIOG(
zB{EO>P(G9&<wpfj0aOqbM1@cxR2UUTMNkn`6ct6qP%-2}E>s*9M<q}RR1%d$rBEqU
z8kI(6P#IJfl||)HIaD5%M-@;7R1sA~l~5&A8C6DAP!&`aRYlcMHB=o{M>S9lR1?)i
zwNNco8`VY*a!?&q2h~M&Q9V=-g`f~rAJs>pC=|to!ADoqBjGR{MW6`O05w1jQ9~4o
zB2gpM2sK8HQ4`d}sHy4CrY3G?;$|jpZsO)9ZeijUCT?lsmL_gx;#MYZZQ|A@Ze!v$
zCT?ruwkB?8;&vtuYtJg$BR6uRC=`XFQ8bD{F(?+rq7JA7>WDg`PN);=j5?z(s0-?f
zx}t8V8|sd_qaLUS>WO-yUZ@x9je4U#s1NFk`l5cQAL@_#qXB3D8i)p>L1+*fj0U42
zXb2jLhN59;7#fa-qY-EX8i_`tQD_tzjYgxmIQZyldU^~TgT|t<XdD`c#-s7bgFI*g
znt<X_JW4<bC=n&1iD)94geIXRl!TH|GMbDgqbX<#N<k@TDw>K?Q7W2-rlB;HhNh$G
z$cwxv9i<~5@}Ufrfo7l?XeOG8W}#Uq6J?^=Xf~RI=AgM~E}Dntq4{V&T7VXyEEHG{
z7m7FGBJmhpEbfO(#Dj3DxEC%H55eW)5x7D;4p)jN;41MbTrHk~YsAxVt#}fy6PLjC
z;!?OlTnRUdhv6o18Qd&hgxTU{m?NHtx#A7DMZ5;Lig(~PF&AzZcfuXwRk#!S55Qf@
zZiTzWEpQLKw+Zf5b|2g)o`U<u3-Ew=9Uc_V!9(Ikco_Os!6TyXJu2#XkBKVTaZx2Z
zA>QJbPl{^7Q=%T>w5V1&BkHxEg~42{@|?Ba$9e0`%ymJ|UW6}NtEn&Hz(UfOMUB29
zW|6%L{n{?qU@%98yKb$u-LO{aZd&i+=Wb!Yw%ct{8|scmXK!Hi<JQ^u32Sw)-&!v{
zV6CRRYpsWQ(pqJ>hXZ<;r^Lm~_OwRlY{$=7Yc<bW>)kwOt)2J0wN8&0to3v+T5I($
zVZX}sG7Ow$_E$vR{HnN$>}%p`_`0|Pz5(y5>)%v%E!nrkb?|L*J$wfSv$Z$hwO&L1
zJvmo%y>G3<>I3Z8OZgB6boWPgv?}zm(rV>T#68Rv6jgvvMeT#n#7hkRT+D%AK)<qI
zDtnvkSK@B?wW!K}Bkmykt+)+-Cu*yIFRJ5zfPNkHKZ@$$`=So72cin~6AWf)H~p-%
z7X6E;!~0iJpQGPk;0mk!U0EH#e~9X?KSh0={t|WX-=Yrwe?%Rz|BCu({0D=%YWs&u
s=P|<Va)o#k(=$?hPIM@LR^6_Q)bvDOxcTRrH^7_d%kZW;8s~QX52gZ3i2wiq

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp852.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp852.php
new file mode 100644
index 0000000000000000000000000000000000000000..f8c318cadeba81f8f69fed5fd262bf088e1bba19
GIT binary patch
literal 3808
zcmXxnby$^26vy$k_1fL~sz@kyOWEBW7*{|+5%F?Su{+jQz%J~ySJ&3vy|Kl1cd*^v
z;mUk}^VdC}=bU-pcV^BE57BYy$>}avhS%*)NpM0E-Cnm7<G4K@ca{_Ga-6US!kn1c
z!k@@O6+uN%QB)KaL&Z>WR2-E+B~VFJ5|u)wP-#>el|f~Y3%O8PR2G#(<xqK49#udU
zP(@S`RYH|eWmFkeK~+#yR25Z2)lhX*9o0ZJP)$@5)k3vUZB!f8L3L1FR2S7l^-z6O
zA2mP?P(#!ZImkhcP$SeBHAYQP6BL3%P*c<tg`!Xt9|rILnjQ&<;V1${pk}BUYL1$t
zNEC@$pcbelYKdB*Rz|H&f3`Mp8xyxNaa$9&HE}x=w=;2j6Sp^U2NQQNaYqw(G;t>r
zcQSEj6L&Uo7ZZ0eaadQrqAQ9*Q79TkqZkx}Vo@xLLvg4Z>V~?b?x+XqfqJ5zs2A#m
zdZXT`59)*ZqQ0mf>WBKH{%8OifCi$0Xb>8N2BX1f2pWQhqM>LQ8it0W;b;UJfkvW{
zXcQWSMx)Va3>t&RqOoWk8i&TC@n`~?fF`1eC_WzE|1~{52~I+j(PT6QO+i!9ROCi(
zG!0Ed2`B+2qC}L0lF)QC9nC;9P%=tJDJTWaL^IJWGz+DoR5TmSMrkMw%|UZeI!Z@#
z(Ol#~9+ZJHkQaGTCdx$f&^$CB%|{E+0+fZa&_c8jEkcXXVzd}7K}*n5v=l8v%g}P<
zUk6u+x8X|hG+ZU-!PVk1xCRC<z_l=-C$CfSNwVuzyb^9u_6&Sb*==y6xE*d%@p-se
z*&A?+va8`%7+4FpDZ2q~S5{+ph&RdZRPhy<EnbB=D!v1A#k+794DN-y#eHxO^yk98
z;(oYK#ah_?;&HME#1-(M#_ocLU|=&mtn3kZL_7!c#LMugsOcYr0j=b5aSg>MU{KRP
zDQfzsRJ@zw)8ZcZ5cHjeXEavtJ*(nPWX~yk2%gtiwaNwY7TJriAXmL|$$AI*hpl(w
z%W}3F@rt$9{t@igVqX<ieGLY*$=6}<AkV%53v!O)o7VcaTh`jT+tvrDzk`FC+Fem+
z^HEi2>ySKVoz3XSt<}9gYc0CpT1^+QUe5TSwchsx4ruC6imRx8O4T`9il?phHP2Y<
zD#^D#!T4vb598;oHM{4n_4O}cpSI~m7|_bTBx>->;ufC$3iNM;uPVD0z6OK3w_aDV
z&eI#B9`&Zi>R7)83$oSrZ(FOC-;s0I^R9QTb;RDo!93FMi@NAOu+`e353ygZ{E?`0
zQXpyrK88W<*C(Q0{Hdt#`b^Yjd@kw|`9jo_zl476{8!56Fo&<ji|`v2>(=;IRL6g(
zVjY<8p-&zBgQ&~vN0_g%KZ)9kpG9rsFQPW)SLoAUqu-$a8Xx()ve)4sqNebtc#7;_
zFke^O-!OQI>_4L3`>&|t|6oC`7Wy9c6*3~q<qGj6Wn`v$otRMmSB-LIre!2~!_7ag
Qg$14@Z>A^BQC*ble=%f9FaQ7m

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp855.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp855.php
new file mode 100644
index 0000000000000000000000000000000000000000..48440ba1acf8727aa87bb9faa657f640dc2ec98a
GIT binary patch
literal 3809
zcmXxnby!qe6vp9e>)73TR3sF;rR?qwj1f>!M4TB^?7(gX?C$PvZuiXXj=A04Df{>B
zzh=G9w@%GoXU{Xyap}qFE|=Hm_N62^A&G9E+lg`99*;ZI33oY8*dt+1Ol<x~WWEZZ
z0;nJ=hzg-Xs4yywil8E>C@PAIp<<{wDvnB^63B&Is3a<hN}*DyG%AhCpfac|DvQdY
za;Q8ik1C)Fs3NL}DxpfKGOCQKpem>;s*0+iYN$G@j%uJ9s3xk3YN1-FHmZ&4pgO27
zs*4=tpn9kts*mcU2B-lFK_RFiYKTHnD2fk*4?oR}gu`$Yfg(^N)Ce_3jZq|uL`_f=
z)D$&E%}_I==4L*do4SRmTbR0~sau-5m8n~qy0xiWo4Spu+nBnosoR>movGWIy1l8}
zo4SLkJD57GBX`jeMWHAZjiONuib1g`7R8}B)CqM$ol$4h1$9APQCHLrbwk}zchm#*
zKs`}U)C=`Oy-{z}2lYXHQD4*#^+Wwpe>4CMKm*Z0GzbksgVA6#1Pwt$(NHuD4MW4x
za5MsqKqJveGzyJEqtR$I28}^u(O4884<CM-nH~qnq48)unt&#tiD)8nBR86aCZPnB
zfD%z6N<v9!GMbF0peZOBC8HFSf~KOWXd0S^Qc)_Jj;5nDl!j)Y87Lj4qnT(X@*ofL
zA}{hGAId-(Xcn4<W~13?4w{29Q6`#;=AwCM9-5ElqXlRIT8I{+MQ9OPi~?KW66jwF
zmnz)~mnmHavy^Uz%atyHE0ku#l}fYVDy2DawbJEqjnZ7WR_O}3PU$wdUg=7>LFsn5
zQRynUN$C!_S?OxHMd?nsRp}a-t#lX6QMwl9D%}mYDP0G*E8PosDBS>eD%}TnDcuNn
zD^>FzrDsX^D%DNyQ+kqgzjz)V5I4bt;stm})Pf#{0e$U9lpdw|sCXG36SdsO#Ve#I
zL@oD87|<}BQhJ!?)8Zv~M${0Vg?Xn)&xyC-c^J&qGhDFNfM2xM*)GZ1n)u7sx|b_B
zpuxNf{YSXkHSs#UE^72{z+lcH;+xjGw_Da4<lEMJ=)Z&gH{e}SqkB)?*;>o{)>?rF
z)>@!E>(iX>QELtCW7dnwAGf}ZpTPc`@JUgx%2Vpjk)O8K-8^G`g2SJ+)-*k5y`TJf
zYdzfy*1G!_ah{gR5B-{gfT%b1B~efEvZx1tMZCk6Ulp|ouZed_Ul;WrzaicueG>+=
zH34r~YZrK1&ed-8j<sHdcd=jlz<V&Dec*lDtrhw}-RHRYhw4@uRH`rZBc<A%KUR8x
zV?R-<x8PHy2T4Cus(t@+r5fum#H%!aDQfTjO1wz=wW!ze8yL{{^Q}@X@^>(prE`6c
z^UiRtA9S!b;2(9cHin<XYc&5X>RtOq$7&&dReGG}-;}P0zbn;s|4^zQjX#xYvj0-5
zpQFE(9^+L1z&!C^7|hiw{iise5m7Ezh$qRLk?M0|Liw{A<;qC&Ci%k6KiB*QPm(Xg
Kljf)|%Jn}O%1rG5

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp856.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp856.php
new file mode 100644
index 0000000000000000000000000000000000000000..c9cac0c35d7c8d46246383d6a092ba47f0422fbb
GIT binary patch
literal 3194
zcmXxnRd7^S9LMqEaB+9IK!`waXR`_J?h<5477_>{tN=j+rMR<MTq-!l+d`4H8<?rW
zW2eY;CJ%jt7Fwu6$@%`y)BSzsf9~8P|MPHD((<zM948p^g|ai;xJ+Nj=XzaVAmGb)
z6CKx0cqhU2rj|UCOH>M#LZwk@R0fqnWl>pF4wXaYQF&AWRX`O{MN|n@LJo3JWmFke
zK~+#yR25Z2)lhX*9o0ZJP)$@5)k3vUZB!f8L3L1FR2S7l^-z6OA2mP?P(#!ZHA0P0
zW7HTmK}}Fo)D$&C%}{gH9J$CvEl>;8617CFP%9LN;!tbU8pWe{l%4?JK247#!bFsW
zl29Ae2DL?PQ8G$K?NB?^9<@guPzR%qrawEH+{xrlCU-Wuv&mgd?qYIRle?PS&E#$-
zcQ?7a$vsT&VRBECdz#$K<X$Ex^kx>lkq3ED3Q9p<<VC3{6{Vpx)CcuJeNkW35A{R+
zQGYZ54L}3YKr{#qLW9v@Gz1MnL(xz)3=KoW(Qq^ZjX)#ONHhwKLZi`WGzN`9W6@YN
z4vj<O(RefgO+XXTL^KIaLX**CGzCpTQ_)m34NXJS(R7ra4&OdaPtSle&`dNF%|f%#
zY&0ABkPpp4b5I7#K$$2L`H>&ZMRU<SG!JE=ER>D1(R?%?EkFxU4$46b(L$7qa?v8R
z2<4$Xv=}W$0Te(%6ht8uLSYm}OVARu6fH%|&@z;d^3ig%9IZer&`PuttwO8NYP1@y
zL2FO}`f(RrEAEEt#69p`aW7miM&Ns5A>1HF;YM*E+$8RYo5cfgi+B)j6%WB};$gU5
zJOX!!N8wKK7~CZuhr7l1;U4h=xL5oTM#PU`p?CsD#glNKcna<pPs0P^8F)}U3lGDX
zzIzlFY3t6YdV#@b#q;o-cpIJ<Z@~-VIe1aL2`|CosE+@#wa)*FwHn~699hTv*Q~We
z*Ktg%yrFWT*7doyK6lev3%zBnlf8{&I-NVB_Wuiwj;NKtv{rk5Wqpmw#;mn*Mb>Jo
zyVeDazh|wj{8}zllYV2Z?|o~n)qiKL2KnAvt@wkr=6~N>^Lv0}+S{L0j_3wGwBE*a
zAIZ^8__6hR`~=4|o1bl2tNlggPZ<4Fya=C(+R9(WkE#A9UWU(Mae<EYh01p*|1N$C
z{}6R=Uc#c!sJ>G5I{Z_-1pg9s$^I7g?myxU2LCHwh5w0H;A>bM)#<!Zxr9j`$B7I0
igW;Tz>y76x!sCQ<gZ@yW`K2fs5b%e>fm~PPJkI|K395bo

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp857.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp857.php
new file mode 100644
index 0000000000000000000000000000000000000000..3e7770ad59374f6dff41ea47271b3e5399323c66
GIT binary patch
literal 3763
zcmXxnb#N3(6vy$yVR3gDAVeUzvk~0gCCHKl5(pveZh+wK&L+6KyW8DvI6pY6bInPe
zOP%|X{{H%}d7pYcJ3Za6-_*v$XQX7fTt2_YpPJ}|C3*ZFC)V+Jy`C&5(&ac2PeeGe
zaru|%d=)?iP(f4>6+(qjVN@6uK}AqeR1_6M#ZYln9F;&NkPEp`NmLS*LZwh?R2r2*
zWl&jE7L`NgP<d1yRX`O`MN|=0LX}WuR2fx4RZvw_6;(skP<2!t)j%~+O;i)rLbXtB
zR2$Vnbx>VY7dgm5^-w)jAJs<<Py-Z(!carh5QU>~ln?<QUrmif!blW_qEI8$2sK8H
zQ8bE1O;8im6g5T7P&1?EraqgSxP^&Zn7E~hTbj6)iCdYtwTWAsxQ&V1n7FNp+nTtY
ziQAdDy@}hKxPys1m^h*%v*?K2$c<u942nguC=SJ;codI1p-!kX>WsReE~qQ&in^h0
zs5|P8dY~StC+dlMp<bvr>W%uKKBzD1i~6B{s6XnD2A~0GAR34Up+RUc8jOaZA!sNX
ziiV+KXgC^<MxYUBBpQiEp;2fw8jZ%FF=#9rixLvx<EyFZac~?OkH(`3XabsuCL#~=
zph;*FN<@h$2_>Oql#C{$$!H3if>KZlN=2z?Dw>L>p=l@$rJ?C)I!Z_BXa<^rGEfGZ
ziDn`%@**GdAwTk?Oq7Xcp;>4)nvLe5IVcNdp}A--nuq40`Di{`fEJ*IXdzmJ7NNx`
zv<fZ}@4%(vNw`cr1ec3P;0o~oTqz!ftHk4QwRj4y5l_Rl;t9A;JP+54=immIdl7C_
zb~)T6u7I1xHE@e~3~m)y!foOe7!a?)Z1EDz5pToo;!U^%=3an1mCb>>#657gcmwW%
z!NYK`vOC~D_+TI0FYbp2H25GqD4vCf#LMuocncm8wXjFUEo6_uTs`-=sOO%5!TSt8
zDQe43iD$^37Vp9{qKfdWs8={As#MO4TJ{StFGsVyXuXx+zGS@(UzP()@fB+o^;H~N
zLi(Dh(bvVrWN*Nrj>}D$m#vMvWv#j0w%*R|cdYl~yEv%hc2CrSy06iJ&5VB1I)I<D
zR`mw0wdf&h6<w~iUgm+dw&7_U(#t#}F5_v>YIOE4{G7FB^Srgz<^^k=ycez2Jzlcb
z+dZ__>>uHvw&`V2mHUdQ?(!-Otz~YniR<9&;%fMYxB<Q?ZiH`%o8a3pFQCKtj`e!-
z@5(v)@%OCNo!-Ymt-=Q|q`N<~qqQX;DXrT5Sk#fr6Sd->h${R~#j8y0Gcg-}4ui^m
zp{xq?OHq6KmAIRGzZQ4GZ$xd>x1t)scQB|{{=KLg{XtZF`cYH^`boUUgMJp(j(-vL
zf%z4Nt~2;IWz|xD7uAmc5cR$JQ`EhGiE8D4i)xzxi24lt3-fYR$p0yw&nUOc73NL$
jWv2O^*l_-Sx?P#+zGQ!-`7fG3z?<yP^rkx+=XU)Mf15s=

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp860.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp860.php
new file mode 100644
index 0000000000000000000000000000000000000000..2a52d4736dcf01405af8c22f26b8db8c908431b0
GIT binary patch
literal 3840
zcmXxnby$>H6vy$kb?j~(6$!;|5wN>EFh)SJ5Qjm<23-XgcMZVqu3d9oYu$zIknK*k
zyF2B6f9J0`pXc2BzIX09_s%mtqLUJmJf7r$FEA(88x-dY_`H!`pWp9G^@e)9-jKUO
zypd5wAK^tRhKix$s5mNtN}!UcBr1hUq0*={Duc?PvZyR7hsq%j@}TmlJgR^ypo*v>
zs)Q<`%BV7`f~ugZs4A+4s-fzrI;w$cpqi*As)cHy+Nd_FgX*BVs4l99>Y@6mK5Bp(
zpoXX+YJ?i0#;7s!A}?x!nxLkrDQbqAp&%55nxp0@7zLx45P0X)^++fTMPVomwLmRU
zOVkpDqj1y;wL+~?Yt#m{acb-Ov#pEUxwxH++q<~Ei#xcugNr-5xTA|Zxww;yJG;2E
zi@UhEi;KIuxT}l1xwxB)L%Oqy?kEC9pdP3PibRnp3Pqu46pebKo~Re<g?gjjs1NFc
z`l7z5AL@ttqyA_B8h{3(foKpKga)I*Xb2jDhN7Wp7#fC#qv2=-8i7Wlk!Tbeg+`;%
zXbc*I#-g!k92$qlqw#10nt&#viD(j<geIfOXbPHwVq)N(PuJ5^;Z!sYO+(YsbTk9a
zKtAL{Gto>Gi(*k6ibL@z9?e3t&}=jtC7=W}2hBlq(OfhS%|r9ie6#>9K#3?3Ekp}Z
z5=ugg&?4kVew2)oQ2+%{3Q9qX(PFd&EkR4sQk05P(K56QEl11I3bX>PL@UuMv<j_8
ztI-;izX7I+H(<JW60Q{w!FA$cc(-@}t{2nb2Jtw|5KqBOaU<L)o`Cm=n_!lh4L6Br
z;JxBnc%PUKH;b8Yi?{}E6*J&A@e<4yFT))10?ZY6!R_KzxI@f>JH;HhOWXr@!#wTt
z9#Q+eSA%ylcpofG*Us)&dK>8j;z4*&JPQwr7vW*?8ayJNheyRN@EFWf36G1KdqTX$
z;FFrW6`oR7H9IZdBzs0w7oHXM748>LGx!1VIy?spbG6FzX1)1>S^INQ&Q^n5G9Tf2
zm*pJ2{Xw&ebH$v?_=n6Y?Nzg?cg?KzT{mxM{tfe9eABGnc-Xv~{4F_qGk(OZ)A6WT
zO`K=e*5{k`{Kw2X5|5izj3?xreZ22U^M3r4S?Azsv)1#BS$E2_=3~r%&a7+Xd9%LX
zZL`*2U{?FTVAkF7qFMEP$$XUey=>NTdd0kh{Htd5&ueD&&+BHj;~Qoji#O$LJ?|~E
zZi2VvT-`bEnAh?Ccg-6Ao>}|xzFGD90N>V`{SfA>I)%z=@gKng&HY$ewdyCz>L&dZ
z=IQ$TOj)h-bIny5zYz7UzZ6yUuSE6a*RU`{J@pMPSkD%GtI>M#cQ#rN`(Dn}3H<@*
zX$O9^v<m){Sq<^CoTY~Q#jMBuiu13qnBQ!=>h(L$J4gBtr8Cq{e=4one_2|m<8L`l
z*W^DMuHTe@mCn`L{!_Y$VG$lrkUu^-Wq!aL8O(p#2v164a(p1v{jn_?;ExZa_!GSv
H7vcFI$@E|M

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp861.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp861.php
new file mode 100644
index 0000000000000000000000000000000000000000..4ba6573c397be67ff55c276c542c146876bcd4b5
GIT binary patch
literal 3841
zcmXxnb#zom6vy%6u(&%c5F!xViQ(=pL6#(tKnP*80fHx3(uNjEg1cKAoTBZfrB3Ru
zsk^&S^1i?O*WS;$_syF(b7#)k@TlbYWS1+&=kX=PxC3H6K94)X?eTg&Y3^W`+Z}XY
zkUJu>_$RbjB~S@e5|u=yP$^Uzl}2Sy8B`XPMdeUAR34Q_6;K7_LM~JhRYa9gB~%$z
zMpaN1R25Z4)lfB59aTp)Pz_WQ)kL*WEmRxTMs-jfR2S7n^-w)jAJs<<Py^HuHAIb2
zBh(l*Momx?)D$&EZsbPIP&3pVHAgK_3lx9?P)pPj1)@L{9R%<FIz18$gHZ?yL9I|L
z)Ec!$p(qr!L2Xc5)E2cv?Hsjt`m?<gcW~kkPTbLnJ34VEC+_6Lot?O|6L)dqE>7Il
ziMu*+Hz)4q#NC~^yA$_t;vP;M)RS5CL}4flg`;p3fg(^OibPQ;3iU$0P;b;5^+A15
zU(^@%L;X;H)E^B%1JFP;5Dh|u&|owe4M9WDP&5<`L&MN;G#rgUBhW}R5{*Km&}cLo
zjX`73STq)mL*vkRG#*Vr6VOC75lupq&}1|jO+i!8R5TSuN5gx+PESvR)6jG@9nC;9
z&`dNFd5{OqLbFf|ib1g`7R8}BG#kxEbI=?VkK$1RN<eebTr>~OLy0I6%}4W55=ue~
z&;pc<lF>r65P6XorJxk#Lq3#>Qqdx`2rWj7(Gs)-rJ*#m6fH%|&@!|fEk`TR3bYcf
zM61v$v>Fv`fa&6Om?55kYs7<at#}x&6ZgaQ;t{w(JO(qxlQ2s>1@9M+!w1AoFk8%r
z8^yiwL2)g7NL&XuiCJ*7coc3C*Tb#i1(+jVg1O>Nm?vI?+r&L^yLbcc5cA+paW~v0
zUV*!z{}9}x>~^>p7G-E<_u<=HNbgtm0eC<>0}qPl;UV!VJS?WeBjQGQRNM-Wi96wO
z=)VO|z@lvJ;Yp=WlRhPCc}|OJ!!x43;bBqD@`$K~&xb{Mn;H77SqpN`ta+c8b26yE
zU{+gSlymj=OJ<#d%VzE66>~1*J!;nWT{UZd*Ua0fziw9N+%T&-Zkl&de@o8M%06b!
zA^*5pUF<h&=?lyn{|WPIo`2G;&A2V+>byN=-bek@W;MbyX3ghWvo4kA%sPY5n{|)8
zVAl8DF>C&XX7&GzW?ddHnYEuUn{_e0V&1|0Up4D|y=GSbylz(iykS;5zG>Fg_LiKZ
z@!mFP^S*cFyiEMASr^!QX4SuM)_Qzk)_#46@0?}0k6?jzr$|{%{$p6EXFpL^t@^35
zYZ&S?=)VX*S61`<LeFX&zZCV=Uy0iEuSNCbH?SyEJ@qXv)II#2s`cXUty+WqAZO`>
z{)qirfuAg`4gcA!hWJI!R>S>j)^NY!g3EmN@AkO%>ksVDC;g|=nQEuMl-ARKTUw{%
zA30t3<i9FE$7ug4ou|3oRl1lVVJ=sIH!dYL(dUi`<j-uFD>W%4&KK<bvn?+0#`#jc
KNp97Jx&8;y9bpmx

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp862.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp862.php
new file mode 100644
index 0000000000000000000000000000000000000000..d2a29a22844f21d17a8b9fcbf835b58c597b99c2
GIT binary patch
literal 3841
zcmXxnb#zo$5XbT2u(&%c5F!xViQ(=pL6#(tKnP*80fG}K4Q<*YNpN>-(b6KNO<L-t
zPF+%WcP01xo4?+C&fNRnymx2zoQ;f0O-%K8(gMCfQk*v^-WTwBqr5)9-<RPH^?1D@
zcZ7JOqKhx##VUbHppvL0Duqg+(x@~lgUX<?s4Oan%AxY8JgR^yAP@4Oil`#0gesxR
zs4}X8s-UW<DyoL6q3WnQs)1^tny4nKg=(SNs5YvD>Y%!)E~<y>q57ykYJeJ`hNvNG
zgc_m7s4;4SnxLkrDe@vOYKEGj=BPPpfm)y-6ogu$mM9nnqu3C5`|5fm6o#TO6oy)%
zR;V><jlxklYJ=LKwx}&?huS%{cm3Jk#T{JS!Nnb2+|k9IT-?dUon747#a&$7#l>A+
z+||Y1T-?pY-Cf+>#XVfy!^I&zsiG%}KoKYsMWQGag`!b3ia{}`7wUz2qu!_w>Vx{C
zzNjDShx()bXaE|32BLvz5E_IAqrqqh8iIzRp=cNyhK8fzXapL8Mxv2u6dHv_qtR##
z8iU57v1l9`hsLAvXabsmCZdUG5}Jf2qseFrnu4aHsVFuU-oCn?o(89(>1aBdfo7nY
zXeRO@ADV?`p*R$W;!!+GKnZ9znvLe5IVce&q9l}r=AyZ19-4=eQ8Jp3=A#spf)=0!
zC>5omg=iu2BR@(*X()gKC>^DvMQ9OPj25FMXbH+d8E7e5ik6{eXgOMrR-hGVC0dDA
zp;c%#y0sCm5jVk1aWh;iZh`B>9C)Xg3)hQz@GfyH%o4Z34dQlqx3~k|BkqLR;x2fv
zxEtOl?t%A<d*McLAKWDFhnvL%aEo{l=7@)2u6P*ciAUg8@hIFT9)sJ(<8X&~0`7$Q
zDr1+ZGIoo4?jBf_sVD8lH*{wEV1eFnzj&G_9T3mMgW_d)NIVM<i)xM|FkeL<6}9)6
zc%8k+VNtdk?S#^&NS_q1!BgT@cv{puJRqJV`=EFQo`FSqD)X#aALN`_U3^~7$z=Zp
zvyS<qoU5llWY+0iGON)aHfs(ZG3)p)n^oTxvnJ!JS^a#?tag9YtZBF|=jh8mX4Y6f
zZoa_#<(u{C3(UIz6Xw;df6}bOxFP3iz@9Q|!k#v3c%Lz=o@dSK{pZXYoafCN(HG2m
zznf;&UuahUzi8H|y=2yTzHHX~ykgdG&#PwrG`(h4|GaKi|J*XG9p5l(F5Z-LbicRE
z*?ix(<-9EXj(Ht^*R1vLne{#1H|xAUz&ACtAHo8iPLZ-I{v%kZy&o&9R{ccTwN&yc
z%)bafQ&x3;uDv?OFGRidm!b~+D^Wf9H7v?fPkn<6*Yl)rwOSAU&Q|MY-^&{`p+De!
zeSse>tpoqbtcLhm&Q`<yV%F_`#RZor<~Q4}^ZFg<pCSE+(phS!Kb6+*zbvik_*-71
z-^qWp{2X`tSLr;}_Mg(l42$r1g8T_->B#|aR4{*LBRuITX$gT)_s_O?fj=RT?oaV*
HU4-X<a4ur?

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp863.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp863.php
new file mode 100644
index 0000000000000000000000000000000000000000..1f36b9a245ebbecc3614160c9f1c4538d0e95551
GIT binary patch
literal 3841
zcmXxnby!qs6vy$kb?j~(6$!;|DZ9G^V+0fw5r;v=#8?GoO~CGswL5o*UAJYslkM&f
zSMK+B{+jc7&Ux>B?|aU@&okjs$??f9SBlT$ONem?#Cm)lcZA#H^?K6W!7jHu=%FBY
zL}cMlXrYRrBB&@Tii)9Ps5mN)N}v*`Br1tYp;D+cDvipZGRTEos4Oar%As<oJSvYW
zpbDrWs)#C~N~kibjH;k2s4A+8s-bGAI;xIppc<$qs)=f$TBtUvjq0E}s4l9D>Y;k5
zKB|uzpa!TRYKYv(jT)gws4;4cnxG~q00p3?s3{6Wfhal%KKONJBp3#x5EO!%p=PK#
zYK}rtC~ARPpq8j5YK2-kYVFKtYbS2w#BH3otrNF(;&x8l&WYPQaeF83;KUuAxT6zy
zbmC4<+{uYMJ8@?x?&8E<oH(c}yXcC-P#6kF;V1${phy&nqEHm-hPt8ds5|O`dZ3=D
zC+dZIq28!B>Vx{AzNjzihx(!Zs6QHj2B3jxAR2@Qp}}Y{8iIzPp=c-?hK8ZxXgC^y
zMxc>sBpQWAq0wkG8iU55v1lwBhsL4tXgr#LCZLIEB8rZN4}P7Qo&+bM$!Ic~f~KIU
zXe#m`51NLip%@f{Vo@xLLvd(2nvQ0m87LmbqXd+IW}=yB7Mg_;Q6id+W}_sOgyx_*
zC>bTAxo9r(A}>loDaeO>C>5omd1xM*kLIHVXaPz?X=ou@h!&wmXfaxhmY^kQDO!q_
zp=Br?<*k9s#hY-2cpR=255QI83iz<N53Yv(%W#ddM`4C|0%nRQ;ac$+TqmA^S>kE<
z2rNk7iq|Wh4mUu*ZoE<1OtPEA47gcb3%7_DVYavq=7<|$u6P4(6|cc<(0>SSS2i2&
z5O=|yD%L^o5)YEyt>W!)kGK==g?Bf@eOh}2?ick$2ekGA*@NPBcu2)+!(s6%*(0LX
z9u?K3V=!+$#m8Ym)<%3n)u-S|@fJKKY78G0Z<9SOYFN&QI`^}%Aa@hh=gc~g^X4t&
zFUZ*%<BMi>>XMwZpZd#YHRp;sm;6<84!&kq_pY0@zZ+(a?@jY=*55K~Hg22M?>lm~
zPWCagM(c62TJAUN==03F{u5@sKTn#~jJtBq9`^T?c`tt2yaPXD)_$Hf>!b3VSrhua
zS>KTt%zD0iX6--UtQY)6v!?bXv-<h6`7rx?#jMxqRr5CTubDMJubVYLZ<sZXZ<_UK
zdrQvN_1-pTas7AXTz!JxHLoK7o>}$pn{^%^nANWj@x5~_{|M%(I|a&W^B==}t^Gt<
zjq0b$uH;gmLH{NAxw6{l7h0<}ektmyzY^8-uSLz|H?SZ>GxaUbU(KDqQ?+jVy;bXC
zKggMSLx046oxo3)R>OZbYao7+vovtOnsvF~aNZR*^Sdoqzy84fv!wr2Iz!|1m(p7O
zx25%V{39>F!}5Psejfg(bguSxU+F@Igt=S+-nf+1M4vk%kUz6wuGFNIIA5^y&$h6@
O8|O>)Cb?A?=K3GlBw-Z*

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp864.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp864.php
new file mode 100644
index 0000000000000000000000000000000000000000..953e4635060777745fefbcedb6c16a49f7605388
GIT binary patch
literal 3779
zcmXxnby(GR6vy$|dhKq#DkBuTrR?qwj4Pm^h<LfE*gdcVF*cpKnX?0~&h5GmT@Th{
zoveF%CcpRR{PjDp=bT@B&o}OKBV$q%Q(dk!pU0OJ=MIYZ_&n|?x5w-CWVl0JZg<Fi
zA?~Q?;!Ak3N}v*`Br1tYp;D+cDvipZGN>#ni^`#Ls5~l<DxeC;g<Pm2s)#C~N~kib
zjH;k2s4A+8s-bGAI;xIppc<$qs)=f$TBtUvjq0E}s4l9D>Y;k5KB|uzpa!TRYKR)4
zMyN4rjGCY(s3~fS+{lfZp=PK#YK~f<7AOb>q5Dz6DHsfcQEUjjcXbv?C=5kmC=9hk
zEm14f3WcL^)Ec!$ZBQH37PWQM&RL-CoVdLcw|C+WPTawXJ34VkC+_6Lot(I{6L)sv
zE>7IViMu*+S10b~#NC{@yAyYJ;*cJEMGq8#B2XlXL{TUTMWbjGgJMum)D!hWy-;t|
z8}&hbP+!y+^+Wwof7BlhKm*V~G!P9!gV10!7!5%~&`>lK4MW4wa5Nl^KqJsdG!l(M
zqtIwH8jV3?&{#AUjYH$mcr+eOKoihJG!acglh9-|8BIY`P;4x`cXihER5%q)L(|Z7
zG#$-AGmr;)&`dNF#i2M9kK$1RN<g#FEHoR<Mu{j9C7~oV2hBlq(Oi^_lF>Xg52c_K
zG#|}JsVEgKKnsu;c~KflLq6m~=_nm7L<`X(v<NLmi%|y3KugdPv=l8x%g{2k94$vH
z&<eB?twgI(;5=L{UW033Vdg%(*1R9DlXG_B^>X$qyurK%KVZIrGtI|vmiY|cXnqK9
zGGE4<&D-%7^Jcu&oQ=1c_u}pN&PBLG>CA(8C%(G@?t*~}Fk8F{cZ(WY4lK;dB)v!J
z({Qiohx=fWUya{yzE1vtS@j3adfOo!I7Inj@hm)|>O4)uQKgTPJ|=1sj$8FQ(kIMY
z@k#SGe9F8VpEhgJoWc2;le3mSK>1_l!}y%}I6jXHG_(t%sxOL1D83|WWS2#a?24!-
zUlkwW-fQBc@Va;c=87j_9xU?jz<!+nAiSY;p4Q4u^A+-sn{)9k-Tp9q0tPgyC#_oB
zDqvns`EB!B{FHe;ep>c##LrlM6Mojb1wUuj;GQ?{BL9MU4}Q_C(Z6KYa9%cRTJD(D
z>bqt&_Z71?%d2Ls=hw{Vc>n9>OZW}5cGH_??Vh*Hx2S(x_N$-yX7#VYtbV;?)(&_V
z2egph6LpBa4{z&ZJ`mNr4`Go%i*NY|7ig+KwzOJbXx8nYnAQ4E&1(H;X0`rvvs(X!
zS*`xktX6+zR;#}@tJUAgc{&BZwY+xwcV-<P-<!46ip<*2KghXy-jBFIEAb~Q*B1WS
ztd;YNS-t<&tlzia%sTOZH|q!F53|m)Kh4^=f0?f`TYsB%nEhkc+4rwm=fHosFsJx5
r3yW~Mg1iZ7>B&BKR4{)>BV6ezX$ihi=f7!jfj7aI?oDy4F2eOceLHQ_

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp865.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp865.php
new file mode 100644
index 0000000000000000000000000000000000000000..2668bcc4e583f4fc5a97336648ffc0a17d767f16
GIT binary patch
literal 3841
zcmXxnby$^26vy$k_1fKfRTS(_K<w@gj4Pm^h<LfE*kZvhyK4Y;cX#W$3%hR1b|>52
zoig9w`RhHO=giDI@64IG&kc)6j7{`-k^;U!T$DE`+86M7!@WMg-<RSI@p!$#_XT^y
zyB9oK6sQm?gbJg=s0b>8ilU;Z7%GN}qvEIpDuGI(lBg6ag*?cEN~6-K3@U@lqOzzQ
zDu>FW@~8r;fGVPjs1mA#Dx=D%3aWytqN=DGs)nkg>Zk^)foh_fs1~Y)YNOhy4yuFd
zqPnOas)y>M`pApCr~zt#8lr}%5o&~jP!MX28lxtt35pDc_nxjsLSP7LikhNks2OUG
znxht|1!{>}qE@ICYK>YuwQ=>?#>H)2+}6eIT-?sZ?Ooj7#T{JS!Nnb2+|k9IT-?dU
zon747#a&$7#l>A++||Xw-Izr;6pBJo7z#t-C>(W1-BARJKs`_o)D!hYy-+XI8}&wg
zP#@G6^+o+qKhz)fM+49RG!P9$gU}!}7!5{4&=52f4MoGyFf<$uM<dV(G!l(OqtGZc
z8jVI{&=@opjYZ?oI5ZxOM-$KlG!acilh7nI8BIo!k?`Kr)$|lN1x-a$(KIv-O-Iv_
z5BbmxGy_GUC=`vNQ4ESfGto>m3(Z2YC>F(`I5Zp0Msv^{6p!N3Tr?LYpae7z%|nSO
z5zR;QkstX{5=ue=6hO%+87)8y&_c8jEkcV>3Q9qX(PFd&EkR4sQnU;$L(9=}v;wU_
zD^c!xxJtYUQ^jL&wYVRy5f8$(;$FB;JOtN^M_`(G9HxsW;QiuJ_<(o@W{9WZgW^f}
zkhlguEUtwc#B{h(JPbF9>)>YbBFq#o!z}SU%ocCJE#ft}RlE(iiP><wxD)OWufm-$
z=K$QL>{hrN=BH|9_uxC5NbgnaeQ=+63hoy#zysoScu+hC4~ZM$VVI*WJR+*^QBfa!
z4CZHSp!0F1wP`2BTVzj)D#KHvzTvc}VmTwK49~*+Y)$i=SqpOByqR}hkTX;9MYG1c
zBxmXEm(4l_SIpYWtL7}myJpt*T{mlfH_TgTf784R-!iK>9x?AAe_PJf%06n&B>$LM
zRh(ni(&w5r{^RDA^nb#v&A20H?I!=Ec@KWdyd6Jn)_k5Z>r#2vtTXtWS@+2EW_{mX
zv*w>?R{g(V*5&b{S^N2tSr^mG=55UP6|>IQt7g^DYi8BY>t>bX8)lu0H|0!?_m(+>
z_q{D=r{Q<Zy1?EwtNnXst;hRj?biqRt`6;oFju>iudF8j5zJHHkCj!aexmGZX7(w}
zxdcB`R`dK^eYK5Wi2CX;MQ!?5qH6MMn4hMa`UdCe9{yIX_2TcWwFdiMPS*+j0q1B1
zezdeU{3o*t;%7NS1^0_t!~KeLukhKwS$FN%?>Ofy=|7ZCQ#t*qw0i$#X`PP0<yE>T
z|50=OsQjyRw&wPq(gkc9>hT2mW0I2N1K#i^{Fx2)Bqt=r1VY?D+kyuEm_V{W!K-$m
Gp8o+}M`57=

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp866.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp866.php
new file mode 100644
index 0000000000000000000000000000000000000000..a7b47f8f39f67571b0eb53559cc2bd10135a41e4
GIT binary patch
literal 3831
zcmXxnWport6o%o&VQ_b7AVeUzGZEa~CCHErBoIOv0fI|_;Fb*T?(VkBx`%a_th>9C
zdcXSB_c^zxr>pC`eNM;3rzfYoT>gM3kdo+xC3ylKC)V-!e4Y#^(&ac24@Ee!aruYn
zd=)?iP(f4>6+(qjVN@6uK}AqeR1_6M#ZYln9F;&NkPEp`NmLS*LZwh?R2r2*Wl&jE
z7L`NgP<d1yRX`O`MN|=0LX}WuR2fx4RZvw_6;(skP<2!t)j%~+O;i)rLbXtBR2$Vn
zbx>VY7dgm5^-w)jAJs<<Py-Z(!carh5QU>~ln?<Q98E?dVI+z|QK%7Wgc_s9C>lkh
zCa4K&ikhNksF_i7lh5X+Zei*crfzBKmZolH>Q<(1ZR*yhZe!{;rfzHMwx(`p>UO4X
zZ|e4@?qKQ;rjF>yU35fl<VG<l2F0RS6o=waJc>u1P$$$Gbw*uK7t|GXMcq(0)E#w4
zJx~wS6ZJ&BP%qRQ^+tVAAJiB1Mg34e)F1Un1JD385Di3w&>%Dz4Ms!I5Hu7GMZ?fA
zG#m{_BhUym5{*Qo&?qz-jYeb87&I1*MF|P;!O>)T92|$nqw#10nt&#viO7RIXcC%)
z5>X;bLP^Mryl66-jHaL|C>bTA6qJIdqN!*anubzQDw>X_qcoI;W}q1;9i^k0XeRO@
zAMztV3ZMWAq9B@uW}(?=HkyOxpbV6O=AyZ19-4>dqxon7T7VX!g=i64gchURjc|#$
z2`&{k!)4+Ym?>t%<zfz8A%@^eaVyLcx4~87cDP#H0oRB-;aYJQTqo{^>%~2AgSZ!N
z6!*bR;(oYUJOH<d2Vu5&2<C`~VMsgzw~9yMHt`tTE*^(F#1n9*coOasPr=>dX}Cu`
z1NVw&;Xd&k+%KMo2gD2Tpm-4;5--8S;$?V5yaJDkSK%@78aysuhbP1v@T7PXo)T}t
z)8cJ-M!W;hig)2Tm={ul&s!_P7p#@xi*oi-et*eYn|xW$Q9`a*D<W5|74vJ>nu6=r
z%FqpK-QP`X&BZNirTMnC!hXkEvv60=)&M_jt)YCxTAO&!T48$BTGxNfdNI%AacgbH
z6LOBm>q%?P*HhLS-KVW}KhIbz`OjKwY@V~$fIe@n^}S%N`+w0|bCzqZLA!6Q{d~z<
zQ~R>D-aM~Z>&5h{wes_twes`2wPy7VYmM@oa<;Dbmi1bm@7r=H3%_HXiQl!>`R`fl
zdAx6}{rUjk7e5r2aJ4*9VgE>6M)zY;fBlKLobIRM3iz405`Hdf8DEI2=zb}#hF^(m
z;Mby-_>H)Z?ziH4_?@@`eh+iCz#r7rbp5EVR`ip)%Hq%JY6-unt4aJ-UH$KG>MHlY
z!+UzK{sHr{6r(@Y*4ywe+tyV4EobVj@sCbdNdHwkq#^iE?R-YLU9K>n*B?v`II-b;
c!n$3-G`}|xX})LkPw;sIL0_7q^W3ig0aT-0AOHXW

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp869.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp869.php
new file mode 100644
index 0000000000000000000000000000000000000000..0f040548b5fb5c26eff8859380f744574ca5c0c0
GIT binary patch
literal 3676
zcmXxnWq1==6o>J}A-FpXP%2Q|sp0M}MM4{Bp_G!OK=Cyew{45t;_hy{S-0uBYu4Re
z>3#qA)12RP&YhgOGV>%pDJw0@;|T=4!Soa-BGnu8Ith-~@Au|7(H_T%x+}^_NG!a>
z7ODs;f{LP|s2D1SilgGF1S)|_qLQc-Duqg;(x?n7gFMKC%A&HU94d#(qw=T%s(>n@
zil`E*ges%Ts0ylrs-mi>8mfk>qw1&zs)1^vny414g=(YPs1B-w>Y}=+9;%1xqxz@;
zYJeJ|hR8t<YJ?i0#;7rBf|{TR6oHzerYI6cqU0!e=W6yyG>k?uC<Zk{%}{gH9L1to
z)B?3YEm2F<3bit7ZT4qt6SpyO8xyxRaa$9&GjTf;w>NQn6L&Ci2NQQRaYqw(GI1vp
zcQ$cn6L&Fj7ZXQyrHig84#lB(6ps>60!l=QC<!H@Zm1jTj=G~Bs0ZqadZJ#a7wV0A
zqduq)>WliKeyAVnkNTqlXaE|B2BJY|5E_gIqakPr8j6OZVQ3f{j)tQVXapLGMxs$@
z6dH|2qcLa<8jHrFacCSGkH(`3XabsuCZgnIc;{;N^dvY5O-7T^6f^}*MN^R%dC@d9
z4W*zIl!{W35Bbn^G#$-AGf)~zL+L0T%|tWNEHn#cpbRt{%|@9h6U{+$P!`HUbJ1Mn
zM}8DQ0Te_*l#Q~{JTwo@NAuAFv;gIx9JCNEM2pZOv=}W$OVARu6fH%|&@!|FxhvpG
z7`hBsi6`J{@eo`C!^^kgwbtA4I_$25>uov@Z%}#_+$gSwo5W*qv$z)KiR)p$cpPql
zp`&oCvK!zwWzWIw;(543#d_qO%I+t-OWBifw|ENf5l_Rtus~0=PuY!RA5vCNv|n6D
z_JE2v!Gq#vcu0H@9u{-q5mEDeRLm!POxyyG!_ZB5LRl^8Nl`0$O2wMz)8ci;o`K<f
zHGS4vU7xd7+vnxndl-Mg`T)L&-R<y_xC34mcfu>;E_fA&^R#f+tkv6fYfZxqYmL8&
z-QC>ombeGrR&}n{@?mSOz$4Zds1I3dS3PR2<{z_OPW|K7H}DhK-3y--_ra%Bou`R<
z+FIQ_W3BV>thLVZbJn{3^VWJg*IL~dU{_Q7f~Zw{Q9MX<FNylCm&L<mUlEVMS4B1Y
zns}D%>!J?s8=?;Gn=qWKt^1a>4%pjrzFtS~Sl`Fp-^H$$>^<=!+4pU=R_FtzFOmLG
z)O#~5ULpIDcolvuUW1>AIz^v~TKdmKozKt3Ta5ieybZsE1#0pu@outTi}%8BM4i5G
zMNP+d&=tRjA-(v15VbNtYV7^o`6p2ym7m22$o`_S+5*2St7Z8Oy1LcxDn7&5KSb@9
zKQ&gLkiWz=6#orfjr~VieKY=r;e74-|8S^~F>xMGgx?p)&ImdQk^E1L^JHfRe8Fh*
Sr?IfW?+a%8Gac2%dHx3%T`Zaa

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp874.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp874.php
new file mode 100644
index 0000000000000000000000000000000000000000..479945691cebc26afca2bf4ff9f1b3c3da49644c
GIT binary patch
literal 3410
zcmXxnRd^I<7>42EFt|Gm5F!xV*=&Nly98O1g#<zfD?rddOAB?pUff+1Dzwzy^`w-#
zyPuT&&-Wh9dtWmLd+q$s!K7sr<P>;bG!}~GX88%(p;*Wd`k_c9ROlyrzMphck{?Vj
zy`+|^3@U@lqOzzQDu>FW@~8r;fGVPjs1mA#Dx=D%3aWxU<e{plDyoL6q3WnQs)1^t
zny4nKg=(SNs5YvD>Y%!)E~<y>q57ykYJeJ`hNvNGgc_m7s4;4SnxLkrDQbqAq2{PL
zYJpmymZ&B2k&jxTR;V><joP3#C;=s)wx}&iM2RRf3EsH6Gm;FGQ3^^y?NB?^9<@iQ
zC>3=;9Z*Nq5p_bHoI1Pn+1c$bZg+9JtJ_`O?&fwkx4XOD-R&N3_i($X+dbXx<#sQ(
zd%NA+?LKbzaXYCmzoIV+pa4okX()(-C>^Dv43vTTp?;`8>W>DX0cao^hz6lSXfPU#
zhM*y6C>n}}p<!q^8jePw5ojbDiAJGOXfzs)#-K51EE<c(p>b$D8jmKR31}jkh$f*)
zXfm3Nrl2WkDw>L>p=oG3nvQ0m8E7V&i83?cjjKD;v*0W=8_h;@&>S=u%|#&;Li5l(
zl!dZTHp)g}6h`yWe6#>9KshJ}<)U1)5G_QD&?1zF^3Y<m80DjUv;-|d1*iZmMN3fx
zMNkw)Q4GaU9L3Qxv<xjr%h3w70u`b{v=XgEtI#U68m&fa&>FNBtwrn5I#h(NZ#a%O
znu`wNE%JSMt9(D+CO?F?%Marn@?N}C-iCL{+wpFEbvN7tuNAMyd*uyypL{dkFW-U>
z$Q$uN`Br>Lz6~FiH{m1lW_(n>9UqhLz{lk~@d^1Zd{Vv}pOWvvr{#O`8F>pnD{sZ;
zWcxeM%l3C(kazI>MR_N_B=5q-vc2vS*<SZ$`2n7POnwkQF57W<Lbl`Zr2GiaUy&ch
zPs#TFpO*J<|Eg@q=^1$+_n(#b<LBf9_<7lm_Y3kN?!PD>#xKc7@XPX1{EB=Gzbac!
zugNF4|GIn<zagK(Z_20fTk;wFwtN=9BcH?X%IEQW@&)|9d=Y;jU&0^C#rPw+1b-}F
z#-GSn@HKNu5&l%Rey_{c?`N|0`?+lWej!`GU&_|+SF-i{wQT)<BU``U%GU39vi1AD
zZ2kTqTfaZb*6&ZU_4~7I{r)0bzrV`X?{Bj8`@3xY{vlhxf6CVHU$XW4w`~3XBU``!
w%GU3Ha%sOQ0nbZ_gro7im>*2!>nPyG^P}NdvinpjeIOE!#UuH?Js0r)2ggbZAOHXW

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp875.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp875.php
new file mode 100644
index 0000000000000000000000000000000000000000..856164536ef82f4e77209da0e67af9350b42677b
GIT binary patch
literal 3776
zcmY+{Wn2_n7{~Ez>)NeYqap)}-7X7ucL&A_tDuOup<<$<SlHcO6~yk2d*^lyw>!Dr
z-6`|?-xt2x{eGV3%${?0&hyN~#HA&rxm<yuH<+AYgeQ7~Uc+N}{eEw{5$Q4v^8wTF
z#1?);7pe#<f{LP|s2D1SiX&?uECI`)k_xVZrQlLjTEU&LjF=5w;s#h2mPO@IIaD5%
zM-@;7R1sA~l~5&A8C6DAP!&`aRYld1wI5a&SHc>wG^(j!7OVwpq1vc63RCJ9SV!Cl
z>%zLI9;%1xqxz@;YJd!6Wx$5wGT2C54jYRrV7QnGn?M(eKs8ak3G2W}ja&_*#5J&~
zxE3}O*THCUJ!}q3pcbekYKclYYUSLr)+Pt7!Da_-9Mo{Ww<WOEK|8R`L3^;>K?ktI
zK}QG0o$s9p>~hc<>~>&w(Zu&ax40L^z-q{Ys-sw?9)NK$40S~Y>V|AqW_A~K)ASHo
zp4n4mfo3m}C7QiO7HReobprc}tkmo$YOVd@1ST~AwLk+=3>t(Y(O}dJ4M7djP!xfN
zAzQmST-0uk5LIYKiaL^`MD6Ej@gP?oBOZcd#lvu%cm$4z6VU_|j^g8CQ#cVtp-IS%
zCZkDc3TlqLs3n?;?4vM2JO&fR9Ox5s;WY6$oG#|UB=H1H7Ei(%a1ok`qEQNJf@Yz~
zC>6z`*(eUBAxra_18p?`zo;S+5LG0C8moUPq^N4fTv0`0o~ZsXUsUZ(hf|o;0@MX9
zM2*oR)D<m8_iCHd2A4n&T8bK>3}mYbEQ4Nx%h6P{0wthKl!#U$A6kW`p)52Vtwu>`
z4N699k$oPn6EDE^;zgJ(UV<CM%W$K31#W`YIk*|lKwHpEv=ybGZD<zSj#AMMG#l+i
zX=oRkgLWf7+Jo$?aIbg`?h~)W{o)OHK)eYLinrh)XlYLl!zBbCL;-XJ1<_FyLdVct
zl!NA>Tr?jYN9iaJEkGxbeH)$>@4!>yU3ePiXTUR}+WlEk{rw!YRO-${`xIj@h^OI2
z@eI5K^K~9CD|(jb6-9MCuZr13uZe2-*F_!P8={^`Zi<<Vy(Q|P-4<0+?uc0=-xXD1
z9)b%AK8(5{3w1}2pdRQ^)Du01dZEWrZ}bG}gPufv(Nm}&dKy{U-DhCFir=%)=3&Ns
zPSmlpVL^s^bN>HUV}Bkm=9gYT{n3kP0D1`xL@%R3=oK^=y^4mQ*U(V(IvR%FK*Q0S
z$WkqOOVrK$HVh;89c1g@dlwdD=$Yd^jm;tZeR!`4JJtCEs7n=~5yU=3Bhg1_6#5vA
zMxUTD=u<QneTK%N&(V1F1+r9QzZ7$ceg!qRukX`0N>v;FR@5Q<4z}Vt-=o&(2h;}r
zh}xo`P&@Q9YL9+F9ni0+Bl-<>LcgQV=nrJ6ar`Of5&a8ljep;#f0U|f`>$B|JQn44
mxx)RvKqw_>cp`Wgb-O~T0belEc`+?a@cV)xf2yH8x9dMXG%%O|

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp932.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp932.php
new file mode 100644
index 0000000000000000000000000000000000000000..0bf828ffdbfbe208e5ee725770fb17a3560e8717
GIT binary patch
literal 134095
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%0Dsv?L$<qxuF|0Cq
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
AWdHyG

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp936.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp936.php
new file mode 100644
index 0000000000000000000000000000000000000000..a593d05deb2677f456f5d87d26c555034c244ac8
GIT binary patch
literal 372283
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

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp949.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp949.php
new file mode 100644
index 0000000000000000000000000000000000000000..d4e99f1f4310365ba3d0a8c27678f3f720f4c6b2
GIT binary patch
literal 291504
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%0A;)Ak64~A`XhFw
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

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.cp950.php b/lib/symfony/polyfill-iconv/Resources/charset/from.cp950.php
new file mode 100644
index 0000000000000000000000000000000000000000..267b190668f43dad5d1129cde15c033ed9e26597
GIT binary patch
literal 231436
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
F{tLg)Cfxu4

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-1.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-1.php
new file mode 100644
index 0000000000000000000000000000000000000000..d7a217c9306874e5ef39c99ac566a70c695120c4
GIT binary patch
literal 3779
zcmXZfMRXNO07l`#;o<J^fIxz~hT!h*79cnQk{8_F-QC^YnSpV4cXxLueebIN@0?!r
zqVA#^Hl8?YVkndxiI0pP7LFPoABhjgh2xWw;-`gULg8@q1JU8QMyW@oRHZ>_P+F80
zr9<gZdXyezKp9X*lo4e@nNVhw8D&9PPzZ%kR+JTGL)lPvlpW<jIZ#fN6Xim=P;QhP
z<w1E+UX&N*L-|mClphs91yDg$5EVj&P+?RU6+uN%QB)KaL&Z>WR2-E+B~VFJ5`|G1
zl|rRZX;d1OL1j=Bib7>kSyT>{Lj$7W{WG{DF)#*|N99okQ~^~)6;UNr2~|dwQ594L
zRYg?;RSWKCwP05dcJ*M_2zHHN*9>;eVAl$Etzg#<cI{x-33i=e*9~^vVAl(Fy<pc5
zcKu*SH{dTCpjZ@(8lr|M4#lBHs1a(68lxtt32KU(qGqTWYL1$t7N`YkiCUsos1<6B
zTBA0o4Qh+pqIReqYLD8Z4yXg_h&rN9s1xdpI-@SA3+jrxqHd@g>W;dj9;gTEiF%@5
zs2A#udZRw559*8hqJF3!>W})P0R!OuGq}?O;XpJ94MKy_U^D~`LGdUa4MjuIFf<Ge
zN5fG9N<bsf2s9FnM5E9sG#ZUYW6&5h7L7&Y&^R<6jYo+n5lui7&_py5O+u4U5=uhJ
zC>cdi1f`%9G#O1sQ_vJN6-`Cc&@?n1O-D1(3^WtXM6=K=G#kxEbI=?#7u}r;=gE0+
zzMKyi$OUkrTnHD*MR2iP4423yaH(7hm&s*txm*rc$Q5v<TnSgnRdBUj4cEvuaIIVm
z*U5Eoy<87B$PI9#+z2<xO>nc^47bQFaI4%3x5;gAyW9?U$Q^K}+zEHdU2wPD4fn`B
zaIf48_sM;5zuXTG$OG`8JO~fTL-4RX43Eeo@TfcrkI7^3xI7L|$P@6SJPA+9Q}DDr
z4bR9k@T@!w&&hM}ygUyt$P4hIya+GJOYpM146n#5@T$BDugPohy1Wi=$Q$scya{i~
zTky8L4e!W1@IiRbejk$ddso`;J!!uWOZ$C9+V7*%ejk(e`?$2<C#3y8Ded<uX}?cP
z`+Y{*@3Yc=pOg0cytLmJr2W1q?e`^Vzb{MseMQ>utI~d7llJ?%wBI+R{k|#f_bq9^
zZ%g}qN80bZ(th8Q_WQoH-w&kyekkqtBWb@MOZ)vq+V7{*em|4;`?<8=FQol`Ded<w
zX}@1f`~61R@3+!^zmxX+y|mvSr2YOV?e`~XzduX+{YBdEuhM>hllJ?&wBJ9Z{r)NK
z_b+L`e@pxQN80bd(tiJwsr{CZ4TYkT5|UHKMZ$6Ac#g(~QWBFBA~C_+H1&g|gh)zK
KV%YCuL;nN!8Z|Qj

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-10.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-10.php
new file mode 100644
index 0000000000000000000000000000000000000000..d60f6473addc9e2f2663c09326734ca5a91c2315
GIT binary patch
literal 3780
zcmXZfb#xSG6vkmZFt|Gm5F!xV*=&Nly98O1g#<zfD?rddaCdi?BE^ffU3Lo<sJm0B
zpcSYWO1|Iw*WTyc@9f^0x$m5_vGM82>6Yd7xqK;!c6gG@=dzu)%j0on*in{kN9KsM
zopIS8G1<zAa-v))7s`!tqdX`N%8T-%d?+6ZLt!XC%8v@50?0xZDu@cALZ}cbj0&S7
zs0b>GilSnu7%Gm6qY|hDDv3&>Qm7OvjY^|3s0=EL%A#_p94e2>qY9`3s)#D0N~jX5
zj4Gols0ylzsv;ZNs2Zw<s-x<t2C9L=Q8=oJYN7}fff6F&^G~xQQ7{Tcqi9qM)k3vV
zZ4`rIP#shU)kSqtJyg%AzS+<Erfy*B2BvOk>V~FnWa>tyZfxqtrfy>DCZ=v`>ZYb{
zX6k09Zf@%4rfy;C7N(AD$rLS-136GEibYQ3L~$q%#iMxC3bjJ5QESu&wLxuBThtD<
zL+w#})B$xs9Z^Tr33Wo9QD@WzbwOQGSJVx4L)}q#)C2WEJyB283-v<1QE$`-^+A16
zU(^rvL;X>IGyn}i1JOV<2n|Am(O@(L4M9WEP?V4WpMRR29tMY@;b=G-fkvQ_Xe4qW
z7aD~|p+uC3l28(IBR3k2Mx!xk3`$1HC<UdUv1lwBhsL2)l#0fq@hA<Yp$TXLN=NBv
zBASRi$b-Ddi+sq3{K$_cp-E^mnvABPDJTPFps8ponueyK>1aBdfo7nYXeOG4W}!?J
z$b_@S*>H|H2WE*`aIQEP&J*Xs`Qm)IKwJP9iVNW)aS>cBE{03QC2*;@6fP5&!R6v|
zxI$b3SBfj)DsdHDEv|-Z#5HiOxE8Jx*TMDTdbmN{05^&o;U;kt+$?T}Tf{AJtGE?z
z6Su+b;&!-0+yQrrJK-)E)Faz1>U#HxyE(j9JPh}V2jPD4EIa@M2jD?<FTz8jZu?;v
z(o{#p{TzNlybO=Rz)^TiT}^dd)T*4&;S(Hw5eBuBCq+HbQ{o;DpB9h6GvXn5Ry+sK
z!GL&P-Ai;|617(sU}zWJi=yt;CGiT~%kWmF7VC=I8tY|IVR!`w72sFlRRuU8D!^Ao
z1vn^b8$zOP)@z~yd<_PVG39kpA$(nj72r42)w;i_u4aBqT}9=Fx(e`3Q2~BiRDj<R
zwMp;7kY;{Q)Ku^5u%7n^q5}M(sQdhpsHr}NA+7r->gtL<Rre%!<1=*?;Lk+`_zO`1
z{!&zczY-PTuSEs;8yM6B{Z?IV(k)Sm{Z7<E-xl{W<Q;Jz{9aV*et^N_bbl1}P=3;3
zh2gHcdVk$hS1Wp7UA_ArsH*@!6tzf?ME&m1q5}L23~32}6*bjwI(&+mAB(5q6Y&iE
zUDONf4;a!F{i*JG4*#XDzWHx;FVOu*)Z6V}QQ`kj)cfnHsCYkv!R#N3c34)p$L;l}
g`fO(e|3@8`Kh5j*MVUXR*#|sspWl;a>zu>-AFVqyRR910

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-11.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-11.php
new file mode 100644
index 0000000000000000000000000000000000000000..d69220bff7d2555652dffb45b4e2223c11278da2
GIT binary patch
literal 3746
zcmXxnRd7{T7{&48aB+7yK!`waC%Fmk?h@pZ1QG}#Tmgc+ySuwP2^CuE?)p;d?%uwX
z?Em_n_WI47hcmPGIx{CRIVU5>=L>}c;mlMoDlHHWcz!Ps3<h$&SfA&`JQCyilM0Ub
z0u@4qP+?RU6+uN%QB)KaL&Z>WR2-E+B~VFJ5|u)wkPrD#X;d1OL1j=`R2G#(<xqK4
z9#udUP(@S`RYH|eWmFkeK~+#yR25Z2)lhX*9o0ZJP)$@5)k3vUZB!f8L3L1FR2S7l
z^-z6OA9=__4NwEr5H&=NP$LwDqEKVh7)7IKloA6Up6-ss!dMiC;!qRR1T{rXQ9O!A
z%}_Jc95qKRPz$G)?tZp(xs}VUTyE`hYnR)&+{Wd$F1K~Loy+Z9Ztrq?mpi!J!R3xF
zcXYXv%bi?~>C9VnMhPeZC89*+M}Cxql29^AMqN-B)D?9_-B35w9d$=NP!H4-^+df;
zFVq|LMtx8p)ED(d{ZK#DAN5BA&;T?L4Mc;`AT$^aMnljLG!zX*!_Y7^91TY!&<HdV
zjYOl+C^Q<4Mq|(zG!~6T<Ip%X9*svSDe&Rx?(_sW0Zl{`(IhkpO-7SZ00qz#GzF!i
zRFsC&P&!ISQ_)m34NXHCC<A4pOf(%$M>Eh2l!da;Of(Z^qii$_%|baS2hB#aQ4j@D
z2!&7>g;4}W&>S=e%|&z3JTwpGqFgi|%|{E+0<;h<M2pZOv=}W$OVARu6y0A6mx;^Z
za&b9aA+CTc#g%ZCxC*WoSHm^p8n{+m3)hM3;CgXA+#qg%8^w)qleh_P7B|B!;ug47
z+zPje+u(L_JKQ1efIG#VaF@6X?iP2$J>nj?SKJHtiTmJwaX&mD9)JhMgYb}e2p$#>
z!z1DmcvL(JkHH6dD)_ir4WBTp;*(}|e9EknPn*^98MA6WYgW(a%qsf4SxsLstLlqp
zb$!XKvM-y}_7$`0zG_zA*UT#Xx>=3iFst&LW_5nctkQ3r)%qQ?YR@yP_k6R8ziU?W
zkD68eV`g>#xLM^tVOIP1%&PxMv-*F^e2n{W-+UZDZ9ajYF`vZGnor^9%%}15<}>&O
z^I80&`5b=9d>+4SzJOmbU&ODPFX7kBm+|Z7EBFobRs5#;8h*=s9lve9f!{IT#P6DK
z;rGn9@%!dG_ycnu{?MF{KQiCNADi#t2Xel?&!3pJ-%rij?`LN1_j9xM`-NHi{nD)c
zer48vzcy>X-<Y-EZ_V28cV_MPd$acYgIW9i(X9RcWY&IvHfz7Xn6=+u&D!s8X6^TP
zv-bOkS^NFdto{CF)_(ssYrp@Pwcmfu+V6kng8jxN_<T{p^iU)#?D?bl+f499vP0?N
USoiB$@IWv<90_K7dM?5DKe1a_p#T5?

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-13.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-13.php
new file mode 100644
index 0000000000000000000000000000000000000000..838783f1b57b725e0948351c02e502c0b0077cf6
GIT binary patch
literal 3783
zcmXxnWq4Fa6o>KRaB+9IK!`waXR`_J?h<5477_>{tN=k5cXxLvZpEc7H(P@ise7Bc
zJJcze_uo(V{GKy&Gc)&`$+K|@87Uc-<qvoQsY!N3vM1oN-L}W)^JLo5mTgBp5oNpM
za~`od%7t>F+$cB7gYuxfC@;!~@}c}FKPrF<pn|9%DufCl3t6ZzDvXMtBB&@Tii)9P
zs5mN)N}v*`Br1tYp;D+cDvipZGN>#ni^`#Ls5~l<DxeCeBC3cgp-QMSs*I|jDyS-|
zimIV%s5+{SY-FPvs0ONuYNA@G7K%U-s5YvNB2gqtjDnA!rbeP+G>Snns1B-w>Y}<R
z7R91^s2-}1>Z1mzfl)(KpAAji$i$6I+}Om8P29x9O-$U>#7#}y%*4%1+}y;?P29r7
zElk|f#4SzS%EYZq9Mzgtv_>xELUAY#xse;iqj;2n5>Ok|2DL?PQ9INQwMXqy2h;&|
zL>*Bl)CqM)olzIm1$9MTQ8&~Lbw}M%57YzoL_JY2)C=`Sy-^?32lYjLQ9slV^+)~D
z05kv%L<7+vGzbkwgV7K)1Pw()(J(X&4M)RKVj_I}G&MZ}jzA;PNHhwKLZi`W<Ut-Z
z28}^UC<!H_WaLF&G!~6T<Ip&if>KZ_N=4(*cr*b`KxrrqO+*t>I!Z^A&?J<BGSFl+
z8TpV8`H>$5Pyhu{5KTc-&{Q-PO+(XACdx$9(R4He%|J8JOf(D4LbK6qGzZN=A#^hY
z=ZbUTJaHbJFV2Sx#07AnxDYN97s18iVz@+H0+)(Q;WBX<TrMt$E5sFWrMMEV5?8_1
z;%c}?Tm#pNYvDR^9b7N2ha1EVaHF^pZW1@a&EjUbMce|nid*3}aU0w&ZihR>9dM_(
z6Ydgs!QJ9+xJTRr_rmOuCht>vAL;$#et1AU01y5@S%2z~(uYVN77xQGp`#riQT7Pg
zqcE(~I;QL~vd6{a@Pv2*o)k~QQ_xYNomTcV*)!r9cvd_M&xz;YQ!qQEqdu?ndD0ie
z3-F?N5nh7MC3soc%kT;es~)Z@dzI`p@fy4?UWYft8}Mo9=-i)yS!%;)MV-z~Q4Q{h
zI;<?{Xl__k3qPm9`h?Gm>W&vgwc(4Js}_C<hPC}$8m#YqTU6b>Eb3ri5s$LpJEG3&
zE)1)r?}@sU?u**OtI$ykzox9#{JOGg;WtDr@=Z~n>@Cez>AWrKs(eRO3%@IB3-3Wk
zb@jfo+R+E1KKF+jtQP(VW@$$si>El8Y*EYjMAS9=DRk7qpNR*V`?&_|7WzWeS$!$$
zUj0gQ)xclF@D*P5jRxziz7=(md?%_?z8BT)KZq*+A7OYeZ~jSCiT*6AfPaCG8u(Xb
zwdUWHRsTK^Rb~%Gt?GBp)vNvx^}p{=QFroRqPFlibhL$klokIK)xVEmb|~lEV_cRM
l;q&@~X#v|E$xl+36-@Vg1JUO9Y0dzjHxTrt+ZyMx{sU@pHv<3w

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-14.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-14.php
new file mode 100644
index 0000000000000000000000000000000000000000..65a48ee397f58fc7835c9f5007dd118001523bba
GIT binary patch
literal 3801
zcmXxnb#zln7{=knA-FqSpj4o^lcvSpU5bP@&_XFC0u*<5cXwSpX<^wd&APkqcHP~L
zZRhvizwY;(Z|2@PGxO%0#3f{;WH=l?zuTXhWJM&q{cg);xxHR@rWNh5tf+^gELVKN
zBep<=P$5(p6-Gr+5mXcvMa57tR2&sYB~S@e5|u=yP$}d<4pbVIMrBYLR2G#*<xn|P
z9+gKGPz6*GRYa9gB~%$zMpaN1R25Z4)lfB59aTp)Pz_WQ)kL*WEmRxTMs-jfR2S7n
z^-w)jAJs<|vQPum05wDnQ6tm{MW6`O7&S(bC=w+`!ThJWBhfG##h@6}1T{fTQBxF)
zVo@{H3^hm1Q47?<sHM4|Elu6Z)U8b2+SIL0-Nw{yOx@PhZB5<I)a^{&-qh_)-NDoy
zOx@Ac9ZlWI)SXNn)tOavMo#2JaVQSCkPF45c$9z=P#4q%bwyoKH`EPvN8M2m)C2WI
zJy9>z3-w05Q6JO?^+kPAKhzKPNBz+NGyn}m1JNKf2n|Mq(GWBQ4MjuIFf<GeN5jzw
zGy;u8Bhe@{3XMji(HJxajYVV8I5ZB8N8?dqBFul9J3RqTKoikKGzm>YlhI`4Ms73(
zO+iU02_>Us<Ut-Z6-`Cc&@_~SQcx;NMbpuAGy}~*X($cNL^Dx3N=LKMER=yV&}=jt
zd65_SkPrEh9|ceV%|Ua}Tr?NWL-SB3%0%<ge6#>9Knu}Av<NLii_v1V1T8^JQO;7h
zOk4(+i_75(aRpo{u7s<^RdBVq8m<x7z_sF9xK3OL*Nf}n25|%2C~kzC#7%IsxEXE{
zx4^C9R=7>v2Dgjb;SO;J+$rvayTn~^x40Yb5%<8o;$FB<+z0oI`{4oc06ZujgongK
z@UVCo9ubegqvBC`4CV!OqQ`CPNKa_^35K79xjKhaqR!#8Jz4EDntX=IXVuQq-8!fC
zIojv#ww7{14(ja}<?L&WzohAx;AQbLyaK~P_^>7iwJTR`Yg?}2Ty4vB@ffpjXmm&`
zziC^sxP^0WG5ogO*3k#$EDaCYecgpDyRS{pw)<Mm9Xb0t@4su0SI{1@t)$(v=WF?o
z;`>_tW1?1*BWm04i&{&rs85AOed%#gnSMf4rk@m*>8C_x`e{*@<rz_@{j8`=KPM{F
z&x^|R3!*apA`IVPyIxXPnSNPRre6`2=~qQ%`ZZCReqGeTz5(+>=lRl`YAe)li3;`G
zqC)+Ss8GKvD%9_Z3ibOitQ+=$y1Km|in=d(qK^L~@i>e8SX87x5l_<nR6GSg6Hmj>
zMJ4(R@hsghMFsjRQJeF%c!9y+h!^3vqSE}Gs5E~sUSaSLFnkmKsP0wxlc?W`pGAe|
z7g3kvS5dF}P1HXB4)a1<^dD;LSLIJJ#E1V9v*6!iHvC7t1OFB8!vA3SHhiG&y?n+v
n9gYaE#}`QRTdqj{q&gjebf3o`ZT_(q4DfpV0dKmcaZbno0Z>I1

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-15.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-15.php
new file mode 100644
index 0000000000000000000000000000000000000000..42e50e0fd412fe7dae7061749d94bb216f38235b
GIT binary patch
literal 3780
zcmXZfWpGnz7(n60A-FpPD73h1DemrW1&UKj1$TFMcXxMoVOe)~Vcp%8-gAECedfJ4
zH<S5JX40^6!l;B$C@DEMdGxSw#PHbU*l<iZHZd`FYB(ws4o5x|8IEa``cf%XX;2!J
z7Nte$P&$+zrAHZ129yzHM43<~lo@44Sx^=fLLrnDWkuOgHk2J@M>$XqloRDdxlk^Y
z8|6lMP#%;Q<wf~WK9nEjM+Hy;R1g(Jg-{_>7!^iEP!UuV6-C8RF;pBCM<q}RR1%d$
zVH8HCP$^Uzl}2Sy85DscP+3$Kl|$vwfJpe@H8>+tFbb7N<xvGx0aZj5Q6*FfRYsLj
z6;uUPMO6b;3(jY?V6Gm_)q}Z4FxLp?n!#K%m}>=dtzfPl%(a8LPB7OA=DNXLH<;@M
zbG=}$AI$ZGIkEwtq5+CV(WoJ6h+<F-YJ?i0#;7rBf|{VFs3~fOnxW>XIckAgpq8j5
zYK2;%)~GdVgW90Bs4Z%T+M)KSJ?eluppK{`>V!I>&Zsl$g1Vrts4MD*x}ol<JL-XY
zpq{8F>V<lt-l#X~gZiMps4wb=`l0@)KN>IqK6nkz^guWe4MKy^U^EyFK|@e1ibX@w
zP&5n;L&MQ<6o=x_2s8qXL?h8CGzyJIqtO^N28~5y(Ks{?jYs2AJc>sX&;*o#63|36
z5hbETl!TH{GD=1%C<RSIlh9-|8BIY`&{Q-PO+(YrbTl2!Kr_%xG!xB2v(Rib8_hv?
z=D@jfE}SRl!TEANTp$;~g>oTWBp1QOaxq*Ym%ycRDO@I(!R2x}Tp?G$m2xFqC0D`K
zay48d*TA)MEnFwp!S!-I+#ol=jdCO0Bsam$ax>f_x4^A(E8Hfx!R>N8+#z?sopLAK
zC3nHyayQ%~_rSe!FWe{h!ToYSJOJ;{JAn_nJ_rxNd%pEyw};staqE+gx;@JFm^=oL
z%j58b^tmVHNw%ltDR^3*hG*m%cvhZ;=j1tfUY>^+;JushqT7q`lDq^j%ggYJ_uhh6
z-Cl*)<TZF*UWYfl*JF26dhBk=D_nfrdvC*s;avlML>llNX~1`-0Y54Y_?|T2$D{#2
zE)DnzX~0iP1Aa;x@YB+OpOFUqtTf=~qyaxK4fq9Vz%NPzeo6XGzAXJFUy%m<sx;u&
zqyfJ!4fqXdz;8+eeoGqg+tPsFkp}#(G~oB70lzN|_ycKWA4;>jFAex3X}}-L100o4
zr2T#>53&7B+VAJ`2-`2D{eCI!_bX|?UrYP_M%wSU(tf{__WQlG-yfv?{wVGDCuzSw
z%L{zwU!?v1D(&|-X}`ZqEBiy*@1N3s|C09mx4gk~|B?QT{44!s_)n(xTRu7zib#x0
lN*R|Njw#3g(dbZ0d{SI;RPg6C^@7B><dnqtu-8S0{s&3bHJShb

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-16.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-16.php
new file mode 100644
index 0000000000000000000000000000000000000000..46758a6a7c968b00402fdb1f7a732b96ec3bc4fd
GIT binary patch
literal 3782
zcmXZfb#xR-5XbSuVQ_aCAVeUzv)Kf9cL}m23kie}R)C-(xVt-tySs+T-JZL9&JE7}
zj!XLc`)lg+s(N;}yQ<&Yn7Fj0G|Tb_Jb~l{J1o%?@YrtK<MVma?MTbEBc6z`-LZL(
z=se{^`A~k89~D3aP(f4>6+(qjVN@6uK}AqeR1_6M#gK(8R2&sYB~S@e5|u=yP$^Uz
zl}2Sy8B`XPMdeUAR34Q_6;K6K5miK$P$g6uRYp}%6;u^fMb%I>R2@}EHBb#y6V*hu
zP%Ts&)kZe5Q5{qV)kSqtJyZ{cp)gb*)kond9K}b#+^6Z0NEnHtP!wu_8lZ-#A&N%P
zs1a&}8l%Rj32I{0)bwXl6E`z)GZQyAadQ*5FmVeLw={7}6Sp#PD-*XiacdK|F>xCc
zw>5EF6Sp&QI}=B==UcQ#F62TnC<eKa8^xkn6o=wa2h;&|L>*Bl)CqM)olzIm1$9MT
zQ8&~Lbw}M%57YzoL_JY2)C=`Sy-^?32lYjLQ9slV^+)~D05kv%L<7+vGzbkwgV7K)
z1Pw()(J(X&4M)S#2s8qXL?h8CGzyJIqfvZ3%zc`k9s|dqv1lwBhsL4tXgu;D51N1`
zpahhF5>X=ZA}^YVCZb7b5=ufzC>bTA$!Ic~f~KGpl!B(BsVEhtqG@OvN<(RAI+~7r
z$cOyMj{+!wf+&b)pc!Z;nu%tiStuQ)quFRSnuF$`xo9q$hvuRAXg*qi7N882l>rxu
z3t^_12^Wcr;9_wxTp})kOU0#dnYaut7nj2o;tIG@TnSf+tKe#JHC!XEfosLJaGkgg
zt{2zC4dMp4QQQbOiJRbNaWmW^Zh>3Ht#F&T4Q>~=!yV!dxKrE-cZs{;ZgDr<BkqBF
z#l3K!xDW0Z_rn9w(UBb#b!1P%Y@Plgn3H*m#fRk#ebf<^>)l6T)={dDDSH4OSN1qO
z0Ylo4lggeXdrE7s!_&&1hG&$$0ndsz;W-tbgXhKb@B(zyI~TQ94Sq?yP4Q)zlcBA?
zg0rrWzA9dY*R=Q!ybc|;<qa6piQm*(ed$|TtH!%6s`2iK*Ld??@fN%XA83T{i#o(C
zQNQp3bVNs4^+UF@n%Sq66`vM0!XZ&3{EVm(epb{7KPPI0pBHruFNoT!7e$TmOQJ^j
zW$0*xUxC@WlwMV_cJeh*JNde(5q?8!^{O|O)d;_(tfum9QH}MEiglpxiYk6j)Cj*X
zYJ@+4j=KLt7}DC0RICyHSk#z(B5JO3#Dg@$r_j-Ee5ULnvY#uf6Z}HiBV@l6HNanq
z$H;yyYJk5HPmujq)Bt}c>gM=f)Brye&#?B9cozNu9o@-4!fdtZPb$7Z@z3H#_=|W6
z{;IWl)o;pbet%b1XY_}to8nIu>kj%$)TQ&csQLXz)JXmd9reb4Fr*K9tm3=5Uoy&N
mSz$h}KbR7*-QoNrby>kwzc&zR{+{L)_`HFjFV$9^%laSmz%=>*

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-2.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-2.php
new file mode 100644
index 0000000000000000000000000000000000000000..5f23f515c40cad0483fe085c94b215b720765e7d
GIT binary patch
literal 3779
zcmXZfb$Aq46o&Cqd~tVJAduj$A-KD{1qe=n2=4Cgt_4c5LUCwIl3MES?(S}6-uJIP
zzvnx5_s+~clPAquOdCHf6iQ5rO`0$|95E&~DK;Dvj!j62ogIz}g~O5eM22IUXM9x8
zP$rZK-HYx;nNenx1!X~5QC5@<WkcCfc9a9<KsixP6ha}C3*|z&QErq6<w1E-UX%~z
zL-|pDQ~(t~1yMm%2o*wwQDIaB6+uN&QB({SL&Z^XR05SiB~eLK3Y9{oQE5~Ll|f}u
zSyT>{Ltzv~<xzQ50aZX1QAHGiB2Xn%2~|dw(a=bE_cJ&nQ7{TsK~+#yR25Z2)lhX*
z9o0ZJP)$@5)k3ub)eg>Q?Vzp`)OCWoZcx_^>Uu$4FR1GWb^V}j5Y!EVx?xZ^4C+Qf
z-6*IV2X*71ZW7c@f;zG(yJ(7{Q8a3XnxPmJgPNn}s0C_)TB4Sy6>5cAqt>VmYJ=LM
zwx}IyhuWj|r~~SNI--uK6Y7LIqt2)c>VmqWuBaR8hPtEfs0ZqSdZM1F7wUz2qu!_w
z>Vx{CzNjDShx()bXaE|32BLvz5E_IAqrqqh8iIxng?B%LGd&CrL&MQ<Gy;u4Bhg3{
zi(=6zGzyJIqtO^N2F0N`G!~6T<Ip%X9*sv6&;&FQO+=H>Bs3XKMpMuf6p!N3R5TS$
zL(|Z7G#w?N1eAypQ4&f*$tW4kKr_%xG!xB2v(Rib8_hv;&|EYZ%|r9hd^8^|Knu`9
zv=A*qcNW3Laxq*Ym%ycRDO@I(!R2x}Tp?G$m2xFqC0D`Kay48d*TA)MEnFwp!S!-I
z+#ol=jdCO0Bsam$ax>f_x4^A(E8Hfx!R>N8+#z?sopLAKC3nHyayQ%~_rSe!FWe{h
z!ToYSJRlFigYqCeBoD#EFx5wP1g5*IqcF{<f6TSVSbN;Hx8Qv?yXO-&pCCOcPr_3+
zyN&y$dp<4wp$FtO)}DcP&cL&#ZsVN1L3-Zi^Y8*p^-Mkp)4j15UF-3_<l0NDeaN-9
z;bog$dj+O@p0B$0D$UnyJ`Ar*AIc4Rob;x=4sXG9pYLr`xACyNN%JGpGx;b?@d@6M
zUSJALm8qs4hBQ-e`(x7iecWcR_X$&H@JUnW_bF4)Rl2G3`?RSi=NVJy_gU%uK4-Ih
zUOK-oz%<`TFG@H05=?P^UzXmhS8VpHUNv=oUz5)7>o$8uZ^*Meg*R>XirzBy5Wa2d
z{JtZ7zVF(6gs*zf)T8pgsV|uiOg&d0O4oh_Q@tA>n>tpXn0m}UmENn*Y(Bv@J~#ED
zd|`Tu^h;A;UtgJ?CjHvfN%_Xq`TbUU>%Ozu_w)DC7xE7<%_I7w^smNGFy$h@`?GX@
zf3exG`qlI@&A-Vj@OPWNqCez0(m!qX*8OFAf%I=vNAe%(3+i8+kJ9`fOwahCD$$`(
oL_%C*^5mp&OlAHZjSeNpC&nd31^=67G$h0&B`3s(?TZfm53l_*NB{r;

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-3.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-3.php
new file mode 100644
index 0000000000000000000000000000000000000000..b31bb83f400bd1597d5e5b1024755c27ae92eb04
GIT binary patch
literal 3674
zcmXZfb#PQy7{=k^aB+9IK!`waXR`_J?h<5477_>{tN_8?-QC^Y8ECo-EurlcT4-??
zTBty$1})Uc`MrPL@0ssAchBB?-ksT~n3RMR%kuhMzQi~?B;Mt7*-qQ#@wig$aLcyC
zJ_xg&(HWP>3}r%@P-c`FWkFd`R+JTGL)lPvlpW<jIZ#fN6Xim=kcBLi8|6lMP#%;Q
z<wf~WK9nEjM+Hy;R1g(Jg-{_>7!^iEP!UuV6-C8RF;pBCM<q}RR1%d$rBEqU8kI(6
zP#IJfl||)HIaD5%M>eui1yli5L={mbR0)Nk5L6jeMxiJa#fHK6S93<fVK|CF5vU5P
zf~umbC=x}YYN#5jj;f;?sD@EZb3SXDx|XSHnYy;AYn!@`sq2`!uBq#qx}K@)nYzBI
z>zlfPsT-KOp{X01x{;|HnL4a7yJ(CY$bq6z6mlXbibl~W2F0Kzs0nI{nxbZ?8ETH2
zqZX(IYKdB+R;U$fjas8Ns10h1+M;%-9cqu-qYkJ8>WDg`PN);=j5?z(s0-?fx}t8V
z8|sd_qaLUS>WO-yUZ@x9je4U#s1NFk`l5cQAL@_#qu5yZ{%X$j05|{*L<7+vGzbkw
zgOLll&=52P#i2M9kK&OVxzSKG6b(bePy$Loi6{{bN5jzwGy)}|Bs3C@M9C-_jY6YP
z3Q9qv(P-pB9^^${<U>B>M}9O0jX`74STqieL#ZegjYs3r1T+CnL=({@Gzm>clhG73
z1x-b1Q{gmm8k{aphcm<(aHcpD&Jt(A+2U+CN1OxaigV#SaUPs6&W8)c1#qFb5H1oI
z!NuZYxI|n6mx@c_GI1GPE-r^F#1(L*xDu`sSHacdYPd#R1J{ac;W}|0TraMN8^jH8
zqqq@n5;wuk;%2x-+yb|XTj4es*bTSCbnR+~hIi22Dei>3wN~7t?jE{(#l3K!hL6Ji
zFsMx)P**%Co@DqCOgjXRXzc}fR9)TqnAU0=$JIT~@Coq*JSpmfPKl@Jo`!*4@Qk`=
z;92o3Jg4Df@H`Cav0qSEyeR5}F2S@*ti7zY7vUB7ks|q_s7R)Xiex}k27@r5;9M1z
zvTGVv20s?n{X|p-uZy}>x~L4^5S77CMP=|aQ5pPPR0h8g6}p?ELU&74=)M#cy02hB
z=lQm}3f&!1q5E3H3eGp`Ds*>6h3=lH(A^ic_5lnY<Q+W})qSL4z3#`NHu*%{#@eUi
zcKA$GtiFW-J?HO4y_Dw~)@gqsDs<nA`?&KD;(qv}cmVz+>KnZj6}ngAVTOMekHB9<
z9sXZMh3+>|q5EA_=>C8KJ&o7up61SPM1}584ePh=FLlo`{8l^<---I6_*+!0{((V#
z!GA^F`9GMRaW*0xmKEZ0d;Lj1+ZoEgM2F>1_PTxH<}YK$fXD6gdy;L<IjsKy#CRB%

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-4.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-4.php
new file mode 100644
index 0000000000000000000000000000000000000000..9cbf9f37ada4790ef69d06bfd0c2d54e8eef11fd
GIT binary patch
literal 3779
zcmXZfb$AnL5XbSuVR3g@pj4o^lcvSpU5bP@&_XFC0u*<5cXxNUYqN*+++E;Y;N0(k
zzTe+pna?vb$-BEV`#gz>OG`?#EPucgNKUZB5<LNr?Y2EWpC{dpv}`-#xd_`GoBa`;
ztsE!^%87EKTqqaHjdG(rC=beu@}hhwAIgvNqXMV^vXF%eqJpRpDufE7!l(!;f{LP|
zs2D1SilgGF1S)|_qLQc-Duqg;(x?n7gUX_^s2nPX%A@kA0;+&2qKc>zs)Q<|%BTve
zf~umb$VN7*hN_|Js5+{FYM?L_hH9dkC>({O_z3vy)67UDj6_i=3e`fjP;FEjMWbj`
z2h~A!QC(CI)ibJZ=Ci(u8<@C(i5r@@p@|!rxRHq)o4B!wo0zzXiJO|ZsfnAJxS5HY
zo4C1&TbQ_oi6dHaik8TQTqp*`AUATOSQLxmP#kK7TA|jcHEM&}pth(jYKPjP_NYDT
zfI6U#s3YoxI-$;}GwOo6psuJZ>V~?Z?x;KJfqI~xs3+=$dZFH^H|m4>puVUt>WBKF
z{-{41fCiv}XdoJd2BE=dFdBk}prL3eijRlSKFv%IgTv5pG#rgUBhW}R5_ymZjY6YP
z0!l!MC=q#)7mY@v(HJxaC7~pgjFQn<G!~6R<4_7pLF3VQl!{W(1T+Dqp)@oRO+-HA
zLw@8(0Te(%6hxEIBs3XKMpMufl#bHTR5TS$L(|Z7G#$-AGtf*l6U{=i&}@`38_p5u
zz`5dFI8U4h=Zo{<0&xLcC@zGH#6@tixEL-Gm%ydsQn*Z92A7M=;R<mDTq&-EtHf1s
zwYVCt5!b-A;##;)TnE>S>){4*1KcQXgqy@oaI?4>ZV|V@t>RX=P22{zi`(H2aR=Nf
z?u5I<U2wO!8}5N2J+i&xWwQIAqf6MY-u+|`sQ55EC|-kyRD1{?7FB!%Iy%Nt_3Az!
z6Zg`4T*U|B37ByLo>cY*Jf-X@cv?IS&%lso@+{2KjXeh)J)`sLJx}ii^&Wv2#q01A
z%+fqxR<G{l73l1t_^Ns}NY})DWUs4Ox9*0h;lC-~r1+MoUAPTH+TZ74ruH{O)c$6Q
z+TW0<VQ@s<s~1G=?;RLA$uaJV+QEA&*8bjCR@0uPtj_$RvKq6Ol-2&eENXvWQSniJ
z_f=8*`x<m~=GR4?>J1fNr1wpjsr`LR)c(FL>QwKDnvHiwUD12cIm<V{udMd>15so4
zp{V`+NWEH(k40VJCo0zdehNc+pr0wLxq2XKaUP1AtItL4?-$|$&itjQE&B?Fv`1fy
zdMMwhSiA78vU+`er|dDl`Fmw`>wZvH`};`LAU#&GdVdu4LjDOl8p5ANo$41AU*dOv
zg_+vl-^2@Ke-||je~9Y+Q`G+c1)X#B{;lj)_>ZVp-@l^X4F9QD_v(L97x)BbW#76e
nmt}?dy#8QHz;=i8chqGCQ~lmRr1@`}UEuQug1%H+buQ~EguyeV

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-5.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-5.php
new file mode 100644
index 0000000000000000000000000000000000000000..fd038823053f32e5358a44934fe6fa62c5d43f67
GIT binary patch
literal 3780
zcmXZfWpES;07T)#VR3g@Aduj$A-KD{1qe=n2=4Cg?(Xi~<=o-ig>!dTGVlGG{%WSS
zcDJXeY8p14IBH@jl$aEoG<sM#Vt8y)Y&a$yn~)GYEgTgJha(?~497G|Jyc3n8k7d5
zMQKqwln$jw=}`uh0cAuPQ6`iLWk#7%7L)~rPzYs3Sy48W4P{5!Q4W*?<wQAAE|d%9
zM!8WQln3QSc~L%;59LSsQ2|r{6+{J5AyfzzMukxkR0I`8MNu(S3>8PkQ3+H6l|&^`
z7==+OR0@?wrBNAF21TF<R2G#*<xn{^AQC<}2KPu5j6&s6c~k*aKowC%R0&l=l~H9>
z1yw;+QPn`zg8Q>tkgEr|dXQ@bxkiv{2DxUCYX!MhkZT9Ic981?xlWMl2DxsK>jk-9
zkn0Dzevl&@@GTmkXcUbaqJ}62#h^y05o(MYqb8^cYKoeoW~dozj+&zus0C_?TB25{
z6>5!Iqc*4wYKz*UcBma{kJ_USr~~SVI-*Xf6Y7jQqb{fm>WaFeZm1jTj=G~Bs0Zqa
zdZJ#a7wV0Aqduq)>WliKeyAVnkNTql1K@*Wa8D0}1JNKf2n|Mq(GWBQ#iCd=6b(hg
z&@eO{4M%Y(4vjz~&`2~AjY6Z)Xfzs)L1WNZG!~6R<Is3C9>t@0GyzRO6VXI82~9!?
zC;=s+M3jV*P%=tJlhI@}1x-Oy(Nr`IO+(YsbTk9aKr_)yGz-l_v(aoc2hBlqQOaC6
zPtJq$<$Sn6E`ST=LbymSf{W#1xI`|2OXX6yOfG}V<#M<}u7E4$O1Mg{f~)0fxJIsl
zYvo$FPOgLN<$Ab5Zh#x*Mz~3Cf}7=LxJ7P(Tjf@`O>TqR<#xD3?tnYxPPj|%g1hBz
zxJT}Rd*xoZ58k!k{nCC9Nc%k~?e~zh-^0>=k4XDHD(&}}wBO^>eosjIJt^(?6ihkA
zPdM#a`#mG=_pG$vbJBj#OZ&Yb?f0Uz-%HYdFH8HqBJKC8wBKveey>aWy&>)QrnKK%
z(tdAC`@JLW_hD(jkH~%eS1EEod{iEQkI94Zad`+nArHeR<q`OlJPMzd$KW&aIDA%~
zfX~U3@Of#!FUZrJeNmo)cjZ}lPo9G>$@B1Kc>%s6FTz*lCHR`W3}2U5;2ZKPd{bV7
zZ^`TMZFvK}BX7cY<t_N0yba%%ci;!`p3mnGrTe`v-S0=z{eCRn?<dmzek$GXXVU$C
zF5T}J(*1rZ-S1b@{eCUo?>Ext^S9Fdeka}U_wfEgXZC}q9q^CR0skZ&@Xyi#{~{gm
zuhLKcO*-J;r33y$I^aL01O7`o;J>8<{s*Qwm47|!fd7-J11=vO3PmKuB_@wc3dfY=
deKb0h9G@7M6cxOjre2T`mz10kANIQF(EqUyHw^#)

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-6.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-6.php
new file mode 100644
index 0000000000000000000000000000000000000000..ed6f72f362f7e68ceb8f5964cc783aa0e198283f
GIT binary patch
literal 3104
zcmXZe)l*eb9K~@PJ$8$ER3sD=`*Oj=E-X-tD_jLd#2YGhw_taR-CYlk-Q7Of-G70y
zzw2qQ&;0hBn!RRDWORCRx@CENE?-Kb9hBtqxooHH@_1YscBp0BA-O_qXH?D-o}=6-
zH_C(Zpu8wA%7^ly{3t&vfC``h6o3k%f~XKGge+vC!l*DRf{LJ`s3<CiilO4DI4Xfk
zppvL0Duqg+(x@~lgUX<?s4Oan%AxY8JgR^ypg<IeDx!+05~_qMqspiXs)DMbs;C;O
zhHPY`>Zm%Zfoh<ds3r<RL8un0g@REqN(h1fS93-}VJHeiVW>8$jq0E}C>({Ox~MLy
zhw7pFsJ>AHb3PlG+|cBPCO0y<k;xGzN0{8$<i;j9F}aD!O-*iUax;^gncUpu<|el=
zxrNCgEqRKT$blRv5=9~>a-t{{g`!b3YK2;%)~GdVgW90Bs4Z%T+M)KSJ&Hjwr~~SN
zI--uK6Y7LIqt2)c>VmqWuBaR8hPtEfs0ZqSdZM1F7wUy#Q7r0>dZRw559*8hqJF3!
z>W})PI24ECQ9K%e2B3jxAWBGp|5tOS2f;yTFdB@8pdn}|8j4)Vg@&PFC=n&1B$R~Q
z$c=`h;b;UJfs#=&N<k@TBpQiEp;0ImrJ~VjG)hBhXbc*I(os4Zi^d`k@*pqrA|LW0
zKk}n-XdD`k#-j;n0?I%cXd;@3CZS1aGMbF0pebl7nu?~OX=pmSG#$<mXTX`_OgKxN
z1!s%1;T&-eoGZ?S^Tc^@zBnH)5EsCO;zGDcTm%=3i{TP+3Ct8TVV0N$mx@c_GI1GP
zE-r^F#1(L*xDu`sSHacdYPd#R1J{ac;W}|0TraMN8^jH8qqq@n5;wuk;%2x-+yb|X
zTVb}C4G+K<`jQ7VJ;?ODrh1GEqON>V+{Wfh;&ymh+ySqMy6;tSC(~=<E_hws4R45h
z;7xHayd~~~x5fSNj(7mx74?Gm#6wK)i-+L@@d$h<9)*v@WAL$f96k|Gz^CF#_)I(n
zpNpsA3-JtmDV~L|#B=a9e5wAv5!K(fqWb$zRDa)#>hA|p{rxDazn?_)_p_+}ei7B*
zucG?<O;mrsi#l~bMD_QlsQ&&E)!*Nu`uj&zfB%X({S9+iR*=W-^{4u5XE6Wz4$GhB
Wb^AiikAKbvkK5<>q}kf%u>JuP5rh^1

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-7.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-7.php
new file mode 100644
index 0000000000000000000000000000000000000000..cf723ac686da214bb81f7ec12f1a1e039af4acf1
GIT binary patch
literal 3692
zcmXxnb#N6|7(nsj@Njo{Kp??gLvVL@3lN+Tk{4WpySqbakpjitTIvSv)V-zd?lL8N
zPXF5PH+T2V&d#}W=QVAfG%hI=N{Pfr#*Yd|jgF7RhvUNW$;t6E!!e<7IQqWma9p$W
zOSN=mKp9X*lo4e@nNVhw8D&9PP*#)`WkcCec9b3EKsitdg-}kE6Xim=P;QhP<w1E+
zUX&N*L-|mClphs91yDg$5EVj&P+?RU6+uN%QB)KaL&Z>WR2-E+B~VFJ5|u)wP-#>e
zl|f}tSyUE<Q5cm&<xqK49#udUP!x(n6;VZ02~|QvqT#)3&`1o7L6uQuR0UN*RZ&$`
z4OK(cQFT-U)j%~-%|Nw+K5GSY?O?7Q%yojfPB7OE=DNXLFPQ5EbNyhhAIuGcxj`^D
z4CaQx+$fkE1#{zIZXC?fO?ZnYC>F({rl={3Lvg4XYKEGl=BNc~fm))Ls1<63TBFve
z4QhkhqPD0VYKPjR_NW8ufI6a%s1xdhI-}003+jTpqOPbL>V~?b?x+XqfqJ5zs2A#m
zdZXT`59)*ZqQ0mf>WBKH{%8OifCi$0Xb>8N2BX1f$Pjq%8Z<o=4n@PzFf<$uM<dV(
z6p!N3NHh|SLZi@VG#VwK1T+SXL1WQaG!BhJ<I#9D0Zl*?(L^)}O+u5=WR!>!(G)ZV
zC7~oV6-`CSC>f=o6cj-bl!{W(G&BuON7K;^Gy}~<Gtn$G3(ZEe(Ht}f%|&z3JTwo@
zNApn{x|IeO$OUkrTnHD*MR2iP4423yaH(7hm&s*txm*rc$Q5v<TnSgnRdBUj4cEvu
zaIIVm*U5Eoy<87B$PI9#+z2<xO>nc^47bQFaI4%3x5;gAyW9?U$Q^K}+zEHdU2wPD
z4fn`BaIf48_sM;5zuXTGz`JR_$Nm4?7dhzd2f6)_JOmHR!|;ea0*}h0@R&RXkIUom
zgggOH!n<jH%u_C(V)?W@4bR9k@T@!w&%xVfd0v|31!<NSefA>HUUJneFH5t$BF*xu
z&tB!(Yp$B*byu&mdc#$-yeZA{5owl>O0&Er&GIp6mXAxbd_wvqpOj|#lr+nyr8zt!
zt>IZ|md{DEd|sO63(_oaOS8Nq&GJQQmM_Tze5;qG6}}=LVD(k`Abd^Q=<Cu(-;g%?
zrnJ$w<U{<_+tOs;ktX}DG}-s$!#w-GJPALL2K=Ek;Jea*KavLgu{_65eIn1pPvr&p
znKa<f<t0|XkeA_?@(TP)8t~Wh8mr$(1O8UtVD&qB6Mhfxc#ixaJx6|&o+Cd=&yk;{
z8}=9JhW%B#VSkgJBfm>G>>tt%`=@ln{v|y}{+4dof28NgzcPKpR*nsYqLLF*QYS^i
gah3Sr7#m7WOi75u1b-saZ%9svq$VeZy)QQOA7qLkyZ`_I

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-8.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-8.php
new file mode 100644
index 0000000000000000000000000000000000000000..c978731a429f57aa8383c20fd27a66ddd4519af6
GIT binary patch
literal 3242
zcmXxn)l(H=0ETf3W5vKiu~tDsF)%O=2NVlCutntvM?nGcgo*_gb_aGBcDG*WAK|5n
z-JLT!%J;lp?faW=XU>_OXLe@e5^^(gEz9e3`7+b&uymKtWjk$`$K%SgBQ4vGC=+2j
z<4Z5mr7DZcqH?GlDv!#e3aA1KKmn*Cs)#C~N~kibjH;k2$U+vXimIYO6o{&!YN$G@
zj%uJ9s3xk3f>02ug=(SNs5YvD>Y%!)E~<y>p<on@>ZAIo0cwCkPzY*>8lpz15o(MY
zqb8^cYKod78`-ECYKEGl<|q_}qA(POTA&sv9EGEl2>9=68i|CFC<;ZPmZ&9ag<7F#
z6pdP=)~F3?gW96DM(s?W?aYobJI3txX16!HgV`O-?r3&LvpbpH$?RCOW6kbtc4xD@
znBB$fu4Z>NJE9x^q8oA`2Z}>+$cdaN9>t>slz_UU?x+Xqff7+7>WO-yUZ@x9je4U#
zs1NFk`l2M1g!-X=s6XnD2A~0GAR34Up+RUc8jOaZA!sNXiiV+KXgC^<l2I}mfkvQ_
zXe1hiMxoJYG#Z1(ps{Ey8i&TA@n}3sNrC^ars)ZA0-A^>qDg2HN=2#2g<NPdnvBv=
z8cIj$$c@}+3YvnZqNykYWuQ!yiKd}xXgZpXvQQSvM%gF_<)9g82FgXbXeOG8JjjE*
z$cuc)hy2KoW}#VVHkys*pgAZH<)OJ~E}Dntq4{V&T7VXyg=itlNBO7#-7SEN#6@ti
zxEL-Gm%ydsQn*Z91`EYPxLjNgSBNX%N^vDzC9Z<2#no_)xCX8j*TQw;I=Eh34>yP#
z;6`yH+$3&-o5js=i?{`D6}Q4|;x<?$7QyY}cDO^_0e6Z!;Vy9(+%4{gd&E6(uecZP
z6ZgUW;(mBgJO~eohu~rHFgzk2fk(xo@R)cE9v6?pVzC&WfcNw?PU`d|r>DeI@U(au
zo)OQ$v*KBJPCN(Ci|645@dCUkUWAv#OYpLI8D0^uz^md_cul+puZ!2=4R}vC-_+?%
zPH%~~;BE0Xyd&O$4`4}wp4~%yUj;uBRd9)@f**@2_=%{3pNcB@nW%!Fi~8Lcq6&T~
zs^C|m3VtoB;5VWQek-crccKb@FRI`Vq6+>f9^mPG5*74kQ9*wZ74%n8L4Ok!^mkD~
z{}2`QPf<bt5>N0qe#4Riy><Tlcj;><%3)by9=F$@<+GjPe04Z1e~#Dfi!`4gr8juo
MKEEf&)_o4^FR)&yX8-^I

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-9.php b/lib/symfony/polyfill-iconv/Resources/charset/from.iso-8859-9.php
new file mode 100644
index 0000000000000000000000000000000000000000..2a3e36a486511cdabe21a6bd873b37694f642d57
GIT binary patch
literal 3779
zcmXZfW0)3u0EY3C>&<q()z)q{x6QV#tv0vSBHOlY+wPp&j&0kv)y{o?n&)@Te3-ee
z|NUVaHl8?YVknfD6q_`9SU6&MY*K7ECLEiP5IZd#6$*zVABqgeG)lcxN>v(^2Bk%5
zQ96_krAO&e29yD1L>W;glnG@<nNb#$1%*%uWkp$0Hk1uzN7+#hlmq2NIZ-Z@3*|<+
zQ67{B<wbc>K9mpTNBL0!Q~(u31yLbX2o*+!Q4v%G6-7l+F;ol{N5xSIR05SmB~ciK
zQ7Kdkl}4pe8B_*Epa@hJl||)HIW!;=KDY*FBnn2M@~AwjfGVJhs3NL_Dxu1#GOB{A
zpsJ{9plZSStQPF*!LA<c8o{m+?3%%@8SGlYt`+Rs!LA+bI>D|J?7G3O8|-?)t{3e3
z!LA?d$OgPc0~C#-QA5-a#h@6}2sJ{DQDf8uH9<{LQ`8JKL(Nfh)B?3YEm2F<3bjJ5
zQESu&wLxuBThtD<L+w#})B$xs9Z^Tr33Wo9QD@WzbwOQGSJVx4L)}q#)C2WEJyB28
z3-v<1QE$`-^+A16U(^rvL;X>IG++RHa1GA%KsXQ$LW9s?G#Cv*Lr^S=MMKe0Gz<+x
z!_jaQhvLu(Gy;u8Bhe@{3XMji(HJxajYVV8I5ZB8N8?dEiboUB1T+y%M3c}Ylz<XY
zB1%L_C<!H_WHcE~MpMufG!;!n)6g_D9Zg3w&<r#a%|x@%EHoR<Msv^{G#A~S3+Kss
zaK4-m7sv&0p<D<T$whFnTnv}UC2*-+3YW=caJgI#SI8A`rCbSD$yIQ*Tn*RAHE^w5
z3)jhYaJ^g)H^>cequdBL$xU#x+zhwKEpV&c3b)B^aJ$?NcgP)Zr`!p5$z5=_+zt20
zJ#eqw3-`%=aKGFS56A=Xpgaf<$wTn4JPeP>Bk-s^3XjQS@VGn<PskJSq&x{v$y4yO
zJPpstGw`fD3(v`O@Vq<^FUSk<qPz$%$xHCEybQ0%EAXnk3a`m)@VdMXZ^#?)ro0Jn
z$y@NYybbTjJMdw6&wd|~_Ip>_?>%Y1DbjxLOZ$CP+V5l1ejk_i`-HULC#C&9CGGcV
zX}`}%`+Zj0?{m_ApNA=)_7}Wszb{JreM#Ey%hG;dk@owlwBOgH{k|^k_YG;kZ%X@p
zOWN<-(th88DIU>x;eEg8Js-B;_oe-QAno@<X}=#y`~6tj?<dlJKb7|TnY7=}rTu;(
z?e|M*zh6oF{aV`ZH`0E;mG=9cwBPSxil6_3ckTB_X}>>7`~6wk?=RARf0g$8o3!8G
zrTzXP?e|Y<zkf;l{af1aKQP62{ukc&i~jTB)PBoHhe8nvaf!*}lEN|N_#KT7CC4Ym
WB}E1Qrl}7k#3dys#D{$@I`ls_?lm9)

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.koi8-r.php b/lib/symfony/polyfill-iconv/Resources/charset/from.koi8-r.php
new file mode 100644
index 0000000000000000000000000000000000000000..d83c2125b7ab2ec965504046f206a6ddf1aec21b
GIT binary patch
literal 3835
zcmXxnby(C{6vpwjb?j~(6$!;|0lT{sV+0fo#9>e|u?ripySuw~bvt3Z!|m=4SMK*c
zfBnwqIcJ#5{oVII&qTIQicj)*k^{a#LX0;k))(-3qr5)9-<RqQ^?1D@kA!%m+T}jN
zbCn0>L3vSLln>=Y`B8pU02M$5Q9)D)6+(qkVN?VaK_28mMNv^y3>8DgQE^lPl|Us?
zNmL4zLZwk@R0fqnWl>pF4wXaYQF&AWRX`O{MN|n@LX}ZvR0UN*RZ&$`4OK(cQFT-U
z)j%~-P2@#hR14KYwNY(U2h~AAC<xU>bx|-1M$sYg;nSUwP#B8BP#CI*>Y@6mJ_<+S
zr~zt#8lr}%5o+Yr*qzVDu5RM$Ca!Mk>ZY!4=IUmyZtm*lu5RJ#7OrmT>Xxo<<?2?h
zZtd#Uu5RP%Hm(k7%PQKU2o!-LQ6!2&QK%hihuWj|r~~SNI--uK6Y7LIqt2)c>VmqW
zuBaR8hPtEfs0ZqSdZM1F7wUz2qu!_w>Vx{CzNjDShx()bXaE|32BLvz5E_IAqrqqh
z8iIzRp=cNyhK8fzXapL8Mxv2u6dHv_qtPfj8a{lwGd%{5L1WQaG!BhJ<I#BJLq0SC
zO+Yay2F0RS6o=x_L^KgiLX%KDibn}30Zm4e(G)ZVO+{1DG&Bt*qC_+uO-D&63C%z=
zkRSO`GD=1P6hJ8`1<gb=(JV9z%|^3PDoRCj&>S=u%|-LjJTxE8M+?vbv=A*sY3P1N
z8eU{xj2D~J@e=a}ywse5mzlTX<>sAuh4~;}X+DWpnJ?ni=9_qpoTc@qo0rmGYhH=h
znYI4)X03mNc_Z^1&71Hh^JctRPTz|&tS@KEE4R_lGH=IQ<W*YVR<rhFoB0s)+woof
z`5kJf@1wm_?Xz%~cpmN+ufRR<p12p@&(v1zGixjMo3#}OaE{sst*xCoWY$SIY|iA{
zkC?OYQS%mj%&e1h+^n5EVb)HbH1FW^r_4HOr_H<QpE2*oXU%)?IkUF<yjfd)0cS5_
z{Gzq@<4fiP__A3q_KI0A_Nw_X^ViHr@OAT1e8YSU-!vb`x6CK-ZL@-P2jA7lAB8#V
zn0^dq>m1z`&(Xc7;pOmgbrsPk#7lIa)UX2il)4w_KCSLD_>8(&;j`j3_?&nhJ}=&Y
zFNnGsUKDT9eM!6xv&B0w2j;AYFN<mL6;ZGHRZ&;sYvK}yUx(S3;TxhN_@;(+{k$cv
zVfbwgE0OQ0tGnS{aV^8|iL2oI;tKeIxEg*4vrog1L`D6+s3?Cd>L`99D#)LT%JFBS
z&h_V_Zh<dEo$@b5W%?^ok^Wj#qQ4Op=x;^k`8!c@{$5m?e-IVsAH_5L`#*___Rpe{
z{fnq1|0*iTzlplGeiwBq{vj%5e~Jp>U!tzKzePp*AMq56{8v;${}Xi|JP>o^9v0#8
n1o`8VQ>F&IQNjF-jqs!-CdUOr-EZ350e@T|#h>WaT!iO;WL94R

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.koi8-u.php b/lib/symfony/polyfill-iconv/Resources/charset/from.koi8-u.php
new file mode 100644
index 0000000000000000000000000000000000000000..dbbf96be1470ea7d188775080050f13815ddba11
GIT binary patch
literal 3827
zcmXxnby$>H6vy$kb?k0^RU{O<9R}>~4vY~{P(&OC6%!j28?d{(yLNFqf$iR9ySr2F
z_jmt#&*wSko%hat?>X~KSVUrMqRW-!_xj_aoPcPr-|KiBug~XAae`fr6ZA-s;|VXk
zgchm@DuRllqNo@uhKi%&s01p3N}`ge6e@*Eqtd7hDuZ0eh03C`s2nPX%A@kA0;+&2
zqKc>zs)Q<|%BTvef~umbs2Zw<s-x<t2C9K-qME1{s)cH!+NchygX*HXs2-|^>ZAIo
z0cwC6qK3#p4r+uNp~k2&YJ!@e02F|lqNXSi1)|6x`0#4ZNH7dWAt(ejL(Ncg)EtGP
zP}BmoKrK;A)C#pSYHiMEYZJFIaT^o2HE~-Lw=;1&6Sp^UdlPpsaR(E3G;v20cQSD&
z6L&UoXA^fZaTgN@b!8P@ksG;D7z#rk<U!#m97UiA)D3k*-BEYc1NA^XQBTwh^+LT-
zZ`23%L48qQ)DQJT{ZW5301ZF`(Lgi^4MKy_U^D~`K||3{Gz<+x!_jaw0*yc;(MU83
zjY6Z*Xfy_mL1WQaG!BhJ<I#9D0Zl*?(L@v(2_Ig~nVtkEp~+}6nu4aFsc0(lA}^YT
zrlBYlg`!b3ia{}GI+~7VpcyC@#iBSAhi0OgXcn4<;!!-Bjb@_+lz`@-IVce&qPb`;
z@*y8eLP^Mv{3sbEqj_i^nvdqA1!w_EK`Ce<T8I{*MQAZvjFzA!XenBXmZ4=R6%}Nr
z;^o#W@Cxe;ywZ9zUS*w$S6lDEYpnO+wbn;)n)Ml+ZhZx>v%Z7Z%h_6QhV?4)8?4jt
zMr*BqleN~r*?J50TdcR@t=8M{HaX(}&a`<sOHMsRK3h)Pg}2M;THg+9?Z-~*qtx%h
zIr{kBN@pA-y+`Q_aIbg??h~)W{qTW!02X9vD-K#~D-Ky}D-Pp4rH_bu@ked7d`#(V
zo_$>04o}!>`J}au%_-}h)StH2HlDHGP5vy-*V@k6^j^~Et@q&z*8A~AYi;u-Yi;vo
zoV%RzE8<Fc)m9(I*OXoZuZwHp4O@K--?ToCZ&{zfx2;d&JJzT0U7WACc+aNQQ1@|;
z?tT>JZRF<1V6M(jj(Cym0~PCwJg%%-^9k`P#ZRhOjrf$Zm&rb@>}vRovNzzf;!XIR
zcndx+-i9xTng}n7cgema-h;W~eV7OHHo<%`6}~L$HNPTi6uv6zt-l6yuW|3|qFV0_
z6>IFgDXypZEfuR1-&R&L;T>@U#qWyg@I6t->3wk>*$-guIryQd!%-lrO+FHJ5<eEz
z!Jmj(eAK6+2GwVx=Hlm~#?}|2+WAXS-TalPX8u}KFMlKI7voz|t^A#+PX1n0BmW?t
zXU#u~YU`gwb@k7pM)fbEy7*U71MD|Z!|-=eUG|4~n&<v0YP$U;s-yoF&r<x4s1E&C
x)HwK0EbR6Wx62jai%Ck3_dA|I{=T|h$q7j@{$TT8wy?k#<4^V_II45I{s*QiSyKQ2

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.us-ascii.php b/lib/symfony/polyfill-iconv/Resources/charset/from.us-ascii.php
new file mode 100644
index 0000000000000000000000000000000000000000..94a93b280f4c2b51d4a7903d94397cc8ced69ebe
GIT binary patch
literal 1859
zcmXZd={J>86u{w>N^i+fX+T~>rc4=<u8X87O@s#H#WiK>4wW?g>v5hw?ccN3{%}6*
zwa(!1;nrakWpk<A_FCMqp30@-WSq)mQb%!f6vs_xn&RZp>1aDu0Ts|$I!ov192HU_
zou~73fiBQRx=2M-M3?9iMHJCxx=dH-3Kdf^U8Sp3LM2p6rBp^`R8Hk|jjqvkx=uIf
z231f6-K3jzi*C_vx=nZJ4pmYmRZ$gHQ#IYCyHrCp6jMyKR7-VKNA*-s4b(vQ=pHpv
zBP}%H$qYBrjLp<SE!0Y_bf4~18?{k8wNnRmP$zW;b%p!v3jHATgV5cfyF>Sc?g`x+
zx;J!R=)TYoLq81NAG$yEqtK5+4}=~F-SpTi9#eu6G)RM#q$CZ|5Dn8XjnD`^p(iv-
zqx6)X(in}=GkQkP={b$lI8D$5y`UHLl3vmzP0}lRMX%{Ky`eYsmfq4kdPh?<Mbk7*
z@990w&<xGeEX~mzeV`BYkv`HV`b3}UGtJXHEiB;43^%=qi?l>bv`oviLMxP_6s^)K
zt<f5-(>kRoO&hd9o3u$=v_;#rO*^zhU+4?%(k|`M9_`aU9nb+C(jk4Nuauz-WhqNJ
z%2A&3^o_pJclu60=m#Cq5&fi}bWF$ei+<5>`b~f65B;UTCu&JVQ9~x3&F|*oWTWpe
a5#{%@>0ER88&4N9>0CauAOGJ=ME?NXW<Ava

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1250.php b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1250.php
new file mode 100644
index 0000000000000000000000000000000000000000..d1d5e6f25c6881e279fe4d576982d1c0cdc6e4a2
GIT binary patch
literal 3721
zcmXxnb#xSG6vpA=Ft|Gm5F!xV*=&Nly98O1g#<zfD?rdR4N!`Eakt{dwJq7LZQWf`
zcXuV<@14K)KIgq--`sD`*@UF5v@FZ=2RwoF6gw)_6Y$t>+vD?jvh7&Qwqx#zvE7M<
zKk<bsf{LJ`s3<CiilO4DI4XfkppvL0Duqg+(x@~lgUTQaS*R>3i^`#Ls5~l<DxeCe
zBC3cgp-QMSs*I|jDyS-|imIV%s5+{SYM>gZCaQ^Qp<1Xms*UQPI;bwHi|V0zs6MKX
z8lVQKA!>+hWTQr?5o(MYqb8^cib7GSDQb$MQ8Y@9fp>q+jKsoN6o=waGt>+<N6k?@
zibpL_3)B*|M6FOOqt<3VTbsI#soR*kt*P6Zx}B-pnYz8H+nc(BsXLguqp3TZx|69p
znYy#7JDa+Tsk@jurYm>R6}gZLC7=Z4MsAdd5>XOLLfud|)E#w4Jx~wS6ZJ&BP%qRQ
z^+tVAAJiB1Mg34e)F1Un1JD385Di3w&>%Dz4Ms!I5Hu7GMZ?fAG#m{_BhUym5{*Qo
z&?qz-jYeb87&I1*MdQ#oG#-sd6VL=S5luwN$?)#4ndwPz5}J%AqbX<#nu?|(5AvXC
zXc|gEDJT`CA}{iy>1aBdfo7mIl!nq#I+}@QqFHDb%0L-tHkyqxQ6`#$=AbN;h32BU
z$cKE$kNhZr0w{=rXdaq}=A-#&0a}2vQ8rqL7NSLH5n7BEqa|nwT8fsUWoQ}7K?S*|
zaIT!Q6X!YJi<dh-idQ(^k5@WAfLA#_habRUwXb&KYs705>*{O8!=&rPTX4OoV>iNr
zoCk?FIo^RcJKl}AINpP|IzEWEIo^!7JKlnK$a(7DiNkvGT~7OT+IK771^0+Y;9l`I
z+$ZYT{qT-f?Es9dr1_wz=RTxk?<GB~W3`4yU?`9Ds8YSoW8yK=<Kl66LOcN<f?<uu
zNu?)APl+0=)8c8;GvXO|7KU%Yb4oQd=f(4+55tI7@`8@dCB3NTi|~?o30@X2!z<zy
zcvZX#uffoAcpZlK!5eDUJ>OKbhVvGTXt-`G)%$$}hHrAJM@3E6V=!ND@Q$bl%!eT{
zq*O07tW=xgad8C~dP2>boF|p8A$>~eD)_Wg%~eF{YSL$vYO6l0bS>#~;yU=en#C8y
z4Wuu^@O|(lQ8)QA%-1%2Mbuios%D+)HKp4))$8JR_=cMGL~n{3!nf3{Cwg0{hVUJw
z`g*)8>ixc_W_=6ZSE^C@K<QR)<3pwTQWS_f_9Gb5YJ99z`}Y&2`Z9bfYOOv~v-a=j
zO7&8{P^$g=rBZz#zf!9G`?XT-vTu}X|9&fK>Aq9*dLHn5aU=WzhBcx;iuaTL1oJPz
zpGEE8U(~Eq{i;;^_cu}d_jfhxiT)7Ja^^qPtfl))slF<IE7g|#N7Q!ySIvhw)qgNj
qc%e9#WkvbC{$NJHc1QE4(q#oR{oX*V`G;B9;PVE8zD!$vF6)2VsV*b{

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1251.php b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1251.php
new file mode 100644
index 0000000000000000000000000000000000000000..f422a71fc7b694578cb7d7efb096c0f250385a84
GIT binary patch
literal 3782
zcmXxnb$k;^7{>9#VR3g@pj4o^lcvSpU5bP@&_XFC0u(K!xclMm?hbdHd(v~i>$$rt
zo!_&6?fd<_GucV@*_lt`5;9UUEXyD81X7dih-6Q|W4mpS&*#asqb=KxdML_v$LC*S
z^Hl&9Km}1jR0tJ9g;8Nt1QkI=QBhP36+^{Qaa018Ko+u4NmLS*LZwh?R2r2*Wl&jE
z7L`NgP<d1yRX`O`MN|=0LX}WuR2fx4RZvw_6;(skP<2!t)j%~+O;i)rLbXtBR2$Vn
zbx>VY7um>0^-w)jAJs<<Py-Z!B2Yur5JjR$lo$mcTunxzVKj<CF{lx0gc_s9C>F({
zCa4K&ikhNksF_i7lh5X+Zei*crfzBKmZolH>Q<(1ZR*yhZe!{;rfzHMwx(`p>UO4X
zZ|e4@?qKQ;rjF{!Dmo$;a-ldBhup}G;!!+GKnbW5>V!I@&ZrCOg1Vxvs2l2rx})x>
z2kL=(qMoQ1>V<lv-lz}igZiSrs2}Qw`lJ4602+V>qJd}-8iWR;!Dt8?f`+1@Xc!uX
zhNIzV1R8-xqLFA68ihuq(P#`BgT|t<C@~Q}xSC9lgX7S6G#*Vr6VOC75qXdYO+u4U
z5=uhJC>eQ?7fnW!(G)ZVrJxj)ic-;3G!;!l(@+{pL(|c8l#bHT3^W5}pbRt<%|t%r
zLw@8(0Te(%6hyPoEHoR<Msv^{l!-FYTr?NWL-WvlG#@QM3(!Ke5G_KBP!<Yh!^Pqf
zm<{u?cH$*Cycy;=?Y(%Z<D+<)<NbKK;{$kwoP8Rvbo%G<DjZq~S3B(+c#Ybt;97AF
zTqmxE>&5kO0}OA18)077!+4Y99eA_j-FS=RJ$S3*gLs=`{ZiW<Z=t_K&e8atIIP?4
za)#ez_-?iJ81{%-%wBO9gZGL1;C^^t&)@(It)qKTgY^Utsk?&iVa+`ZkHFjw@Tj_a
z+Q-CWbdST(Vt7K`6Y!+EIq;Oar{HN(xi}-9p?g+53(vvOa(G@{W$1!<f$l{OUIs70
z@HTiE=5B;nH1`U;Dqe-x#B1<63~TNUn3toEzNxkXa7&YKG5NN-ir*a=T1xk>x?ABr
zaXWlOgY{G%6}680qJsXIs9ZiSYE@5&y3v!OzQR+Y?)$W;H9sRN!q19|>~o?r`n;$F
zzaZ*udQns;UlJAQkf=b1MeQlMqF$_*#Y6m7uZRlttKt#5uZaru>!JevhIpL8Z;A@^
zTjEK&Z;J}_JE8*puBbr2Co0hIi|6>L4@3p}Ls5aw6E8COBk>aaSiB5B5f$i9MFsjZ
zQGxzkyw2P&L~XubirS&R5|!t##oNsNM!W;R74O3D#C!027|wz}h}uVf6m?+zB<jHW
zS=6@ji>UYLS5YtjZ=yDi-$m_xe~3DK{uFiC{3Ysi`CHW4^N+Zeukf#^J@-E`|0s%a
nSyqJ4>kp;{Y<DF8NL^Mi-R})Vo4=>|1AN{<(3fs&oXh$jw@N_P

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1252.php b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1252.php
new file mode 100644
index 0000000000000000000000000000000000000000..ba6d203dcabee1831ae4ceaf3a3037340ffe7d3c
GIT binary patch
literal 3721
zcmXxnb#xS09L4eCFt|Gm5F!xV*=&Nly98O1g#<zfD?rc?g1fuByE`<rCA3h1x>0v`
z0rI|g{+jzazj>3*&b#lNjfzQ0NU<z`z!OM}vqR!N0gvsrJwBf&)eg68JM6hI+Z~;K
ziOg0Glmq2NIZ-Z@3*|<+Q67{B<wbc>K9mpTNBL0!Q~+7XLIqJlR0tJ9g;8Nt1QkI=
zQBhP36+^{Qaa018KqXO0R0@?srBP{A29-f&QCU<Dl|$uGc~k*aKowC%R0&l=l~H9>
z1yw;+QB`Ck8&yNqP<2!t)j%~+2ns<pQB4$zLQ!lOe0DW^BpimL2o!;8p<1Xms*NI1
zB&vhzpt`6os)y<s)i?XIzR3+tZeVgllN*}c$mB*QH#WJk$xTddVscZHo0{Cr<Yp!}
zH@UgVElh4<a#%|~MN8yDE)<2LkQ=#CG>S$sC<e7ctx#*!8nr=fP+Qa%wL|Std(<9v
zKpjv=)Dd+;ols}g8FfKjP*>Cybwk}ychnvAKs``T)D!hWy-;t|8}&hbP+!y+^+Wwo
zf7BlhKm*V~G!P9!gV10!7!5%~&`>lK#m2&CSF@*w!C`1P8jePw5ojbDi9E=IMxjwC
z4#lB(6py^fi$<f-Xbc*I5>Nt4M2ToD8jHrEaVQBTq48)uN=C_O0-AtQPzsueCL$m5
zAwTk?01BWW3ZhA95}J%AqbX<#N=2z?Dw>L>p=oG3nvQ0m8E7V&iDsc$C=ESMKZ4Wc
zv`u&pzOxEuIOA=2uH$`pp5q;OzT=&E0nVBS7dqn;coELj>c!6ZBI6|*>%%M)uQFZf
z+`R#>a=a0*cDx0zal93;b-W9&bG#a_cf1B~z*&0SMvXJHd=t*pf4<pSeTmguG}gnn
ziPxBJ7cama@Rq)pouVGSOVl6UE$(LR9&r!cEAEB+M7_WL;(n$F!~^i4cn}^E55dFY
zVR%H;#yTn<WqM3J29Jx!;R#XO;-q+z=_&CPJT0DvXT&q`tauil6VJi(;(2&M)YpDd
z)b_h1>J45NFSGWFcm-Y+wK=bedcW7j>)d<;-cExz#o6$dm=14?bKvu02Fw)a!aJf0
z_kuW|>5Jk5_>#B~-W3<YEO9ZsCoX|6i%a1v;xc$&Tn-<IE8wf*O8A<nn!hfpDQ}2s
z;X`pPYafa0;G5!l_?D;>;%!j}#5<ynzIVmVtbI>Z-QO2=czhu0T>Mbn&f1Se_4i{@
z{e3K|zn_Te@28^r`<bZzelDuNUx@1Om!kUnm8kxHEvmoYi0bdRqWb%tsQ!L0s=q&o
z>hF)D`umfp{{AegzrTp;@2{fz`<tl#{w}J&e~9YupQ8Hvm#F^!Evmo&i0bdZqWb%v
zsQ&&hs=rUf?EXf$EGxw4^#_vzwmXy`l`boo?Dq!3%`eRC8+_hC(3foMK9}_r+iNe6

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1253.php b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1253.php
new file mode 100644
index 0000000000000000000000000000000000000000..c04dc8f0e07da5ca7ee22429198714b47604397c
GIT binary patch
literal 3542
zcmXxncXSPD9LDk08NGJ~kwWzD<|caYy+pZ^OF~54f~eUDR@tJj#jf6a@2tfZ1jnwr
zg|LO~y>eFG?=yeR^EtnH=gggX-Z|$+#iS&pSe8HF2_(kZA@QDo$9CHupU;zOhg-HC
z_EMPbj?O+rW-ABEfpVgpC>P3wa--ZR56Xk`qP!>{%7^l!{HOpbfGlL8f~X)WgbJa;
zs4yymilCyXC@O}Eq2j1GDuGI%lBgsqg-W5)s5B~r%Am5SEGmb}q4KCas(>n>il`#0
zgesxRs4}X8s-UW<DzcG{s-bGAI;xIppc*Iyg`k?KCJIHNC^ihfIGT=x!*CRVB2X<<
z3)M!oQ6!2)bx<8t7u7}eP(7pirl0jqZeVf)lN*}c(BwuYH!``g$&F2JVsaCco0{Cz
z<Yp!}Gr76R%}s7$ato8gT5=aHkqfy{6pBJ_<VMjb8pWU()C#pitx;>#2DL$LQCrjw
zwL|Sud(;7SKpjy>)CqM$ol$4h1$9APQCHLrbwk}zchm#*Ks`}U)C=`Oy-{z}2lYXH
zQD4*#^+Wwpe>4CMKm*Z0GzbksgVA6#1Pwt$(NGi{3tt>fr-#8|XgC^<MxYUBBpQi4
z$b&|qQ78_@p?DOJyvU12qtR##8iNv00!l=QXe=6w#-VX22_>QNXgo?r$!G$afKpHj
znusPMAMznT@}mF>pdbpONoW$9j3%QgXbMV2sc0&iil(7yXgZpXW}q2pCYp(6p;;&m
zWu@=J>2lgzcs9PY1ZFtnxA7duTku@R>+n3s>+yWY`|v`?$MIsvZ{j76SK+0O*WhK2
z*W%@lH{cbHm*SO<m*G`%hR$E@%ug_1htKQhtcRI%m~If~!i_q4Bitlzf}6$7aEqu1
zw^iKAbep&hZWp)1o#IZoOVlgeE$(KzN8AJV!mPCAc%R04A^XMsOb>_$;6d>qJOnc{
z;9*S<!z1DmcvL(Jk7?~I@VGc1o)8znlUjQcp3-y?Jgw<zct+FL;92o?cusr+zAG+<
z=S9{1JyGqsAgVkUMLo$&;tDSHzPJ*8Agb6Oit6=8qITV7aW!kNh${V6QJv2ewI#2K
z@38i|s0QB<wI6Sas_e(2D*K73%H9%H+1sKjdq-4d?~1DIJ#hzjbzfA2KNZ#B&qOu&
zb5RZcLfp%x9*8RNLs13J5>?<wq6++2JjA8G6jk7_L>2gJQ3d`+JjU85qCR9#MSVxU
z6;<Hx#8a&OUQ~g95YI6EQ9KKOg4fdE&*IDQ7cm|FD$a(#iQ2Hgi~5}XA?kDXr#O$b
ze~H?#e~a3%|A^YK|B4G)`=6){`%HY5>2ooA!$!C)E5zsZ2a^J}JCuKDE-RSq_Xfhv
S-?i)$eBMCNmu%}im-Rn3-~){S

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1254.php b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1254.php
new file mode 100644
index 0000000000000000000000000000000000000000..1cfadcf2b45b964117e92888b6cd54a1c501f1bb
GIT binary patch
literal 3691
zcmXxnb#&BN9L4d)A-FpPC>1E~OsB=&U5X6tKntam5uj+d6lZr2?(XjHFvCh$VBLjv
zcQ@$!-u#vOIlsI#Y2M8_6PJ*Yl3`i?fG3ceWJe@>0v_9Kdwf1mrX6kBcGP20wmUxW
z5SyobC?Cp?@}mN%04j(IqC%(;DvS!FBB%%|ii)CQs2H-4g^Hu%s01p3N}`ge6e@*E
zqtd7hDuc?RvZx#?hsvY!r~;~hDx!+05~_qMqspiXs)DMbs;C;OhN`3Ls0ONmYNDE`
z7OI76quR(uHmZZ_pt`6os)y>K2o!<pqxvWkMWVzg_~>Z%NHmN_F(?K#Kn+ks)DXp@
zSkwqLLXA;l)C4s#YHIdpQ<IyS+|1<WCO0>^g~=^UZfSB$lUteG%H-B2w>G(r$!$z-
zYjRtY+nL<X<f!)CMSJ8zE)<92kQ=#CJc>sNC;@dq9Z*Nq5p_bHP-oN`bwOQFSJV}C
zL)}n!)E)IeJy1{76ZJy9P;b;5^+A15U(^@%L;X;H)E^B%1JFP;5Dh|u&|owe4M9WD
zP&5<`L&MN;G#rgUBhW}R5{*Km&}cLoB__g0N3*BLz%ghn8jHrEacDdmk37hOCZGu@
z2_>Oql#IN{izcFpXcC%)Qcwy?MX6{qnvABPDJTu4p{ZypN=NBv8k&YOPzIWgrXwHn
zAwTk?01BWW3ZfZk2AYXxqFHDb%0!uHHkys*pgCwRnv3S4d1yYGj~1W>C<{HvK8myD
ztj%~KzPlRcIOFYjk>mY%vE!Y1iQ`>(Db8ICmpS8;csUMh^$KTviSbH}bu+7+@kYk0
z9dE*G9B;*I9dE<y9Ph^K9k0O~9IwS2ajq`6N#h(X-;Be0)Gf~H%dFn2u`a$tyvTGX
zysanSCF)wcMg65c;vUxS75Bn@;y$=v)Ehb=9$<P<JO~eohu~rHFgzk2fk#DconzuL
zrpLwO@Pv2*o)q=sPl>0Po)%BTGvXO|Ry+&OiRa*X@jSdBUVs-x{o5~z+F+MOy|OFf
z71mxAufl8MHF#aT4sVDz;7xcZ3*HhRhquLSct>0aLt+jLi;Li0QI&dHT*CAjaVdOO
zTn3*Lm&06f1$<sy311MOfG>(q!k5IS;5``9cjCULtC+qls>rX1s>Z9LYWJGBj<v6g
z>){*X2Kc6^Pr_TGz6fuN`nbI#Zei`aqWb+F3~7tL55sz*4|MVl)_y3ezaNR}?*mc&
z{a93gKM~d6Pet|jGg1BhTvUI*5Y^u=MfLY9QT_c|RDZt_)!%PL_4hkb{rz54e}8}>
zJ^qiHs=q&p>hI5@`umHh{{AYezrTs<@9(1e`-iCh{wb=ze~Iev-=g~akEs6s3q!i+
z|6o{8^uJEd>u-$9vLbw5e=sdzyCeD8=(2+8es3V!{D#as!RHMGed)H&b6F1ozXvC=

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1255.php b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1255.php
new file mode 100644
index 0000000000000000000000000000000000000000..f73cbb6ffd844dcc04e7ec63775f611166299b26
GIT binary patch
literal 3454
zcmXxnWpGqi7{>A9aB+9Ife?Y<&Snz=!QCy$k}M<;LRbNUh7f2OW^k7lcXzk6v`lEx
zLO-^tA}zE~fthxiod0t_-RC#&Id}Ixd+$55(Xr{t>6YaWcmgSjc4(3(;IZAd$LI58
z*b$a(hkp=myJHG2Q3Wc53ZcTNFe-wIprWWKDu#-o;;1+(fl8o~s3a<dN+Anbs5B~#
z%Ahi+EGmo2p>n7^Dvv6l3aBEgh$^8<s4}XIs-P;UDyoXAp=zi)s*Y-)8mK0!iE5!*
zs5YvN>YzHPE~<;_p?au3s*h}BqYxB=8lVQKA!>+1Q7CGJ8lf;0h7!VI{?$Aq5ikNp
zqDa&jHAYQP6BLD_P*c<tHABr%bJX0Zg?T<(nB3CjmL|6{xs}PSO>S*+8<X3Z+}7l_
zCbu)WoyqM@Zf|l2lRKE)(d3RMhj-#zbV4rVLeVH1xse;ipcoX3Vo_(*8O5PE)CF}x
zT~SvQkK$1`)D3k<-BAzJ1NB5bQ7_aB^+vr>AJhl+MSW2})DQJX{m}q401ZR~(I7Mk
z4Mu~}5Hti0MMKdrGz<+#!_f#d0*yo?(I_+ujYgx<7&HbYB*6Tud8Wt0v1l9`hsLAv
zXabsmJjjD4qKPOGC88vhguKX$CZS1aGMbE%Q8G$FDQF6sf~KOWC>5omX=oZsLuqI_
znvT*@I+}rIARqD}Kk}mh3ZNhgqM2wWnuTVe*=RP(KpAKbnuF$|xo94mhvuXCXaQP)
z7NUhH6Xj(c!C7+V7Q7hWUIVk8^2d0I<9&Fk;~n@z$2;*yICm*r=9Ew1<&H1n)s8pe
zHI6sqwT`#pb&j{=^^SMp4UX61jgHshO*mJ#+pKc7wr_QoUt;+Vd`r#l6xHi4QJZ&*
zyV<)3=4BnidsW^G_lY{!{o;PA2gC#Lpm-1-f;k)EVO0;qBcgurqvBDj$HZgsxOg0%
z5cPAN6i-q;C7yz(#nbSNcm|#o&%$%!Ie1<?4=;!p;6+hS$t9Sh#g|pR%;GEJ6?j#=
z3a^RR;C1mjyaAu6-<zWPy(OyO98vv#DyrYlMD=@HRKK5#YT*k}{oWDPZ?32Y?}}>h
zOHmDeC91)Dq8hvppJvkU191_2C}zP&;$rw%)Zu(B>TsTjI-IAX4(A(Dhx4ttiaUQN
zu7-J{X3+Pd-r*lay~00=>)HF0xB>nw>ecu~)OdL&YPviZH40ydTe;OsQM2M#QIqF4
zQFHQ@_z8Poiy9oiiy9n%h#DMkL=BF&;vR1Gr>ME{m#De%x2U=CkEprvPSo6ZFKQzF
z3-dBp@JatUUYYMmmt}?ey#8Qnz;=i6Ps(Kl)BN5*g!x-lu)yaH1bu0?*14?z0cX+f
ArvLx|

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1256.php b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1256.php
new file mode 100644
index 0000000000000000000000000000000000000000..953704f6e5af289f97294f99980d3a2e651609bb
GIT binary patch
literal 3800
zcmXxnbzBsA9LDjpb?t5)6$!;|VZrY1z*u1w6cLwQ6%!G=<LvJ4&O7(;!s}$0ORl>+
zJo$Z|`D?!K*YlfU*ylI1uZ@mPO-yw-(!4HjQoI$C;PSdGr{(f^T<KQ0!?MDj2(z3q
z`G?4S6+i`0K~xYGLWNLaR2UUOMNm;x6ct0oP;pcol|Uts136GhR1%d!rBG>98kIq1
zP+3$Kl|$uFc~l-%Kow9$R1sA|l~83=8C5}5P*qeFRYTQKbyOYIKs8WJR1?)gwNPzT
z8`VK|P+e3PS;#{5P(4&1)kh6b0~CTnP(#!Zg`!Xt7X}|6%^nGd;V1${phl<>YK$7A
zNEC^hpeCp(YKoenW=74;{%mgM7G`c?=9Xq|Y35dDZe`}yW^QffHfC;P=C)>TYvy)l
zZfEB9W^Qlh4rcCP=CF?3MMo5cqEIx7Mo#2JF(?MbqFB@kbwZs{XVe9CL0wT-)D3k*
z-BEYc1NA^XQBTwh^+LT-Z`23%L48qQ)DQJT{ZW5301ZF`(Lgi^4MKy_U^D~`K||3{
zGz<+x!_jaw0*yc;(MU83jY6Z*Xfy_mL1WQa6c+~{AI+W~2gjlDXgr#LCZLIEB61-Y
znuI2ycodHkPy%uzH=2wlqbX<#N<@h$2_>PaXeye9rlDk%jHaXMC<UdU8E6JdMX6{e
znu$EfgVInM@**$tAs?EBW}(?=HkyOxpmdau=AyZ19-4>dqxon7T7VX!g=i64gfdWG
z=4reb2kyd5#Th&C68vBj%(COXc&Y89c$w|}c)9HZcm;mA46d}}^LP~w+<>d?SYCs(
zbu(*WP#0S#Zs+9n;tIGyJO?+zybP`0WP1nsX4|{*7TbI9leQ1yt+qGgZML`I?KpS>
z?ogbi(|0P~NW9BF`zGFvvvu)3cD#moukE#X9}ep5{qVjzIRJBX@<FA#lSASmE_GNu
z43CIM;89WS9}|y}9v6?p6QVwXlQ5`_cS`9g7M~WiOV5aBNY9FA;W<&=o)@*LE{GRc
zd{MjzFNv4nW$`k+B3^-4#jEg|cnw|`ufrRnHt$WCvy1eW(p&JhcpKgk@4&mFKC62$
zXCLWPFn2M0TB#nn`=a{wi|Y3oQT=9%>i2=DexDW9?{lL1eO^?*FNi0(tB0cceNj}u
zFNx~+Wl{aUBC6k4MfLldsD57;)$bdk`h8PWzi)}^_ia)Az61T+_!n}Ns_uZOx`U$X
z&K30xz6%2xT<SehmAx-!l71jAfgeJ@p5Kp@W|8J8RlgrAT}t|isCVS2;&Rf@M7<+F
zhko_@g{XeN6xHunqWb+>RKMTAz)Jqmx8f@JoffO#??v_dgBGu5@sFb3S3ik**ZnN6
zWAQK0uYP}3x}NkmaRdBai&f|!O7#-{Q>hC5OR2tm{#L5z_a9Nu@4qlFL$~#xZQaNt
uoST2Kh$x36#N$r$C3`JrD8Eso9KMt^w>RAUV9j6PaeIB96ie%(9RCC6c1dpl

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1257.php b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1257.php
new file mode 100644
index 0000000000000000000000000000000000000000..78580ece01bbaeb2477c97dbae88eafe2579e4a8
GIT binary patch
literal 3616
zcmXxnb#PQy6vy%6@Njo{K!`waXR`_J?h<5477_>{tN=mNG{7(|?ch!+P~6=Md0A+i
zy1P(!cP01xdw=cu%sKbXm2>aRCM0F0Wm#4*<O`*z*ioszkk9tozCgg2ZO2-+9dlod
z?M*EDi7!$yR16hI#Zd`V0+mE1Q7Kdkl}4pe8B_+9MP*SrR1R6lLgi6;Q~^~$6;VZ0
z2~|RsQDsyGRY6rzRa6aCL)B4rR0GvOHBn7e3)MokQEgNQ)j@SpT~rU%L-kR8)BrU=
z4N*hX2sJ{DQDbBy8#O^qP*c<tHABr%6pBL4QF9cHqET`Ty!UH*Bo@Y^I24Ckpcbel
zYKh`eJZgnnq1LE1YJ=JswKe_O*2L{h+|I=9P2AqZ9ZcN8#2roC(Zroh+{wh9P2AbU
zT}<4?#9d9?)x_OQ+|9%>-I+yq<Ut;kfD(`wc~K%tL`f(K^*}vPPt+6jLcLIL)Eo6d
zeNbQ27xhE^P=C}P4L}3XKr|2yLW9s?G#Cv*L(ot(6b(be&~P*yjX)#NNHh|SLZi@V
zG#ZUTW6)SM7L7yW(0DW+O+XXSL^KgiLX*&BG#Mo)!+XD`r>DRvXeyeDrlDzQI+~7r
z$cJX287Kv%pj4EK{K$`HqM2wGnuXF(8cIj$Xf~RS=Abz!17)DOXfDb`nP?uGhq6!>
znvdqA01BWW3Zf7Sp)d-g1!w_Uh!&znXc5Xr*=R9ZjFzA!XenBXmZ4>6Ia-cZpcN<w
z-OW9QbLE`vIM4NNywddnyvp?+yxR3+c#Z2*_(9i~@midJ2tEu8SHnk?y#&{}gSX=K
zuD9V0u6N>%u6N;0uJ_{2t~cN<t~cUsa-QmUxcMvOcj5e#a5pU60rx1Yo!KkuTl>U)
z6z>=J!vmsr`Ji}^>>=oA8xAXbnCuZ4*$j^=dlViMb>7Ft<77{WC*Vowtb(VM)mfev
zPm?_(o`Gk@v+$gF4xSg!!wcdCcu~9vFF{9ba9LTk&=nZjLh)5)ufl8MHF#aT4sVDz
z;1kf%w%>#Wd1P;i+MIkbhpZ!NuL_`}u@P}4#kW<g6TBm?C;O!M5PV8w*TAP?M9VK!
zv5xy0QEm3DsEvJ2Ji@1*7qwR}z=%5bMezZOUlO&1m!YG(^NO;X^Q+2kV(e?8Ci%Lk
zBYQ(*)j4m9_cQh_Q7_WlqL%Oubadt4RaPr{Pt<Y0ui{7f@&~X$EBa8>b-pWV8Xt*z
znm&e(F6<}b<9zv373*R8Ow?X|F0Q5c3yszN{Srp>$b6+@?bX+!-i>cW-IQ-dUH0!p
zHUIZ8qPO`6Q7!tTs0RKCI=a6<E2}yGqO9)kucF%QH&L_tU1RmBKg3*?|EH*D^Dj|L
z_!~M}!avH2|BAZ5|G~ndZIAO<R#d<r3}=LFZ#4h)JXSa}=nuu3KYm380e>hQ$h1}G
GvHk~;j}(jm

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1258.php b/lib/symfony/polyfill-iconv/Resources/charset/from.windows-1258.php
new file mode 100644
index 0000000000000000000000000000000000000000..de1609d85ab469a8d4fe3e139a502b66b0c10c5e
GIT binary patch
literal 3662
zcmXxnb#xS09L4eCu(&%65F!xV*=&Nly98O1g#<zfD?rdR1S^FWDN@|s-CNjfC0loI
zQ-ivDOUe7*`D=ckbKlI)nR$24*|>y^lnjT%=Xd*4ldOnjx8H5KEVtL|&a|Q(mKF6-
zl;w&qIK&pH5GsTUqr#{NDuRllqNo@uhKi%&s01p3N}`ge6e@)r$bm|u(x?n7gUX_^
zs2nPX%A@kA0;+&2qKc>zs)Q<|%BTvef~umbs2Zw<s-x<t2C9K-qME1{s)cH!+Nchy
zgX*HXs2-|^>ZAI|LKbR(8lZ-#A!>vgp$HU#8l%Q25=ElKDEQ!L_DD30MlmP`H9<{K
zQ`8j2qFB@nHABr&bJPO0FluS`XG=4;GIJ|4w>EQYGq*8w8#A{xb6YdFGjlsLw>NWp
zGj}j^2Qzmxb4N3GGIJ+0M|I{dIwL1?qBs<XT*!suQ9MdO38)L|g1Vxvs2l2rx})x>
z2kL=(qMoQ1>V<lv-lz}igZiSrs2}Qw`lJ4602+V>qJd}-8iWR;!Dt8?f`+1@Xc!uX
zhNIzV1R8-xqLFA68ihuq(P#`BgT|t<XdD`c#-s5lF%dpEnms)MPCygUL^KIaLX**C
z<VJ2Z1x-OoC<!H_WaL2}G!;!n)6g`Of>KZ_N=4JrbTk9aKxrrq%|tU%I!Z^g&@7aJ
zGSF-^8+nlz`H&C!ksk$60L?*j&|EYZ%|r80Cdx$f(R{Q3EkFy=LbM1iLW|L2v;-|d
zStvjIIL?-{p2SOWXg$oa<DGb!?Spu^?cI2V?LBxU&RY&w+3{(-+V&OvD9+Wdue0MV
z#OrNu#T#sI#~W?$z)#rTi#OTcfH&LTh_~Q8U2d!59G$++UVfG3+i|Y0woANBx*Ois
zli4Hc!R!@v>3!lp&fPEWhX=$1@Sv!7a7a8vdRRORkBCR$QSm4|CLV*wMQx4~;tA4|
z;z@W)JOxjSdbMZ7Go)w5v+$gF4xSg!!wcdCcu~9vFNv4nWl@j)il`lRRn#lHCSK#*
z>*95IL%acRiZ|gc@fLgv-pPVbix0!wVm7=3gJMu=4r#8q42DFN<{5DX>9gWW_?);3
zJ}*83^TgFK48ywT7nH6ceNkKsUlJdKFT>#D@D-)&;HxmK+jvc>s`0w0p1lD>s>Yj2
zH*u-A#Le(+QQv@fM12C@74`XgPu#}2?~5w*2QZ`^`ymW3W${N^ybFFT>Lx!C)!%$k
z{rwaMb*ayks=uF$>hBk#`unA*{@xYU-+Q9^`<1Bvel4oM-@vdo;kQcF-|s~A_j^%K
z;|Cbj3;j{4`uh_M>jU+(QuX&2QT_cDhV-m{Q>y;{E~>wOi0bd3qWb%nsQ&&fs=xn;
z>hHfWq)*U)Fh5&Q=e|}K6gbA|a71`LzCfDaaz*mb(CG-I`#k<=^Ea_zf!E^?c+)Md
Hb2|P9YmgvV

literal 0
HcmV?d00001

diff --git a/lib/symfony/polyfill-iconv/Resources/charset/translit.php b/lib/symfony/polyfill-iconv/Resources/charset/translit.php
new file mode 100644
index 000000000..779db649c
--- /dev/null
+++ b/lib/symfony/polyfill-iconv/Resources/charset/translit.php
@@ -0,0 +1,4103 @@
+<?php
+
+return array (
+  'µ' => 'μ',
+  '¼' => ' 1�4 ',
+  '½' => ' 1�2 ',
+  '¾' => ' 3�4 ',
+  'IJ' => 'IJ',
+  'ij' => 'ij',
+  'Ŀ' => 'L·',
+  'ŀ' => 'l·',
+  'ʼn' => 'ʼn',
+  'Å¿' => 's',
+  'DŽ' => 'DŽ',
+  'Dž' => 'Dž',
+  'dž' => 'dž',
+  'LJ' => 'LJ',
+  'Lj' => 'Lj',
+  'lj' => 'lj',
+  'ÇŠ' => 'NJ',
+  'Ç‹' => 'Nj',
+  'nj' => 'nj',
+  'DZ' => 'DZ',
+  'Dz' => 'Dz',
+  'dz' => 'dz',
+  '�' => 'β',
+  'ϑ' => 'θ',
+  'Ï’' => 'Î¥',
+  'ϕ' => 'φ',
+  'Ï–' => 'Ï€',
+  'ϰ' => 'κ',
+  'ϱ' => '�',
+  'ϲ' => 'ς',
+  'ϴ' => 'Θ',
+  'ϵ' => 'ε',
+  'Ϲ' => 'Σ',
+  'Ö‡' => 'Õ¥Ö‚',
+  'ٵ' => 'اٴ',
+  'ٶ' => 'وٴ',
+  'Ù·' => 'Û‡Ù´',
+  'ٸ' => 'يٴ',
+  'ำ' => '�า',
+  'ຳ' => '�າ',
+  'ໜ' => 'ຫນ',
+  '�' => 'ຫມ',
+  'ཷ' => 'ྲ�',
+  'ཹ' => 'ླ�',
+  'ẚ' => 'aʾ',
+  '․' => '.',
+  '‥' => '..',
+  '…' => '...',
+  '″' => '′′',
+  '‴' => '′′′',
+  '‶' => '‵‵',
+  '‷' => '‵‵‵',
+  '‼' => '!!',
+  '�' => '??',
+  '�' => '?!',
+  '�' => '!?',
+  '�' => '′′′′',
+  '₨' => 'Rs',
+  'â„€' => 'a/c',
+  '�' => 'a/s',
+  'â„‚' => 'C',
+  '℃' => '°C',
+  'â„…' => 'c/o',
+  '℆' => 'c/u',
+  'ℇ' => '�',
+  '℉' => '°F',
+  'â„Š' => 'g',
+  'â„‹' => 'H',
+  'ℌ' => 'H',
+  '�' => 'H',
+  'â„Ž' => 'h',
+  '�' => 'ħ',
+  '�' => 'I',
+  'â„‘' => 'I',
+  'â„’' => 'L',
+  'â„“' => 'l',
+  'â„•' => 'N',
+  'â„–' => 'No',
+  'â„™' => 'P',
+  'â„š' => 'Q',
+  'â„›' => 'R',
+  'ℜ' => 'R',
+  '�' => 'R',
+  'â„¡' => 'TEL',
+  'ℤ' => 'Z',
+  'ℨ' => 'Z',
+  'ℬ' => 'B',
+  'â„­' => 'C',
+  'ℯ' => 'e',
+  'â„°' => 'E',
+  'ℱ' => 'F',
+  'ℳ' => 'M',
+  'â„´' => 'o',
+  'ℵ' => '�',
+  'ℶ' => 'ב',
+  'â„·' => '×’',
+  'ℸ' => 'ד',
+  'ℹ' => 'i',
+  'â„»' => 'FAX',
+  'ℼ' => 'π',
+  'ℽ' => 'γ',
+  'ℾ' => 'Γ',
+  'ℿ' => 'Π',
+  '⅀' => '∑',
+  'â……' => 'D',
+  'â…†' => 'd',
+  'â…‡' => 'e',
+  'â…ˆ' => 'i',
+  'â…‰' => 'j',
+  '�' => ' 1�7 ',
+  '⅑' => ' 1�9 ',
+  '⅒' => ' 1�10 ',
+  '⅓' => ' 1�3 ',
+  '⅔' => ' 2�3 ',
+  '⅕' => ' 1�5 ',
+  '⅖' => ' 2�5 ',
+  '⅗' => ' 3�5 ',
+  '⅘' => ' 4�5 ',
+  '⅙' => ' 1�6 ',
+  '⅚' => ' 5�6 ',
+  '⅛' => ' 1�8 ',
+  '⅜' => ' 3�8 ',
+  '�' => ' 5�8 ',
+  '⅞' => ' 7�8 ',
+  '⅟' => ' 1� ',
+  'â… ' => 'I',
+  'â…¡' => 'II',
+  'â…¢' => 'III',
+  'â…£' => 'IV',
+  'â…¤' => 'V',
+  'â…¥' => 'VI',
+  'â…¦' => 'VII',
+  'â…§' => 'VIII',
+  'â…¨' => 'IX',
+  'â…©' => 'X',
+  'â…ª' => 'XI',
+  'â…«' => 'XII',
+  'â…¬' => 'L',
+  'â…­' => 'C',
+  'â…®' => 'D',
+  'â…¯' => 'M',
+  'â…°' => 'i',
+  'â…±' => 'ii',
+  'â…²' => 'iii',
+  'â…³' => 'iv',
+  'â…´' => 'v',
+  'â…µ' => 'vi',
+  'â…¶' => 'vii',
+  'â…·' => 'viii',
+  'â…¸' => 'ix',
+  'â…¹' => 'x',
+  'â…º' => 'xi',
+  'â…»' => 'xii',
+  'â…¼' => 'l',
+  'â…½' => 'c',
+  'â…¾' => 'd',
+  'â…¿' => 'm',
+  '↉' => ' 0�3 ',
+  '∬' => '∫∫',
+  '∭' => '∫∫∫',
+  '∯' => '∮∮',
+  '∰' => '∮∮∮',
+  'â‘ ' => '(1)',
+  'â‘¡' => '(2)',
+  'â‘¢' => '(3)',
+  'â‘£' => '(4)',
+  '⑤' => '(5)',
+  'â‘¥' => '(6)',
+  '⑦' => '(7)',
+  '⑧' => '(8)',
+  '⑨' => '(9)',
+  'â‘©' => '(10)',
+  '⑪' => '(11)',
+  'â‘«' => '(12)',
+  '⑬' => '(13)',
+  'â‘­' => '(14)',
+  'â‘®' => '(15)',
+  '⑯' => '(16)',
+  'â‘°' => '(17)',
+  '⑱' => '(18)',
+  '⑲' => '(19)',
+  '⑳' => '(20)',
+  'â‘´' => '(1)',
+  '⑵' => '(2)',
+  '⑶' => '(3)',
+  'â‘·' => '(4)',
+  '⑸' => '(5)',
+  '⑹' => '(6)',
+  '⑺' => '(7)',
+  'â‘»' => '(8)',
+  '⑼' => '(9)',
+  '⑽' => '(10)',
+  '⑾' => '(11)',
+  'â‘¿' => '(12)',
+  'â’€' => '(13)',
+  'â’�' => '(14)',
+  'â’‚' => '(15)',
+  'â’ƒ' => '(16)',
+  'â’„' => '(17)',
+  'â’…' => '(18)',
+  'â’†' => '(19)',
+  'â’‡' => '(20)',
+  'â’ˆ' => '1.',
+  'â’‰' => '2.',
+  'â’Š' => '3.',
+  'â’‹' => '4.',
+  '⒌' => '5.',
+  'â’�' => '6.',
+  'â’Ž' => '7.',
+  'â’�' => '8.',
+  'â’�' => '9.',
+  'â’‘' => '10.',
+  'â’’' => '11.',
+  'â’“' => '12.',
+  'â’”' => '13.',
+  'â’•' => '14.',
+  'â’–' => '15.',
+  'â’—' => '16.',
+  'â’˜' => '17.',
+  'â’™' => '18.',
+  'â’š' => '19.',
+  'â’›' => '20.',
+  '⒜' => '(a)',
+  'â’�' => '(b)',
+  'â’ž' => '(c)',
+  'â’Ÿ' => '(d)',
+  'â’ ' => '(e)',
+  'â’¡' => '(f)',
+  'â’¢' => '(g)',
+  'â’£' => '(h)',
+  'â’¤' => '(i)',
+  'â’¥' => '(j)',
+  'â’¦' => '(k)',
+  'â’§' => '(l)',
+  'â’¨' => '(m)',
+  'â’©' => '(n)',
+  'â’ª' => '(o)',
+  'â’«' => '(p)',
+  'â’¬' => '(q)',
+  'â’­' => '(r)',
+  'â’®' => '(s)',
+  'â’¯' => '(t)',
+  'â’°' => '(u)',
+  'â’±' => '(v)',
+  'â’²' => '(w)',
+  'â’³' => '(x)',
+  'â’´' => '(y)',
+  'â’µ' => '(z)',
+  'â’¶' => '(A)',
+  'â’·' => '(B)',
+  'â’¸' => '(C)',
+  'â’¹' => '(D)',
+  'â’º' => '(E)',
+  'â’»' => '(F)',
+  'â’¼' => '(G)',
+  'â’½' => '(H)',
+  'â’¾' => '(I)',
+  'â’¿' => '(J)',
+  'â“€' => '(K)',
+  '�' => '(L)',
+  'â“‚' => '(M)',
+  'Ⓝ' => '(N)',
+  'â“„' => '(O)',
+  'â“…' => '(P)',
+  'Ⓠ' => '(Q)',
+  'Ⓡ' => '(R)',
+  'Ⓢ' => '(S)',
+  'Ⓣ' => '(T)',
+  'â“Š' => '(U)',
+  'â“‹' => '(V)',
+  'Ⓦ' => '(W)',
+  '�' => '(X)',
+  'â“Ž' => '(Y)',
+  '�' => '(Z)',
+  '�' => '(a)',
+  'â“‘' => '(b)',
+  'â“’' => '(c)',
+  'â““' => '(d)',
+  'â“”' => '(e)',
+  'â“•' => '(f)',
+  'â“–' => '(g)',
+  'â“—' => '(h)',
+  'ⓘ' => '(i)',
+  'â“™' => '(j)',
+  'â“š' => '(k)',
+  'â“›' => '(l)',
+  'ⓜ' => '(m)',
+  '�' => '(n)',
+  'â“ž' => '(o)',
+  'â“Ÿ' => '(p)',
+  'â“ ' => '(q)',
+  'â“¡' => '(r)',
+  'â“¢' => '(s)',
+  'â“£' => '(t)',
+  'ⓤ' => '(u)',
+  'â“¥' => '(v)',
+  'ⓦ' => '(w)',
+  'ⓧ' => '(x)',
+  'ⓨ' => '(y)',
+  'â“©' => '(z)',
+  '⓪' => '(0)',
+  '⨌' => '∫∫∫∫',
+  'â©´' => '::=',
+  '⩵' => '==',
+  '⩶' => '===',
+  '⺟' => '�',
+  '⻳' => '龟',
+  '⼀' => '一',
+  '�' => '丨',
+  '⼂' => '丶',
+  '⼃' => '丿',
+  '⼄' => '乙',
+  '⼅' => '亅',
+  '⼆' => '二',
+  '⼇' => '亠',
+  '⼈' => '人',
+  '⼉' => '儿',
+  '⼊' => '入',
+  '⼋' => '八',
+  '⼌' => '冂',
+  '�' => '冖',
+  '⼎' => '冫',
+  '�' => '几',
+  '�' => '凵',
+  '⼑' => '刀',
+  '⼒' => '力',
+  '⼓' => '勹',
+  '⼔' => '匕',
+  '⼕' => '匚',
+  '⼖' => '匸',
+  '⼗' => '�',
+  '⼘' => '�',
+  '⼙' => '�',
+  '⼚' => '厂',
+  '⼛' => '厶',
+  '⼜' => '�',
+  '�' => '�',
+  '⼞' => '囗',
+  '⼟' => '土',
+  '⼠' => '士',
+  '⼡' => '夂',
+  '⼢' => '夊',
+  '⼣' => '夕',
+  '⼤' => '大',
+  '⼥' => '女',
+  '⼦' => '�',
+  '⼧' => '宀',
+  '⼨' => '寸',
+  '⼩' => '�',
+  '⼪' => '尢',
+  '⼫' => '尸',
+  '⼬' => '屮',
+  'â¼­' => 'å±±',
+  'â¼®' => 'å·›',
+  '⼯' => '工',
+  'â¼°' => 'å·±',
+  'â¼±' => 'å·¾',
+  'â¼²' => 'å¹²',
+  '⼳' => '幺',
+  '⼴' => '广',
+  'â¼µ' => 'å»´',
+  '⼶' => '廾',
+  '⼷' => '弋',
+  '⼸' => '弓',
+  '⼹' => '�',
+  '⼺' => '彡',
+  'â¼»' => 'å½³',
+  '⼼' => '心',
+  '⼽' => '戈',
+  '⼾' => '戶',
+  '⼿' => '手',
+  '⽀' => '支',
+  '�' => '攴',
+  '⽂' => '文',
+  '⽃' => '斗',
+  '⽄' => '斤',
+  'â½…' => 'æ–¹',
+  '⽆' => '无',
+  '⽇' => '日',
+  '⽈' => '曰',
+  '⽉' => '月',
+  '⽊' => '木',
+  '⽋' => '欠',
+  '⽌' => '止',
+  '�' => '歹',
+  '⽎' => '殳',
+  '�' => '毋',
+  '�' => '比',
+  '⽑' => '毛',
+  'â½’' => 'æ°�',
+  '⽓' => '气',
+  'â½”' => 'æ°´',
+  '⽕' => '�',
+  '⽖' => '爪',
+  '⽗' => '父',
+  '⽘' => '爻',
+  '⽙' => '爿',
+  '⽚' => '片',
+  '⽛' => '牙',
+  '⽜' => '牛',
+  '�' => '犬',
+  '⽞' => '玄',
+  '⽟' => '玉',
+  '⽠' => '瓜',
+  '⽡' => '瓦',
+  '⽢' => '甘',
+  '⽣' => '生',
+  '⽤' => '用',
+  'â½¥' => 'ç”°',
+  '⽦' => '疋',
+  '⽧' => '疒',
+  '⽨' => '癶',
+  '⽩' => '白',
+  '⽪' => '皮',
+  '⽫' => '皿',
+  '⽬' => '目',
+  '⽭' => '矛',
+  '⽮' => '矢',
+  '⽯' => '石',
+  '⽰' => '示',
+  '⽱' => '禸',
+  '⽲' => '禾',
+  'â½³' => 'ç©´',
+  'â½´' => 'ç«‹',
+  '⽵' => '竹',
+  '⽶' => '米',
+  '⽷' => '糸',
+  '⽸' => '缶',
+  '⽹' => '网',
+  '⽺' => '羊',
+  'â½»' => 'ç¾½',
+  '⽼' => '�',
+  '⽽' => '而',
+  '⽾' => '耒',
+  '⽿' => '耳',
+  '⾀' => '�',
+  '�' => '肉',
+  '⾂' => '臣',
+  '⾃' => '自',
+  '⾄' => '至',
+  '⾅' => '臼',
+  '⾆' => '舌',
+  '⾇' => '舛',
+  '⾈' => '舟',
+  '⾉' => '艮',
+  '⾊' => '色',
+  '⾋' => '艸',
+  '⾌' => '�',
+  '�' => '虫',
+  '⾎' => '血',
+  '�' => '行',
+  '�' => '衣',
+  '⾑' => '襾',
+  '⾒' => '見',
+  '⾓' => '角',
+  '⾔' => '言',
+  '⾕' => '谷',
+  '⾖' => '豆',
+  '⾗' => '豕',
+  '⾘' => '豸',
+  '⾙' => '�',
+  '⾚' => '赤',
+  'â¾›' => 'èµ°',
+  '⾜' => '足',
+  '�' => '身',
+  '⾞' => '車',
+  '⾟' => '辛',
+  'â¾ ' => 'è¾°',
+  '⾡' => '辵',
+  'â¾¢' => 'é‚‘',
+  'â¾£' => 'é…‰',
+  '⾤' => '釆',
+  '⾥' => '里',
+  '⾦' => '金',
+  '⾧' => '長',
+  '⾨' => '門',
+  '⾩' => '阜',
+  '⾪' => '隶',
+  '⾫' => '隹',
+  '⾬' => '雨',
+  '⾭' => '�',
+  '⾮' => '�',
+  '⾯' => '�',
+  '⾰' => '�',
+  '⾱' => '韋',
+  '⾲' => '韭',
+  '⾳' => '音',
+  'â¾´' => 'é �',
+  '⾵' => '風',
+  '⾶' => '飛',
+  '⾷' => '食',
+  '⾸' => '首',
+  '⾹' => '香',
+  '⾺' => '馬',
+  '⾻' => '骨',
+  '⾼' => '高',
+  'â¾½' => 'é«Ÿ',
+  '⾾' => '鬥',
+  '⾿' => '鬯',
+  '⿀' => '鬲',
+  '�' => '鬼',
+  'â¿‚' => 'é­š',
+  '⿃' => '鳥',
+  'â¿„' => 'é¹µ',
+  '⿅' => '鹿',
+  '⿆' => '麥',
+  '⿇' => '麻',
+  '⿈' => '黃',
+  '⿉' => '�',
+  '⿊' => '黑',
+  '⿋' => '黹',
+  '⿌' => '黽',
+  '�' => '鼎',
+  '⿎' => '鼓',
+  '�' => '鼠',
+  '�' => '鼻',
+  '⿑' => '齊',
+  'â¿’' => 'é½’',
+  '⿓' => '�',
+  '⿔' => '龜',
+  'â¿•' => 'é¾ ',
+  '　' => ' ',
+  '〶' => '〒',
+  '〸' => '�',
+  '〹' => '�',
+  '〺' => '�',
+  'ㄱ' => 'ᄀ',
+  'ㄲ' => '�',
+  'ㄳ' => 'ᆪ',
+  'ã„´' => 'á„‚',
+  'ㄵ' => 'ᆬ',
+  'ㄶ' => 'ᆭ',
+  'ㄷ' => 'ᄃ',
+  'ㄸ' => 'ᄄ',
+  'ㄹ' => 'ᄅ',
+  'ㄺ' => 'ᆰ',
+  'ㄻ' => 'ᆱ',
+  'ㄼ' => 'ᆲ',
+  'ㄽ' => 'ᆳ',
+  'ㄾ' => 'ᆴ',
+  'ㄿ' => 'ᆵ',
+  'ã…€' => 'á„š',
+  '�' => 'ᄆ',
+  'ㅂ' => 'ᄇ',
+  'ㅃ' => 'ᄈ',
+  'ã…„' => 'á„¡',
+  'ㅅ' => 'ᄉ',
+  'ã…†' => 'á„Š',
+  'ã…‡' => 'á„‹',
+  'ㅈ' => 'ᄌ',
+  'ㅉ' => '�',
+  'ã…Š' => 'á„Ž',
+  'ㅋ' => '�',
+  'ㅌ' => '�',
+  'ã…�' => 'á„‘',
+  'ã…Ž' => 'á„’',
+  'ã…�' => 'á…¡',
+  'ã…�' => 'á…¢',
+  'ã…‘' => 'á…£',
+  'ã…’' => 'á…¤',
+  'ã…“' => 'á…¥',
+  'ã…”' => 'á…¦',
+  'ã…•' => 'á…§',
+  'ã…–' => 'á…¨',
+  'ã…—' => 'á…©',
+  'ã…˜' => 'á…ª',
+  'ã…™' => 'á…«',
+  'ã…š' => 'á…¬',
+  'ã…›' => 'á…­',
+  'ㅜ' => 'ᅮ',
+  'ã…�' => 'á…¯',
+  'ã…ž' => 'á…°',
+  'ã…Ÿ' => 'á…±',
+  'ã… ' => 'á…²',
+  'ã…¡' => 'á…³',
+  'ã…¢' => 'á…´',
+  'ã…£' => 'á…µ',
+  'ã…¤' => 'á… ',
+  'ã…¥' => 'á„”',
+  'ã…¦' => 'á„•',
+  'ㅧ' => 'ᇇ',
+  'ㅨ' => 'ᇈ',
+  'ㅩ' => 'ᇌ',
+  'ㅪ' => 'ᇎ',
+  'ㅫ' => 'ᇓ',
+  'ㅬ' => 'ᇗ',
+  'ㅭ' => 'ᇙ',
+  'ㅮ' => 'ᄜ',
+  'ㅯ' => '�',
+  'ㅰ' => 'ᇟ',
+  'ㅱ' => '�',
+  'ã…²' => 'á„ž',
+  'ã…³' => 'á„ ',
+  'ã…´' => 'á„¢',
+  'ã…µ' => 'á„£',
+  'ㅶ' => 'ᄧ',
+  'ã…·' => 'á„©',
+  'ã…¸' => 'á„«',
+  'ㅹ' => 'ᄬ',
+  'ã…º' => 'á„­',
+  'ã…»' => 'á„®',
+  'ㅼ' => 'ᄯ',
+  'ㅽ' => 'ᄲ',
+  'ㅾ' => 'ᄶ',
+  'ã…¿' => 'á…€',
+  'ㆀ' => 'ᅇ',
+  '�' => 'ᅌ',
+  'ㆂ' => 'ᇱ',
+  'ㆃ' => 'ᇲ',
+  'ㆄ' => 'ᅗ',
+  'ㆅ' => 'ᅘ',
+  'ㆆ' => 'ᅙ',
+  'ㆇ' => 'ᆄ',
+  'ㆈ' => 'ᆅ',
+  'ㆉ' => 'ᆈ',
+  'ㆊ' => 'ᆑ',
+  'ㆋ' => 'ᆒ',
+  'ㆌ' => 'ᆔ',
+  '�' => 'ᆞ',
+  'ㆎ' => 'ᆡ',
+  '㈀' => '(ᄀ)',
+  '�' => '(ᄂ)',
+  '㈂' => '(ᄃ)',
+  '㈃' => '(ᄅ)',
+  '㈄' => '(ᄆ)',
+  '㈅' => '(ᄇ)',
+  '㈆' => '(ᄉ)',
+  '㈇' => '(ᄋ)',
+  '㈈' => '(ᄌ)',
+  '㈉' => '(ᄎ)',
+  '㈊' => '(�)',
+  '㈋' => '(�)',
+  '㈌' => '(ᄑ)',
+  '�' => '(ᄒ)',
+  '㈎' => '(가)',
+  '�' => '(나)',
+  '�' => '(다)',
+  '㈑' => '(라)',
+  '㈒' => '(마)',
+  '㈓' => '(바)',
+  '㈔' => '(사)',
+  '㈕' => '(아)',
+  '㈖' => '(자)',
+  '㈗' => '(차)',
+  '㈘' => '(�ᅡ)',
+  '㈙' => '(�ᅡ)',
+  '㈚' => '(파)',
+  '㈛' => '(하)',
+  '㈜' => '(주)',
+  '�' => '(오전)',
+  '㈞' => '(오후)',
+  '㈠' => '(一)',
+  '㈡' => '(二)',
+  '㈢' => '(三)',
+  '㈣' => '(四)',
+  '㈤' => '(五)',
+  '㈥' => '(六)',
+  '㈦' => '(七)',
+  '㈧' => '(八)',
+  '㈨' => '(�)',
+  '㈩' => '(�)',
+  '㈪' => '(月)',
+  '㈫' => '(�)',
+  '㈬' => '(水)',
+  '㈭' => '(木)',
+  '㈮' => '(金)',
+  '㈯' => '(土)',
+  '㈰' => '(日)',
+  '㈱' => '(株)',
+  '㈲' => '(有)',
+  '㈳' => '(社)',
+  '㈴' => '(�)',
+  '㈵' => '(特)',
+  '㈶' => '(財)',
+  '㈷' => '(�)',
+  '㈸' => '(労)',
+  '㈹' => '(代)',
+  '㈺' => '(呼)',
+  '㈻' => '(学)',
+  '㈼' => '(監)',
+  '㈽' => '(�)',
+  '㈾' => '(資)',
+  '㈿' => '(�)',
+  '㉀' => '(祭)',
+  '�' => '(休)',
+  '㉂' => '(自)',
+  '㉃' => '(至)',
+  '㉄' => '(�)',
+  '㉅' => '(幼)',
+  '㉆' => '(文)',
+  '㉇' => '(�)',
+  '�' => 'PTE',
+  '㉑' => '(21)',
+  '㉒' => '(22)',
+  '㉓' => '(23)',
+  '㉔' => '(24)',
+  '㉕' => '(25)',
+  '㉖' => '(26)',
+  '㉗' => '(27)',
+  '㉘' => '(28)',
+  '㉙' => '(29)',
+  '㉚' => '(30)',
+  '㉛' => '(31)',
+  '㉜' => '(32)',
+  '�' => '(33)',
+  '㉞' => '(34)',
+  '㉟' => '(35)',
+  '㉠' => '(ᄀ)',
+  '㉡' => '(ᄂ)',
+  '㉢' => '(ᄃ)',
+  '㉣' => '(ᄅ)',
+  '㉤' => '(ᄆ)',
+  '㉥' => '(ᄇ)',
+  '㉦' => '(ᄉ)',
+  '㉧' => '(ᄋ)',
+  '㉨' => '(ᄌ)',
+  '㉩' => '(ᄎ)',
+  '㉪' => '(�)',
+  '㉫' => '(�)',
+  '㉬' => '(ᄑ)',
+  '㉭' => '(ᄒ)',
+  '㉮' => '(가)',
+  '㉯' => '(나)',
+  '㉰' => '(다)',
+  '㉱' => '(라)',
+  '㉲' => '(마)',
+  '㉳' => '(바)',
+  '㉴' => '(사)',
+  '㉵' => '(아)',
+  '㉶' => '(자)',
+  '㉷' => '(차)',
+  '㉸' => '(�ᅡ)',
+  '㉹' => '(�ᅡ)',
+  '㉺' => '(파)',
+  '㉻' => '(하)',
+  '㉼' => '(참고)',
+  '㉽' => '(주의)',
+  '㉾' => '(우)',
+  '㊀' => '(一)',
+  '�' => '(二)',
+  '㊂' => '(三)',
+  '㊃' => '(四)',
+  '㊄' => '(五)',
+  '㊅' => '(六)',
+  '㊆' => '(七)',
+  '㊇' => '(八)',
+  '㊈' => '(�)',
+  '㊉' => '(�)',
+  '㊊' => '(月)',
+  '㊋' => '(�)',
+  '㊌' => '(水)',
+  '�' => '(木)',
+  '㊎' => '(金)',
+  '�' => '(土)',
+  '�' => '(日)',
+  '㊑' => '(株)',
+  '㊒' => '(有)',
+  '㊓' => '(社)',
+  '㊔' => '(�)',
+  '㊕' => '(特)',
+  '㊖' => '(財)',
+  '㊗' => '(�)',
+  '㊘' => '(労)',
+  '㊙' => '(秘)',
+  '㊚' => '(男)',
+  '㊛' => '(女)',
+  '㊜' => '(�)',
+  '�' => '(優)',
+  '㊞' => '(�)',
+  '㊟' => '(注)',
+  '㊠' => '(項)',
+  '㊡' => '(休)',
+  '㊢' => '(写)',
+  '㊣' => '(正)',
+  '㊤' => '(上)',
+  '㊥' => '(中)',
+  '㊦' => '(下)',
+  '㊧' => '(左)',
+  '㊨' => '(�)',
+  '㊩' => '(医)',
+  '㊪' => '(宗)',
+  '㊫' => '(学)',
+  '㊬' => '(監)',
+  '㊭' => '(�)',
+  '㊮' => '(資)',
+  '㊯' => '(�)',
+  '㊰' => '(夜)',
+  '㊱' => '(36)',
+  '㊲' => '(37)',
+  '㊳' => '(38)',
+  '㊴' => '(39)',
+  '㊵' => '(40)',
+  '㊶' => '(41)',
+  '㊷' => '(42)',
+  '㊸' => '(43)',
+  '㊹' => '(44)',
+  '㊺' => '(45)',
+  '㊻' => '(46)',
+  '㊼' => '(47)',
+  '㊽' => '(48)',
+  '㊾' => '(49)',
+  '㊿' => '(50)',
+  '㋀' => '1月',
+  '�' => '2月',
+  '㋂' => '3月',
+  '㋃' => '4月',
+  '㋄' => '5月',
+  '㋅' => '6月',
+  '㋆' => '7月',
+  '㋇' => '8月',
+  '㋈' => '9月',
+  '㋉' => '10月',
+  '㋊' => '11月',
+  '㋋' => '12月',
+  '㋌' => 'Hg',
+  '�' => 'erg',
+  'ã‹Ž' => 'eV',
+  '�' => 'LTD',
+  '�' => '(ア)',
+  '㋑' => '(イ)',
+  '㋒' => '(ウ)',
+  '㋓' => '(エ)',
+  '㋔' => '(オ)',
+  'ã‹•' => '(ã‚«)',
+  'ã‹–' => '(ã‚­)',
+  '㋗' => '(ク)',
+  '㋘' => '(ケ)',
+  '㋙' => '(コ)',
+  '㋚' => '(サ)',
+  'ã‹›' => '(ã‚·)',
+  '㋜' => '(ス)',
+  '�' => '(セ)',
+  '㋞' => '(ソ)',
+  'ã‹Ÿ' => '(ã‚¿)',
+  '㋠' => '(�)',
+  '㋡' => '(ツ)',
+  '㋢' => '(テ)',
+  '㋣' => '(ト)',
+  '㋤' => '(ナ)',
+  '㋥' => '(ニ)',
+  '㋦' => '(ヌ)',
+  '㋧' => '(�)',
+  '㋨' => '(ノ)',
+  '㋩' => '(�)',
+  '㋪' => '(ヒ)',
+  '㋫' => '(フ)',
+  '㋬' => '(ヘ)',
+  '㋭' => '(ホ)',
+  '㋮' => '(マ)',
+  '㋯' => '(ミ)',
+  '㋰' => '(ム)',
+  '㋱' => '(メ)',
+  '㋲' => '(モ)',
+  '㋳' => '(ヤ)',
+  '㋴' => '(ユ)',
+  '㋵' => '(ヨ)',
+  '㋶' => '(ラ)',
+  '㋷' => '(リ)',
+  '㋸' => '(ル)',
+  '㋹' => '(レ)',
+  '㋺' => '(ロ)',
+  '㋻' => '(ワ)',
+  '㋼' => '(ヰ)',
+  '㋽' => '(ヱ)',
+  '㋾' => '(ヲ)',
+  '㋿' => '令和',
+  '㌀' => 'アパート',
+  '�' => 'アルファ',
+  '㌂' => 'アンペア',
+  '㌃' => 'アール',
+  '㌄' => 'イニング',
+  '㌅' => 'イン�',
+  '㌆' => 'ウォン',
+  '㌇' => 'エスクード',
+  '㌈' => 'エーカー',
+  '㌉' => 'オンス',
+  '㌊' => 'オーム',
+  '㌋' => 'カイリ',
+  '㌌' => 'カラット',
+  '�' => 'カロリー',
+  '㌎' => 'ガロン',
+  '�' => 'ガンマ',
+  '�' => 'ギガ',
+  '㌑' => 'ギニー',
+  '㌒' => 'キュリー',
+  '㌓' => 'ギルダー',
+  '㌔' => 'キロ',
+  '㌕' => 'キログラム',
+  '㌖' => 'キロメートル',
+  '㌗' => 'キロワット',
+  '㌘' => 'グラム',
+  '㌙' => 'グラムトン',
+  '㌚' => 'クルゼイロ',
+  '㌛' => 'クロー�',
+  '㌜' => 'ケース',
+  '�' => 'コルナ',
+  '㌞' => 'コー�',
+  '㌟' => 'サイクル',
+  '㌠' => 'サン�ーム',
+  '㌡' => 'シリング',
+  '㌢' => 'セン�',
+  '㌣' => 'セント',
+  '㌤' => 'ダース',
+  '㌥' => 'デシ',
+  '㌦' => 'ドル',
+  '㌧' => 'トン',
+  '㌨' => 'ナノ',
+  '㌩' => 'ノット',
+  '㌪' => '�イツ',
+  '㌫' => 'パーセント',
+  '㌬' => 'パーツ',
+  '㌭' => '�ーレル',
+  '㌮' => 'ピアストル',
+  '㌯' => 'ピクル',
+  '㌰' => 'ピコ',
+  '㌱' => 'ビル',
+  '㌲' => 'ファラッド',
+  '㌳' => 'フィート',
+  '㌴' => 'ブッシェル',
+  '㌵' => 'フラン',
+  '㌶' => 'ヘクタール',
+  '㌷' => 'ペソ',
+  '㌸' => 'ペニヒ',
+  '㌹' => 'ヘルツ',
+  '㌺' => 'ペンス',
+  '㌻' => 'ページ',
+  '㌼' => 'ベータ',
+  '㌽' => '�イント',
+  '㌾' => 'ボルト',
+  '㌿' => 'ホン',
+  '�' => '�ンド',
+  '�' => 'ホール',
+  '�' => 'ホーン',
+  '�' => 'マイクロ',
+  '�' => 'マイル',
+  '�' => 'マッ�',
+  '�' => 'マルク',
+  '�' => 'マンション',
+  '�' => 'ミクロン',
+  '�' => 'ミリ',
+  '�' => 'ミリ�ール',
+  '�' => 'メガ',
+  '�' => 'メガトン',
+  '�' => 'メートル',
+  '�' => 'ヤード',
+  '�' => 'ヤール',
+  '�' => 'ユアン',
+  '�' => 'リットル',
+  '�' => 'リラ',
+  '�' => 'ルピー',
+  '�' => 'ルーブル',
+  '�' => 'レム',
+  '�' => 'レントゲン',
+  '�' => 'ワット',
+  '�' => '0点',
+  '�' => '1点',
+  '�' => '2点',
+  '�' => '3点',
+  '�' => '4点',
+  '�' => '5点',
+  '�' => '6点',
+  '�' => '7点',
+  '�' => '8点',
+  '�' => '9点',
+  '�' => '10点',
+  '�' => '11点',
+  '�' => '12点',
+  '�' => '13点',
+  '�' => '14点',
+  '�' => '15点',
+  '�' => '16点',
+  '�' => '17点',
+  '�' => '18点',
+  '�' => '19点',
+  '�' => '20点',
+  '�' => '21点',
+  '�' => '22点',
+  '�' => '23点',
+  '�' => '24点',
+  '�' => 'hPa',
+  '�' => 'da',
+  '�' => 'AU',
+  '�' => 'bar',
+  '�' => 'oV',
+  '�' => 'pc',
+  '�' => 'dm',
+  '�' => 'dm²',
+  '�' => 'dm³',
+  '�' => 'IU',
+  '�' => '平�',
+  '�' => '昭和',
+  '�' => '大正',
+  '�' => '明治',
+  '�' => '株�会社',
+  '㎀' => 'pA',
+  '�' => 'nA',
+  '㎂' => 'μA',
+  '㎃' => 'mA',
+  '㎄' => 'kA',
+  '㎅' => 'KB',
+  '㎆' => 'MB',
+  '㎇' => 'GB',
+  '㎈' => 'cal',
+  '㎉' => 'kcal',
+  '㎊' => 'pF',
+  '㎋' => 'nF',
+  '㎌' => 'μF',
+  '�' => 'μg',
+  '㎎' => 'mg',
+  '�' => 'kg',
+  '�' => 'Hz',
+  '㎑' => 'kHz',
+  '㎒' => 'MHz',
+  '㎓' => 'GHz',
+  '㎔' => 'THz',
+  '㎕' => 'μℓ',
+  '㎖' => 'mℓ',
+  '㎗' => 'dℓ',
+  '㎘' => 'kℓ',
+  '㎙' => 'fm',
+  '㎚' => 'nm',
+  '㎛' => 'μm',
+  '㎜' => 'mm',
+  '�' => 'cm',
+  '㎞' => 'km',
+  '㎟' => 'mm²',
+  '㎠' => 'cm²',
+  '㎡' => 'm²',
+  '㎢' => 'km²',
+  '㎣' => 'mm³',
+  '㎤' => 'cm³',
+  '㎥' => 'm³',
+  '㎦' => 'km³',
+  '㎧' => 'm∕s',
+  '㎨' => 'm∕s²',
+  '㎩' => 'Pa',
+  '㎪' => 'kPa',
+  '㎫' => 'MPa',
+  '㎬' => 'GPa',
+  '㎭' => 'rad',
+  '㎮' => 'rad∕s',
+  '㎯' => 'rad∕s²',
+  '㎰' => 'ps',
+  '㎱' => 'ns',
+  '㎲' => 'μs',
+  '㎳' => 'ms',
+  '㎴' => 'pV',
+  '㎵' => 'nV',
+  '㎶' => 'μV',
+  '㎷' => 'mV',
+  '㎸' => 'kV',
+  '㎹' => 'MV',
+  '㎺' => 'pW',
+  '㎻' => 'nW',
+  '㎼' => 'μW',
+  '㎽' => 'mW',
+  '㎾' => 'kW',
+  '㎿' => 'MW',
+  '�' => 'kΩ',
+  '�' => 'MΩ',
+  '�' => 'a.m.',
+  '�' => 'Bq',
+  '�' => 'cc',
+  '�' => 'cd',
+  '�' => 'C∕kg',
+  '�' => 'Co.',
+  '�' => 'dB',
+  '�' => 'Gy',
+  '�' => 'ha',
+  '�' => 'HP',
+  '�' => 'in',
+  '�' => 'KK',
+  '�' => 'KM',
+  '�' => 'kt',
+  '�' => 'lm',
+  '�' => 'ln',
+  '�' => 'log',
+  '�' => 'lx',
+  '�' => 'mb',
+  '�' => 'mil',
+  '�' => 'mol',
+  '�' => 'PH',
+  '�' => 'p.m.',
+  '�' => 'PPM',
+  '�' => 'PR',
+  '�' => 'sr',
+  '�' => 'Sv',
+  '�' => 'Wb',
+  '�' => 'V∕m',
+  '�' => 'A∕m',
+  '�' => '1日',
+  '�' => '2日',
+  '�' => '3日',
+  '�' => '4日',
+  '�' => '5日',
+  '�' => '6日',
+  '�' => '7日',
+  '�' => '8日',
+  '�' => '9日',
+  '�' => '10日',
+  '�' => '11日',
+  '�' => '12日',
+  '�' => '13日',
+  '�' => '14日',
+  '�' => '15日',
+  '�' => '16日',
+  '�' => '17日',
+  '�' => '18日',
+  '�' => '19日',
+  '�' => '20日',
+  '�' => '21日',
+  '�' => '22日',
+  '�' => '23日',
+  '�' => '24日',
+  '�' => '25日',
+  '�' => '26日',
+  '�' => '27日',
+  '�' => '28日',
+  '�' => '29日',
+  '�' => '30日',
+  '�' => '31日',
+  '�' => 'gal',
+  '豈' => '豈',
+  '�' => '更',
+  '車' => '車',
+  '賈' => '賈',
+  '滑' => '滑',
+  '串' => '串',
+  '句' => '�',
+  '龜' => '龜',
+  '龜' => '龜',
+  '契' => '契',
+  '金' => '金',
+  '喇' => '喇',
+  '奈' => '奈',
+  '�' => '懶',
+  '癩' => '癩',
+  '�' => '羅',
+  '�' => '蘿',
+  '螺' => '螺',
+  '裸' => '裸',
+  '邏' => '�',
+  '樂' => '樂',
+  '洛' => '洛',
+  '烙' => '烙',
+  '珞' => '�',
+  '落' => '�',
+  '酪' => '酪',
+  '駱' => '駱',
+  '亂' => '亂',
+  '卵' => '�',
+  '�' => '欄',
+  '爛' => '爛',
+  '蘭' => '蘭',
+  '鸞' => '鸞',
+  '嵐' => '�',
+  '濫' => '濫',
+  '藍' => '�',
+  '襤' => '襤',
+  '拉' => '拉',
+  '臘' => '臘',
+  '蠟' => '蠟',
+  '廊' => '廊',
+  '朗' => '朗',
+  '浪' => '浪',
+  '狼' => '狼',
+  '郎' => '郎',
+  '來' => '來',
+  '冷' => '冷',
+  '勞' => '勞',
+  '擄' => '擄',
+  '櫓' => '櫓',
+  '爐' => '�',
+  '盧' => '盧',
+  '老' => '�',
+  '蘆' => '蘆',
+  '虜' => '虜',
+  '路' => '路',
+  '露' => '露',
+  '魯' => '魯',
+  '鷺' => '鷺',
+  '碌' => '碌',
+  '祿' => '祿',
+  '綠' => '綠',
+  '菉' => '�',
+  '錄' => '錄',
+  '鹿' => '鹿',
+  '�' => '論',
+  '壟' => '壟',
+  '弄' => '弄',
+  '籠' => '籠',
+  '聾' => '�',
+  '牢' => '牢',
+  '磊' => '磊',
+  '賂' => '賂',
+  '雷' => '雷',
+  '壘' => '壘',
+  '屢' => '屢',
+  '樓' => '樓',
+  '�' => '淚',
+  '漏' => '�',
+  '�' => '累',
+  '�' => '縷',
+  '陋' => '陋',
+  '勒' => '勒',
+  '肋' => '肋',
+  '凜' => '凜',
+  '凌' => '凌',
+  '稜' => '稜',
+  '綾' => '綾',
+  '菱' => '�',
+  '陵' => '陵',
+  '讀' => '讀',
+  '拏' => '�',
+  '樂' => '樂',
+  '�' => '諾',
+  '丹' => '丹',
+  '寧' => '寧',
+  '怒' => '怒',
+  '率' => '率',
+  '異' => '異',
+  '北' => '北',
+  '磻' => '磻',
+  '便' => '便',
+  '復' => '復',
+  '不' => '�',
+  '泌' => '泌',
+  '數' => '數',
+  '索' => '索',
+  '參' => '�',
+  '塞' => '塞',
+  '省' => '�',
+  '葉' => '葉',
+  '說' => '說',
+  '殺' => '殺',
+  '辰' => '辰',
+  '沈' => '沈',
+  '拾' => '拾',
+  '若' => '若',
+  '掠' => '掠',
+  '略' => '略',
+  '亮' => '亮',
+  '兩' => '兩',
+  '凉' => '凉',
+  '梁' => '�',
+  '糧' => '糧',
+  '良' => '良',
+  '諒' => '諒',
+  '量' => '�',
+  '勵' => '勵',
+  '呂' => '呂',
+  '�' => '女',
+  '廬' => '廬',
+  '旅' => '旅',
+  '濾' => '濾',
+  '礪' => '礪',
+  '閭' => '閭',
+  '驪' => '驪',
+  '麗' => '麗',
+  '黎' => '黎',
+  '力' => '力',
+  '曆' => '曆',
+  '歷' => '歷',
+  '�' => '轢',
+  '年' => '年',
+  '�' => '�',
+  '�' => '戀',
+  '撚' => '撚',
+  '漣' => '漣',
+  '煉' => '煉',
+  '璉' => '璉',
+  '秊' => '秊',
+  '練' => '練',
+  '聯' => '�',
+  '輦' => '輦',
+  '蓮' => '蓮',
+  '連' => '連',
+  '鍊' => '�',
+  '列' => '列',
+  '�' => '劣',
+  '咽' => '咽',
+  '烈' => '烈',
+  '裂' => '裂',
+  '說' => '說',
+  '廉' => '廉',
+  '念' => '念',
+  '捻' => '�',
+  '殮' => '殮',
+  '簾' => '簾',
+  '獵' => '�',
+  '令' => '令',
+  '囹' => '囹',
+  '寧' => '寧',
+  '嶺' => '嶺',
+  '怜' => '怜',
+  '玲' => '玲',
+  '瑩' => '瑩',
+  '羚' => '羚',
+  '聆' => '�',
+  '鈴' => '鈴',
+  '零' => '零',
+  '靈' => '�',
+  '領' => '領',
+  '例' => '例',
+  '禮' => '禮',
+  '醴' => '醴',
+  '隸' => '隸',
+  '惡' => '惡',
+  '了' => '了',
+  '僚' => '僚',
+  '寮' => '寮',
+  '尿' => '尿',
+  '料' => '料',
+  '樂' => '樂',
+  '燎' => '燎',
+  '�' => '療',
+  '蓼' => '蓼',
+  '遼' => '�',
+  '龍' => '�',
+  '暈' => '暈',
+  '阮' => '阮',
+  '劉' => '劉',
+  '杻' => '�',
+  '柳' => '柳',
+  '流' => '�',
+  '溜' => '溜',
+  '琉' => '�',
+  '�' => '留',
+  '硫' => '硫',
+  '�' => '�',
+  '�' => '類',
+  '六' => '六',
+  '戮' => '戮',
+  '陸' => '陸',
+  '倫' => '倫',
+  '崙' => '崙',
+  '淪' => '淪',
+  '輪' => '輪',
+  '律' => '律',
+  '慄' => '慄',
+  '栗' => '栗',
+  '率' => '率',
+  '隆' => '隆',
+  '�' => '利',
+  '吏' => '�',
+  '履' => '履',
+  '易' => '易',
+  '李' => '�',
+  '梨' => '梨',
+  '泥' => '泥',
+  '理' => '�',
+  '痢' => '痢',
+  '罹' => '罹',
+  '裏' => '�',
+  '裡' => '裡',
+  '里' => '里',
+  '離' => '離',
+  '匿' => '匿',
+  '溺' => '溺',
+  '吝' => '�',
+  '燐' => '�',
+  '璘' => '璘',
+  '藺' => '藺',
+  '隣' => '隣',
+  '鱗' => '鱗',
+  '麟' => '麟',
+  '林' => '林',
+  '淋' => '淋',
+  '臨' => '臨',
+  '立' => '立',
+  '笠' => '笠',
+  '粒' => '粒',
+  '狀' => '狀',
+  '炙' => '炙',
+  '識' => '識',
+  '什' => '什',
+  '茶' => '茶',
+  '刺' => '刺',
+  '切' => '切',
+  '�' => '度',
+  '拓' => '拓',
+  '糖' => '糖',
+  '宅' => '宅',
+  '洞' => '洞',
+  '暴' => '暴',
+  '輻' => '輻',
+  '行' => '行',
+  '降' => '�',
+  '見' => '見',
+  '廓' => '廓',
+  '兀' => '兀',
+  '�' => '嗀',
+  '﨎' => '' . "\0" . '',
+  '�' => '' . "\0" . '',
+  '�' => '塚',
+  '﨑' => '' . "\0" . '',
+  '晴' => '晴',
+  '﨓' => '' . "\0" . '',
+  '﨔' => '' . "\0" . '',
+  '凞' => '凞',
+  '猪' => '猪',
+  '益' => '益',
+  '礼' => '礼',
+  '神' => '神',
+  '祥' => '祥',
+  '福' => '�',
+  '靖' => '�',
+  '�' => '精',
+  '羽' => '羽',
+  '﨟' => '' . "\0" . '',
+  '蘒' => '蘒',
+  '﨡' => '' . "\0" . '',
+  '諸' => '諸',
+  '﨣' => '' . "\0" . '',
+  '﨤' => '' . "\0" . '',
+  '逸' => '逸',
+  '都' => '都',
+  '﨧' => '' . "\0" . '',
+  '﨨' => '' . "\0" . '',
+  '﨩' => '' . "\0" . '',
+  '飯' => '飯',
+  '飼' => '飼',
+  '館' => '館',
+  '鶴' => '鶴',
+  '郞' => '郞',
+  '隷' => '隷',
+  '侮' => '侮',
+  '僧' => '僧',
+  '免' => '�',
+  '勉' => '勉',
+  '勤' => '勤',
+  '卑' => '�',
+  '喝' => '�',
+  '嘆' => '嘆',
+  '器' => '器',
+  '塀' => '塀',
+  '墨' => '墨',
+  '層' => '層',
+  '屮' => '屮',
+  '悔' => '悔',
+  '慨' => '慨',
+  '憎' => '憎',
+  '懲' => '懲',
+  '�' => '�',
+  'ï©‚' => 'æ—¢',
+  '暑' => '暑',
+  '梅' => '梅',
+  'ï©…' => 'æµ·',
+  '渚' => '渚',
+  '漢' => '漢',
+  '煮' => '煮',
+  '爫' => '爫',
+  '琢' => '�',
+  '碑' => '碑',
+  '社' => '社',
+  '�' => '祉',
+  '祈' => '祈',
+  '�' => '�',
+  '�' => '祖',
+  '祝' => '�',
+  '禍' => '�',
+  '禎' => '禎',
+  'ï©”' => 'ç©€',
+  '突' => '�',
+  '節' => '節',
+  'ï©—' => 'ç·´',
+  '縉' => '縉',
+  '繁' => '�',
+  'ï©š' => 'ç½²',
+  '者' => '者',
+  '臭' => '臭',
+  '�' => '艹',
+  '艹' => '艹',
+  'ï©Ÿ' => 'è‘—',
+  '褐' => '�',
+  '視' => '視',
+  '謁' => '�',
+  '謹' => '謹',
+  '賓' => '賓',
+  'ï©¥' => 'è´ˆ',
+  '辶' => '辶',
+  '逸' => '逸',
+  '難' => '難',
+  '響' => '響',
+  '頻' => '頻',
+  '恵' => '�',
+  '𤋮' => '𤋮',
+  '舘' => '舘',
+  '並' => '並',
+  '况' => '况',
+  '全' => '全',
+  '侀' => '侀',
+  'ï©´' => 'å……',
+  '冀' => '冀',
+  '勇' => '勇',
+  '勺' => '勺',
+  '喝' => '�',
+  '啕' => '啕',
+  '喙' => '喙',
+  'ï©»' => 'å—¢',
+  '塚' => '塚',
+  '墳' => '墳',
+  '奄' => '奄',
+  '奔' => '奔',
+  '婢' => '婢',
+  '�' => '嬨',
+  '廒' => '廒',
+  '廙' => '廙',
+  '彩' => '彩',
+  '徭' => '徭',
+  '惘' => '惘',
+  '慎' => '慎',
+  '愈' => '愈',
+  '憎' => '憎',
+  '慠' => '慠',
+  '懲' => '懲',
+  '戴' => '戴',
+  '�' => '�',
+  '搜' => '�',
+  '�' => '摒',
+  '�' => '敖',
+  '晴' => '晴',
+  '朗' => '朗',
+  '望' => '望',
+  '杖' => '�',
+  '歹' => '歹',
+  '殺' => '殺',
+  '流' => '�',
+  '滛' => '滛',
+  '滋' => '滋',
+  '漢' => '漢',
+  '瀞' => '瀞',
+  '煮' => '煮',
+  '�' => '瞧',
+  '爵' => '爵',
+  '犯' => '犯',
+  '猪' => '猪',
+  '瑱' => '瑱',
+  '甆' => '甆',
+  '画' => '画',
+  '瘝' => '�',
+  '瘟' => '瘟',
+  '益' => '益',
+  '盛' => '盛',
+  '直' => '直',
+  '睊' => '�',
+  '着' => '�',
+  '磌' => '磌',
+  '窱' => '窱',
+  '節' => '節',
+  '类' => '类',
+  '絛' => '絛',
+  '練' => '練',
+  '缾' => '缾',
+  '者' => '者',
+  '荒' => '�',
+  '華' => '�',
+  '蝹' => '�',
+  '襁' => '�',
+  '覆' => '覆',
+  '視' => '視',
+  '調' => '調',
+  '諸' => '諸',
+  '請' => '請',
+  '謁' => '�',
+  '諾' => '諾',
+  '諭' => '諭',
+  '謹' => '謹',
+  '變' => '變',
+  '�' => '贈',
+  '輸' => '輸',
+  '遲' => '�',
+  '醙' => '醙',
+  '鉶' => '鉶',
+  '陼' => '陼',
+  '難' => '難',
+  '靖' => '�',
+  '韛' => '韛',
+  '響' => '響',
+  'ï«‹' => 'é ‹',
+  '頻' => '頻',
+  '�' => '鬒',
+  '龜' => '龜',
+  '�' => '𢡊',
+  '�' => '𢡄',
+  '𣏕' => '�',
+  '㮝' => '�',
+  '䀘' => '䀘',
+  '䀹' => '䀹',
+  '𥉉' => '𥉉',
+  '𥳐' => '�',
+  '𧻓' => '𧻓',
+  '齃' => '齃',
+  '龎' => '龎',
+  'ff' => 'ff',
+  '�' => 'fi',
+  'fl' => 'fl',
+  'ffi' => 'ffi',
+  'ffl' => 'ffl',
+  'ſt' => 'ſt',
+  'st' => 'st',
+  'ﬓ' => 'մն',
+  'ﬔ' => 'մե',
+  'ﬕ' => 'մի',
+  'ﬖ' => 'վն',
+  'ﬗ' => 'մխ',
+  'ﬠ' => 'ע',
+  'ﬡ' => '�',
+  'ﬢ' => 'ד',
+  'ﬣ' => 'ה',
+  'ﬤ' => 'כ',
+  'ﬥ' => 'ל',
+  'ﬦ' => '�',
+  'ﬧ' => 'ר',
+  'ﬨ' => 'ת',
+  '﬩' => '+',
+  '�' => '�ל',
+  '﹉' => '‾',
+  '﹊' => '‾',
+  '﹋' => '‾',
+  '﹌' => '‾',
+  '�' => '_',
+  '﹎' => '_',
+  '�' => '_',
+  '�' => ',',
+  '﹑' => '�',
+  'ï¹’' => '.',
+  'ï¹”' => ';',
+  '﹕' => ':',
+  'ï¹–' => '?',
+  'ï¹—' => '!',
+  '﹘' => '—',
+  'ï¹™' => '(',
+  '﹚' => ')',
+  'ï¹›' => '{',
+  '﹜' => '}',
+  '�' => '〔',
+  '﹞' => '〕',
+  '﹟' => '#',
+  'ï¹ ' => '&',
+  '﹡' => '*',
+  'ï¹¢' => '+',
+  'ï¹£' => '-',
+  '﹤' => '<',
+  'ï¹¥' => '>',
+  '﹦' => '=',
+  '﹨' => '\\',
+  '﹩' => '$',
+  '﹪' => '%',
+  '﹫' => '@',
+  '�' => '!',
+  '＂' => '"',
+  '＃' => '#',
+  '＄' => '$',
+  'ï¼…' => '%',
+  '＆' => '&',
+  '＇' => '\'',
+  '（' => '(',
+  '）' => ')',
+  '＊' => '*',
+  '＋' => '+',
+  '，' => ',',
+  '�' => '-',
+  '．' => '.',
+  '�' => '/',
+  '�' => '0',
+  '１' => '1',
+  'ï¼’' => '2',
+  '３' => '3',
+  'ï¼”' => '4',
+  '５' => '5',
+  'ï¼–' => '6',
+  'ï¼—' => '7',
+  '８' => '8',
+  'ï¼™' => '9',
+  '：' => ':',
+  'ï¼›' => ';',
+  '＜' => '<',
+  '�' => '=',
+  '＞' => '>',
+  '？' => '?',
+  'ï¼ ' => '@',
+  'Ａ' => 'A',
+  'ï¼¢' => 'B',
+  'ï¼£' => 'C',
+  'Ｄ' => 'D',
+  'ï¼¥' => 'E',
+  'Ｆ' => 'F',
+  'Ｇ' => 'G',
+  'Ｈ' => 'H',
+  'Ｉ' => 'I',
+  'Ｊ' => 'J',
+  'Ｋ' => 'K',
+  'Ｌ' => 'L',
+  'ï¼­' => 'M',
+  'ï¼®' => 'N',
+  'Ｏ' => 'O',
+  'ï¼°' => 'P',
+  'ï¼±' => 'Q',
+  'ï¼²' => 'R',
+  'ï¼³' => 'S',
+  'ï¼´' => 'T',
+  'ï¼µ' => 'U',
+  'Ｖ' => 'V',
+  'ï¼·' => 'W',
+  'Ｘ' => 'X',
+  'ï¼¹' => 'Y',
+  'Ｚ' => 'Z',
+  'ï¼»' => '[',
+  'ï¼¼' => '\\',
+  'ï¼½' => ']',
+  'ï¼¾' => '^',
+  '＿' => '_',
+  'ï½€' => '`',
+  '�' => 'a',
+  'ｂ' => 'b',
+  'ｃ' => 'c',
+  'ｄ' => 'd',
+  'ï½…' => 'e',
+  'ｆ' => 'f',
+  'ｇ' => 'g',
+  'ｈ' => 'h',
+  'ｉ' => 'i',
+  'ｊ' => 'j',
+  'ｋ' => 'k',
+  'ｌ' => 'l',
+  '�' => 'm',
+  'ｎ' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  'ｑ' => 'q',
+  'ï½’' => 'r',
+  'ｓ' => 's',
+  'ï½”' => 't',
+  'ｕ' => 'u',
+  'ï½–' => 'v',
+  'ï½—' => 'w',
+  'ｘ' => 'x',
+  'ï½™' => 'y',
+  'ｚ' => 'z',
+  'ï½›' => '{',
+  '｜' => '|',
+  '�' => '}',
+  '～' => '~',
+  '｟' => '⦅',
+  '｠' => '⦆',
+  '｡' => '。',
+  '｢' => '「',
+  '｣' => '�',
+  '､' => '�',
+  '･' => '・',
+  'ｦ' => 'ヲ',
+  'ｧ' => 'ァ',
+  'ｨ' => 'ィ',
+  'ｩ' => 'ゥ',
+  'ｪ' => 'ェ',
+  'ｫ' => 'ォ',
+  'ｬ' => 'ャ',
+  'ｭ' => 'ュ',
+  'ｮ' => 'ョ',
+  'ｯ' => 'ッ',
+  'ｰ' => 'ー',
+  'ï½±' => 'ã‚¢',
+  'ｲ' => 'イ',
+  'ｳ' => 'ウ',
+  'ｴ' => 'エ',
+  'ｵ' => 'オ',
+  'ｶ' => 'カ',
+  'ï½·' => 'ã‚­',
+  'ｸ' => 'ク',
+  'ｹ' => 'ケ',
+  'ｺ' => 'コ',
+  'ｻ' => 'サ',
+  'ï½¼' => 'ã‚·',
+  'ｽ' => 'ス',
+  'ï½¾' => 'ã‚»',
+  'ｿ' => 'ソ',
+  'ï¾€' => 'ã‚¿',
+  '�' => '�',
+  'ﾂ' => 'ツ',
+  'ﾃ' => 'テ',
+  'ﾄ' => 'ト',
+  'ﾅ' => 'ナ',
+  'ﾆ' => 'ニ',
+  'ﾇ' => 'ヌ',
+  'ﾈ' => '�',
+  'ﾉ' => 'ノ',
+  'ﾊ' => '�',
+  'ﾋ' => 'ヒ',
+  'ﾌ' => 'フ',
+  '�' => 'ヘ',
+  'ﾎ' => 'ホ',
+  '�' => 'マ',
+  '�' => 'ミ',
+  'ﾑ' => 'ム',
+  'ﾒ' => 'メ',
+  'ﾓ' => 'モ',
+  'ﾔ' => 'ヤ',
+  'ﾕ' => 'ユ',
+  'ﾖ' => 'ヨ',
+  'ﾗ' => 'ラ',
+  'ﾘ' => 'リ',
+  'ﾙ' => 'ル',
+  'ﾚ' => 'レ',
+  'ﾛ' => 'ロ',
+  'ﾜ' => 'ワ',
+  '�' => 'ン',
+  'ﾞ' => '゙',
+  'ﾟ' => '゚',
+  'ï¾ ' => 'ã…¤',
+  'ﾡ' => 'ㄱ',
+  'ﾢ' => 'ㄲ',
+  'ﾣ' => 'ㄳ',
+  'ﾤ' => 'ㄴ',
+  'ﾥ' => 'ㄵ',
+  'ﾦ' => 'ㄶ',
+  'ﾧ' => 'ㄷ',
+  'ﾨ' => 'ㄸ',
+  'ﾩ' => 'ㄹ',
+  'ﾪ' => 'ㄺ',
+  'ﾫ' => 'ㄻ',
+  'ﾬ' => 'ㄼ',
+  'ﾭ' => 'ㄽ',
+  'ﾮ' => 'ㄾ',
+  'ﾯ' => 'ㄿ',
+  'ï¾°' => 'ã…€',
+  'ï¾±' => 'ã…�',
+  'ï¾²' => 'ã…‚',
+  'ï¾³' => 'ã…ƒ',
+  'ï¾´' => 'ã…„',
+  'ï¾µ' => 'ã……',
+  'ﾶ' => 'ㅆ',
+  'ï¾·' => 'ã…‡',
+  'ﾸ' => 'ㅈ',
+  'ï¾¹' => 'ã…‰',
+  'ﾺ' => 'ㅊ',
+  'ï¾»' => 'ã…‹',
+  'ﾼ' => 'ㅌ',
+  'ï¾½' => 'ã…�',
+  'ï¾¾' => 'ã…Ž',
+  'ï¿‚' => 'ã…�',
+  'ￃ' => '�',
+  'ï¿„' => 'ã…‘',
+  'ï¿…' => 'ã…’',
+  'ￆ' => 'ㅓ',
+  'ￇ' => 'ㅔ',
+  'ï¿Š' => 'ã…•',
+  'ï¿‹' => 'ã…–',
+  'ￌ' => 'ㅗ',
+  '�' => 'ㅘ',
+  'ï¿Ž' => 'ã…™',
+  '�' => 'ㅚ',
+  'ï¿’' => 'ã…›',
+  'ￓ' => 'ㅜ',
+  'ï¿”' => 'ã…�',
+  'ï¿•' => 'ã…ž',
+  'ï¿–' => 'ã…Ÿ',
+  'ï¿—' => 'ã… ',
+  'ï¿š' => 'ã…¡',
+  'ï¿›' => 'ã…¢',
+  'ￜ' => 'ㅣ',
+  '￠' => '¢',
+  '￡' => '£',
+  '￢' => '¬',
+  '￣' => '¯',
+  '￤' => '¦',
+  'ï¿¥' => 'Â¥',
+  '￦' => '₩',
+  '￨' => '│',
+  '￩' => '�',
+  '￪' => '↑',
+  '￫' => '→',
+  '￬' => '↓',
+  'ï¿­' => 'â– ',
+  'ï¿®' => 'â—‹',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'H',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'R',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'H',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'R',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'H',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'R',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'G',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'f',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'H',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'R',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'O',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'H',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'R',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'H',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'R',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'H',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'R',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'H',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'R',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'H',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'R',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'H',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'R',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'ı',
+  '�' => 'ȷ',
+  '�' => 'Α',
+  '�' => 'Β',
+  '�' => 'Γ',
+  '�' => 'Δ',
+  '�' => 'Ε',
+  '�' => 'Ζ',
+  '�' => 'Η',
+  '�' => 'Θ',
+  '�' => 'Ι',
+  '�' => 'Κ',
+  '�' => 'Λ',
+  '�' => 'Μ',
+  '�' => '�',
+  '�' => 'Ξ',
+  '�' => 'Ο',
+  '�' => 'Π',
+  '�' => 'Ρ',
+  '�' => 'ϴ',
+  '�' => 'Σ',
+  '�' => 'Τ',
+  '�' => 'Υ',
+  '�' => 'Φ',
+  '�' => 'Χ',
+  '�' => 'Ψ',
+  '�' => 'Ω',
+  '�' => '∇',
+  '�' => 'α',
+  '�' => 'β',
+  '�' => 'γ',
+  '�' => 'δ',
+  '�' => 'ε',
+  '�' => 'ζ',
+  '�' => 'η',
+  '�' => 'θ',
+  '�' => 'ι',
+  '�' => 'κ',
+  '�' => 'λ',
+  '�' => 'μ',
+  '�' => 'ν',
+  '�' => 'ξ',
+  '�' => 'ο',
+  '�' => 'π',
+  '�' => '�',
+  '�' => 'ς',
+  '�' => 'σ',
+  '�' => 'τ',
+  '�' => 'υ',
+  '�' => 'φ',
+  '�' => 'χ',
+  '�' => 'ψ',
+  '�' => 'ω',
+  '�' => '∂',
+  '�' => 'ϵ',
+  '�' => 'ϑ',
+  '�' => 'ϰ',
+  '�' => 'ϕ',
+  '�' => 'ϱ',
+  '�' => 'ϖ',
+  '�' => 'Α',
+  '�' => 'Β',
+  '�' => 'Γ',
+  '�' => 'Δ',
+  '�' => 'Ε',
+  '�' => 'Ζ',
+  '�' => 'Η',
+  '�' => 'Θ',
+  '�' => 'Ι',
+  '�' => 'Κ',
+  '�' => 'Λ',
+  '�' => 'Μ',
+  '�' => '�',
+  '�' => 'Ξ',
+  '�' => 'Ο',
+  '�' => 'Π',
+  '�' => 'Ρ',
+  '�' => 'ϴ',
+  '�' => 'Σ',
+  '�' => 'Τ',
+  '�' => 'Υ',
+  '�' => 'Φ',
+  '�' => 'Χ',
+  '�' => 'Ψ',
+  '�' => 'Ω',
+  '�' => '∇',
+  '�' => 'α',
+  '�' => 'β',
+  '�' => 'γ',
+  '�' => 'δ',
+  '�' => 'ε',
+  '�' => 'ζ',
+  '�' => 'η',
+  '�' => 'θ',
+  '�' => 'ι',
+  '�' => 'κ',
+  '�' => 'λ',
+  '�' => 'μ',
+  '�' => 'ν',
+  '�' => 'ξ',
+  '�' => 'ο',
+  '�' => 'π',
+  '�' => '�',
+  '�' => 'ς',
+  '�' => 'σ',
+  '�' => 'τ',
+  '�' => 'υ',
+  '�' => 'φ',
+  '�' => 'χ',
+  '�' => 'ψ',
+  '�' => 'ω',
+  '�' => '∂',
+  '�' => 'ϵ',
+  '�' => 'ϑ',
+  '�' => 'ϰ',
+  '�' => 'ϕ',
+  '�' => 'ϱ',
+  '�' => 'ϖ',
+  '�' => 'Α',
+  '�' => 'Β',
+  '�' => 'Γ',
+  '�' => 'Δ',
+  '�' => 'Ε',
+  '�' => 'Ζ',
+  '�' => 'Η',
+  '�' => 'Θ',
+  '�' => 'Ι',
+  '�' => 'Κ',
+  '�' => 'Λ',
+  '�' => 'Μ',
+  '�' => '�',
+  '�' => 'Ξ',
+  '�' => 'Ο',
+  '�' => 'Π',
+  '�' => 'Ρ',
+  '�' => 'ϴ',
+  '�' => 'Σ',
+  '�' => 'Τ',
+  '�' => 'Υ',
+  '�' => 'Φ',
+  '�' => 'Χ',
+  '�' => 'Ψ',
+  '�' => 'Ω',
+  '�' => '∇',
+  '�' => 'α',
+  '�' => 'β',
+  '�' => 'γ',
+  '�' => 'δ',
+  '�' => 'ε',
+  '�' => 'ζ',
+  '�' => 'η',
+  '�' => 'θ',
+  '�' => 'ι',
+  '�' => 'κ',
+  '�' => 'λ',
+  '�' => 'μ',
+  '�' => 'ν',
+  '�' => 'ξ',
+  '�' => 'ο',
+  '�' => 'π',
+  '�' => '�',
+  '�' => 'ς',
+  '�' => 'σ',
+  '�' => 'τ',
+  '�' => 'υ',
+  '�' => 'φ',
+  '�' => 'χ',
+  '�' => 'ψ',
+  '�' => 'ω',
+  '�' => '∂',
+  '�' => 'ϵ',
+  '�' => 'ϑ',
+  '�' => 'ϰ',
+  '�' => 'ϕ',
+  '�' => 'ϱ',
+  '�' => 'ϖ',
+  '�' => 'Α',
+  '�' => 'Β',
+  '�' => 'Γ',
+  '�' => 'Δ',
+  '�' => 'Ε',
+  '�' => 'Ζ',
+  '�' => 'Η',
+  '�' => 'Θ',
+  '�' => 'Ι',
+  '�' => 'Κ',
+  '�' => 'Λ',
+  '�' => 'Μ',
+  '�' => '�',
+  '�' => 'Ξ',
+  '�' => 'Ο',
+  '�' => 'Π',
+  '�' => 'Ρ',
+  '�' => 'ϴ',
+  '�' => 'Σ',
+  '�' => 'Τ',
+  '�' => 'Υ',
+  '�' => 'Φ',
+  '�' => 'Χ',
+  '�' => 'Ψ',
+  '�' => 'Ω',
+  '�' => '∇',
+  '�' => 'α',
+  '�' => 'β',
+  '�' => 'γ',
+  '�' => 'δ',
+  '�' => 'ε',
+  '�' => 'ζ',
+  '�' => 'η',
+  '�' => 'θ',
+  '�' => 'ι',
+  '�' => 'κ',
+  '�' => 'λ',
+  '�' => 'μ',
+  '�' => 'ν',
+  '�' => 'ξ',
+  '�' => 'ο',
+  '�' => 'π',
+  '�' => '�',
+  '�' => 'ς',
+  '�' => 'σ',
+  '�' => 'τ',
+  '�' => 'υ',
+  '�' => 'φ',
+  '�' => 'χ',
+  '�' => 'ψ',
+  '�' => 'ω',
+  '�' => '∂',
+  '�' => 'ϵ',
+  '�' => 'ϑ',
+  '�' => 'ϰ',
+  '�' => 'ϕ',
+  '�' => 'ϱ',
+  '�' => 'ϖ',
+  '�' => 'Α',
+  '�' => 'Β',
+  '�' => 'Γ',
+  '�' => 'Δ',
+  '�' => 'Ε',
+  '�' => 'Ζ',
+  '�' => 'Η',
+  '�' => 'Θ',
+  '�' => 'Ι',
+  '�' => 'Κ',
+  '�' => 'Λ',
+  '�' => 'Μ',
+  '�' => '�',
+  '�' => 'Ξ',
+  '�' => 'Ο',
+  '�' => 'Π',
+  '�' => 'Ρ',
+  '�' => 'ϴ',
+  '�' => 'Σ',
+  '�' => 'Τ',
+  '�' => 'Υ',
+  '�' => 'Φ',
+  '�' => 'Χ',
+  '�' => 'Ψ',
+  '�' => 'Ω',
+  '�' => '∇',
+  '�' => 'α',
+  '�' => 'β',
+  '�' => 'γ',
+  '�' => 'δ',
+  '�' => 'ε',
+  '�' => 'ζ',
+  '�' => 'η',
+  '�' => 'θ',
+  '�' => 'ι',
+  '�' => 'κ',
+  '�' => 'λ',
+  '�' => 'μ',
+  '�' => 'ν',
+  '�' => 'ξ',
+  '�' => 'ο',
+  '�' => 'π',
+  '�' => '�',
+  '�' => 'ς',
+  '�' => 'σ',
+  '�' => 'τ',
+  '�' => 'υ',
+  '�' => 'φ',
+  '�' => 'χ',
+  '�' => 'ψ',
+  '�' => 'ω',
+  '�' => '∂',
+  '�' => 'ϵ',
+  '�' => 'ϑ',
+  '�' => 'ϰ',
+  '�' => 'ϕ',
+  '�' => 'ϱ',
+  '�' => 'ϖ',
+  '�' => 'Ϝ',
+  '�' => '�',
+  '�' => '0',
+  '�' => '1',
+  '�' => '2',
+  '�' => '3',
+  '�' => '4',
+  '�' => '5',
+  '�' => '6',
+  '�' => '7',
+  '�' => '8',
+  '�' => '9',
+  '�' => '0',
+  '�' => '1',
+  '�' => '2',
+  '�' => '3',
+  '�' => '4',
+  '�' => '5',
+  '�' => '6',
+  '�' => '7',
+  '�' => '8',
+  '�' => '9',
+  '�' => '0',
+  '�' => '1',
+  '�' => '2',
+  '�' => '3',
+  '�' => '4',
+  '�' => '5',
+  '�' => '6',
+  '�' => '7',
+  '�' => '8',
+  '�' => '9',
+  '�' => '0',
+  '�' => '1',
+  '�' => '2',
+  '�' => '3',
+  '�' => '4',
+  '�' => '5',
+  '�' => '6',
+  '�' => '7',
+  '�' => '8',
+  '�' => '9',
+  '�' => '0',
+  '�' => '1',
+  '�' => '2',
+  '�' => '3',
+  '�' => '4',
+  '�' => '5',
+  '�' => '6',
+  '�' => '7',
+  '�' => '8',
+  '�' => '9',
+  '𞸀' => 'ا',
+  '�' => 'ب',
+  '𞸂' => 'ج',
+  '𞸃' => 'د',
+  '𞸅' => 'و',
+  '𞸆' => 'ز',
+  '𞸇' => 'ح',
+  '𞸈' => 'ط',
+  '𞸉' => 'ي',
+  '𞸊' => 'ك',
+  '𞸋' => 'ل',
+  '𞸌' => 'م',
+  '�' => 'ن',
+  '𞸎' => 'س',
+  '�' => 'ع',
+  '�' => '�',
+  '𞸑' => 'ص',
+  '𞸒' => 'ق',
+  '𞸓' => 'ر',
+  '𞸔' => 'ش',
+  '𞸕' => 'ت',
+  '𞸖' => 'ث',
+  '𞸗' => 'خ',
+  '𞸘' => 'ذ',
+  '𞸙' => 'ض',
+  '𞸚' => 'ظ',
+  '𞸛' => 'غ',
+  '𞸜' => 'ٮ',
+  '�' => 'ں',
+  '𞸞' => 'ڡ',
+  '𞸟' => 'ٯ',
+  '𞸡' => 'ب',
+  '𞸢' => 'ج',
+  '𞸤' => 'ه',
+  '𞸧' => 'ح',
+  '𞸩' => 'ي',
+  '𞸪' => 'ك',
+  '𞸫' => 'ل',
+  '𞸬' => 'م',
+  '𞸭' => 'ن',
+  '𞸮' => 'س',
+  '𞸯' => 'ع',
+  '𞸰' => '�',
+  '𞸱' => 'ص',
+  '𞸲' => 'ق',
+  '𞸴' => 'ش',
+  '𞸵' => 'ت',
+  '𞸶' => 'ث',
+  '𞸷' => 'خ',
+  '𞸹' => 'ض',
+  '𞸻' => 'غ',
+  '𞹂' => 'ج',
+  '𞹇' => 'ح',
+  '𞹉' => 'ي',
+  '𞹋' => 'ل',
+  '�' => 'ن',
+  '𞹎' => 'س',
+  '�' => 'ع',
+  '𞹑' => 'ص',
+  'ðž¹’' => 'Ù‚',
+  'ðž¹”' => 'Ø´',
+  'ðž¹—' => 'Ø®',
+  '𞹙' => 'ض',
+  '𞹛' => 'غ',
+  '�' => 'ں',
+  '𞹟' => 'ٯ',
+  '𞹡' => 'ب',
+  '𞹢' => 'ج',
+  '𞹤' => 'ه',
+  '𞹧' => 'ح',
+  '𞹨' => 'ط',
+  '𞹩' => 'ي',
+  '𞹪' => 'ك',
+  '𞹬' => 'م',
+  'ðž¹­' => 'Ù†',
+  '𞹮' => 'س',
+  '𞹯' => 'ع',
+  'ðž¹°' => 'Ù�',
+  '𞹱' => 'ص',
+  'ðž¹²' => 'Ù‚',
+  'ðž¹´' => 'Ø´',
+  '𞹵' => 'ت',
+  '𞹶' => 'ث',
+  'ðž¹·' => 'Ø®',
+  '𞹹' => 'ض',
+  '𞹺' => 'ظ',
+  '𞹻' => 'غ',
+  'ðž¹¼' => 'Ù®',
+  'ðž¹¾' => 'Ú¡',
+  '𞺀' => 'ا',
+  '�' => 'ب',
+  '𞺂' => 'ج',
+  '𞺃' => 'د',
+  '𞺄' => 'ه',
+  '𞺅' => 'و',
+  '𞺆' => 'ز',
+  '𞺇' => 'ح',
+  '𞺈' => 'ط',
+  '𞺉' => 'ي',
+  '𞺋' => 'ل',
+  '𞺌' => 'م',
+  '�' => 'ن',
+  '𞺎' => 'س',
+  '�' => 'ع',
+  '�' => '�',
+  '𞺑' => 'ص',
+  '𞺒' => 'ق',
+  '𞺓' => 'ر',
+  '𞺔' => 'ش',
+  '𞺕' => 'ت',
+  '𞺖' => 'ث',
+  '𞺗' => 'خ',
+  '𞺘' => 'ذ',
+  '𞺙' => 'ض',
+  '𞺚' => 'ظ',
+  '𞺛' => 'غ',
+  '𞺡' => 'ب',
+  '𞺢' => 'ج',
+  '𞺣' => 'د',
+  '𞺥' => 'و',
+  '𞺦' => 'ز',
+  '𞺧' => 'ح',
+  '𞺨' => 'ط',
+  '𞺩' => 'ي',
+  '𞺫' => 'ل',
+  '𞺬' => 'م',
+  '𞺭' => 'ن',
+  '𞺮' => 'س',
+  '𞺯' => 'ع',
+  '𞺰' => '�',
+  '𞺱' => 'ص',
+  '𞺲' => 'ق',
+  '𞺳' => 'ر',
+  '𞺴' => 'ش',
+  '𞺵' => 'ت',
+  '𞺶' => 'ث',
+  '𞺷' => 'خ',
+  '𞺸' => 'ذ',
+  '𞺹' => 'ض',
+  '𞺺' => 'ظ',
+  '𞺻' => 'غ',
+  '🄀' => '0.',
+  '�' => '0,',
+  '🄂' => '1,',
+  '🄃' => '2,',
+  '🄄' => '3,',
+  '🄅' => '4,',
+  '🄆' => '5,',
+  '🄇' => '6,',
+  '🄈' => '7,',
+  '🄉' => '8,',
+  '🄊' => '9,',
+  '�' => '(A)',
+  '🄑' => '(B)',
+  '🄒' => '(C)',
+  '🄓' => '(D)',
+  '🄔' => '(E)',
+  '🄕' => '(F)',
+  '🄖' => '(G)',
+  '🄗' => '(H)',
+  '🄘' => '(I)',
+  '🄙' => '(J)',
+  '🄚' => '(K)',
+  '🄛' => '(L)',
+  '🄜' => '(M)',
+  '�' => '(N)',
+  '🄞' => '(O)',
+  '🄟' => '(P)',
+  '🄠' => '(Q)',
+  '🄡' => '(R)',
+  '🄢' => '(S)',
+  '🄣' => '(T)',
+  '🄤' => '(U)',
+  '🄥' => '(V)',
+  '🄦' => '(W)',
+  '🄧' => '(X)',
+  '🄨' => '(Y)',
+  '🄩' => '(Z)',
+  '🄪' => '〔S〕',
+  '🄫' => '(C)',
+  '🄬' => '(R)',
+  '🄭' => '(CD)',
+  '🄮' => '(WZ)',
+  '🄰' => 'A',
+  '🄱' => 'B',
+  '🄲' => 'C',
+  '🄳' => 'D',
+  '🄴' => 'E',
+  '🄵' => 'F',
+  '🄶' => 'G',
+  '🄷' => 'H',
+  '🄸' => 'I',
+  '🄹' => 'J',
+  '🄺' => 'K',
+  '🄻' => 'L',
+  '🄼' => 'M',
+  '🄽' => 'N',
+  '🄾' => 'O',
+  '🄿' => 'P',
+  '🅀' => 'Q',
+  '�' => 'R',
+  '🅂' => 'S',
+  '🅃' => 'T',
+  '🅄' => 'U',
+  '🅅' => 'V',
+  '🅆' => 'W',
+  '🅇' => 'X',
+  '🅈' => 'Y',
+  '🅉' => 'Z',
+  '🅊' => 'HV',
+  '🅋' => 'MV',
+  '🅌' => 'SD',
+  '�' => 'SS',
+  '🅎' => 'PPV',
+  '�' => 'WC',
+  '�' => 'DJ',
+  '🈀' => '��',
+  '�' => 'ココ',
+  '🈂' => 'サ',
+  '�' => '手',
+  '🈑' => '字',
+  '🈒' => '�',
+  '🈓' => 'デ',
+  '🈔' => '二',
+  '🈕' => '多',
+  '🈖' => '解',
+  '🈗' => '天',
+  '🈘' => '交',
+  '🈙' => '映',
+  '🈚' => '無',
+  '🈛' => '料',
+  '🈜' => '�',
+  '�' => '後',
+  '🈞' => '�',
+  '🈟' => '新',
+  '🈠' => '�',
+  '🈡' => '終',
+  '🈢' => '生',
+  '🈣' => '販',
+  '🈤' => '声',
+  '🈥' => '�',
+  '🈦' => '演',
+  '🈧' => '投',
+  '🈨' => '�',
+  '🈩' => '一',
+  '🈪' => '三',
+  '🈫' => '�',
+  '🈬' => '左',
+  '🈭' => '中',
+  '🈮' => '�',
+  '🈯' => '指',
+  '🈰' => '走',
+  '🈱' => '打',
+  '🈲' => '�',
+  '🈳' => '空',
+  '🈴' => '�',
+  '🈵' => '満',
+  '🈶' => '有',
+  '🈷' => '月',
+  '🈸' => '申',
+  '🈹' => '割',
+  '🈺' => '営',
+  '🈻' => '�',
+  '🉀' => '〔本〕',
+  '�' => '〔三〕',
+  '🉂' => '〔二〕',
+  '🉃' => '〔安〕',
+  '🉄' => '〔点〕',
+  '🉅' => '〔打〕',
+  '🉆' => '〔盗〕',
+  '🉇' => '〔�〕',
+  '🉈' => '〔敗〕',
+  '�' => '(得)',
+  '🉑' => '(�)',
+  '🯰' => '0',
+  '🯱' => '1',
+  '🯲' => '2',
+  '🯳' => '3',
+  '🯴' => '4',
+  '🯵' => '5',
+  '🯶' => '6',
+  '🯷' => '7',
+  '🯸' => '8',
+  '🯹' => '9',
+  '丽' => '丽',
+  '�' => '丸',
+  '乁' => '�',
+  '𠄢' => '𠄢',
+  '你' => '你',
+  '侮' => '侮',
+  '侻' => '侻',
+  '倂' => '倂',
+  '偺' => '�',
+  '備' => '備',
+  '僧' => '僧',
+  '像' => '�',
+  '㒞' => '㒞',
+  '�' => '𠘺',
+  '免' => '�',
+  '�' => '兔',
+  '�' => '兤',
+  '具' => '具',
+  '𠔜' => '𠔜',
+  '㒹' => '㒹',
+  '內' => '內',
+  '再' => '�',
+  '𠕋' => '𠕋',
+  '冗' => '冗',
+  '冤' => '冤',
+  '仌' => '仌',
+  '冬' => '冬',
+  '况' => '况',
+  '𩇟' => '𩇟',
+  '�' => '凵',
+  '刃' => '刃',
+  '㓟' => '㓟',
+  '刻' => '刻',
+  '剆' => '剆',
+  '割' => '割',
+  '剷' => '剷',
+  '㔕' => '㔕',
+  '勇' => '勇',
+  '勉' => '勉',
+  '勤' => '勤',
+  '勺' => '勺',
+  '包' => '包',
+  '匆' => '匆',
+  '北' => '北',
+  '卉' => '�',
+  '卑' => '�',
+  '博' => '�',
+  '即' => '�',
+  '卽' => '�',
+  '卿' => '�',
+  '卿' => '�',
+  '卿' => '�',
+  '𠨬' => '𠨬',
+  '灰' => '�',
+  '及' => '�',
+  '叟' => '�',
+  '𠭣' => '𠭣',
+  '叫' => '�',
+  '叱' => '�',
+  '吆' => '�',
+  '咞' => '咞',
+  '吸' => '�',
+  '呈' => '呈',
+  '周' => '周',
+  '咢' => '咢',
+  '�' => '哶',
+  '唐' => '�',
+  '啓' => '啓',
+  '啣' => '啣',
+  '善' => '善',
+  '善' => '善',
+  '喙' => '喙',
+  '喫' => '喫',
+  '喳' => '喳',
+  '嗂' => '嗂',
+  '圖' => '圖',
+  '嘆' => '嘆',
+  '�' => '圗',
+  '噑' => '噑',
+  '�' => '噴',
+  '�' => '切',
+  '壮' => '壮',
+  '城' => '城',
+  '埴' => '埴',
+  '堍' => '�',
+  '型' => '型',
+  '堲' => '堲',
+  '報' => '報',
+  '墬' => '墬',
+  '𡓤' => '𡓤',
+  '売' => '売',
+  '壷' => '壷',
+  '夆' => '夆',
+  '�' => '多',
+  '夢' => '夢',
+  '奢' => '奢',
+  '𡚨' => '𡚨',
+  '𡛪' => '𡛪',
+  '姬' => '姬',
+  '娛' => '娛',
+  '娧' => '娧',
+  '姘' => '姘',
+  '婦' => '婦',
+  '㛮' => '㛮',
+  '㛼' => '㛼',
+  '嬈' => '嬈',
+  '嬾' => '嬾',
+  '嬾' => '嬾',
+  '𡧈' => '𡧈',
+  '寃' => '寃',
+  '寘' => '寘',
+  '寧' => '寧',
+  '寳' => '寳',
+  '𡬘' => '𡬘',
+  '寿' => '寿',
+  '将' => '将',
+  '当' => '当',
+  '尢' => '尢',
+  '㞁' => '�',
+  '屠' => '屠',
+  '屮' => '屮',
+  '峀' => '峀',
+  '岍' => '�',
+  '𡷤' => '𡷤',
+  '嵃' => '嵃',
+  '𡷦' => '𡷦',
+  '嵮' => '嵮',
+  '嵫' => '嵫',
+  '嵼' => '嵼',
+  '�' => '巡',
+  '巢' => '巢',
+  '㠯' => '㠯',
+  '巽' => '巽',
+  '帨' => '帨',
+  '帽' => '帽',
+  '幩' => '幩',
+  '㡢' => '㡢',
+  '𢆃' => '𢆃',
+  '㡼' => '㡼',
+  '庰' => '庰',
+  '庳' => '庳',
+  '�' => '庶',
+  '廊' => '廊',
+  '�' => '𪎒',
+  '�' => '廾',
+  '𢌱' => '𢌱',
+  '𢌱' => '𢌱',
+  '舁' => '�',
+  '弢' => '弢',
+  '弢' => '弢',
+  '㣇' => '㣇',
+  '𣊸' => '𣊸',
+  '𦇚' => '𦇚',
+  '形' => '形',
+  '彫' => '彫',
+  '㣣' => '㣣',
+  '徚' => '徚',
+  '�' => '�',
+  '志' => '志',
+  '忹' => '忹',
+  '悁' => '�',
+  '㤺' => '㤺',
+  '㤜' => '㤜',
+  '悔' => '悔',
+  '𢛔' => '𢛔',
+  '惇' => '惇',
+  '慈' => '慈',
+  '慌' => '慌',
+  '慎' => '慎',
+  '慌' => '慌',
+  '慺' => '慺',
+  '憎' => '憎',
+  '憲' => '憲',
+  '憤' => '憤',
+  '憯' => '憯',
+  '懞' => '懞',
+  '懲' => '懲',
+  '懶' => '懶',
+  '成' => '�',
+  '戛' => '戛',
+  '扝' => '�',
+  '抱' => '抱',
+  '拔' => '拔',
+  '捐' => '�',
+  '𢬌' => '𢬌',
+  '挽' => '挽',
+  '拼' => '拼',
+  '捨' => '�',
+  '掃' => '掃',
+  '揤' => '�',
+  '𢯱' => '𢯱',
+  '搢' => '�',
+  '揅' => '�',
+  '�' => '掩',
+  '㨮' => '㨮',
+  '摩' => '摩',
+  '摾' => '摾',
+  '撝' => '�',
+  '摷' => '摷',
+  '㩬' => '㩬',
+  '敏' => '�',
+  '敬' => '敬',
+  '𣀊' => '𣀊',
+  '旣' => '旣',
+  '書' => '書',
+  '�' => '晉',
+  '㬙' => '㬙',
+  '�' => '暑',
+  '�' => '㬈',
+  '㫤' => '㫤',
+  '冒' => '冒',
+  '冕' => '冕',
+  '最' => '最',
+  '暜' => '暜',
+  '肭' => '肭',
+  '䏙' => '�',
+  '朗' => '朗',
+  '望' => '望',
+  '朡' => '朡',
+  '杞' => '�',
+  '杓' => '�',
+  '�' => '�',
+  '㭉' => '㭉',
+  '柺' => '柺',
+  '枅' => '枅',
+  '桒' => '桒',
+  '梅' => '梅',
+  '𣑭' => '𣑭',
+  '梎' => '梎',
+  '栟' => '栟',
+  '椔' => '椔',
+  '㮝' => '�',
+  '楂' => '楂',
+  '榣' => '榣',
+  '槪' => '槪',
+  '檨' => '檨',
+  '𣚣' => '𣚣',
+  '櫛' => '櫛',
+  '㰘' => '㰘',
+  '次' => '次',
+  '𣢧' => '𣢧',
+  '歔' => '歔',
+  '㱎' => '㱎',
+  '歲' => '歲',
+  '殟' => '殟',
+  '殺' => '殺',
+  '殻' => '殻',
+  '𣪍' => '�',
+  '𡴋' => '𡴋',
+  '𣫺' => '𣫺',
+  '汎' => '汎',
+  '𣲼' => '𣲼',
+  '沿' => '沿',
+  '泍' => '�',
+  '汧' => '汧',
+  '洖' => '洖',
+  '派' => '派',
+  '�' => '海',
+  '流' => '�',
+  '浩' => '浩',
+  '浸' => '浸',
+  '涅' => '涅',
+  '𣴞' => '𣴞',
+  '洴' => '洴',
+  '港' => '港',
+  '湮' => '湮',
+  '㴳' => '㴳',
+  '滋' => '滋',
+  '滇' => '滇',
+  '�' => '𣻑',
+  '淹' => '淹',
+  '�' => '潮',
+  '�' => '𣽞',
+  '𣾎' => '𣾎',
+  '濆' => '濆',
+  '瀹' => '瀹',
+  '瀞' => '瀞',
+  '瀛' => '瀛',
+  '㶖' => '㶖',
+  '灊' => '�',
+  '災' => '�',
+  '灷' => '�',
+  '炭' => '炭',
+  '𠔥' => '𠔥',
+  '煅' => '煅',
+  '�' => '𤉣',
+  '熜' => '熜',
+  '𤎫' => '𤎫',
+  '爨' => '爨',
+  '爵' => '爵',
+  '牐' => '�',
+  '𤘈' => '𤘈',
+  '犀' => '犀',
+  '犕' => '犕',
+  '𤜵' => '𤜵',
+  '𤠔' => '𤠔',
+  '獺' => '�',
+  '王' => '王',
+  '㺬' => '㺬',
+  '玥' => '玥',
+  '㺸' => '㺸',
+  '㺸' => '㺸',
+  '瑇' => '瑇',
+  '瑜' => '瑜',
+  '瑱' => '瑱',
+  '璅' => '璅',
+  '瓊' => '瓊',
+  '㼛' => '㼛',
+  '甤' => '甤',
+  '𤰶' => '𤰶',
+  '甾' => '甾',
+  '𤲒' => '𤲒',
+  '異' => '異',
+  '𢆟' => '𢆟',
+  '瘐' => '�',
+  '𤾡' => '𤾡',
+  '𤾸' => '𤾸',
+  '𥁄' => '�',
+  '㿼' => '㿼',
+  '䀈' => '䀈',
+  '直' => '直',
+  '�' => '𥃳',
+  '𥃲' => '𥃲',
+  '𥄙' => '𥄙',
+  '𥄳' => '𥄳',
+  '眞' => '眞',
+  '真' => '真',
+  '真' => '真',
+  '睊' => '�',
+  '䀹' => '䀹',
+  '瞋' => '瞋',
+  '䁆' => '�',
+  '䂖' => '䂖',
+  '�' => '�',
+  '硎' => '硎',
+  '�' => '碌',
+  '�' => '磌',
+  '䃣' => '䃣',
+  '𥘦' => '𥘦',
+  '祖' => '祖',
+  '𥚚' => '𥚚',
+  '𥛅' => '𥛅',
+  '福' => '�',
+  '秫' => '秫',
+  '䄯' => '䄯',
+  '穀' => '穀',
+  '穊' => '穊',
+  '穏' => '�',
+  '𥥼' => '𥥼',
+  '�' => '𥪧',
+  '𥪧' => '𥪧',
+  '竮' => '竮',
+  '䈂' => '䈂',
+  '𥮫' => '𥮫',
+  '篆' => '篆',
+  '築' => '築',
+  '䈧' => '䈧',
+  '𥲀' => '𥲀',
+  '糒' => '糒',
+  '䊠' => '䊠',
+  '糨' => '糨',
+  '糣' => '糣',
+  '紀' => '紀',
+  '𥾆' => '𥾆',
+  '絣' => '絣',
+  '䌁' => '�',
+  '緇' => '緇',
+  '縂' => '縂',
+  '繅' => '繅',
+  '䌴' => '䌴',
+  '𦈨' => '𦈨',
+  '𦉇' => '𦉇',
+  '䍙' => '�',
+  '𦋙' => '𦋙',
+  '罺' => '罺',
+  '𦌾' => '𦌾',
+  '羕' => '羕',
+  '翺' => '翺',
+  '者' => '者',
+  '𦓚' => '𦓚',
+  '𦔣' => '𦔣',
+  '聠' => '�',
+  '𦖨' => '𦖨',
+  '聰' => '�',
+  '𣍟' => '�',
+  '�' => '�',
+  '育' => '育',
+  '脃' => '脃',
+  '䐋' => '�',
+  '脾' => '脾',
+  '媵' => '媵',
+  '𦞧' => '𦞧',
+  '𦞵' => '𦞵',
+  '𣎓' => '𣎓',
+  '𣎜' => '𣎜',
+  '舁' => '�',
+  '舄' => '舄',
+  '�' => '辞',
+  '䑫' => '䑫',
+  '�' => '芑',
+  '�' => '芋',
+  '芝' => '�',
+  '劳' => '劳',
+  '花' => '花',
+  '芳' => '芳',
+  '芽' => '芽',
+  '苦' => '苦',
+  '𦬼' => '𦬼',
+  '若' => '若',
+  '茝' => '�',
+  '荣' => '�',
+  '莭' => '莭',
+  '茣' => '茣',
+  '�' => '莽',
+  '菧' => '�',
+  '著' => '著',
+  '荓' => '�',
+  '菊' => '�',
+  '菌' => '�',
+  '菜' => '�',
+  '𦰶' => '𦰶',
+  '𦵫' => '𦵫',
+  '𦳕' => '𦳕',
+  '䔫' => '䔫',
+  '蓱' => '蓱',
+  '蓳' => '蓳',
+  '蔖' => '蔖',
+  '𧏊' => '�',
+  '蕤' => '蕤',
+  '𦼬' => '𦼬',
+  '䕝' => '�',
+  '䕡' => '䕡',
+  '𦾱' => '𦾱',
+  '𧃒' => '𧃒',
+  '䕫' => '䕫',
+  '虐' => '�',
+  '虜' => '虜',
+  '虧' => '虧',
+  '虩' => '虩',
+  '蚩' => '蚩',
+  '蚈' => '蚈',
+  '蜎' => '蜎',
+  '蛢' => '蛢',
+  '蝹' => '�',
+  '蜨' => '蜨',
+  '蝫' => '�',
+  '螆' => '螆',
+  '䗗' => '䗗',
+  '蟡' => '蟡',
+  '�' => '�',
+  '䗹' => '䗹',
+  '衠' => '衠',
+  '衣' => '衣',
+  '𧙧' => '𧙧',
+  '裗' => '裗',
+  '裞' => '裞',
+  '䘵' => '䘵',
+  '裺' => '裺',
+  '㒻' => '㒻',
+  '𧢮' => '𧢮',
+  '𧥦' => '𧥦',
+  '�' => '䚾',
+  '䛇' => '䛇',
+  '�' => '誠',
+  '�' => '諭',
+  '變' => '變',
+  '豕' => '豕',
+  '𧲨' => '𧲨',
+  '貫' => '貫',
+  '賁' => '�',
+  '贛' => '贛',
+  '起' => '起',
+  '𧼯' => '𧼯',
+  '𠠄' => '𠠄',
+  '跋' => '跋',
+  '趼' => '趼',
+  '跰' => '跰',
+  '�' => '𠣞',
+  '軔' => '軔',
+  '輸' => '輸',
+  '𨗒' => '𨗒',
+  '𨗭' => '𨗭',
+  '邔' => '邔',
+  '郱' => '郱',
+  '鄑' => '鄑',
+  '𨜮' => '𨜮',
+  '鄛' => '鄛',
+  '鈸' => '鈸',
+  '鋗' => '鋗',
+  '鋘' => '鋘',
+  '鉼' => '鉼',
+  '鏹' => '�',
+  '鐕' => '�',
+  '𨯺' => '𨯺',
+  '開' => '開',
+  '䦕' => '䦕',
+  '閷' => '閷',
+  '𨵷' => '𨵷',
+  '䧦' => '䧦',
+  '雃' => '雃',
+  '嶲' => '嶲',
+  '霣' => '霣',
+  '𩅅' => '𩅅',
+  '𩈚' => '𩈚',
+  '䩮' => '䩮',
+  '䩶' => '䩶',
+  '韠' => '韠',
+  '𩐊' => '�',
+  '䪲' => '䪲',
+  '𩒖' => '𩒖',
+  '頋' => '頋',
+  '頋' => '頋',
+  '頩' => '頩',
+  '�' => '𩖶',
+  '飢' => '飢',
+  '䬳' => '䬳',
+  '餩' => '餩',
+  '馧' => '馧',
+  '駂' => '駂',
+  '駾' => '駾',
+  '䯎' => '䯎',
+  '𩬰' => '𩬰',
+  '鬒' => '鬒',
+  '鱀' => '鱀',
+  '鳽' => '鳽',
+  '�' => '䳎',
+  '䳭' => '䳭',
+  '�' => '鵧',
+  '�' => '𪃎',
+  '䳸' => '䳸',
+  '𪄅' => '𪄅',
+  '𪈎' => '𪈎',
+  '𪊑' => '𪊑',
+  '麻' => '麻',
+  '䵖' => '䵖',
+  '黹' => '黹',
+  '黾' => '黾',
+  '鼅' => '鼅',
+  '鼏' => '�',
+  '鼖' => '鼖',
+  '鼻' => '鼻',
+  '�' => '𪘀',
+  'Æ' => 'AE',
+  '�' => 'D',
+  'Ø' => 'O',
+  'Þ' => 'TH',
+  'ß' => 'ss',
+  'æ' => 'ae',
+  'ð' => 'd',
+  'ø' => 'o',
+  'þ' => 'th',
+  '�' => 'D',
+  'Ä‘' => 'd',
+  'Ħ' => 'H',
+  'ħ' => 'h',
+  'ı' => 'i',
+  'ĸ' => 'q',
+  '�' => 'L',
+  'Å‚' => 'l',
+  'ÅŠ' => 'N',
+  'Å‹' => 'n',
+  'Å’' => 'OE',
+  'Å“' => 'oe',
+  'Ŧ' => 'T',
+  'ŧ' => 't',
+  'Æ€' => 'b',
+  '�' => 'B',
+  'Æ‚' => 'B',
+  'ƃ' => 'b',
+  'Ƈ' => 'C',
+  'ƈ' => 'c',
+  'Ɖ' => 'D',
+  'ÆŠ' => 'D',
+  'Æ‹' => 'D',
+  'ƌ' => 'd',
+  '�' => 'E',
+  'Æ‘' => 'F',
+  'Æ’' => 'f',
+  'Æ“' => 'G',
+  'Æ•' => 'hv',
+  'Æ–' => 'I',
+  'Æ—' => 'I',
+  'Ƙ' => 'K',
+  'Æ™' => 'k',
+  'Æš' => 'l',
+  '�' => 'N',
+  'Æž' => 'n',
+  'Æ¢' => 'OI',
+  'Æ£' => 'oi',
+  'Ƥ' => 'P',
+  'Æ¥' => 'p',
+  'Æ«' => 't',
+  'Ƭ' => 'T',
+  'Æ­' => 't',
+  'Æ®' => 'T',
+  'Ʋ' => 'V',
+  'Ƴ' => 'Y',
+  'Æ´' => 'y',
+  'Ƶ' => 'Z',
+  'ƶ' => 'z',
+  'Ǥ' => 'G',
+  'Ç¥' => 'g',
+  'È¡' => 'd',
+  'Ȥ' => 'Z',
+  'È¥' => 'z',
+  'È´' => 'l',
+  'ȵ' => 'n',
+  'ȶ' => 't',
+  'È·' => 'j',
+  'ȸ' => 'db',
+  'ȹ' => 'qp',
+  'Ⱥ' => 'A',
+  'È»' => 'C',
+  'ȼ' => 'c',
+  'Ƚ' => 'L',
+  'Ⱦ' => 'T',
+  'È¿' => 's',
+  'É€' => 'z',
+  'Ƀ' => 'B',
+  'É„' => 'U',
+  'Ɇ' => 'E',
+  'ɇ' => 'e',
+  'Ɉ' => 'J',
+  'ɉ' => 'j',
+  'Ɍ' => 'R',
+  '�' => 'r',
+  'ÉŽ' => 'Y',
+  '�' => 'y',
+  'É“' => 'b',
+  'É•' => 'c',
+  'É–' => 'd',
+  'É—' => 'd',
+  'É›' => 'e',
+  'ÉŸ' => 'j',
+  'É ' => 'g',
+  'É¡' => 'g',
+  'É¢' => 'G',
+  'ɦ' => 'h',
+  'ɧ' => 'h',
+  'ɨ' => 'i',
+  'ɪ' => 'I',
+  'É«' => 'l',
+  'ɬ' => 'l',
+  'É­' => 'l',
+  'ɱ' => 'm',
+  'ɲ' => 'n',
+  'ɳ' => 'n',
+  'É´' => 'N',
+  'ɶ' => 'OE',
+  'ɼ' => 'r',
+  'ɽ' => 'r',
+  'ɾ' => 'r',
+  'Ê€' => 'R',
+  'Ê‚' => 's',
+  'ʈ' => 't',
+  'ʉ' => 'u',
+  'Ê‹' => 'v',
+  '�' => 'Y',
+  '�' => 'z',
+  'Ê‘' => 'z',
+  'Ê™' => 'B',
+  'Ê›' => 'G',
+  'ʜ' => 'H',
+  '�' => 'j',
+  'ÊŸ' => 'L',
+  'Ê ' => 'q',
+  'Ê£' => 'dz',
+  'Ê¥' => 'dz',
+  'ʦ' => 'ts',
+  'ʪ' => 'ls',
+  'Ê«' => 'lz',
+  'á´€' => 'A',
+  'á´�' => 'AE',
+  'á´ƒ' => 'B',
+  'á´„' => 'C',
+  'á´…' => 'D',
+  'á´†' => 'D',
+  'á´‡' => 'E',
+  'á´Š' => 'J',
+  'á´‹' => 'K',
+  'ᴌ' => 'L',
+  'á´�' => 'M',
+  'á´�' => 'O',
+  'á´˜' => 'P',
+  'á´›' => 'T',
+  'ᴜ' => 'U',
+  'á´ ' => 'V',
+  'á´¡' => 'W',
+  'á´¢' => 'Z',
+  'ᵫ' => 'ue',
+  'ᵬ' => 'b',
+  'áµ­' => 'd',
+  'áµ®' => 'f',
+  'ᵯ' => 'm',
+  'áµ°' => 'n',
+  'áµ±' => 'p',
+  'áµ²' => 'r',
+  'áµ³' => 'r',
+  'áµ´' => 's',
+  'áµµ' => 't',
+  'ᵶ' => 'z',
+  'ᵺ' => 'th',
+  'áµ»' => 'I',
+  'áµ½' => 'p',
+  'áµ¾' => 'U',
+  'ᶀ' => 'b',
+  '�' => 'd',
+  'ᶂ' => 'f',
+  'ᶃ' => 'g',
+  'ᶄ' => 'k',
+  'ᶅ' => 'l',
+  'ᶆ' => 'm',
+  'ᶇ' => 'n',
+  'ᶈ' => 'p',
+  'ᶉ' => 'r',
+  'ᶊ' => 's',
+  'ᶌ' => 'v',
+  '�' => 'x',
+  'ᶎ' => 'z',
+  '�' => 'a',
+  'ᶑ' => 'd',
+  'ᶒ' => 'e',
+  'ᶓ' => 'e',
+  'ᶖ' => 'i',
+  'ᶙ' => 'u',
+  'ẜ' => 's',
+  '�' => 's',
+  'ẞ' => 'SS',
+  'Ỻ' => 'LL',
+  'á»»' => 'll',
+  'Ỽ' => 'V',
+  'ỽ' => 'v',
+  'Ỿ' => 'Y',
+  'ỿ' => 'y',
+  'â± ' => 'L',
+  'ⱡ' => 'l',
+  'â±¢' => 'L',
+  'â±£' => 'P',
+  'Ɽ' => 'R',
+  'â±¥' => 'a',
+  'ⱦ' => 't',
+  'Ⱨ' => 'H',
+  'ⱨ' => 'h',
+  'Ⱪ' => 'K',
+  'ⱪ' => 'k',
+  'Ⱬ' => 'Z',
+  'ⱬ' => 'z',
+  'â±®' => 'M',
+  'â±±' => 'v',
+  'â±²' => 'W',
+  'â±³' => 'w',
+  'â±´' => 'v',
+  'ⱸ' => 'e',
+  'ⱺ' => 'o',
+  'â±¾' => 'S',
+  'Ɀ' => 'Z',
+  'ꜰ' => 'F',
+  'ꜱ' => 'S',
+  'Ꜳ' => 'AA',
+  'ꜳ' => 'aa',
+  'Ꜵ' => 'AO',
+  'ꜵ' => 'ao',
+  'Ꜷ' => 'AU',
+  'ꜷ' => 'au',
+  'Ꜹ' => 'AV',
+  'ꜹ' => 'av',
+  'Ꜻ' => 'AV',
+  'ꜻ' => 'av',
+  'Ꜽ' => 'AY',
+  'ꜽ' => 'ay',
+  '�' => 'K',
+  '�' => 'k',
+  '�' => 'K',
+  '�' => 'k',
+  '�' => 'K',
+  '�' => 'k',
+  '�' => 'L',
+  '�' => 'l',
+  '�' => 'L',
+  '�' => 'l',
+  '�' => 'O',
+  '�' => 'o',
+  '�' => 'O',
+  '�' => 'o',
+  '�' => 'OO',
+  '�' => 'oo',
+  '�' => 'P',
+  '�' => 'p',
+  '�' => 'P',
+  '�' => 'p',
+  '�' => 'P',
+  '�' => 'p',
+  '�' => 'Q',
+  '�' => 'q',
+  '�' => 'Q',
+  '�' => 'q',
+  '�' => 'V',
+  '�' => 'v',
+  '�' => 'VY',
+  '�' => 'vy',
+  '�' => 'TH',
+  '�' => 'th',
+  '�' => 'TH',
+  '�' => 'th',
+  '�' => 'd',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'r',
+  '�' => 'R',
+  '�' => 't',
+  '�' => 'D',
+  '�' => 'd',
+  '�' => 'F',
+  '�' => 'f',
+  'Ꞇ' => 'T',
+  'ꞇ' => 't',
+  '�' => 'N',
+  'êž‘' => 'n',
+  'êž’' => 'C',
+  'êž“' => 'c',
+  'êž ' => 'G',
+  'êž¡' => 'g',
+  'Ꞣ' => 'K',
+  'ꞣ' => 'k',
+  'Ꞥ' => 'N',
+  'ꞥ' => 'n',
+  'Ꞧ' => 'R',
+  'ꞧ' => 'r',
+  'Ꞩ' => 'S',
+  'êž©' => 's',
+  'Ɦ' => 'H',
+  '©' => '(C)',
+  '®' => '(R)',
+  'â‚ ' => 'CE',
+  'â‚¢' => 'Cr',
+  'â‚£' => 'Fr.',
+  '₤' => 'L.',
+  '₧' => 'Pts',
+  '₺' => 'TL',
+  '₹' => 'Rs',
+  'â„—' => '(P)',
+  '℘' => 'P',
+  'â„ž' => 'Rx',
+  '〇' => '0',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  '�' => ' ',
+  'ʹ' => '\'',
+  'ʺ' => '"',
+  'Ê»' => '\'',
+  'ʼ' => '\'',
+  'ʽ' => '\'',
+  'ˈ' => '\'',
+  'Ë‹' => '`',
+  '‘' => '\'',
+  '’' => '\'',
+  '‚' => ',',
+  '‛' => '\'',
+  '“' => '"',
+  '�' => '"',
+  '„' => ',,',
+  '‟' => '"',
+  '′' => '\'',
+  '�' => '"',
+  '〞' => '"',
+  '«' => '<<',
+  '»' => '>>',
+  '‹' => '<',
+  '›' => '>',
+  '­' => '-',
+  '�' => '-',
+  '‑' => '-',
+  '‒' => '-',
+  '–' => '-',
+  '—' => '-',
+  '―' => '-',
+  '︱' => '-',
+  '︲' => '-',
+  'Ë‚' => '<',
+  '˃' => '>',
+  'Ë„' => '^',
+  'ˆ' => '^',
+  '�' => ':',
+  '˜' => '~',
+  '‖' => '||',
+  '�' => '/',
+  '�' => '[',
+  '�' => ']',
+  '�' => '*',
+  '�' => ',',
+  '。' => '.',
+  '〈' => '<',
+  '〉' => '>',
+  '《' => '<<',
+  '》' => '>>',
+  '〔' => '[',
+  '〕' => ']',
+  '〘' => '[',
+  '〙' => ']',
+  '〚' => '[',
+  '〛' => ']',
+  '�' => ',',
+  '︑' => ',',
+  '︒' => '.',
+  '︓' => ':',
+  '︔' => ';',
+  '︕' => '!',
+  '︖' => '?',
+  '︙' => '...',
+  '︰' => '..',
+  '︵' => '(',
+  '︶' => ')',
+  '︷' => '{',
+  '︸' => '}',
+  '︹' => '[',
+  '︺' => ']',
+  '︽' => '<<',
+  '︾' => '>>',
+  '︿' => '<',
+  'ï¹€' => '>',
+  '﹇' => '[',
+  '﹈' => ']',
+  '×' => '*',
+  '÷' => '/',
+  'Ë–' => '+',
+  'Ë—' => '-',
+  '−' => '-',
+  '∕' => '/',
+  '∖' => '\\',
+  '∣' => '|',
+  '∥' => '||',
+  '≪' => '<<',
+  '≫' => '>>',
+  '⦅' => '((',
+  '⦆' => '))',
+);
diff --git a/lib/symfony/polyfill-iconv/bootstrap.php b/lib/symfony/polyfill-iconv/bootstrap.php
new file mode 100644
index 000000000..6eb76fc5a
--- /dev/null
+++ b/lib/symfony/polyfill-iconv/bootstrap.php
@@ -0,0 +1,84 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Polyfill\Iconv as p;
+
+if (extension_loaded('iconv')) {
+    return;
+}
+
+if (!defined('ICONV_IMPL')) {
+    define('ICONV_IMPL', 'Symfony');
+}
+if (!defined('ICONV_VERSION')) {
+    define('ICONV_VERSION', '1.0');
+}
+if (!defined('ICONV_MIME_DECODE_STRICT')) {
+    define('ICONV_MIME_DECODE_STRICT', 1);
+}
+if (!defined('ICONV_MIME_DECODE_CONTINUE_ON_ERROR')) {
+    define('ICONV_MIME_DECODE_CONTINUE_ON_ERROR', 2);
+}
+
+if (!function_exists('iconv')) {
+    function iconv($from_encoding, $to_encoding, $string) { return p\Iconv::iconv($from_encoding, $to_encoding, $string); }
+}
+if (!function_exists('iconv_get_encoding')) {
+    function iconv_get_encoding($type = 'all') { return p\Iconv::iconv_get_encoding($type); }
+}
+if (!function_exists('iconv_set_encoding')) {
+    function iconv_set_encoding($type, $encoding) { return p\Iconv::iconv_set_encoding($type, $encoding); }
+}
+if (!function_exists('iconv_mime_encode')) {
+    function iconv_mime_encode($field_name, $field_value, $options = null) { return p\Iconv::iconv_mime_encode($field_name, $field_value, $options); }
+}
+if (!function_exists('iconv_mime_decode_headers')) {
+    function iconv_mime_decode_headers($headers, $mode = 0, $encoding = null) { return p\Iconv::iconv_mime_decode_headers($headers, $mode, $encoding); }
+}
+
+if (extension_loaded('mbstring')) {
+    if (!function_exists('iconv_strlen')) {
+        function iconv_strlen($string, $encoding = null) { null === $encoding && $encoding = p\Iconv::$internalEncoding; return mb_strlen($string, $encoding); }
+    }
+    if (!function_exists('iconv_strpos')) {
+        function iconv_strpos($haystack, $needle, $offset = 0, $encoding = null) { null === $encoding && $encoding = p\Iconv::$internalEncoding; return mb_strpos($haystack, $needle, $offset, $encoding); }
+    }
+    if (!function_exists('iconv_strrpos')) {
+        function iconv_strrpos($haystack, $needle, $encoding = null) { null === $encoding && $encoding = p\Iconv::$internalEncoding; return mb_strrpos($haystack, $needle, 0, $encoding); }
+    }
+    if (!function_exists('iconv_substr')) {
+        function iconv_substr($string, $offset, $length = 2147483647, $encoding = null) { null === $encoding && $encoding = p\Iconv::$internalEncoding; return mb_substr($string, $offset, $length, $encoding); }
+    }
+    if (!function_exists('iconv_mime_decode')) {
+        function iconv_mime_decode($string, $mode = 0, $encoding = null) { null === $encoding && $encoding = p\Iconv::$internalEncoding; return mb_decode_mimeheader($string, $mode, $encoding); }
+    }
+} else {
+    if (!function_exists('iconv_strlen')) {
+        if (extension_loaded('xml')) {
+            function iconv_strlen($string, $encoding = null) { return p\Iconv::strlen1($string, $encoding); }
+        } else {
+            function iconv_strlen($string, $encoding = null) { return p\Iconv::strlen2($string, $encoding); }
+        }
+    }
+
+    if (!function_exists('iconv_strpos')) {
+        function iconv_strpos($haystack, $needle, $offset = 0, $encoding = null) { return p\Iconv::iconv_strpos($haystack, $needle, $offset, $encoding); }
+    }
+    if (!function_exists('iconv_strrpos')) {
+        function iconv_strrpos($haystack, $needle, $encoding = null) { return p\Iconv::iconv_strrpos($haystack, $needle, $encoding); }
+    }
+    if (!function_exists('iconv_substr')) {
+        function iconv_substr($string, $offset, $length = 2147483647, $encoding = null) { return p\Iconv::iconv_substr($string, $offset, $length, $encoding); }
+    }
+    if (!function_exists('iconv_mime_decode')) {
+        function iconv_mime_decode($string, $mode = 0, $encoding = null) { return p\Iconv::iconv_mime_decode($string, $mode, $encoding); }
+    }
+}
diff --git a/lib/symfony/polyfill-iconv/composer.json b/lib/symfony/polyfill-iconv/composer.json
new file mode 100644
index 000000000..727f74281
--- /dev/null
+++ b/lib/symfony/polyfill-iconv/composer.json
@@ -0,0 +1,38 @@
+{
+    "name": "symfony/polyfill-iconv",
+    "type": "library",
+    "description": "Symfony polyfill for the Iconv extension",
+    "keywords": ["polyfill", "shim", "compatibility", "portable", "iconv"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Nicolas Grekas",
+            "email": "p@tchwork.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Polyfill\\Iconv\\": "" },
+        "files": [ "bootstrap.php" ]
+    },
+    "suggest": {
+        "ext-iconv": "For best performance"
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-main": "1.19-dev"
+        },
+        "thanks": {
+            "name": "symfony/polyfill",
+            "url": "https://github.com/symfony/polyfill"
+        }
+    }
+}
diff --git a/lib/symfony/polyfill-intl-idn/Idn.php b/lib/symfony/polyfill-intl-idn/Idn.php
new file mode 100644
index 000000000..bccea3ec5
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Idn.php
@@ -0,0 +1,923 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com> and Trevor Rowbotham <trevor.rowbotham@pm.me>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Intl\Idn;
+
+use Exception;
+use Normalizer;
+use Symfony\Polyfill\Intl\Idn\Resources\unidata\DisallowedRanges;
+use Symfony\Polyfill\Intl\Idn\Resources\unidata\Regex;
+
+/**
+ * @see https://www.unicode.org/reports/tr46/
+ *
+ * @internal
+ */
+final class Idn
+{
+    const ERROR_EMPTY_LABEL = 1;
+    const ERROR_LABEL_TOO_LONG = 2;
+    const ERROR_DOMAIN_NAME_TOO_LONG = 4;
+    const ERROR_LEADING_HYPHEN = 8;
+    const ERROR_TRAILING_HYPHEN = 0x10;
+    const ERROR_HYPHEN_3_4 = 0x20;
+    const ERROR_LEADING_COMBINING_MARK = 0x40;
+    const ERROR_DISALLOWED = 0x80;
+    const ERROR_PUNYCODE = 0x100;
+    const ERROR_LABEL_HAS_DOT = 0x200;
+    const ERROR_INVALID_ACE_LABEL = 0x400;
+    const ERROR_BIDI = 0x800;
+    const ERROR_CONTEXTJ = 0x1000;
+    const ERROR_CONTEXTO_PUNCTUATION = 0x2000;
+    const ERROR_CONTEXTO_DIGITS = 0x4000;
+
+    const INTL_IDNA_VARIANT_2003 = 0;
+    const INTL_IDNA_VARIANT_UTS46 = 1;
+
+    const IDNA_DEFAULT = 0;
+    const IDNA_ALLOW_UNASSIGNED = 1;
+    const IDNA_USE_STD3_RULES = 2;
+    const IDNA_CHECK_BIDI = 4;
+    const IDNA_CHECK_CONTEXTJ = 8;
+    const IDNA_NONTRANSITIONAL_TO_ASCII = 16;
+    const IDNA_NONTRANSITIONAL_TO_UNICODE = 32;
+
+    const MAX_DOMAIN_SIZE = 253;
+    const MAX_LABEL_SIZE = 63;
+
+    const BASE = 36;
+    const TMIN = 1;
+    const TMAX = 26;
+    const SKEW = 38;
+    const DAMP = 700;
+    const INITIAL_BIAS = 72;
+    const INITIAL_N = 128;
+    const DELIMITER = '-';
+    const MAX_INT = 2147483647;
+
+    /**
+     * Contains the numeric value of a basic code point (for use in representing integers) in the
+     * range 0 to BASE-1, or -1 if b is does not represent a value.
+     *
+     * @var array<int, int>
+     */
+    private static $basicToDigit = array(
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        26, 27, 28, 29, 30, 31, 32, 33, 34, 35, -1, -1, -1, -1, -1, -1,
+
+        -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
+        15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
+
+        -1,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14,
+        15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, -1, -1, -1, -1, -1,
+
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+        -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    );
+
+    /**
+     * @var array<int, int>
+     */
+    private static $virama;
+
+    /**
+     * @var array<int, string>
+     */
+    private static $mapped;
+
+    /**
+     * @var array<int, bool>
+     */
+    private static $ignored;
+
+    /**
+     * @var array<int, string>
+     */
+    private static $deviation;
+
+    /**
+     * @var array<int, bool>
+     */
+    private static $disallowed;
+
+    /**
+     * @var array<int, string>
+     */
+    private static $disallowed_STD3_mapped;
+
+    /**
+     * @var array<int, bool>
+     */
+    private static $disallowed_STD3_valid;
+
+    /**
+     * @var bool
+     */
+    private static $mappingTableLoaded = false;
+
+    /**
+     * @see https://www.unicode.org/reports/tr46/#ToASCII
+     *
+     * @param string $domainName
+     * @param int    $options
+     * @param int    $variant
+     * @param array  $idna_info
+     *
+     * @return string|false
+     */
+    public static function idn_to_ascii($domainName, $options = self::IDNA_DEFAULT, $variant = self::INTL_IDNA_VARIANT_UTS46, &$idna_info = array())
+    {
+        if (\PHP_VERSION_ID >= 70200 && self::INTL_IDNA_VARIANT_2003 === $variant) {
+            @trigger_error('idn_to_ascii(): INTL_IDNA_VARIANT_2003 is deprecated', E_USER_DEPRECATED);
+        }
+
+        $options = array(
+            'CheckHyphens' => true,
+            'CheckBidi' => self::INTL_IDNA_VARIANT_2003 === $variant || 0 !== ($options & self::IDNA_CHECK_BIDI),
+            'CheckJoiners' => self::INTL_IDNA_VARIANT_UTS46 === $variant && 0 !== ($options & self::IDNA_CHECK_CONTEXTJ),
+            'UseSTD3ASCIIRules' => 0 !== ($options & self::IDNA_USE_STD3_RULES),
+            'Transitional_Processing' => self::INTL_IDNA_VARIANT_2003 === $variant || 0 === ($options & self::IDNA_NONTRANSITIONAL_TO_ASCII),
+            'VerifyDnsLength' => true,
+        );
+        $info = new Info();
+        $labels = self::process((string) $domainName, $options, $info);
+
+        foreach ($labels as $i => $label) {
+            // Only convert labels to punycode that contain non-ASCII code points
+            if (1 === preg_match('/[^\x00-\x7F]/', $label)) {
+                try {
+                    $label = 'xn--'.self::punycodeEncode($label);
+                } catch (Exception $e) {
+                    $info->errors |= self::ERROR_PUNYCODE;
+                }
+
+                $labels[$i] = $label;
+            }
+        }
+
+        if ($options['VerifyDnsLength']) {
+            self::validateDomainAndLabelLength($labels, $info);
+        }
+
+        $idna_info = array(
+            'result' => implode('.', $labels),
+            'isTransitionalDifferent' => $info->transitionalDifferent,
+            'errors' => $info->errors,
+        );
+
+        return 0 === $info->errors ? $idna_info['result'] : false;
+    }
+
+    /**
+     * @see https://www.unicode.org/reports/tr46/#ToUnicode
+     *
+     * @param string $domainName
+     * @param int    $options
+     * @param int    $variant
+     * @param array  $idna_info
+     *
+     * @return string|false
+     */
+    public static function idn_to_utf8($domainName, $options = self::IDNA_DEFAULT, $variant = self::INTL_IDNA_VARIANT_UTS46, &$idna_info = array())
+    {
+        if (\PHP_VERSION_ID >= 70200 && self::INTL_IDNA_VARIANT_2003 === $variant) {
+            @trigger_error('idn_to_utf8(): INTL_IDNA_VARIANT_2003 is deprecated', E_USER_DEPRECATED);
+        }
+
+        $info = new Info();
+        $labels = self::process((string) $domainName, array(
+            'CheckHyphens' => true,
+            'CheckBidi' => self::INTL_IDNA_VARIANT_2003 === $variant || 0 !== ($options & self::IDNA_CHECK_BIDI),
+            'CheckJoiners' => self::INTL_IDNA_VARIANT_UTS46 === $variant && 0 !== ($options & self::IDNA_CHECK_CONTEXTJ),
+            'UseSTD3ASCIIRules' => 0 !== ($options & self::IDNA_USE_STD3_RULES),
+            'Transitional_Processing' => self::INTL_IDNA_VARIANT_2003 === $variant || 0 === ($options & self::IDNA_NONTRANSITIONAL_TO_UNICODE),
+        ), $info);
+        $idna_info = array(
+            'result' => implode('.', $labels),
+            'isTransitionalDifferent' => $info->transitionalDifferent,
+            'errors' => $info->errors,
+        );
+
+        return 0 === $info->errors ? $idna_info['result'] : false;
+    }
+
+    /**
+     * @param string $label
+     *
+     * @return bool
+     */
+    private static function isValidContextJ(array $codePoints, $label)
+    {
+        if (!isset(self::$virama)) {
+            self::$virama = require __DIR__.\DIRECTORY_SEPARATOR.'Resources'.\DIRECTORY_SEPARATOR.'unidata'.\DIRECTORY_SEPARATOR.'virama.php';
+        }
+
+        $offset = 0;
+
+        foreach ($codePoints as $i => $codePoint) {
+            if (0x200C !== $codePoint && 0x200D !== $codePoint) {
+                continue;
+            }
+
+            if (!isset($codePoints[$i - 1])) {
+                return false;
+            }
+
+            // If Canonical_Combining_Class(Before(cp)) .eq. Virama Then True;
+            if (isset(self::$virama[$codePoints[$i - 1]])) {
+                continue;
+            }
+
+            // If RegExpMatch((Joining_Type:{L,D})(Joining_Type:T)*\u200C(Joining_Type:T)*(Joining_Type:{R,D})) Then
+            // True;
+            // Generated RegExp = ([Joining_Type:{L,D}][Joining_Type:T]*\u200C[Joining_Type:T]*)[Joining_Type:{R,D}]
+            if (0x200C === $codePoint && 1 === preg_match(Regex::ZWNJ, $label, $matches, PREG_OFFSET_CAPTURE, $offset)) {
+                $offset += \strlen($matches[1][0]);
+
+                continue;
+            }
+
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * @see https://www.unicode.org/reports/tr46/#ProcessingStepMap
+     *
+     * @param string              $input
+     * @param array<string, bool> $options
+     *
+     * @return string
+     */
+    private static function mapCodePoints($input, array $options, Info $info)
+    {
+        $str = '';
+        $useSTD3ASCIIRules = $options['UseSTD3ASCIIRules'];
+        $transitional = $options['Transitional_Processing'];
+
+        foreach (self::utf8Decode($input) as $codePoint) {
+            $data = self::lookupCodePointStatus($codePoint, $useSTD3ASCIIRules);
+
+            switch ($data['status']) {
+                case 'disallowed':
+                    $info->errors |= self::ERROR_DISALLOWED;
+
+                    // no break.
+
+                case 'valid':
+                    $str .= mb_chr($codePoint, 'utf-8');
+
+                    break;
+
+                case 'ignored':
+                    // Do nothing.
+                    break;
+
+                case 'mapped':
+                    $str .= $data['mapping'];
+
+                    break;
+
+                case 'deviation':
+                    $info->transitionalDifferent = true;
+                    $str .= ($transitional ? $data['mapping'] : mb_chr($codePoint, 'utf-8'));
+
+                    break;
+            }
+        }
+
+        return $str;
+    }
+
+    /**
+     * @see https://www.unicode.org/reports/tr46/#Processing
+     *
+     * @param string              $domain
+     * @param array<string, bool> $options
+     *
+     * @return array<int, string>
+     */
+    private static function process($domain, array $options, Info $info)
+    {
+        // If VerifyDnsLength is not set, we are doing ToUnicode otherwise we are doing ToASCII and
+        // we need to respect the VerifyDnsLength option.
+        $checkForEmptyLabels = !isset($options['VerifyDnsLength']) || $options['VerifyDnsLength'];
+
+        if ($checkForEmptyLabels && '' === $domain) {
+            $info->errors |= self::ERROR_EMPTY_LABEL;
+
+            return array($domain);
+        }
+
+        // Step 1. Map each code point in the domain name string
+        $domain = self::mapCodePoints($domain, $options, $info);
+
+        // Step 2. Normalize the domain name string to Unicode Normalization Form C.
+        if (!Normalizer::isNormalized($domain, Normalizer::FORM_C)) {
+            $domain = Normalizer::normalize($domain, Normalizer::FORM_C);
+        }
+
+        // Step 3. Break the string into labels at U+002E (.) FULL STOP.
+        $labels = explode('.', $domain);
+        $lastLabelIndex = \count($labels) - 1;
+
+        // Step 4. Convert and validate each label in the domain name string.
+        foreach ($labels as $i => $label) {
+            $validationOptions = $options;
+
+            if ('xn--' === substr($label, 0, 4)) {
+                try {
+                    $label = self::punycodeDecode(substr($label, 4));
+                } catch (Exception $e) {
+                    $info->errors |= self::ERROR_PUNYCODE;
+
+                    continue;
+                }
+
+                $validationOptions['Transitional_Processing'] = false;
+                $labels[$i] = $label;
+            }
+
+            self::validateLabel($label, $info, $validationOptions, $i > 0 && $i === $lastLabelIndex);
+        }
+
+        if ($info->bidiDomain && !$info->validBidiDomain) {
+            $info->errors |= self::ERROR_BIDI;
+        }
+
+        // Any input domain name string that does not record an error has been successfully
+        // processed according to this specification. Conversely, if an input domain_name string
+        // causes an error, then the processing of the input domain_name string fails. Determining
+        // what to do with error input is up to the caller, and not in the scope of this document.
+        return $labels;
+    }
+
+    /**
+     * @see https://tools.ietf.org/html/rfc5893#section-2
+     *
+     * @param string $label
+     */
+    private static function validateBidiLabel($label, Info $info)
+    {
+        if (1 === preg_match(Regex::RTL_LABEL, $label)) {
+            $info->bidiDomain = true;
+
+            // Step 1. The first character must be a character with Bidi property L, R, or AL.
+            // If it has the R or AL property, it is an RTL label
+            if (1 !== preg_match(Regex::BIDI_STEP_1_RTL, $label)) {
+                $info->validBidiDomain = false;
+
+                return;
+            }
+
+            // Step 2. In an RTL label, only characters with the Bidi properties R, AL, AN, EN, ES,
+            // CS, ET, ON, BN, or NSM are allowed.
+            if (1 === preg_match(Regex::BIDI_STEP_2, $label)) {
+                $info->validBidiDomain = false;
+
+                return;
+            }
+
+            // Step 3. In an RTL label, the end of the label must be a character with Bidi property
+            // R, AL, EN, or AN, followed by zero or more characters with Bidi property NSM.
+            if (1 !== preg_match(Regex::BIDI_STEP_3, $label)) {
+                $info->validBidiDomain = false;
+
+                return;
+            }
+
+            // Step 4. In an RTL label, if an EN is present, no AN may be present, and vice versa.
+            if (1 === preg_match(Regex::BIDI_STEP_4_AN, $label) && 1 === preg_match(Regex::BIDI_STEP_4_EN, $label)) {
+                $info->validBidiDomain = false;
+
+                return;
+            }
+
+            return;
+        }
+
+        // We are a LTR label
+        // Step 1. The first character must be a character with Bidi property L, R, or AL.
+        // If it has the L property, it is an LTR label.
+        if (1 !== preg_match(Regex::BIDI_STEP_1_LTR, $label)) {
+            $info->validBidiDomain = false;
+
+            return;
+        }
+
+        // Step 5. In an LTR label, only characters with the Bidi properties L, EN,
+        // ES, CS, ET, ON, BN, or NSM are allowed.
+        if (1 === preg_match(Regex::BIDI_STEP_5, $label)) {
+            $info->validBidiDomain = false;
+
+            return;
+        }
+
+        // Step 6.In an LTR label, the end of the label must be a character with Bidi property L or
+        // EN, followed by zero or more characters with Bidi property NSM.
+        if (1 !== preg_match(Regex::BIDI_STEP_6, $label)) {
+            $info->validBidiDomain = false;
+
+            return;
+        }
+    }
+
+    /**
+     * @param array<int, string> $labels
+     */
+    private static function validateDomainAndLabelLength(array $labels, Info $info)
+    {
+        $maxDomainSize = self::MAX_DOMAIN_SIZE;
+        $length = \count($labels);
+
+        // Number of "." delimiters.
+        $domainLength = $length - 1;
+
+        // If the last label is empty and it is not the first label, then it is the root label.
+        // Increase the max size by 1, making it 254, to account for the root label's "."
+        // delimiter. This also means we don't need to check the last label's length for being too
+        // long.
+        if ($length > 1 && '' === $labels[$length - 1]) {
+            ++$maxDomainSize;
+            --$length;
+        }
+
+        for ($i = 0; $i < $length; ++$i) {
+            $bytes = \strlen($labels[$i]);
+            $domainLength += $bytes;
+
+            if ($bytes > self::MAX_LABEL_SIZE) {
+                $info->errors |= self::ERROR_LABEL_TOO_LONG;
+            }
+        }
+
+        if ($domainLength > $maxDomainSize) {
+            $info->errors |= self::ERROR_DOMAIN_NAME_TOO_LONG;
+        }
+    }
+
+    /**
+     * @see https://www.unicode.org/reports/tr46/#Validity_Criteria
+     *
+     * @param string              $label
+     * @param array<string, bool> $options
+     * @param bool                $canBeEmpty
+     */
+    private static function validateLabel($label, Info $info, array $options, $canBeEmpty)
+    {
+        if ('' === $label) {
+            if (!$canBeEmpty && (!isset($options['VerifyDnsLength']) || $options['VerifyDnsLength'])) {
+                $info->errors |= self::ERROR_EMPTY_LABEL;
+            }
+
+            return;
+        }
+
+        // Step 1. The label must be in Unicode Normalization Form C.
+        if (!Normalizer::isNormalized($label, Normalizer::FORM_C)) {
+            $info->errors |= self::ERROR_INVALID_ACE_LABEL;
+        }
+
+        $codePoints = self::utf8Decode($label);
+
+        if ($options['CheckHyphens']) {
+            // Step 2. If CheckHyphens, the label must not contain a U+002D HYPHEN-MINUS character
+            // in both the thrid and fourth positions.
+            if (isset($codePoints[2], $codePoints[3]) && 0x002D === $codePoints[2] && 0x002D === $codePoints[3]) {
+                $info->errors |= self::ERROR_HYPHEN_3_4;
+            }
+
+            // Step 3. If CheckHyphens, the label must neither begin nor end with a U+002D
+            // HYPHEN-MINUS character.
+            if ('-' === substr($label, 0, 1)) {
+                $info->errors |= self::ERROR_LEADING_HYPHEN;
+            }
+
+            if ('-' === substr($label, -1, 1)) {
+                $info->errors |= self::ERROR_TRAILING_HYPHEN;
+            }
+        }
+
+        // Step 4. The label must not contain a U+002E (.) FULL STOP.
+        if (false !== strpos($label, '.')) {
+            $info->errors |= self::ERROR_LABEL_HAS_DOT;
+        }
+
+        // Step 5. The label must not begin with a combining mark, that is: General_Category=Mark.
+        if (1 === preg_match(Regex::COMBINING_MARK, $label)) {
+            $info->errors |= self::ERROR_LEADING_COMBINING_MARK;
+        }
+
+        // Step 6. Each code point in the label must only have certain status values according to
+        // Section 5, IDNA Mapping Table:
+        $transitional = $options['Transitional_Processing'];
+        $useSTD3ASCIIRules = $options['UseSTD3ASCIIRules'];
+
+        foreach ($codePoints as $codePoint) {
+            $data = self::lookupCodePointStatus($codePoint, $useSTD3ASCIIRules);
+            $status = $data['status'];
+
+            if ('valid' === $status || (!$transitional && 'deviation' === $status)) {
+                continue;
+            }
+
+            $info->errors |= self::ERROR_DISALLOWED;
+
+            break;
+        }
+
+        // Step 7. If CheckJoiners, the label must satisify the ContextJ rules from Appendix A, in
+        // The Unicode Code Points and Internationalized Domain Names for Applications (IDNA)
+        // [IDNA2008].
+        if ($options['CheckJoiners'] && !self::isValidContextJ($codePoints, $label)) {
+            $info->errors |= self::ERROR_CONTEXTJ;
+        }
+
+        // Step 8. If CheckBidi, and if the domain name is a  Bidi domain name, then the label must
+        // satisfy all six of the numbered conditions in [IDNA2008] RFC 5893, Section 2.
+        if ($options['CheckBidi'] && (!$info->bidiDomain || $info->validBidiDomain)) {
+            self::validateBidiLabel($label, $info);
+        }
+    }
+
+    /**
+     * @see https://tools.ietf.org/html/rfc3492#section-6.2
+     *
+     * @param string $input
+     *
+     * @return string
+     */
+    private static function punycodeDecode($input)
+    {
+        $n = self::INITIAL_N;
+        $out = 0;
+        $i = 0;
+        $bias = self::INITIAL_BIAS;
+        $lastDelimIndex = strrpos($input, self::DELIMITER);
+        $b = false === $lastDelimIndex ? 0 : $lastDelimIndex;
+        $inputLength = \strlen($input);
+        $output = array();
+        $bytes = array_map('ord', str_split($input));
+
+        for ($j = 0; $j < $b; ++$j) {
+            if ($bytes[$j] > 0x7F) {
+                throw new Exception('Invalid input');
+            }
+
+            $output[$out++] = $input[$j];
+        }
+
+        if ($b > 0) {
+            ++$b;
+        }
+
+        for ($in = $b; $in < $inputLength; ++$out) {
+            $oldi = $i;
+            $w = 1;
+
+            for ($k = self::BASE; /* no condition */; $k += self::BASE) {
+                if ($in >= $inputLength) {
+                    throw new Exception('Invalid input');
+                }
+
+                $digit = self::$basicToDigit[$bytes[$in++] & 0xFF];
+
+                if ($digit < 0) {
+                    throw new Exception('Invalid input');
+                }
+
+                if ($digit > intdiv(self::MAX_INT - $i, $w)) {
+                    throw new Exception('Integer overflow');
+                }
+
+                $i += $digit * $w;
+
+                if ($k <= $bias) {
+                    $t = self::TMIN;
+                } elseif ($k >= $bias + self::TMAX) {
+                    $t = self::TMAX;
+                } else {
+                    $t = $k - $bias;
+                }
+
+                if ($digit < $t) {
+                    break;
+                }
+
+                $baseMinusT = self::BASE - $t;
+
+                if ($w > intdiv(self::MAX_INT, $baseMinusT)) {
+                    throw new Exception('Integer overflow');
+                }
+
+                $w *= $baseMinusT;
+            }
+
+            $outPlusOne = $out + 1;
+            $bias = self::adaptBias($i - $oldi, $outPlusOne, 0 === $oldi);
+
+            if (intdiv($i, $outPlusOne) > self::MAX_INT - $n) {
+                throw new Exception('Integer overflow');
+            }
+
+            $n += intdiv($i, $outPlusOne);
+            $i %= $outPlusOne;
+            array_splice($output, $i++, 0, array(mb_chr($n, 'utf-8')));
+        }
+
+        return implode('', $output);
+    }
+
+    /**
+     * @see https://tools.ietf.org/html/rfc3492#section-6.3
+     *
+     * @param string $input
+     *
+     * @return string
+     */
+    private static function punycodeEncode($input)
+    {
+        $n = self::INITIAL_N;
+        $delta = 0;
+        $out = 0;
+        $bias = self::INITIAL_BIAS;
+        $inputLength = 0;
+        $output = '';
+        $iter = self::utf8Decode($input);
+
+        foreach ($iter as $codePoint) {
+            ++$inputLength;
+
+            if ($codePoint < 0x80) {
+                $output .= \chr($codePoint);
+                ++$out;
+            }
+        }
+
+        $h = $out;
+        $b = $out;
+
+        if ($b > 0) {
+            $output .= self::DELIMITER;
+            ++$out;
+        }
+
+        while ($h < $inputLength) {
+            $m = self::MAX_INT;
+
+            foreach ($iter as $codePoint) {
+                if ($codePoint >= $n && $codePoint < $m) {
+                    $m = $codePoint;
+                }
+            }
+
+            if ($m - $n > intdiv(self::MAX_INT - $delta, $h + 1)) {
+                throw new Exception('Integer overflow');
+            }
+
+            $delta += ($m - $n) * ($h + 1);
+            $n = $m;
+
+            foreach ($iter as $codePoint) {
+                if ($codePoint < $n && 0 === ++$delta) {
+                    throw new Exception('Integer overflow');
+                } elseif ($codePoint === $n) {
+                    $q = $delta;
+
+                    for ($k = self::BASE; /* no condition */; $k += self::BASE) {
+                        if ($k <= $bias) {
+                            $t = self::TMIN;
+                        } elseif ($k >= $bias + self::TMAX) {
+                            $t = self::TMAX;
+                        } else {
+                            $t = $k - $bias;
+                        }
+
+                        if ($q < $t) {
+                            break;
+                        }
+
+                        $qMinusT = $q - $t;
+                        $baseMinusT = self::BASE - $t;
+                        $output .= self::encodeDigit($t + ($qMinusT) % ($baseMinusT), false);
+                        ++$out;
+                        $q = intdiv($qMinusT, $baseMinusT);
+                    }
+
+                    $output .= self::encodeDigit($q, false);
+                    ++$out;
+                    $bias = self::adaptBias($delta, $h + 1, $h === $b);
+                    $delta = 0;
+                    ++$h;
+                }
+            }
+
+            ++$delta;
+            ++$n;
+        }
+
+        return $output;
+    }
+
+    /**
+     * @see https://tools.ietf.org/html/rfc3492#section-6.1
+     *
+     * @param int  $delta
+     * @param int  $numPoints
+     * @param bool $firstTime
+     *
+     * @return int
+     */
+    private static function adaptBias($delta, $numPoints, $firstTime)
+    {
+        // xxx >> 1 is a faster way of doing intdiv(xxx, 2)
+        $delta = $firstTime ? intdiv($delta, self::DAMP) : $delta >> 1;
+        $delta += intdiv($delta, $numPoints);
+        $k = 0;
+
+        while ($delta > ((self::BASE - self::TMIN) * self::TMAX) >> 1) {
+            $delta = intdiv($delta, self::BASE - self::TMIN);
+            $k += self::BASE;
+        }
+
+        return $k + intdiv((self::BASE - self::TMIN + 1) * $delta, $delta + self::SKEW);
+    }
+
+    /**
+     * @param int  $d
+     * @param bool $flag
+     *
+     * @return string
+     */
+    private static function encodeDigit($d, $flag)
+    {
+        return \chr($d + 22 + 75 * ($d < 26 ? 1 : 0) - (($flag ? 1 : 0) << 5));
+    }
+
+    /**
+     * Takes a UTF-8 encoded string and converts it into a series of integer code points. Any
+     * invalid byte sequences will be replaced by a U+FFFD replacement code point.
+     *
+     * @see https://encoding.spec.whatwg.org/#utf-8-decoder
+     *
+     * @param string $input
+     *
+     * @return array<int, int>
+     */
+    private static function utf8Decode($input)
+    {
+        $bytesSeen = 0;
+        $bytesNeeded = 0;
+        $lowerBoundary = 0x80;
+        $upperBoundary = 0xBF;
+        $codePoint = 0;
+        $codePoints = array();
+        $length = \strlen($input);
+
+        for ($i = 0; $i < $length; ++$i) {
+            $byte = \ord($input[$i]);
+
+            if (0 === $bytesNeeded) {
+                if ($byte >= 0x00 && $byte <= 0x7F) {
+                    $codePoints[] = $byte;
+
+                    continue;
+                }
+
+                if ($byte >= 0xC2 && $byte <= 0xDF) {
+                    $bytesNeeded = 1;
+                    $codePoint = $byte & 0x1F;
+                } elseif ($byte >= 0xE0 && $byte <= 0xEF) {
+                    if (0xE0 === $byte) {
+                        $lowerBoundary = 0xA0;
+                    } elseif (0xED === $byte) {
+                        $upperBoundary = 0x9F;
+                    }
+
+                    $bytesNeeded = 2;
+                    $codePoint = $byte & 0xF;
+                } elseif ($byte >= 0xF0 && $byte <= 0xF4) {
+                    if (0xF0 === $byte) {
+                        $lowerBoundary = 0x90;
+                    } elseif (0xF4 === $byte) {
+                        $upperBoundary = 0x8F;
+                    }
+
+                    $bytesNeeded = 3;
+                    $codePoint = $byte & 0x7;
+                } else {
+                    $codePoints[] = 0xFFFD;
+                }
+
+                continue;
+            }
+
+            if ($byte < $lowerBoundary || $byte > $upperBoundary) {
+                $codePoint = 0;
+                $bytesNeeded = 0;
+                $bytesSeen = 0;
+                $lowerBoundary = 0x80;
+                $upperBoundary = 0xBF;
+                --$i;
+                $codePoints[] = 0xFFFD;
+
+                continue;
+            }
+
+            $lowerBoundary = 0x80;
+            $upperBoundary = 0xBF;
+            $codePoint = ($codePoint << 6) | ($byte & 0x3F);
+
+            if (++$bytesSeen !== $bytesNeeded) {
+                continue;
+            }
+
+            $codePoints[] = $codePoint;
+            $codePoint = 0;
+            $bytesNeeded = 0;
+            $bytesSeen = 0;
+        }
+
+        // String unexpectedly ended, so append a U+FFFD code point.
+        if (0 !== $bytesNeeded) {
+            $codePoints[] = 0xFFFD;
+        }
+
+        return $codePoints;
+    }
+
+    /**
+     * @param int  $codePoint
+     * @param bool $useSTD3ASCIIRules
+     *
+     * @return array{status: string, mapping?: string}
+     */
+    private static function lookupCodePointStatus($codePoint, $useSTD3ASCIIRules)
+    {
+        if (!self::$mappingTableLoaded) {
+            self::$mappingTableLoaded = true;
+            self::$mapped = require __DIR__.'/Resources/unidata/mapped.php';
+            self::$ignored = require __DIR__.'/Resources/unidata/ignored.php';
+            self::$deviation = require __DIR__.'/Resources/unidata/deviation.php';
+            self::$disallowed = require __DIR__.'/Resources/unidata/disallowed.php';
+            self::$disallowed_STD3_mapped = require __DIR__.'/Resources/unidata/disallowed_STD3_mapped.php';
+            self::$disallowed_STD3_valid = require __DIR__.'/Resources/unidata/disallowed_STD3_valid.php';
+        }
+
+        if (isset(self::$mapped[$codePoint])) {
+            return array('status' => 'mapped', 'mapping' => self::$mapped[$codePoint]);
+        }
+
+        if (isset(self::$ignored[$codePoint])) {
+            return array('status' => 'ignored');
+        }
+
+        if (isset(self::$deviation[$codePoint])) {
+            return array('status' => 'deviation', 'mapping' => self::$deviation[$codePoint]);
+        }
+
+        if (isset(self::$disallowed[$codePoint]) || DisallowedRanges::inRange($codePoint)) {
+            return array('status' => 'disallowed');
+        }
+
+        $isDisallowedMapped = isset(self::$disallowed_STD3_mapped[$codePoint]);
+
+        if ($isDisallowedMapped || isset(self::$disallowed_STD3_valid[$codePoint])) {
+            $status = 'disallowed';
+
+            if (!$useSTD3ASCIIRules) {
+                $status = $isDisallowedMapped ? 'mapped' : 'valid';
+            }
+
+            if ($isDisallowedMapped) {
+                return array('status' => $status, 'mapping' => self::$disallowed_STD3_mapped[$codePoint]);
+            }
+
+            return array('status' => $status);
+        }
+
+        return array('status' => 'valid');
+    }
+}
diff --git a/lib/symfony/polyfill-intl-idn/Info.php b/lib/symfony/polyfill-intl-idn/Info.php
new file mode 100644
index 000000000..25c3582b2
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Info.php
@@ -0,0 +1,23 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com> and Trevor Rowbotham <trevor.rowbotham@pm.me>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Intl\Idn;
+
+/**
+ * @internal
+ */
+class Info
+{
+    public $bidiDomain = false;
+    public $errors = 0;
+    public $validBidiDomain = true;
+    public $transitionalDifferent = false;
+}
diff --git a/lib/symfony/polyfill-intl-idn/LICENSE b/lib/symfony/polyfill-intl-idn/LICENSE
new file mode 100644
index 000000000..03c5e2577
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2018-2019 Fabien Potencier and Trevor Rowbotham <trevor.rowbotham@pm.me>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/lib/symfony/polyfill-intl-idn/README.md b/lib/symfony/polyfill-intl-idn/README.md
new file mode 100644
index 000000000..2e75f2e52
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/README.md
@@ -0,0 +1,12 @@
+Symfony Polyfill / Intl: Idn
+============================
+
+This component provides [`idn_to_ascii`](https://php.net/idn-to-ascii) and [`idn_to_utf8`](https://php.net/idn-to-utf8) functions to users who run php versions without the [Intl](https://php.net/intl) extension.
+
+More information can be found in the
+[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
+
+License
+=======
+
+This library is released under the [MIT license](LICENSE).
diff --git a/lib/symfony/polyfill-intl-idn/Resources/unidata/DisallowedRanges.php b/lib/symfony/polyfill-intl-idn/Resources/unidata/DisallowedRanges.php
new file mode 100644
index 000000000..5bb70e48a
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Resources/unidata/DisallowedRanges.php
@@ -0,0 +1,375 @@
+<?php
+
+namespace Symfony\Polyfill\Intl\Idn\Resources\unidata;
+
+/**
+ * @internal
+ */
+final class DisallowedRanges
+{
+    /**
+     * @param int $codePoint
+     *
+     * @return bool
+     */
+    public static function inRange($codePoint)
+    {
+        if ($codePoint >= 128 && $codePoint <= 159) {
+            return true;
+        }
+
+        if ($codePoint >= 2155 && $codePoint <= 2207) {
+            return true;
+        }
+
+        if ($codePoint >= 3676 && $codePoint <= 3712) {
+            return true;
+        }
+
+        if ($codePoint >= 3808 && $codePoint <= 3839) {
+            return true;
+        }
+
+        if ($codePoint >= 4059 && $codePoint <= 4095) {
+            return true;
+        }
+
+        if ($codePoint >= 4256 && $codePoint <= 4293) {
+            return true;
+        }
+
+        if ($codePoint >= 6849 && $codePoint <= 6911) {
+            return true;
+        }
+
+        if ($codePoint >= 11859 && $codePoint <= 11903) {
+            return true;
+        }
+
+        if ($codePoint >= 42955 && $codePoint <= 42996) {
+            return true;
+        }
+
+        if ($codePoint >= 55296 && $codePoint <= 57343) {
+            return true;
+        }
+
+        if ($codePoint >= 57344 && $codePoint <= 63743) {
+            return true;
+        }
+
+        if ($codePoint >= 64218 && $codePoint <= 64255) {
+            return true;
+        }
+
+        if ($codePoint >= 64976 && $codePoint <= 65007) {
+            return true;
+        }
+
+        if ($codePoint >= 65630 && $codePoint <= 65663) {
+            return true;
+        }
+
+        if ($codePoint >= 65953 && $codePoint <= 65999) {
+            return true;
+        }
+
+        if ($codePoint >= 66046 && $codePoint <= 66175) {
+            return true;
+        }
+
+        if ($codePoint >= 66518 && $codePoint <= 66559) {
+            return true;
+        }
+
+        if ($codePoint >= 66928 && $codePoint <= 67071) {
+            return true;
+        }
+
+        if ($codePoint >= 67432 && $codePoint <= 67583) {
+            return true;
+        }
+
+        if ($codePoint >= 67760 && $codePoint <= 67807) {
+            return true;
+        }
+
+        if ($codePoint >= 67904 && $codePoint <= 67967) {
+            return true;
+        }
+
+        if ($codePoint >= 68256 && $codePoint <= 68287) {
+            return true;
+        }
+
+        if ($codePoint >= 68528 && $codePoint <= 68607) {
+            return true;
+        }
+
+        if ($codePoint >= 68681 && $codePoint <= 68735) {
+            return true;
+        }
+
+        if ($codePoint >= 68922 && $codePoint <= 69215) {
+            return true;
+        }
+
+        if ($codePoint >= 69298 && $codePoint <= 69375) {
+            return true;
+        }
+
+        if ($codePoint >= 69466 && $codePoint <= 69551) {
+            return true;
+        }
+
+        if ($codePoint >= 70207 && $codePoint <= 70271) {
+            return true;
+        }
+
+        if ($codePoint >= 70517 && $codePoint <= 70655) {
+            return true;
+        }
+
+        if ($codePoint >= 70874 && $codePoint <= 71039) {
+            return true;
+        }
+
+        if ($codePoint >= 71134 && $codePoint <= 71167) {
+            return true;
+        }
+
+        if ($codePoint >= 71370 && $codePoint <= 71423) {
+            return true;
+        }
+
+        if ($codePoint >= 71488 && $codePoint <= 71679) {
+            return true;
+        }
+
+        if ($codePoint >= 71740 && $codePoint <= 71839) {
+            return true;
+        }
+
+        if ($codePoint >= 72026 && $codePoint <= 72095) {
+            return true;
+        }
+
+        if ($codePoint >= 72441 && $codePoint <= 72703) {
+            return true;
+        }
+
+        if ($codePoint >= 72887 && $codePoint <= 72959) {
+            return true;
+        }
+
+        if ($codePoint >= 73130 && $codePoint <= 73439) {
+            return true;
+        }
+
+        if ($codePoint >= 73465 && $codePoint <= 73647) {
+            return true;
+        }
+
+        if ($codePoint >= 74650 && $codePoint <= 74751) {
+            return true;
+        }
+
+        if ($codePoint >= 75076 && $codePoint <= 77823) {
+            return true;
+        }
+
+        if ($codePoint >= 78905 && $codePoint <= 82943) {
+            return true;
+        }
+
+        if ($codePoint >= 83527 && $codePoint <= 92159) {
+            return true;
+        }
+
+        if ($codePoint >= 92784 && $codePoint <= 92879) {
+            return true;
+        }
+
+        if ($codePoint >= 93072 && $codePoint <= 93759) {
+            return true;
+        }
+
+        if ($codePoint >= 93851 && $codePoint <= 93951) {
+            return true;
+        }
+
+        if ($codePoint >= 94112 && $codePoint <= 94175) {
+            return true;
+        }
+
+        if ($codePoint >= 101590 && $codePoint <= 101631) {
+            return true;
+        }
+
+        if ($codePoint >= 101641 && $codePoint <= 110591) {
+            return true;
+        }
+
+        if ($codePoint >= 110879 && $codePoint <= 110927) {
+            return true;
+        }
+
+        if ($codePoint >= 111356 && $codePoint <= 113663) {
+            return true;
+        }
+
+        if ($codePoint >= 113828 && $codePoint <= 118783) {
+            return true;
+        }
+
+        if ($codePoint >= 119366 && $codePoint <= 119519) {
+            return true;
+        }
+
+        if ($codePoint >= 119673 && $codePoint <= 119807) {
+            return true;
+        }
+
+        if ($codePoint >= 121520 && $codePoint <= 122879) {
+            return true;
+        }
+
+        if ($codePoint >= 122923 && $codePoint <= 123135) {
+            return true;
+        }
+
+        if ($codePoint >= 123216 && $codePoint <= 123583) {
+            return true;
+        }
+
+        if ($codePoint >= 123648 && $codePoint <= 124927) {
+            return true;
+        }
+
+        if ($codePoint >= 125143 && $codePoint <= 125183) {
+            return true;
+        }
+
+        if ($codePoint >= 125280 && $codePoint <= 126064) {
+            return true;
+        }
+
+        if ($codePoint >= 126133 && $codePoint <= 126208) {
+            return true;
+        }
+
+        if ($codePoint >= 126270 && $codePoint <= 126463) {
+            return true;
+        }
+
+        if ($codePoint >= 126652 && $codePoint <= 126703) {
+            return true;
+        }
+
+        if ($codePoint >= 126706 && $codePoint <= 126975) {
+            return true;
+        }
+
+        if ($codePoint >= 127406 && $codePoint <= 127461) {
+            return true;
+        }
+
+        if ($codePoint >= 127590 && $codePoint <= 127743) {
+            return true;
+        }
+
+        if ($codePoint >= 129202 && $codePoint <= 129279) {
+            return true;
+        }
+
+        if ($codePoint >= 129751 && $codePoint <= 129791) {
+            return true;
+        }
+
+        if ($codePoint >= 129995 && $codePoint <= 130031) {
+            return true;
+        }
+
+        if ($codePoint >= 130042 && $codePoint <= 131069) {
+            return true;
+        }
+
+        if ($codePoint >= 173790 && $codePoint <= 173823) {
+            return true;
+        }
+
+        if ($codePoint >= 191457 && $codePoint <= 194559) {
+            return true;
+        }
+
+        if ($codePoint >= 195102 && $codePoint <= 196605) {
+            return true;
+        }
+
+        if ($codePoint >= 201547 && $codePoint <= 262141) {
+            return true;
+        }
+
+        if ($codePoint >= 262144 && $codePoint <= 327677) {
+            return true;
+        }
+
+        if ($codePoint >= 327680 && $codePoint <= 393213) {
+            return true;
+        }
+
+        if ($codePoint >= 393216 && $codePoint <= 458749) {
+            return true;
+        }
+
+        if ($codePoint >= 458752 && $codePoint <= 524285) {
+            return true;
+        }
+
+        if ($codePoint >= 524288 && $codePoint <= 589821) {
+            return true;
+        }
+
+        if ($codePoint >= 589824 && $codePoint <= 655357) {
+            return true;
+        }
+
+        if ($codePoint >= 655360 && $codePoint <= 720893) {
+            return true;
+        }
+
+        if ($codePoint >= 720896 && $codePoint <= 786429) {
+            return true;
+        }
+
+        if ($codePoint >= 786432 && $codePoint <= 851965) {
+            return true;
+        }
+
+        if ($codePoint >= 851968 && $codePoint <= 917501) {
+            return true;
+        }
+
+        if ($codePoint >= 917536 && $codePoint <= 917631) {
+            return true;
+        }
+
+        if ($codePoint >= 917632 && $codePoint <= 917759) {
+            return true;
+        }
+
+        if ($codePoint >= 918000 && $codePoint <= 983037) {
+            return true;
+        }
+
+        if ($codePoint >= 983040 && $codePoint <= 1048573) {
+            return true;
+        }
+
+        if ($codePoint >= 1048576 && $codePoint <= 1114109) {
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/lib/symfony/polyfill-intl-idn/Resources/unidata/Regex.php b/lib/symfony/polyfill-intl-idn/Resources/unidata/Regex.php
new file mode 100644
index 000000000..5c1c51dde
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Resources/unidata/Regex.php
@@ -0,0 +1,24 @@
+<?php
+
+namespace Symfony\Polyfill\Intl\Idn\Resources\unidata;
+
+/**
+ * @internal
+ */
+final class Regex
+{
+    const COMBINING_MARK = '/^[\x{0300}-\x{036F}\x{0483}-\x{0487}\x{0488}-\x{0489}\x{0591}-\x{05BD}\x{05BF}\x{05C1}-\x{05C2}\x{05C4}-\x{05C5}\x{05C7}\x{0610}-\x{061A}\x{064B}-\x{065F}\x{0670}\x{06D6}-\x{06DC}\x{06DF}-\x{06E4}\x{06E7}-\x{06E8}\x{06EA}-\x{06ED}\x{0711}\x{0730}-\x{074A}\x{07A6}-\x{07B0}\x{07EB}-\x{07F3}\x{07FD}\x{0816}-\x{0819}\x{081B}-\x{0823}\x{0825}-\x{0827}\x{0829}-\x{082D}\x{0859}-\x{085B}\x{08D3}-\x{08E1}\x{08E3}-\x{0902}\x{0903}\x{093A}\x{093B}\x{093C}\x{093E}-\x{0940}\x{0941}-\x{0948}\x{0949}-\x{094C}\x{094D}\x{094E}-\x{094F}\x{0951}-\x{0957}\x{0962}-\x{0963}\x{0981}\x{0982}-\x{0983}\x{09BC}\x{09BE}-\x{09C0}\x{09C1}-\x{09C4}\x{09C7}-\x{09C8}\x{09CB}-\x{09CC}\x{09CD}\x{09D7}\x{09E2}-\x{09E3}\x{09FE}\x{0A01}-\x{0A02}\x{0A03}\x{0A3C}\x{0A3E}-\x{0A40}\x{0A41}-\x{0A42}\x{0A47}-\x{0A48}\x{0A4B}-\x{0A4D}\x{0A51}\x{0A70}-\x{0A71}\x{0A75}\x{0A81}-\x{0A82}\x{0A83}\x{0ABC}\x{0ABE}-\x{0AC0}\x{0AC1}-\x{0AC5}\x{0AC7}-\x{0AC8}\x{0AC9}\x{0ACB}-\x{0ACC}\x{0ACD}\x{0AE2}-\x{0AE3}\x{0AFA}-\x{0AFF}\x{0B01}\x{0B02}-\x{0B03}\x{0B3C}\x{0B3E}\x{0B3F}\x{0B40}\x{0B41}-\x{0B44}\x{0B47}-\x{0B48}\x{0B4B}-\x{0B4C}\x{0B4D}\x{0B55}-\x{0B56}\x{0B57}\x{0B62}-\x{0B63}\x{0B82}\x{0BBE}-\x{0BBF}\x{0BC0}\x{0BC1}-\x{0BC2}\x{0BC6}-\x{0BC8}\x{0BCA}-\x{0BCC}\x{0BCD}\x{0BD7}\x{0C00}\x{0C01}-\x{0C03}\x{0C04}\x{0C3E}-\x{0C40}\x{0C41}-\x{0C44}\x{0C46}-\x{0C48}\x{0C4A}-\x{0C4D}\x{0C55}-\x{0C56}\x{0C62}-\x{0C63}\x{0C81}\x{0C82}-\x{0C83}\x{0CBC}\x{0CBE}\x{0CBF}\x{0CC0}-\x{0CC4}\x{0CC6}\x{0CC7}-\x{0CC8}\x{0CCA}-\x{0CCB}\x{0CCC}-\x{0CCD}\x{0CD5}-\x{0CD6}\x{0CE2}-\x{0CE3}\x{0D00}-\x{0D01}\x{0D02}-\x{0D03}\x{0D3B}-\x{0D3C}\x{0D3E}-\x{0D40}\x{0D41}-\x{0D44}\x{0D46}-\x{0D48}\x{0D4A}-\x{0D4C}\x{0D4D}\x{0D57}\x{0D62}-\x{0D63}\x{0D81}\x{0D82}-\x{0D83}\x{0DCA}\x{0DCF}-\x{0DD1}\x{0DD2}-\x{0DD4}\x{0DD6}\x{0DD8}-\x{0DDF}\x{0DF2}-\x{0DF3}\x{0E31}\x{0E34}-\x{0E3A}\x{0E47}-\x{0E4E}\x{0EB1}\x{0EB4}-\x{0EBC}\x{0EC8}-\x{0ECD}\x{0F18}-\x{0F19}\x{0F35}\x{0F37}\x{0F39}\x{0F3E}-\x{0F3F}\x{0F71}-\x{0F7E}\x{0F7F}\x{0F80}-\x{0F84}\x{0F86}-\x{0F87}\x{0F8D}-\x{0F97}\x{0F99}-\x{0FBC}\x{0FC6}\x{102B}-\x{102C}\x{102D}-\x{1030}\x{1031}\x{1032}-\x{1037}\x{1038}\x{1039}-\x{103A}\x{103B}-\x{103C}\x{103D}-\x{103E}\x{1056}-\x{1057}\x{1058}-\x{1059}\x{105E}-\x{1060}\x{1062}-\x{1064}\x{1067}-\x{106D}\x{1071}-\x{1074}\x{1082}\x{1083}-\x{1084}\x{1085}-\x{1086}\x{1087}-\x{108C}\x{108D}\x{108F}\x{109A}-\x{109C}\x{109D}\x{135D}-\x{135F}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}-\x{1753}\x{1772}-\x{1773}\x{17B4}-\x{17B5}\x{17B6}\x{17B7}-\x{17BD}\x{17BE}-\x{17C5}\x{17C6}\x{17C7}-\x{17C8}\x{17C9}-\x{17D3}\x{17DD}\x{180B}-\x{180D}\x{1885}-\x{1886}\x{18A9}\x{1920}-\x{1922}\x{1923}-\x{1926}\x{1927}-\x{1928}\x{1929}-\x{192B}\x{1930}-\x{1931}\x{1932}\x{1933}-\x{1938}\x{1939}-\x{193B}\x{1A17}-\x{1A18}\x{1A19}-\x{1A1A}\x{1A1B}\x{1A55}\x{1A56}\x{1A57}\x{1A58}-\x{1A5E}\x{1A60}\x{1A61}\x{1A62}\x{1A63}-\x{1A64}\x{1A65}-\x{1A6C}\x{1A6D}-\x{1A72}\x{1A73}-\x{1A7C}\x{1A7F}\x{1AB0}-\x{1ABD}\x{1ABE}\x{1ABF}-\x{1AC0}\x{1B00}-\x{1B03}\x{1B04}\x{1B34}\x{1B35}\x{1B36}-\x{1B3A}\x{1B3B}\x{1B3C}\x{1B3D}-\x{1B41}\x{1B42}\x{1B43}-\x{1B44}\x{1B6B}-\x{1B73}\x{1B80}-\x{1B81}\x{1B82}\x{1BA1}\x{1BA2}-\x{1BA5}\x{1BA6}-\x{1BA7}\x{1BA8}-\x{1BA9}\x{1BAA}\x{1BAB}-\x{1BAD}\x{1BE6}\x{1BE7}\x{1BE8}-\x{1BE9}\x{1BEA}-\x{1BEC}\x{1BED}\x{1BEE}\x{1BEF}-\x{1BF1}\x{1BF2}-\x{1BF3}\x{1C24}-\x{1C2B}\x{1C2C}-\x{1C33}\x{1C34}-\x{1C35}\x{1C36}-\x{1C37}\x{1CD0}-\x{1CD2}\x{1CD4}-\x{1CE0}\x{1CE1}\x{1CE2}-\x{1CE8}\x{1CED}\x{1CF4}\x{1CF7}\x{1CF8}-\x{1CF9}\x{1DC0}-\x{1DF9}\x{1DFB}-\x{1DFF}\x{20D0}-\x{20DC}\x{20DD}-\x{20E0}\x{20E1}\x{20E2}-\x{20E4}\x{20E5}-\x{20F0}\x{2CEF}-\x{2CF1}\x{2D7F}\x{2DE0}-\x{2DFF}\x{302A}-\x{302D}\x{302E}-\x{302F}\x{3099}-\x{309A}\x{A66F}\x{A670}-\x{A672}\x{A674}-\x{A67D}\x{A69E}-\x{A69F}\x{A6F0}-\x{A6F1}\x{A802}\x{A806}\x{A80B}\x{A823}-\x{A824}\x{A825}-\x{A826}\x{A827}\x{A82C}\x{A880}-\x{A881}\x{A8B4}-\x{A8C3}\x{A8C4}-\x{A8C5}\x{A8E0}-\x{A8F1}\x{A8FF}\x{A926}-\x{A92D}\x{A947}-\x{A951}\x{A952}-\x{A953}\x{A980}-\x{A982}\x{A983}\x{A9B3}\x{A9B4}-\x{A9B5}\x{A9B6}-\x{A9B9}\x{A9BA}-\x{A9BB}\x{A9BC}-\x{A9BD}\x{A9BE}-\x{A9C0}\x{A9E5}\x{AA29}-\x{AA2E}\x{AA2F}-\x{AA30}\x{AA31}-\x{AA32}\x{AA33}-\x{AA34}\x{AA35}-\x{AA36}\x{AA43}\x{AA4C}\x{AA4D}\x{AA7B}\x{AA7C}\x{AA7D}\x{AAB0}\x{AAB2}-\x{AAB4}\x{AAB7}-\x{AAB8}\x{AABE}-\x{AABF}\x{AAC1}\x{AAEB}\x{AAEC}-\x{AAED}\x{AAEE}-\x{AAEF}\x{AAF5}\x{AAF6}\x{ABE3}-\x{ABE4}\x{ABE5}\x{ABE6}-\x{ABE7}\x{ABE8}\x{ABE9}-\x{ABEA}\x{ABEC}\x{ABED}\x{FB1E}\x{FE00}-\x{FE0F}\x{FE20}-\x{FE2F}\x{101FD}\x{102E0}\x{10376}-\x{1037A}\x{10A01}-\x{10A03}\x{10A05}-\x{10A06}\x{10A0C}-\x{10A0F}\x{10A38}-\x{10A3A}\x{10A3F}\x{10AE5}-\x{10AE6}\x{10D24}-\x{10D27}\x{10EAB}-\x{10EAC}\x{10F46}-\x{10F50}\x{11000}\x{11001}\x{11002}\x{11038}-\x{11046}\x{1107F}-\x{11081}\x{11082}\x{110B0}-\x{110B2}\x{110B3}-\x{110B6}\x{110B7}-\x{110B8}\x{110B9}-\x{110BA}\x{11100}-\x{11102}\x{11127}-\x{1112B}\x{1112C}\x{1112D}-\x{11134}\x{11145}-\x{11146}\x{11173}\x{11180}-\x{11181}\x{11182}\x{111B3}-\x{111B5}\x{111B6}-\x{111BE}\x{111BF}-\x{111C0}\x{111C9}-\x{111CC}\x{111CE}\x{111CF}\x{1122C}-\x{1122E}\x{1122F}-\x{11231}\x{11232}-\x{11233}\x{11234}\x{11235}\x{11236}-\x{11237}\x{1123E}\x{112DF}\x{112E0}-\x{112E2}\x{112E3}-\x{112EA}\x{11300}-\x{11301}\x{11302}-\x{11303}\x{1133B}-\x{1133C}\x{1133E}-\x{1133F}\x{11340}\x{11341}-\x{11344}\x{11347}-\x{11348}\x{1134B}-\x{1134D}\x{11357}\x{11362}-\x{11363}\x{11366}-\x{1136C}\x{11370}-\x{11374}\x{11435}-\x{11437}\x{11438}-\x{1143F}\x{11440}-\x{11441}\x{11442}-\x{11444}\x{11445}\x{11446}\x{1145E}\x{114B0}-\x{114B2}\x{114B3}-\x{114B8}\x{114B9}\x{114BA}\x{114BB}-\x{114BE}\x{114BF}-\x{114C0}\x{114C1}\x{114C2}-\x{114C3}\x{115AF}-\x{115B1}\x{115B2}-\x{115B5}\x{115B8}-\x{115BB}\x{115BC}-\x{115BD}\x{115BE}\x{115BF}-\x{115C0}\x{115DC}-\x{115DD}\x{11630}-\x{11632}\x{11633}-\x{1163A}\x{1163B}-\x{1163C}\x{1163D}\x{1163E}\x{1163F}-\x{11640}\x{116AB}\x{116AC}\x{116AD}\x{116AE}-\x{116AF}\x{116B0}-\x{116B5}\x{116B6}\x{116B7}\x{1171D}-\x{1171F}\x{11720}-\x{11721}\x{11722}-\x{11725}\x{11726}\x{11727}-\x{1172B}\x{1182C}-\x{1182E}\x{1182F}-\x{11837}\x{11838}\x{11839}-\x{1183A}\x{11930}-\x{11935}\x{11937}-\x{11938}\x{1193B}-\x{1193C}\x{1193D}\x{1193E}\x{11940}\x{11942}\x{11943}\x{119D1}-\x{119D3}\x{119D4}-\x{119D7}\x{119DA}-\x{119DB}\x{119DC}-\x{119DF}\x{119E0}\x{119E4}\x{11A01}-\x{11A0A}\x{11A33}-\x{11A38}\x{11A39}\x{11A3B}-\x{11A3E}\x{11A47}\x{11A51}-\x{11A56}\x{11A57}-\x{11A58}\x{11A59}-\x{11A5B}\x{11A8A}-\x{11A96}\x{11A97}\x{11A98}-\x{11A99}\x{11C2F}\x{11C30}-\x{11C36}\x{11C38}-\x{11C3D}\x{11C3E}\x{11C3F}\x{11C92}-\x{11CA7}\x{11CA9}\x{11CAA}-\x{11CB0}\x{11CB1}\x{11CB2}-\x{11CB3}\x{11CB4}\x{11CB5}-\x{11CB6}\x{11D31}-\x{11D36}\x{11D3A}\x{11D3C}-\x{11D3D}\x{11D3F}-\x{11D45}\x{11D47}\x{11D8A}-\x{11D8E}\x{11D90}-\x{11D91}\x{11D93}-\x{11D94}\x{11D95}\x{11D96}\x{11D97}\x{11EF3}-\x{11EF4}\x{11EF5}-\x{11EF6}\x{16AF0}-\x{16AF4}\x{16B30}-\x{16B36}\x{16F4F}\x{16F51}-\x{16F87}\x{16F8F}-\x{16F92}\x{16FE4}\x{16FF0}-\x{16FF1}\x{1BC9D}-\x{1BC9E}\x{1D165}-\x{1D166}\x{1D167}-\x{1D169}\x{1D16D}-\x{1D172}\x{1D17B}-\x{1D182}\x{1D185}-\x{1D18B}\x{1D1AA}-\x{1D1AD}\x{1D242}-\x{1D244}\x{1DA00}-\x{1DA36}\x{1DA3B}-\x{1DA6C}\x{1DA75}\x{1DA84}\x{1DA9B}-\x{1DA9F}\x{1DAA1}-\x{1DAAF}\x{1E000}-\x{1E006}\x{1E008}-\x{1E018}\x{1E01B}-\x{1E021}\x{1E023}-\x{1E024}\x{1E026}-\x{1E02A}\x{1E130}-\x{1E136}\x{1E2EC}-\x{1E2EF}\x{1E8D0}-\x{1E8D6}\x{1E944}-\x{1E94A}\x{E0100}-\x{E01EF}]/u';
+
+    const RTL_LABEL = '/[\x{0590}\x{05BE}\x{05C0}\x{05C3}\x{05C6}\x{05C8}-\x{05CF}\x{05D0}-\x{05EA}\x{05EB}-\x{05EE}\x{05EF}-\x{05F2}\x{05F3}-\x{05F4}\x{05F5}-\x{05FF}\x{0600}-\x{0605}\x{0608}\x{060B}\x{060D}\x{061B}\x{061C}\x{061D}\x{061E}-\x{061F}\x{0620}-\x{063F}\x{0640}\x{0641}-\x{064A}\x{0660}-\x{0669}\x{066B}-\x{066C}\x{066D}\x{066E}-\x{066F}\x{0671}-\x{06D3}\x{06D4}\x{06D5}\x{06DD}\x{06E5}-\x{06E6}\x{06EE}-\x{06EF}\x{06FA}-\x{06FC}\x{06FD}-\x{06FE}\x{06FF}\x{0700}-\x{070D}\x{070E}\x{070F}\x{0710}\x{0712}-\x{072F}\x{074B}-\x{074C}\x{074D}-\x{07A5}\x{07B1}\x{07B2}-\x{07BF}\x{07C0}-\x{07C9}\x{07CA}-\x{07EA}\x{07F4}-\x{07F5}\x{07FA}\x{07FB}-\x{07FC}\x{07FE}-\x{07FF}\x{0800}-\x{0815}\x{081A}\x{0824}\x{0828}\x{082E}-\x{082F}\x{0830}-\x{083E}\x{083F}\x{0840}-\x{0858}\x{085C}-\x{085D}\x{085E}\x{085F}\x{0860}-\x{086A}\x{086B}-\x{086F}\x{0870}-\x{089F}\x{08A0}-\x{08B4}\x{08B5}\x{08B6}-\x{08C7}\x{08C8}-\x{08D2}\x{08E2}\x{200F}\x{FB1D}\x{FB1F}-\x{FB28}\x{FB2A}-\x{FB36}\x{FB37}\x{FB38}-\x{FB3C}\x{FB3D}\x{FB3E}\x{FB3F}\x{FB40}-\x{FB41}\x{FB42}\x{FB43}-\x{FB44}\x{FB45}\x{FB46}-\x{FB4F}\x{FB50}-\x{FBB1}\x{FBB2}-\x{FBC1}\x{FBC2}-\x{FBD2}\x{FBD3}-\x{FD3D}\x{FD40}-\x{FD4F}\x{FD50}-\x{FD8F}\x{FD90}-\x{FD91}\x{FD92}-\x{FDC7}\x{FDC8}-\x{FDCF}\x{FDF0}-\x{FDFB}\x{FDFC}\x{FDFE}-\x{FDFF}\x{FE70}-\x{FE74}\x{FE75}\x{FE76}-\x{FEFC}\x{FEFD}-\x{FEFE}\x{10800}-\x{10805}\x{10806}-\x{10807}\x{10808}\x{10809}\x{1080A}-\x{10835}\x{10836}\x{10837}-\x{10838}\x{10839}-\x{1083B}\x{1083C}\x{1083D}-\x{1083E}\x{1083F}-\x{10855}\x{10856}\x{10857}\x{10858}-\x{1085F}\x{10860}-\x{10876}\x{10877}-\x{10878}\x{10879}-\x{1087F}\x{10880}-\x{1089E}\x{1089F}-\x{108A6}\x{108A7}-\x{108AF}\x{108B0}-\x{108DF}\x{108E0}-\x{108F2}\x{108F3}\x{108F4}-\x{108F5}\x{108F6}-\x{108FA}\x{108FB}-\x{108FF}\x{10900}-\x{10915}\x{10916}-\x{1091B}\x{1091C}-\x{1091E}\x{10920}-\x{10939}\x{1093A}-\x{1093E}\x{1093F}\x{10940}-\x{1097F}\x{10980}-\x{109B7}\x{109B8}-\x{109BB}\x{109BC}-\x{109BD}\x{109BE}-\x{109BF}\x{109C0}-\x{109CF}\x{109D0}-\x{109D1}\x{109D2}-\x{109FF}\x{10A00}\x{10A04}\x{10A07}-\x{10A0B}\x{10A10}-\x{10A13}\x{10A14}\x{10A15}-\x{10A17}\x{10A18}\x{10A19}-\x{10A35}\x{10A36}-\x{10A37}\x{10A3B}-\x{10A3E}\x{10A40}-\x{10A48}\x{10A49}-\x{10A4F}\x{10A50}-\x{10A58}\x{10A59}-\x{10A5F}\x{10A60}-\x{10A7C}\x{10A7D}-\x{10A7E}\x{10A7F}\x{10A80}-\x{10A9C}\x{10A9D}-\x{10A9F}\x{10AA0}-\x{10ABF}\x{10AC0}-\x{10AC7}\x{10AC8}\x{10AC9}-\x{10AE4}\x{10AE7}-\x{10AEA}\x{10AEB}-\x{10AEF}\x{10AF0}-\x{10AF6}\x{10AF7}-\x{10AFF}\x{10B00}-\x{10B35}\x{10B36}-\x{10B38}\x{10B40}-\x{10B55}\x{10B56}-\x{10B57}\x{10B58}-\x{10B5F}\x{10B60}-\x{10B72}\x{10B73}-\x{10B77}\x{10B78}-\x{10B7F}\x{10B80}-\x{10B91}\x{10B92}-\x{10B98}\x{10B99}-\x{10B9C}\x{10B9D}-\x{10BA8}\x{10BA9}-\x{10BAF}\x{10BB0}-\x{10BFF}\x{10C00}-\x{10C48}\x{10C49}-\x{10C7F}\x{10C80}-\x{10CB2}\x{10CB3}-\x{10CBF}\x{10CC0}-\x{10CF2}\x{10CF3}-\x{10CF9}\x{10CFA}-\x{10CFF}\x{10D00}-\x{10D23}\x{10D28}-\x{10D2F}\x{10D30}-\x{10D39}\x{10D3A}-\x{10D3F}\x{10D40}-\x{10E5F}\x{10E60}-\x{10E7E}\x{10E7F}\x{10E80}-\x{10EA9}\x{10EAA}\x{10EAD}\x{10EAE}-\x{10EAF}\x{10EB0}-\x{10EB1}\x{10EB2}-\x{10EFF}\x{10F00}-\x{10F1C}\x{10F1D}-\x{10F26}\x{10F27}\x{10F28}-\x{10F2F}\x{10F30}-\x{10F45}\x{10F51}-\x{10F54}\x{10F55}-\x{10F59}\x{10F5A}-\x{10F6F}\x{10F70}-\x{10FAF}\x{10FB0}-\x{10FC4}\x{10FC5}-\x{10FCB}\x{10FCC}-\x{10FDF}\x{10FE0}-\x{10FF6}\x{10FF7}-\x{10FFF}\x{1E800}-\x{1E8C4}\x{1E8C5}-\x{1E8C6}\x{1E8C7}-\x{1E8CF}\x{1E8D7}-\x{1E8FF}\x{1E900}-\x{1E943}\x{1E94B}\x{1E94C}-\x{1E94F}\x{1E950}-\x{1E959}\x{1E95A}-\x{1E95D}\x{1E95E}-\x{1E95F}\x{1E960}-\x{1EC6F}\x{1EC70}\x{1EC71}-\x{1ECAB}\x{1ECAC}\x{1ECAD}-\x{1ECAF}\x{1ECB0}\x{1ECB1}-\x{1ECB4}\x{1ECB5}-\x{1ECBF}\x{1ECC0}-\x{1ECFF}\x{1ED00}\x{1ED01}-\x{1ED2D}\x{1ED2E}\x{1ED2F}-\x{1ED3D}\x{1ED3E}-\x{1ED4F}\x{1ED50}-\x{1EDFF}\x{1EE00}-\x{1EE03}\x{1EE04}\x{1EE05}-\x{1EE1F}\x{1EE20}\x{1EE21}-\x{1EE22}\x{1EE23}\x{1EE24}\x{1EE25}-\x{1EE26}\x{1EE27}\x{1EE28}\x{1EE29}-\x{1EE32}\x{1EE33}\x{1EE34}-\x{1EE37}\x{1EE38}\x{1EE39}\x{1EE3A}\x{1EE3B}\x{1EE3C}-\x{1EE41}\x{1EE42}\x{1EE43}-\x{1EE46}\x{1EE47}\x{1EE48}\x{1EE49}\x{1EE4A}\x{1EE4B}\x{1EE4C}\x{1EE4D}-\x{1EE4F}\x{1EE50}\x{1EE51}-\x{1EE52}\x{1EE53}\x{1EE54}\x{1EE55}-\x{1EE56}\x{1EE57}\x{1EE58}\x{1EE59}\x{1EE5A}\x{1EE5B}\x{1EE5C}\x{1EE5D}\x{1EE5E}\x{1EE5F}\x{1EE60}\x{1EE61}-\x{1EE62}\x{1EE63}\x{1EE64}\x{1EE65}-\x{1EE66}\x{1EE67}-\x{1EE6A}\x{1EE6B}\x{1EE6C}-\x{1EE72}\x{1EE73}\x{1EE74}-\x{1EE77}\x{1EE78}\x{1EE79}-\x{1EE7C}\x{1EE7D}\x{1EE7E}\x{1EE7F}\x{1EE80}-\x{1EE89}\x{1EE8A}\x{1EE8B}-\x{1EE9B}\x{1EE9C}-\x{1EEA0}\x{1EEA1}-\x{1EEA3}\x{1EEA4}\x{1EEA5}-\x{1EEA9}\x{1EEAA}\x{1EEAB}-\x{1EEBB}\x{1EEBC}-\x{1EEEF}\x{1EEF2}-\x{1EEFF}\x{1EF00}-\x{1EFFF}]/u';
+
+    const BIDI_STEP_1_LTR = '/^[^\x{0000}-\x{0008}\x{0009}\x{000A}\x{000B}\x{000C}\x{000D}\x{000E}-\x{001B}\x{001C}-\x{001E}\x{001F}\x{0020}\x{0021}-\x{0022}\x{0023}\x{0024}\x{0025}\x{0026}-\x{0027}\x{0028}\x{0029}\x{002A}\x{002B}\x{002C}\x{002D}\x{002E}-\x{002F}\x{0030}-\x{0039}\x{003A}\x{003B}\x{003C}-\x{003E}\x{003F}-\x{0040}\x{005B}\x{005C}\x{005D}\x{005E}\x{005F}\x{0060}\x{007B}\x{007C}\x{007D}\x{007E}\x{007F}-\x{0084}\x{0085}\x{0086}-\x{009F}\x{00A0}\x{00A1}\x{00A2}-\x{00A5}\x{00A6}\x{00A7}\x{00A8}\x{00A9}\x{00AB}\x{00AC}\x{00AD}\x{00AE}\x{00AF}\x{00B0}\x{00B1}\x{00B2}-\x{00B3}\x{00B4}\x{00B6}-\x{00B7}\x{00B8}\x{00B9}\x{00BB}\x{00BC}-\x{00BE}\x{00BF}\x{00D7}\x{00F7}\x{02B9}-\x{02BA}\x{02C2}-\x{02C5}\x{02C6}-\x{02CF}\x{02D2}-\x{02DF}\x{02E5}-\x{02EB}\x{02EC}\x{02ED}\x{02EF}-\x{02FF}\x{0300}-\x{036F}\x{0374}\x{0375}\x{037E}\x{0384}-\x{0385}\x{0387}\x{03F6}\x{0483}-\x{0487}\x{0488}-\x{0489}\x{058A}\x{058D}-\x{058E}\x{058F}\x{0590}\x{0591}-\x{05BD}\x{05BE}\x{05BF}\x{05C0}\x{05C1}-\x{05C2}\x{05C3}\x{05C4}-\x{05C5}\x{05C6}\x{05C7}\x{05C8}-\x{05CF}\x{05D0}-\x{05EA}\x{05EB}-\x{05EE}\x{05EF}-\x{05F2}\x{05F3}-\x{05F4}\x{05F5}-\x{05FF}\x{0600}-\x{0605}\x{0606}-\x{0607}\x{0608}\x{0609}-\x{060A}\x{060B}\x{060C}\x{060D}\x{060E}-\x{060F}\x{0610}-\x{061A}\x{061B}\x{061C}\x{061D}\x{061E}-\x{061F}\x{0620}-\x{063F}\x{0640}\x{0641}-\x{064A}\x{064B}-\x{065F}\x{0660}-\x{0669}\x{066A}\x{066B}-\x{066C}\x{066D}\x{066E}-\x{066F}\x{0670}\x{0671}-\x{06D3}\x{06D4}\x{06D5}\x{06D6}-\x{06DC}\x{06DD}\x{06DE}\x{06DF}-\x{06E4}\x{06E5}-\x{06E6}\x{06E7}-\x{06E8}\x{06E9}\x{06EA}-\x{06ED}\x{06EE}-\x{06EF}\x{06F0}-\x{06F9}\x{06FA}-\x{06FC}\x{06FD}-\x{06FE}\x{06FF}\x{0700}-\x{070D}\x{070E}\x{070F}\x{0710}\x{0711}\x{0712}-\x{072F}\x{0730}-\x{074A}\x{074B}-\x{074C}\x{074D}-\x{07A5}\x{07A6}-\x{07B0}\x{07B1}\x{07B2}-\x{07BF}\x{07C0}-\x{07C9}\x{07CA}-\x{07EA}\x{07EB}-\x{07F3}\x{07F4}-\x{07F5}\x{07F6}\x{07F7}-\x{07F9}\x{07FA}\x{07FB}-\x{07FC}\x{07FD}\x{07FE}-\x{07FF}\x{0800}-\x{0815}\x{0816}-\x{0819}\x{081A}\x{081B}-\x{0823}\x{0824}\x{0825}-\x{0827}\x{0828}\x{0829}-\x{082D}\x{082E}-\x{082F}\x{0830}-\x{083E}\x{083F}\x{0840}-\x{0858}\x{0859}-\x{085B}\x{085C}-\x{085D}\x{085E}\x{085F}\x{0860}-\x{086A}\x{086B}-\x{086F}\x{0870}-\x{089F}\x{08A0}-\x{08B4}\x{08B5}\x{08B6}-\x{08C7}\x{08C8}-\x{08D2}\x{08D3}-\x{08E1}\x{08E2}\x{08E3}-\x{0902}\x{093A}\x{093C}\x{0941}-\x{0948}\x{094D}\x{0951}-\x{0957}\x{0962}-\x{0963}\x{0981}\x{09BC}\x{09C1}-\x{09C4}\x{09CD}\x{09E2}-\x{09E3}\x{09F2}-\x{09F3}\x{09FB}\x{09FE}\x{0A01}-\x{0A02}\x{0A3C}\x{0A41}-\x{0A42}\x{0A47}-\x{0A48}\x{0A4B}-\x{0A4D}\x{0A51}\x{0A70}-\x{0A71}\x{0A75}\x{0A81}-\x{0A82}\x{0ABC}\x{0AC1}-\x{0AC5}\x{0AC7}-\x{0AC8}\x{0ACD}\x{0AE2}-\x{0AE3}\x{0AF1}\x{0AFA}-\x{0AFF}\x{0B01}\x{0B3C}\x{0B3F}\x{0B41}-\x{0B44}\x{0B4D}\x{0B55}-\x{0B56}\x{0B62}-\x{0B63}\x{0B82}\x{0BC0}\x{0BCD}\x{0BF3}-\x{0BF8}\x{0BF9}\x{0BFA}\x{0C00}\x{0C04}\x{0C3E}-\x{0C40}\x{0C46}-\x{0C48}\x{0C4A}-\x{0C4D}\x{0C55}-\x{0C56}\x{0C62}-\x{0C63}\x{0C78}-\x{0C7E}\x{0C81}\x{0CBC}\x{0CCC}-\x{0CCD}\x{0CE2}-\x{0CE3}\x{0D00}-\x{0D01}\x{0D3B}-\x{0D3C}\x{0D41}-\x{0D44}\x{0D4D}\x{0D62}-\x{0D63}\x{0D81}\x{0DCA}\x{0DD2}-\x{0DD4}\x{0DD6}\x{0E31}\x{0E34}-\x{0E3A}\x{0E3F}\x{0E47}-\x{0E4E}\x{0EB1}\x{0EB4}-\x{0EBC}\x{0EC8}-\x{0ECD}\x{0F18}-\x{0F19}\x{0F35}\x{0F37}\x{0F39}\x{0F3A}\x{0F3B}\x{0F3C}\x{0F3D}\x{0F71}-\x{0F7E}\x{0F80}-\x{0F84}\x{0F86}-\x{0F87}\x{0F8D}-\x{0F97}\x{0F99}-\x{0FBC}\x{0FC6}\x{102D}-\x{1030}\x{1032}-\x{1037}\x{1039}-\x{103A}\x{103D}-\x{103E}\x{1058}-\x{1059}\x{105E}-\x{1060}\x{1071}-\x{1074}\x{1082}\x{1085}-\x{1086}\x{108D}\x{109D}\x{135D}-\x{135F}\x{1390}-\x{1399}\x{1400}\x{1680}\x{169B}\x{169C}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}-\x{1753}\x{1772}-\x{1773}\x{17B4}-\x{17B5}\x{17B7}-\x{17BD}\x{17C6}\x{17C9}-\x{17D3}\x{17DB}\x{17DD}\x{17F0}-\x{17F9}\x{1800}-\x{1805}\x{1806}\x{1807}-\x{180A}\x{180B}-\x{180D}\x{180E}\x{1885}-\x{1886}\x{18A9}\x{1920}-\x{1922}\x{1927}-\x{1928}\x{1932}\x{1939}-\x{193B}\x{1940}\x{1944}-\x{1945}\x{19DE}-\x{19FF}\x{1A17}-\x{1A18}\x{1A1B}\x{1A56}\x{1A58}-\x{1A5E}\x{1A60}\x{1A62}\x{1A65}-\x{1A6C}\x{1A73}-\x{1A7C}\x{1A7F}\x{1AB0}-\x{1ABD}\x{1ABE}\x{1ABF}-\x{1AC0}\x{1B00}-\x{1B03}\x{1B34}\x{1B36}-\x{1B3A}\x{1B3C}\x{1B42}\x{1B6B}-\x{1B73}\x{1B80}-\x{1B81}\x{1BA2}-\x{1BA5}\x{1BA8}-\x{1BA9}\x{1BAB}-\x{1BAD}\x{1BE6}\x{1BE8}-\x{1BE9}\x{1BED}\x{1BEF}-\x{1BF1}\x{1C2C}-\x{1C33}\x{1C36}-\x{1C37}\x{1CD0}-\x{1CD2}\x{1CD4}-\x{1CE0}\x{1CE2}-\x{1CE8}\x{1CED}\x{1CF4}\x{1CF8}-\x{1CF9}\x{1DC0}-\x{1DF9}\x{1DFB}-\x{1DFF}\x{1FBD}\x{1FBF}-\x{1FC1}\x{1FCD}-\x{1FCF}\x{1FDD}-\x{1FDF}\x{1FED}-\x{1FEF}\x{1FFD}-\x{1FFE}\x{2000}-\x{200A}\x{200B}-\x{200D}\x{200F}\x{2010}-\x{2015}\x{2016}-\x{2017}\x{2018}\x{2019}\x{201A}\x{201B}-\x{201C}\x{201D}\x{201E}\x{201F}\x{2020}-\x{2027}\x{2028}\x{2029}\x{202A}\x{202B}\x{202C}\x{202D}\x{202E}\x{202F}\x{2030}-\x{2034}\x{2035}-\x{2038}\x{2039}\x{203A}\x{203B}-\x{203E}\x{203F}-\x{2040}\x{2041}-\x{2043}\x{2044}\x{2045}\x{2046}\x{2047}-\x{2051}\x{2052}\x{2053}\x{2054}\x{2055}-\x{205E}\x{205F}\x{2060}-\x{2064}\x{2065}\x{2066}\x{2067}\x{2068}\x{2069}\x{206A}-\x{206F}\x{2070}\x{2074}-\x{2079}\x{207A}-\x{207B}\x{207C}\x{207D}\x{207E}\x{2080}-\x{2089}\x{208A}-\x{208B}\x{208C}\x{208D}\x{208E}\x{20A0}-\x{20BF}\x{20C0}-\x{20CF}\x{20D0}-\x{20DC}\x{20DD}-\x{20E0}\x{20E1}\x{20E2}-\x{20E4}\x{20E5}-\x{20F0}\x{2100}-\x{2101}\x{2103}-\x{2106}\x{2108}-\x{2109}\x{2114}\x{2116}-\x{2117}\x{2118}\x{211E}-\x{2123}\x{2125}\x{2127}\x{2129}\x{212E}\x{213A}-\x{213B}\x{2140}-\x{2144}\x{214A}\x{214B}\x{214C}-\x{214D}\x{2150}-\x{215F}\x{2189}\x{218A}-\x{218B}\x{2190}-\x{2194}\x{2195}-\x{2199}\x{219A}-\x{219B}\x{219C}-\x{219F}\x{21A0}\x{21A1}-\x{21A2}\x{21A3}\x{21A4}-\x{21A5}\x{21A6}\x{21A7}-\x{21AD}\x{21AE}\x{21AF}-\x{21CD}\x{21CE}-\x{21CF}\x{21D0}-\x{21D1}\x{21D2}\x{21D3}\x{21D4}\x{21D5}-\x{21F3}\x{21F4}-\x{2211}\x{2212}\x{2213}\x{2214}-\x{22FF}\x{2300}-\x{2307}\x{2308}\x{2309}\x{230A}\x{230B}\x{230C}-\x{231F}\x{2320}-\x{2321}\x{2322}-\x{2328}\x{2329}\x{232A}\x{232B}-\x{2335}\x{237B}\x{237C}\x{237D}-\x{2394}\x{2396}-\x{239A}\x{239B}-\x{23B3}\x{23B4}-\x{23DB}\x{23DC}-\x{23E1}\x{23E2}-\x{2426}\x{2440}-\x{244A}\x{2460}-\x{2487}\x{2488}-\x{249B}\x{24EA}-\x{24FF}\x{2500}-\x{25B6}\x{25B7}\x{25B8}-\x{25C0}\x{25C1}\x{25C2}-\x{25F7}\x{25F8}-\x{25FF}\x{2600}-\x{266E}\x{266F}\x{2670}-\x{26AB}\x{26AD}-\x{2767}\x{2768}\x{2769}\x{276A}\x{276B}\x{276C}\x{276D}\x{276E}\x{276F}\x{2770}\x{2771}\x{2772}\x{2773}\x{2774}\x{2775}\x{2776}-\x{2793}\x{2794}-\x{27BF}\x{27C0}-\x{27C4}\x{27C5}\x{27C6}\x{27C7}-\x{27E5}\x{27E6}\x{27E7}\x{27E8}\x{27E9}\x{27EA}\x{27EB}\x{27EC}\x{27ED}\x{27EE}\x{27EF}\x{27F0}-\x{27FF}\x{2900}-\x{2982}\x{2983}\x{2984}\x{2985}\x{2986}\x{2987}\x{2988}\x{2989}\x{298A}\x{298B}\x{298C}\x{298D}\x{298E}\x{298F}\x{2990}\x{2991}\x{2992}\x{2993}\x{2994}\x{2995}\x{2996}\x{2997}\x{2998}\x{2999}-\x{29D7}\x{29D8}\x{29D9}\x{29DA}\x{29DB}\x{29DC}-\x{29FB}\x{29FC}\x{29FD}\x{29FE}-\x{2AFF}\x{2B00}-\x{2B2F}\x{2B30}-\x{2B44}\x{2B45}-\x{2B46}\x{2B47}-\x{2B4C}\x{2B4D}-\x{2B73}\x{2B76}-\x{2B95}\x{2B97}-\x{2BFF}\x{2CE5}-\x{2CEA}\x{2CEF}-\x{2CF1}\x{2CF9}-\x{2CFC}\x{2CFD}\x{2CFE}-\x{2CFF}\x{2D7F}\x{2DE0}-\x{2DFF}\x{2E00}-\x{2E01}\x{2E02}\x{2E03}\x{2E04}\x{2E05}\x{2E06}-\x{2E08}\x{2E09}\x{2E0A}\x{2E0B}\x{2E0C}\x{2E0D}\x{2E0E}-\x{2E16}\x{2E17}\x{2E18}-\x{2E19}\x{2E1A}\x{2E1B}\x{2E1C}\x{2E1D}\x{2E1E}-\x{2E1F}\x{2E20}\x{2E21}\x{2E22}\x{2E23}\x{2E24}\x{2E25}\x{2E26}\x{2E27}\x{2E28}\x{2E29}\x{2E2A}-\x{2E2E}\x{2E2F}\x{2E30}-\x{2E39}\x{2E3A}-\x{2E3B}\x{2E3C}-\x{2E3F}\x{2E40}\x{2E41}\x{2E42}\x{2E43}-\x{2E4F}\x{2E50}-\x{2E51}\x{2E52}\x{2E80}-\x{2E99}\x{2E9B}-\x{2EF3}\x{2F00}-\x{2FD5}\x{2FF0}-\x{2FFB}\x{3000}\x{3001}-\x{3003}\x{3004}\x{3008}\x{3009}\x{300A}\x{300B}\x{300C}\x{300D}\x{300E}\x{300F}\x{3010}\x{3011}\x{3012}-\x{3013}\x{3014}\x{3015}\x{3016}\x{3017}\x{3018}\x{3019}\x{301A}\x{301B}\x{301C}\x{301D}\x{301E}-\x{301F}\x{3020}\x{302A}-\x{302D}\x{3030}\x{3036}-\x{3037}\x{303D}\x{303E}-\x{303F}\x{3099}-\x{309A}\x{309B}-\x{309C}\x{30A0}\x{30FB}\x{31C0}-\x{31E3}\x{321D}-\x{321E}\x{3250}\x{3251}-\x{325F}\x{327C}-\x{327E}\x{32B1}-\x{32BF}\x{32CC}-\x{32CF}\x{3377}-\x{337A}\x{33DE}-\x{33DF}\x{33FF}\x{4DC0}-\x{4DFF}\x{A490}-\x{A4C6}\x{A60D}-\x{A60F}\x{A66F}\x{A670}-\x{A672}\x{A673}\x{A674}-\x{A67D}\x{A67E}\x{A67F}\x{A69E}-\x{A69F}\x{A6F0}-\x{A6F1}\x{A700}-\x{A716}\x{A717}-\x{A71F}\x{A720}-\x{A721}\x{A788}\x{A802}\x{A806}\x{A80B}\x{A825}-\x{A826}\x{A828}-\x{A82B}\x{A82C}\x{A838}\x{A839}\x{A874}-\x{A877}\x{A8C4}-\x{A8C5}\x{A8E0}-\x{A8F1}\x{A8FF}\x{A926}-\x{A92D}\x{A947}-\x{A951}\x{A980}-\x{A982}\x{A9B3}\x{A9B6}-\x{A9B9}\x{A9BC}-\x{A9BD}\x{A9E5}\x{AA29}-\x{AA2E}\x{AA31}-\x{AA32}\x{AA35}-\x{AA36}\x{AA43}\x{AA4C}\x{AA7C}\x{AAB0}\x{AAB2}-\x{AAB4}\x{AAB7}-\x{AAB8}\x{AABE}-\x{AABF}\x{AAC1}\x{AAEC}-\x{AAED}\x{AAF6}\x{AB6A}-\x{AB6B}\x{ABE5}\x{ABE8}\x{ABED}\x{FB1D}\x{FB1E}\x{FB1F}-\x{FB28}\x{FB29}\x{FB2A}-\x{FB36}\x{FB37}\x{FB38}-\x{FB3C}\x{FB3D}\x{FB3E}\x{FB3F}\x{FB40}-\x{FB41}\x{FB42}\x{FB43}-\x{FB44}\x{FB45}\x{FB46}-\x{FB4F}\x{FB50}-\x{FBB1}\x{FBB2}-\x{FBC1}\x{FBC2}-\x{FBD2}\x{FBD3}-\x{FD3D}\x{FD3E}\x{FD3F}\x{FD40}-\x{FD4F}\x{FD50}-\x{FD8F}\x{FD90}-\x{FD91}\x{FD92}-\x{FDC7}\x{FDC8}-\x{FDCF}\x{FDD0}-\x{FDEF}\x{FDF0}-\x{FDFB}\x{FDFC}\x{FDFD}\x{FDFE}-\x{FDFF}\x{FE00}-\x{FE0F}\x{FE10}-\x{FE16}\x{FE17}\x{FE18}\x{FE19}\x{FE20}-\x{FE2F}\x{FE30}\x{FE31}-\x{FE32}\x{FE33}-\x{FE34}\x{FE35}\x{FE36}\x{FE37}\x{FE38}\x{FE39}\x{FE3A}\x{FE3B}\x{FE3C}\x{FE3D}\x{FE3E}\x{FE3F}\x{FE40}\x{FE41}\x{FE42}\x{FE43}\x{FE44}\x{FE45}-\x{FE46}\x{FE47}\x{FE48}\x{FE49}-\x{FE4C}\x{FE4D}-\x{FE4F}\x{FE50}\x{FE51}\x{FE52}\x{FE54}\x{FE55}\x{FE56}-\x{FE57}\x{FE58}\x{FE59}\x{FE5A}\x{FE5B}\x{FE5C}\x{FE5D}\x{FE5E}\x{FE5F}\x{FE60}-\x{FE61}\x{FE62}\x{FE63}\x{FE64}-\x{FE66}\x{FE68}\x{FE69}\x{FE6A}\x{FE6B}\x{FE70}-\x{FE74}\x{FE75}\x{FE76}-\x{FEFC}\x{FEFD}-\x{FEFE}\x{FEFF}\x{FF01}-\x{FF02}\x{FF03}\x{FF04}\x{FF05}\x{FF06}-\x{FF07}\x{FF08}\x{FF09}\x{FF0A}\x{FF0B}\x{FF0C}\x{FF0D}\x{FF0E}-\x{FF0F}\x{FF10}-\x{FF19}\x{FF1A}\x{FF1B}\x{FF1C}-\x{FF1E}\x{FF1F}-\x{FF20}\x{FF3B}\x{FF3C}\x{FF3D}\x{FF3E}\x{FF3F}\x{FF40}\x{FF5B}\x{FF5C}\x{FF5D}\x{FF5E}\x{FF5F}\x{FF60}\x{FF61}\x{FF62}\x{FF63}\x{FF64}-\x{FF65}\x{FFE0}-\x{FFE1}\x{FFE2}\x{FFE3}\x{FFE4}\x{FFE5}-\x{FFE6}\x{FFE8}\x{FFE9}-\x{FFEC}\x{FFED}-\x{FFEE}\x{FFF0}-\x{FFF8}\x{FFF9}-\x{FFFB}\x{FFFC}-\x{FFFD}\x{FFFE}-\x{FFFF}\x{10101}\x{10140}-\x{10174}\x{10175}-\x{10178}\x{10179}-\x{10189}\x{1018A}-\x{1018B}\x{1018C}\x{10190}-\x{1019C}\x{101A0}\x{101FD}\x{102E0}\x{102E1}-\x{102FB}\x{10376}-\x{1037A}\x{10800}-\x{10805}\x{10806}-\x{10807}\x{10808}\x{10809}\x{1080A}-\x{10835}\x{10836}\x{10837}-\x{10838}\x{10839}-\x{1083B}\x{1083C}\x{1083D}-\x{1083E}\x{1083F}-\x{10855}\x{10856}\x{10857}\x{10858}-\x{1085F}\x{10860}-\x{10876}\x{10877}-\x{10878}\x{10879}-\x{1087F}\x{10880}-\x{1089E}\x{1089F}-\x{108A6}\x{108A7}-\x{108AF}\x{108B0}-\x{108DF}\x{108E0}-\x{108F2}\x{108F3}\x{108F4}-\x{108F5}\x{108F6}-\x{108FA}\x{108FB}-\x{108FF}\x{10900}-\x{10915}\x{10916}-\x{1091B}\x{1091C}-\x{1091E}\x{1091F}\x{10920}-\x{10939}\x{1093A}-\x{1093E}\x{1093F}\x{10940}-\x{1097F}\x{10980}-\x{109B7}\x{109B8}-\x{109BB}\x{109BC}-\x{109BD}\x{109BE}-\x{109BF}\x{109C0}-\x{109CF}\x{109D0}-\x{109D1}\x{109D2}-\x{109FF}\x{10A00}\x{10A01}-\x{10A03}\x{10A04}\x{10A05}-\x{10A06}\x{10A07}-\x{10A0B}\x{10A0C}-\x{10A0F}\x{10A10}-\x{10A13}\x{10A14}\x{10A15}-\x{10A17}\x{10A18}\x{10A19}-\x{10A35}\x{10A36}-\x{10A37}\x{10A38}-\x{10A3A}\x{10A3B}-\x{10A3E}\x{10A3F}\x{10A40}-\x{10A48}\x{10A49}-\x{10A4F}\x{10A50}-\x{10A58}\x{10A59}-\x{10A5F}\x{10A60}-\x{10A7C}\x{10A7D}-\x{10A7E}\x{10A7F}\x{10A80}-\x{10A9C}\x{10A9D}-\x{10A9F}\x{10AA0}-\x{10ABF}\x{10AC0}-\x{10AC7}\x{10AC8}\x{10AC9}-\x{10AE4}\x{10AE5}-\x{10AE6}\x{10AE7}-\x{10AEA}\x{10AEB}-\x{10AEF}\x{10AF0}-\x{10AF6}\x{10AF7}-\x{10AFF}\x{10B00}-\x{10B35}\x{10B36}-\x{10B38}\x{10B39}-\x{10B3F}\x{10B40}-\x{10B55}\x{10B56}-\x{10B57}\x{10B58}-\x{10B5F}\x{10B60}-\x{10B72}\x{10B73}-\x{10B77}\x{10B78}-\x{10B7F}\x{10B80}-\x{10B91}\x{10B92}-\x{10B98}\x{10B99}-\x{10B9C}\x{10B9D}-\x{10BA8}\x{10BA9}-\x{10BAF}\x{10BB0}-\x{10BFF}\x{10C00}-\x{10C48}\x{10C49}-\x{10C7F}\x{10C80}-\x{10CB2}\x{10CB3}-\x{10CBF}\x{10CC0}-\x{10CF2}\x{10CF3}-\x{10CF9}\x{10CFA}-\x{10CFF}\x{10D00}-\x{10D23}\x{10D24}-\x{10D27}\x{10D28}-\x{10D2F}\x{10D30}-\x{10D39}\x{10D3A}-\x{10D3F}\x{10D40}-\x{10E5F}\x{10E60}-\x{10E7E}\x{10E7F}\x{10E80}-\x{10EA9}\x{10EAA}\x{10EAB}-\x{10EAC}\x{10EAD}\x{10EAE}-\x{10EAF}\x{10EB0}-\x{10EB1}\x{10EB2}-\x{10EFF}\x{10F00}-\x{10F1C}\x{10F1D}-\x{10F26}\x{10F27}\x{10F28}-\x{10F2F}\x{10F30}-\x{10F45}\x{10F46}-\x{10F50}\x{10F51}-\x{10F54}\x{10F55}-\x{10F59}\x{10F5A}-\x{10F6F}\x{10F70}-\x{10FAF}\x{10FB0}-\x{10FC4}\x{10FC5}-\x{10FCB}\x{10FCC}-\x{10FDF}\x{10FE0}-\x{10FF6}\x{10FF7}-\x{10FFF}\x{11001}\x{11038}-\x{11046}\x{11052}-\x{11065}\x{1107F}-\x{11081}\x{110B3}-\x{110B6}\x{110B9}-\x{110BA}\x{11100}-\x{11102}\x{11127}-\x{1112B}\x{1112D}-\x{11134}\x{11173}\x{11180}-\x{11181}\x{111B6}-\x{111BE}\x{111C9}-\x{111CC}\x{111CF}\x{1122F}-\x{11231}\x{11234}\x{11236}-\x{11237}\x{1123E}\x{112DF}\x{112E3}-\x{112EA}\x{11300}-\x{11301}\x{1133B}-\x{1133C}\x{11340}\x{11366}-\x{1136C}\x{11370}-\x{11374}\x{11438}-\x{1143F}\x{11442}-\x{11444}\x{11446}\x{1145E}\x{114B3}-\x{114B8}\x{114BA}\x{114BF}-\x{114C0}\x{114C2}-\x{114C3}\x{115B2}-\x{115B5}\x{115BC}-\x{115BD}\x{115BF}-\x{115C0}\x{115DC}-\x{115DD}\x{11633}-\x{1163A}\x{1163D}\x{1163F}-\x{11640}\x{11660}-\x{1166C}\x{116AB}\x{116AD}\x{116B0}-\x{116B5}\x{116B7}\x{1171D}-\x{1171F}\x{11722}-\x{11725}\x{11727}-\x{1172B}\x{1182F}-\x{11837}\x{11839}-\x{1183A}\x{1193B}-\x{1193C}\x{1193E}\x{11943}\x{119D4}-\x{119D7}\x{119DA}-\x{119DB}\x{119E0}\x{11A01}-\x{11A06}\x{11A09}-\x{11A0A}\x{11A33}-\x{11A38}\x{11A3B}-\x{11A3E}\x{11A47}\x{11A51}-\x{11A56}\x{11A59}-\x{11A5B}\x{11A8A}-\x{11A96}\x{11A98}-\x{11A99}\x{11C30}-\x{11C36}\x{11C38}-\x{11C3D}\x{11C92}-\x{11CA7}\x{11CAA}-\x{11CB0}\x{11CB2}-\x{11CB3}\x{11CB5}-\x{11CB6}\x{11D31}-\x{11D36}\x{11D3A}\x{11D3C}-\x{11D3D}\x{11D3F}-\x{11D45}\x{11D47}\x{11D90}-\x{11D91}\x{11D95}\x{11D97}\x{11EF3}-\x{11EF4}\x{11FD5}-\x{11FDC}\x{11FDD}-\x{11FE0}\x{11FE1}-\x{11FF1}\x{16AF0}-\x{16AF4}\x{16B30}-\x{16B36}\x{16F4F}\x{16F8F}-\x{16F92}\x{16FE2}\x{16FE4}\x{1BC9D}-\x{1BC9E}\x{1BCA0}-\x{1BCA3}\x{1D167}-\x{1D169}\x{1D173}-\x{1D17A}\x{1D17B}-\x{1D182}\x{1D185}-\x{1D18B}\x{1D1AA}-\x{1D1AD}\x{1D200}-\x{1D241}\x{1D242}-\x{1D244}\x{1D245}\x{1D300}-\x{1D356}\x{1D6DB}\x{1D715}\x{1D74F}\x{1D789}\x{1D7C3}\x{1D7CE}-\x{1D7FF}\x{1DA00}-\x{1DA36}\x{1DA3B}-\x{1DA6C}\x{1DA75}\x{1DA84}\x{1DA9B}-\x{1DA9F}\x{1DAA1}-\x{1DAAF}\x{1E000}-\x{1E006}\x{1E008}-\x{1E018}\x{1E01B}-\x{1E021}\x{1E023}-\x{1E024}\x{1E026}-\x{1E02A}\x{1E130}-\x{1E136}\x{1E2EC}-\x{1E2EF}\x{1E2FF}\x{1E800}-\x{1E8C4}\x{1E8C5}-\x{1E8C6}\x{1E8C7}-\x{1E8CF}\x{1E8D0}-\x{1E8D6}\x{1E8D7}-\x{1E8FF}\x{1E900}-\x{1E943}\x{1E944}-\x{1E94A}\x{1E94B}\x{1E94C}-\x{1E94F}\x{1E950}-\x{1E959}\x{1E95A}-\x{1E95D}\x{1E95E}-\x{1E95F}\x{1E960}-\x{1EC6F}\x{1EC70}\x{1EC71}-\x{1ECAB}\x{1ECAC}\x{1ECAD}-\x{1ECAF}\x{1ECB0}\x{1ECB1}-\x{1ECB4}\x{1ECB5}-\x{1ECBF}\x{1ECC0}-\x{1ECFF}\x{1ED00}\x{1ED01}-\x{1ED2D}\x{1ED2E}\x{1ED2F}-\x{1ED3D}\x{1ED3E}-\x{1ED4F}\x{1ED50}-\x{1EDFF}\x{1EE00}-\x{1EE03}\x{1EE04}\x{1EE05}-\x{1EE1F}\x{1EE20}\x{1EE21}-\x{1EE22}\x{1EE23}\x{1EE24}\x{1EE25}-\x{1EE26}\x{1EE27}\x{1EE28}\x{1EE29}-\x{1EE32}\x{1EE33}\x{1EE34}-\x{1EE37}\x{1EE38}\x{1EE39}\x{1EE3A}\x{1EE3B}\x{1EE3C}-\x{1EE41}\x{1EE42}\x{1EE43}-\x{1EE46}\x{1EE47}\x{1EE48}\x{1EE49}\x{1EE4A}\x{1EE4B}\x{1EE4C}\x{1EE4D}-\x{1EE4F}\x{1EE50}\x{1EE51}-\x{1EE52}\x{1EE53}\x{1EE54}\x{1EE55}-\x{1EE56}\x{1EE57}\x{1EE58}\x{1EE59}\x{1EE5A}\x{1EE5B}\x{1EE5C}\x{1EE5D}\x{1EE5E}\x{1EE5F}\x{1EE60}\x{1EE61}-\x{1EE62}\x{1EE63}\x{1EE64}\x{1EE65}-\x{1EE66}\x{1EE67}-\x{1EE6A}\x{1EE6B}\x{1EE6C}-\x{1EE72}\x{1EE73}\x{1EE74}-\x{1EE77}\x{1EE78}\x{1EE79}-\x{1EE7C}\x{1EE7D}\x{1EE7E}\x{1EE7F}\x{1EE80}-\x{1EE89}\x{1EE8A}\x{1EE8B}-\x{1EE9B}\x{1EE9C}-\x{1EEA0}\x{1EEA1}-\x{1EEA3}\x{1EEA4}\x{1EEA5}-\x{1EEA9}\x{1EEAA}\x{1EEAB}-\x{1EEBB}\x{1EEBC}-\x{1EEEF}\x{1EEF0}-\x{1EEF1}\x{1EEF2}-\x{1EEFF}\x{1EF00}-\x{1EFFF}\x{1F000}-\x{1F02B}\x{1F030}-\x{1F093}\x{1F0A0}-\x{1F0AE}\x{1F0B1}-\x{1F0BF}\x{1F0C1}-\x{1F0CF}\x{1F0D1}-\x{1F0F5}\x{1F100}-\x{1F10A}\x{1F10B}-\x{1F10C}\x{1F10D}-\x{1F10F}\x{1F12F}\x{1F16A}-\x{1F16F}\x{1F1AD}\x{1F260}-\x{1F265}\x{1F300}-\x{1F3FA}\x{1F3FB}-\x{1F3FF}\x{1F400}-\x{1F6D7}\x{1F6E0}-\x{1F6EC}\x{1F6F0}-\x{1F6FC}\x{1F700}-\x{1F773}\x{1F780}-\x{1F7D8}\x{1F7E0}-\x{1F7EB}\x{1F800}-\x{1F80B}\x{1F810}-\x{1F847}\x{1F850}-\x{1F859}\x{1F860}-\x{1F887}\x{1F890}-\x{1F8AD}\x{1F8B0}-\x{1F8B1}\x{1F900}-\x{1F978}\x{1F97A}-\x{1F9CB}\x{1F9CD}-\x{1FA53}\x{1FA60}-\x{1FA6D}\x{1FA70}-\x{1FA74}\x{1FA78}-\x{1FA7A}\x{1FA80}-\x{1FA86}\x{1FA90}-\x{1FAA8}\x{1FAB0}-\x{1FAB6}\x{1FAC0}-\x{1FAC2}\x{1FAD0}-\x{1FAD6}\x{1FB00}-\x{1FB92}\x{1FB94}-\x{1FBCA}\x{1FBF0}-\x{1FBF9}\x{1FFFE}-\x{1FFFF}\x{2FFFE}-\x{2FFFF}\x{3FFFE}-\x{3FFFF}\x{4FFFE}-\x{4FFFF}\x{5FFFE}-\x{5FFFF}\x{6FFFE}-\x{6FFFF}\x{7FFFE}-\x{7FFFF}\x{8FFFE}-\x{8FFFF}\x{9FFFE}-\x{9FFFF}\x{AFFFE}-\x{AFFFF}\x{BFFFE}-\x{BFFFF}\x{CFFFE}-\x{CFFFF}\x{DFFFE}-\x{E0000}\x{E0001}\x{E0002}-\x{E001F}\x{E0020}-\x{E007F}\x{E0080}-\x{E00FF}\x{E0100}-\x{E01EF}\x{E01F0}-\x{E0FFF}\x{EFFFE}-\x{EFFFF}\x{FFFFE}-\x{FFFFF}\x{10FFFE}-\x{10FFFF}]/u';
+    const BIDI_STEP_1_RTL = '/^[\x{0590}\x{05BE}\x{05C0}\x{05C3}\x{05C6}\x{05C8}-\x{05CF}\x{05D0}-\x{05EA}\x{05EB}-\x{05EE}\x{05EF}-\x{05F2}\x{05F3}-\x{05F4}\x{05F5}-\x{05FF}\x{0608}\x{060B}\x{060D}\x{061B}\x{061C}\x{061D}\x{061E}-\x{061F}\x{0620}-\x{063F}\x{0640}\x{0641}-\x{064A}\x{066D}\x{066E}-\x{066F}\x{0671}-\x{06D3}\x{06D4}\x{06D5}\x{06E5}-\x{06E6}\x{06EE}-\x{06EF}\x{06FA}-\x{06FC}\x{06FD}-\x{06FE}\x{06FF}\x{0700}-\x{070D}\x{070E}\x{070F}\x{0710}\x{0712}-\x{072F}\x{074B}-\x{074C}\x{074D}-\x{07A5}\x{07B1}\x{07B2}-\x{07BF}\x{07C0}-\x{07C9}\x{07CA}-\x{07EA}\x{07F4}-\x{07F5}\x{07FA}\x{07FB}-\x{07FC}\x{07FE}-\x{07FF}\x{0800}-\x{0815}\x{081A}\x{0824}\x{0828}\x{082E}-\x{082F}\x{0830}-\x{083E}\x{083F}\x{0840}-\x{0858}\x{085C}-\x{085D}\x{085E}\x{085F}\x{0860}-\x{086A}\x{086B}-\x{086F}\x{0870}-\x{089F}\x{08A0}-\x{08B4}\x{08B5}\x{08B6}-\x{08C7}\x{08C8}-\x{08D2}\x{200F}\x{FB1D}\x{FB1F}-\x{FB28}\x{FB2A}-\x{FB36}\x{FB37}\x{FB38}-\x{FB3C}\x{FB3D}\x{FB3E}\x{FB3F}\x{FB40}-\x{FB41}\x{FB42}\x{FB43}-\x{FB44}\x{FB45}\x{FB46}-\x{FB4F}\x{FB50}-\x{FBB1}\x{FBB2}-\x{FBC1}\x{FBC2}-\x{FBD2}\x{FBD3}-\x{FD3D}\x{FD40}-\x{FD4F}\x{FD50}-\x{FD8F}\x{FD90}-\x{FD91}\x{FD92}-\x{FDC7}\x{FDC8}-\x{FDCF}\x{FDF0}-\x{FDFB}\x{FDFC}\x{FDFE}-\x{FDFF}\x{FE70}-\x{FE74}\x{FE75}\x{FE76}-\x{FEFC}\x{FEFD}-\x{FEFE}\x{10800}-\x{10805}\x{10806}-\x{10807}\x{10808}\x{10809}\x{1080A}-\x{10835}\x{10836}\x{10837}-\x{10838}\x{10839}-\x{1083B}\x{1083C}\x{1083D}-\x{1083E}\x{1083F}-\x{10855}\x{10856}\x{10857}\x{10858}-\x{1085F}\x{10860}-\x{10876}\x{10877}-\x{10878}\x{10879}-\x{1087F}\x{10880}-\x{1089E}\x{1089F}-\x{108A6}\x{108A7}-\x{108AF}\x{108B0}-\x{108DF}\x{108E0}-\x{108F2}\x{108F3}\x{108F4}-\x{108F5}\x{108F6}-\x{108FA}\x{108FB}-\x{108FF}\x{10900}-\x{10915}\x{10916}-\x{1091B}\x{1091C}-\x{1091E}\x{10920}-\x{10939}\x{1093A}-\x{1093E}\x{1093F}\x{10940}-\x{1097F}\x{10980}-\x{109B7}\x{109B8}-\x{109BB}\x{109BC}-\x{109BD}\x{109BE}-\x{109BF}\x{109C0}-\x{109CF}\x{109D0}-\x{109D1}\x{109D2}-\x{109FF}\x{10A00}\x{10A04}\x{10A07}-\x{10A0B}\x{10A10}-\x{10A13}\x{10A14}\x{10A15}-\x{10A17}\x{10A18}\x{10A19}-\x{10A35}\x{10A36}-\x{10A37}\x{10A3B}-\x{10A3E}\x{10A40}-\x{10A48}\x{10A49}-\x{10A4F}\x{10A50}-\x{10A58}\x{10A59}-\x{10A5F}\x{10A60}-\x{10A7C}\x{10A7D}-\x{10A7E}\x{10A7F}\x{10A80}-\x{10A9C}\x{10A9D}-\x{10A9F}\x{10AA0}-\x{10ABF}\x{10AC0}-\x{10AC7}\x{10AC8}\x{10AC9}-\x{10AE4}\x{10AE7}-\x{10AEA}\x{10AEB}-\x{10AEF}\x{10AF0}-\x{10AF6}\x{10AF7}-\x{10AFF}\x{10B00}-\x{10B35}\x{10B36}-\x{10B38}\x{10B40}-\x{10B55}\x{10B56}-\x{10B57}\x{10B58}-\x{10B5F}\x{10B60}-\x{10B72}\x{10B73}-\x{10B77}\x{10B78}-\x{10B7F}\x{10B80}-\x{10B91}\x{10B92}-\x{10B98}\x{10B99}-\x{10B9C}\x{10B9D}-\x{10BA8}\x{10BA9}-\x{10BAF}\x{10BB0}-\x{10BFF}\x{10C00}-\x{10C48}\x{10C49}-\x{10C7F}\x{10C80}-\x{10CB2}\x{10CB3}-\x{10CBF}\x{10CC0}-\x{10CF2}\x{10CF3}-\x{10CF9}\x{10CFA}-\x{10CFF}\x{10D00}-\x{10D23}\x{10D28}-\x{10D2F}\x{10D3A}-\x{10D3F}\x{10D40}-\x{10E5F}\x{10E7F}\x{10E80}-\x{10EA9}\x{10EAA}\x{10EAD}\x{10EAE}-\x{10EAF}\x{10EB0}-\x{10EB1}\x{10EB2}-\x{10EFF}\x{10F00}-\x{10F1C}\x{10F1D}-\x{10F26}\x{10F27}\x{10F28}-\x{10F2F}\x{10F30}-\x{10F45}\x{10F51}-\x{10F54}\x{10F55}-\x{10F59}\x{10F5A}-\x{10F6F}\x{10F70}-\x{10FAF}\x{10FB0}-\x{10FC4}\x{10FC5}-\x{10FCB}\x{10FCC}-\x{10FDF}\x{10FE0}-\x{10FF6}\x{10FF7}-\x{10FFF}\x{1E800}-\x{1E8C4}\x{1E8C5}-\x{1E8C6}\x{1E8C7}-\x{1E8CF}\x{1E8D7}-\x{1E8FF}\x{1E900}-\x{1E943}\x{1E94B}\x{1E94C}-\x{1E94F}\x{1E950}-\x{1E959}\x{1E95A}-\x{1E95D}\x{1E95E}-\x{1E95F}\x{1E960}-\x{1EC6F}\x{1EC70}\x{1EC71}-\x{1ECAB}\x{1ECAC}\x{1ECAD}-\x{1ECAF}\x{1ECB0}\x{1ECB1}-\x{1ECB4}\x{1ECB5}-\x{1ECBF}\x{1ECC0}-\x{1ECFF}\x{1ED00}\x{1ED01}-\x{1ED2D}\x{1ED2E}\x{1ED2F}-\x{1ED3D}\x{1ED3E}-\x{1ED4F}\x{1ED50}-\x{1EDFF}\x{1EE00}-\x{1EE03}\x{1EE04}\x{1EE05}-\x{1EE1F}\x{1EE20}\x{1EE21}-\x{1EE22}\x{1EE23}\x{1EE24}\x{1EE25}-\x{1EE26}\x{1EE27}\x{1EE28}\x{1EE29}-\x{1EE32}\x{1EE33}\x{1EE34}-\x{1EE37}\x{1EE38}\x{1EE39}\x{1EE3A}\x{1EE3B}\x{1EE3C}-\x{1EE41}\x{1EE42}\x{1EE43}-\x{1EE46}\x{1EE47}\x{1EE48}\x{1EE49}\x{1EE4A}\x{1EE4B}\x{1EE4C}\x{1EE4D}-\x{1EE4F}\x{1EE50}\x{1EE51}-\x{1EE52}\x{1EE53}\x{1EE54}\x{1EE55}-\x{1EE56}\x{1EE57}\x{1EE58}\x{1EE59}\x{1EE5A}\x{1EE5B}\x{1EE5C}\x{1EE5D}\x{1EE5E}\x{1EE5F}\x{1EE60}\x{1EE61}-\x{1EE62}\x{1EE63}\x{1EE64}\x{1EE65}-\x{1EE66}\x{1EE67}-\x{1EE6A}\x{1EE6B}\x{1EE6C}-\x{1EE72}\x{1EE73}\x{1EE74}-\x{1EE77}\x{1EE78}\x{1EE79}-\x{1EE7C}\x{1EE7D}\x{1EE7E}\x{1EE7F}\x{1EE80}-\x{1EE89}\x{1EE8A}\x{1EE8B}-\x{1EE9B}\x{1EE9C}-\x{1EEA0}\x{1EEA1}-\x{1EEA3}\x{1EEA4}\x{1EEA5}-\x{1EEA9}\x{1EEAA}\x{1EEAB}-\x{1EEBB}\x{1EEBC}-\x{1EEEF}\x{1EEF2}-\x{1EEFF}\x{1EF00}-\x{1EFFF}]/u';
+    const BIDI_STEP_2 = '/[^\x{0000}-\x{0008}\x{000E}-\x{001B}\x{0021}-\x{0022}\x{0023}\x{0024}\x{0025}\x{0026}-\x{0027}\x{0028}\x{0029}\x{002A}\x{002B}\x{002C}\x{002D}\x{002E}-\x{002F}\x{0030}-\x{0039}\x{003A}\x{003B}\x{003C}-\x{003E}\x{003F}-\x{0040}\x{005B}\x{005C}\x{005D}\x{005E}\x{005F}\x{0060}\x{007B}\x{007C}\x{007D}\x{007E}\x{007F}-\x{0084}\x{0086}-\x{009F}\x{00A0}\x{00A1}\x{00A2}-\x{00A5}\x{00A6}\x{00A7}\x{00A8}\x{00A9}\x{00AB}\x{00AC}\x{00AD}\x{00AE}\x{00AF}\x{00B0}\x{00B1}\x{00B2}-\x{00B3}\x{00B4}\x{00B6}-\x{00B7}\x{00B8}\x{00B9}\x{00BB}\x{00BC}-\x{00BE}\x{00BF}\x{00D7}\x{00F7}\x{02B9}-\x{02BA}\x{02C2}-\x{02C5}\x{02C6}-\x{02CF}\x{02D2}-\x{02DF}\x{02E5}-\x{02EB}\x{02EC}\x{02ED}\x{02EF}-\x{02FF}\x{0300}-\x{036F}\x{0374}\x{0375}\x{037E}\x{0384}-\x{0385}\x{0387}\x{03F6}\x{0483}-\x{0487}\x{0488}-\x{0489}\x{058A}\x{058D}-\x{058E}\x{058F}\x{0590}\x{0591}-\x{05BD}\x{05BE}\x{05BF}\x{05C0}\x{05C1}-\x{05C2}\x{05C3}\x{05C4}-\x{05C5}\x{05C6}\x{05C7}\x{05C8}-\x{05CF}\x{05D0}-\x{05EA}\x{05EB}-\x{05EE}\x{05EF}-\x{05F2}\x{05F3}-\x{05F4}\x{05F5}-\x{05FF}\x{0600}-\x{0605}\x{0606}-\x{0607}\x{0608}\x{0609}-\x{060A}\x{060B}\x{060C}\x{060D}\x{060E}-\x{060F}\x{0610}-\x{061A}\x{061B}\x{061C}\x{061D}\x{061E}-\x{061F}\x{0620}-\x{063F}\x{0640}\x{0641}-\x{064A}\x{064B}-\x{065F}\x{0660}-\x{0669}\x{066A}\x{066B}-\x{066C}\x{066D}\x{066E}-\x{066F}\x{0670}\x{0671}-\x{06D3}\x{06D4}\x{06D5}\x{06D6}-\x{06DC}\x{06DD}\x{06DE}\x{06DF}-\x{06E4}\x{06E5}-\x{06E6}\x{06E7}-\x{06E8}\x{06E9}\x{06EA}-\x{06ED}\x{06EE}-\x{06EF}\x{06F0}-\x{06F9}\x{06FA}-\x{06FC}\x{06FD}-\x{06FE}\x{06FF}\x{0700}-\x{070D}\x{070E}\x{070F}\x{0710}\x{0711}\x{0712}-\x{072F}\x{0730}-\x{074A}\x{074B}-\x{074C}\x{074D}-\x{07A5}\x{07A6}-\x{07B0}\x{07B1}\x{07B2}-\x{07BF}\x{07C0}-\x{07C9}\x{07CA}-\x{07EA}\x{07EB}-\x{07F3}\x{07F4}-\x{07F5}\x{07F6}\x{07F7}-\x{07F9}\x{07FA}\x{07FB}-\x{07FC}\x{07FD}\x{07FE}-\x{07FF}\x{0800}-\x{0815}\x{0816}-\x{0819}\x{081A}\x{081B}-\x{0823}\x{0824}\x{0825}-\x{0827}\x{0828}\x{0829}-\x{082D}\x{082E}-\x{082F}\x{0830}-\x{083E}\x{083F}\x{0840}-\x{0858}\x{0859}-\x{085B}\x{085C}-\x{085D}\x{085E}\x{085F}\x{0860}-\x{086A}\x{086B}-\x{086F}\x{0870}-\x{089F}\x{08A0}-\x{08B4}\x{08B5}\x{08B6}-\x{08C7}\x{08C8}-\x{08D2}\x{08D3}-\x{08E1}\x{08E2}\x{08E3}-\x{0902}\x{093A}\x{093C}\x{0941}-\x{0948}\x{094D}\x{0951}-\x{0957}\x{0962}-\x{0963}\x{0981}\x{09BC}\x{09C1}-\x{09C4}\x{09CD}\x{09E2}-\x{09E3}\x{09F2}-\x{09F3}\x{09FB}\x{09FE}\x{0A01}-\x{0A02}\x{0A3C}\x{0A41}-\x{0A42}\x{0A47}-\x{0A48}\x{0A4B}-\x{0A4D}\x{0A51}\x{0A70}-\x{0A71}\x{0A75}\x{0A81}-\x{0A82}\x{0ABC}\x{0AC1}-\x{0AC5}\x{0AC7}-\x{0AC8}\x{0ACD}\x{0AE2}-\x{0AE3}\x{0AF1}\x{0AFA}-\x{0AFF}\x{0B01}\x{0B3C}\x{0B3F}\x{0B41}-\x{0B44}\x{0B4D}\x{0B55}-\x{0B56}\x{0B62}-\x{0B63}\x{0B82}\x{0BC0}\x{0BCD}\x{0BF3}-\x{0BF8}\x{0BF9}\x{0BFA}\x{0C00}\x{0C04}\x{0C3E}-\x{0C40}\x{0C46}-\x{0C48}\x{0C4A}-\x{0C4D}\x{0C55}-\x{0C56}\x{0C62}-\x{0C63}\x{0C78}-\x{0C7E}\x{0C81}\x{0CBC}\x{0CCC}-\x{0CCD}\x{0CE2}-\x{0CE3}\x{0D00}-\x{0D01}\x{0D3B}-\x{0D3C}\x{0D41}-\x{0D44}\x{0D4D}\x{0D62}-\x{0D63}\x{0D81}\x{0DCA}\x{0DD2}-\x{0DD4}\x{0DD6}\x{0E31}\x{0E34}-\x{0E3A}\x{0E3F}\x{0E47}-\x{0E4E}\x{0EB1}\x{0EB4}-\x{0EBC}\x{0EC8}-\x{0ECD}\x{0F18}-\x{0F19}\x{0F35}\x{0F37}\x{0F39}\x{0F3A}\x{0F3B}\x{0F3C}\x{0F3D}\x{0F71}-\x{0F7E}\x{0F80}-\x{0F84}\x{0F86}-\x{0F87}\x{0F8D}-\x{0F97}\x{0F99}-\x{0FBC}\x{0FC6}\x{102D}-\x{1030}\x{1032}-\x{1037}\x{1039}-\x{103A}\x{103D}-\x{103E}\x{1058}-\x{1059}\x{105E}-\x{1060}\x{1071}-\x{1074}\x{1082}\x{1085}-\x{1086}\x{108D}\x{109D}\x{135D}-\x{135F}\x{1390}-\x{1399}\x{1400}\x{169B}\x{169C}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}-\x{1753}\x{1772}-\x{1773}\x{17B4}-\x{17B5}\x{17B7}-\x{17BD}\x{17C6}\x{17C9}-\x{17D3}\x{17DB}\x{17DD}\x{17F0}-\x{17F9}\x{1800}-\x{1805}\x{1806}\x{1807}-\x{180A}\x{180B}-\x{180D}\x{180E}\x{1885}-\x{1886}\x{18A9}\x{1920}-\x{1922}\x{1927}-\x{1928}\x{1932}\x{1939}-\x{193B}\x{1940}\x{1944}-\x{1945}\x{19DE}-\x{19FF}\x{1A17}-\x{1A18}\x{1A1B}\x{1A56}\x{1A58}-\x{1A5E}\x{1A60}\x{1A62}\x{1A65}-\x{1A6C}\x{1A73}-\x{1A7C}\x{1A7F}\x{1AB0}-\x{1ABD}\x{1ABE}\x{1ABF}-\x{1AC0}\x{1B00}-\x{1B03}\x{1B34}\x{1B36}-\x{1B3A}\x{1B3C}\x{1B42}\x{1B6B}-\x{1B73}\x{1B80}-\x{1B81}\x{1BA2}-\x{1BA5}\x{1BA8}-\x{1BA9}\x{1BAB}-\x{1BAD}\x{1BE6}\x{1BE8}-\x{1BE9}\x{1BED}\x{1BEF}-\x{1BF1}\x{1C2C}-\x{1C33}\x{1C36}-\x{1C37}\x{1CD0}-\x{1CD2}\x{1CD4}-\x{1CE0}\x{1CE2}-\x{1CE8}\x{1CED}\x{1CF4}\x{1CF8}-\x{1CF9}\x{1DC0}-\x{1DF9}\x{1DFB}-\x{1DFF}\x{1FBD}\x{1FBF}-\x{1FC1}\x{1FCD}-\x{1FCF}\x{1FDD}-\x{1FDF}\x{1FED}-\x{1FEF}\x{1FFD}-\x{1FFE}\x{200B}-\x{200D}\x{200F}\x{2010}-\x{2015}\x{2016}-\x{2017}\x{2018}\x{2019}\x{201A}\x{201B}-\x{201C}\x{201D}\x{201E}\x{201F}\x{2020}-\x{2027}\x{202F}\x{2030}-\x{2034}\x{2035}-\x{2038}\x{2039}\x{203A}\x{203B}-\x{203E}\x{203F}-\x{2040}\x{2041}-\x{2043}\x{2044}\x{2045}\x{2046}\x{2047}-\x{2051}\x{2052}\x{2053}\x{2054}\x{2055}-\x{205E}\x{2060}-\x{2064}\x{2065}\x{206A}-\x{206F}\x{2070}\x{2074}-\x{2079}\x{207A}-\x{207B}\x{207C}\x{207D}\x{207E}\x{2080}-\x{2089}\x{208A}-\x{208B}\x{208C}\x{208D}\x{208E}\x{20A0}-\x{20BF}\x{20C0}-\x{20CF}\x{20D0}-\x{20DC}\x{20DD}-\x{20E0}\x{20E1}\x{20E2}-\x{20E4}\x{20E5}-\x{20F0}\x{2100}-\x{2101}\x{2103}-\x{2106}\x{2108}-\x{2109}\x{2114}\x{2116}-\x{2117}\x{2118}\x{211E}-\x{2123}\x{2125}\x{2127}\x{2129}\x{212E}\x{213A}-\x{213B}\x{2140}-\x{2144}\x{214A}\x{214B}\x{214C}-\x{214D}\x{2150}-\x{215F}\x{2189}\x{218A}-\x{218B}\x{2190}-\x{2194}\x{2195}-\x{2199}\x{219A}-\x{219B}\x{219C}-\x{219F}\x{21A0}\x{21A1}-\x{21A2}\x{21A3}\x{21A4}-\x{21A5}\x{21A6}\x{21A7}-\x{21AD}\x{21AE}\x{21AF}-\x{21CD}\x{21CE}-\x{21CF}\x{21D0}-\x{21D1}\x{21D2}\x{21D3}\x{21D4}\x{21D5}-\x{21F3}\x{21F4}-\x{2211}\x{2212}\x{2213}\x{2214}-\x{22FF}\x{2300}-\x{2307}\x{2308}\x{2309}\x{230A}\x{230B}\x{230C}-\x{231F}\x{2320}-\x{2321}\x{2322}-\x{2328}\x{2329}\x{232A}\x{232B}-\x{2335}\x{237B}\x{237C}\x{237D}-\x{2394}\x{2396}-\x{239A}\x{239B}-\x{23B3}\x{23B4}-\x{23DB}\x{23DC}-\x{23E1}\x{23E2}-\x{2426}\x{2440}-\x{244A}\x{2460}-\x{2487}\x{2488}-\x{249B}\x{24EA}-\x{24FF}\x{2500}-\x{25B6}\x{25B7}\x{25B8}-\x{25C0}\x{25C1}\x{25C2}-\x{25F7}\x{25F8}-\x{25FF}\x{2600}-\x{266E}\x{266F}\x{2670}-\x{26AB}\x{26AD}-\x{2767}\x{2768}\x{2769}\x{276A}\x{276B}\x{276C}\x{276D}\x{276E}\x{276F}\x{2770}\x{2771}\x{2772}\x{2773}\x{2774}\x{2775}\x{2776}-\x{2793}\x{2794}-\x{27BF}\x{27C0}-\x{27C4}\x{27C5}\x{27C6}\x{27C7}-\x{27E5}\x{27E6}\x{27E7}\x{27E8}\x{27E9}\x{27EA}\x{27EB}\x{27EC}\x{27ED}\x{27EE}\x{27EF}\x{27F0}-\x{27FF}\x{2900}-\x{2982}\x{2983}\x{2984}\x{2985}\x{2986}\x{2987}\x{2988}\x{2989}\x{298A}\x{298B}\x{298C}\x{298D}\x{298E}\x{298F}\x{2990}\x{2991}\x{2992}\x{2993}\x{2994}\x{2995}\x{2996}\x{2997}\x{2998}\x{2999}-\x{29D7}\x{29D8}\x{29D9}\x{29DA}\x{29DB}\x{29DC}-\x{29FB}\x{29FC}\x{29FD}\x{29FE}-\x{2AFF}\x{2B00}-\x{2B2F}\x{2B30}-\x{2B44}\x{2B45}-\x{2B46}\x{2B47}-\x{2B4C}\x{2B4D}-\x{2B73}\x{2B76}-\x{2B95}\x{2B97}-\x{2BFF}\x{2CE5}-\x{2CEA}\x{2CEF}-\x{2CF1}\x{2CF9}-\x{2CFC}\x{2CFD}\x{2CFE}-\x{2CFF}\x{2D7F}\x{2DE0}-\x{2DFF}\x{2E00}-\x{2E01}\x{2E02}\x{2E03}\x{2E04}\x{2E05}\x{2E06}-\x{2E08}\x{2E09}\x{2E0A}\x{2E0B}\x{2E0C}\x{2E0D}\x{2E0E}-\x{2E16}\x{2E17}\x{2E18}-\x{2E19}\x{2E1A}\x{2E1B}\x{2E1C}\x{2E1D}\x{2E1E}-\x{2E1F}\x{2E20}\x{2E21}\x{2E22}\x{2E23}\x{2E24}\x{2E25}\x{2E26}\x{2E27}\x{2E28}\x{2E29}\x{2E2A}-\x{2E2E}\x{2E2F}\x{2E30}-\x{2E39}\x{2E3A}-\x{2E3B}\x{2E3C}-\x{2E3F}\x{2E40}\x{2E41}\x{2E42}\x{2E43}-\x{2E4F}\x{2E50}-\x{2E51}\x{2E52}\x{2E80}-\x{2E99}\x{2E9B}-\x{2EF3}\x{2F00}-\x{2FD5}\x{2FF0}-\x{2FFB}\x{3001}-\x{3003}\x{3004}\x{3008}\x{3009}\x{300A}\x{300B}\x{300C}\x{300D}\x{300E}\x{300F}\x{3010}\x{3011}\x{3012}-\x{3013}\x{3014}\x{3015}\x{3016}\x{3017}\x{3018}\x{3019}\x{301A}\x{301B}\x{301C}\x{301D}\x{301E}-\x{301F}\x{3020}\x{302A}-\x{302D}\x{3030}\x{3036}-\x{3037}\x{303D}\x{303E}-\x{303F}\x{3099}-\x{309A}\x{309B}-\x{309C}\x{30A0}\x{30FB}\x{31C0}-\x{31E3}\x{321D}-\x{321E}\x{3250}\x{3251}-\x{325F}\x{327C}-\x{327E}\x{32B1}-\x{32BF}\x{32CC}-\x{32CF}\x{3377}-\x{337A}\x{33DE}-\x{33DF}\x{33FF}\x{4DC0}-\x{4DFF}\x{A490}-\x{A4C6}\x{A60D}-\x{A60F}\x{A66F}\x{A670}-\x{A672}\x{A673}\x{A674}-\x{A67D}\x{A67E}\x{A67F}\x{A69E}-\x{A69F}\x{A6F0}-\x{A6F1}\x{A700}-\x{A716}\x{A717}-\x{A71F}\x{A720}-\x{A721}\x{A788}\x{A802}\x{A806}\x{A80B}\x{A825}-\x{A826}\x{A828}-\x{A82B}\x{A82C}\x{A838}\x{A839}\x{A874}-\x{A877}\x{A8C4}-\x{A8C5}\x{A8E0}-\x{A8F1}\x{A8FF}\x{A926}-\x{A92D}\x{A947}-\x{A951}\x{A980}-\x{A982}\x{A9B3}\x{A9B6}-\x{A9B9}\x{A9BC}-\x{A9BD}\x{A9E5}\x{AA29}-\x{AA2E}\x{AA31}-\x{AA32}\x{AA35}-\x{AA36}\x{AA43}\x{AA4C}\x{AA7C}\x{AAB0}\x{AAB2}-\x{AAB4}\x{AAB7}-\x{AAB8}\x{AABE}-\x{AABF}\x{AAC1}\x{AAEC}-\x{AAED}\x{AAF6}\x{AB6A}-\x{AB6B}\x{ABE5}\x{ABE8}\x{ABED}\x{FB1D}\x{FB1E}\x{FB1F}-\x{FB28}\x{FB29}\x{FB2A}-\x{FB36}\x{FB37}\x{FB38}-\x{FB3C}\x{FB3D}\x{FB3E}\x{FB3F}\x{FB40}-\x{FB41}\x{FB42}\x{FB43}-\x{FB44}\x{FB45}\x{FB46}-\x{FB4F}\x{FB50}-\x{FBB1}\x{FBB2}-\x{FBC1}\x{FBC2}-\x{FBD2}\x{FBD3}-\x{FD3D}\x{FD3E}\x{FD3F}\x{FD40}-\x{FD4F}\x{FD50}-\x{FD8F}\x{FD90}-\x{FD91}\x{FD92}-\x{FDC7}\x{FDC8}-\x{FDCF}\x{FDD0}-\x{FDEF}\x{FDF0}-\x{FDFB}\x{FDFC}\x{FDFD}\x{FDFE}-\x{FDFF}\x{FE00}-\x{FE0F}\x{FE10}-\x{FE16}\x{FE17}\x{FE18}\x{FE19}\x{FE20}-\x{FE2F}\x{FE30}\x{FE31}-\x{FE32}\x{FE33}-\x{FE34}\x{FE35}\x{FE36}\x{FE37}\x{FE38}\x{FE39}\x{FE3A}\x{FE3B}\x{FE3C}\x{FE3D}\x{FE3E}\x{FE3F}\x{FE40}\x{FE41}\x{FE42}\x{FE43}\x{FE44}\x{FE45}-\x{FE46}\x{FE47}\x{FE48}\x{FE49}-\x{FE4C}\x{FE4D}-\x{FE4F}\x{FE50}\x{FE51}\x{FE52}\x{FE54}\x{FE55}\x{FE56}-\x{FE57}\x{FE58}\x{FE59}\x{FE5A}\x{FE5B}\x{FE5C}\x{FE5D}\x{FE5E}\x{FE5F}\x{FE60}-\x{FE61}\x{FE62}\x{FE63}\x{FE64}-\x{FE66}\x{FE68}\x{FE69}\x{FE6A}\x{FE6B}\x{FE70}-\x{FE74}\x{FE75}\x{FE76}-\x{FEFC}\x{FEFD}-\x{FEFE}\x{FEFF}\x{FF01}-\x{FF02}\x{FF03}\x{FF04}\x{FF05}\x{FF06}-\x{FF07}\x{FF08}\x{FF09}\x{FF0A}\x{FF0B}\x{FF0C}\x{FF0D}\x{FF0E}-\x{FF0F}\x{FF10}-\x{FF19}\x{FF1A}\x{FF1B}\x{FF1C}-\x{FF1E}\x{FF1F}-\x{FF20}\x{FF3B}\x{FF3C}\x{FF3D}\x{FF3E}\x{FF3F}\x{FF40}\x{FF5B}\x{FF5C}\x{FF5D}\x{FF5E}\x{FF5F}\x{FF60}\x{FF61}\x{FF62}\x{FF63}\x{FF64}-\x{FF65}\x{FFE0}-\x{FFE1}\x{FFE2}\x{FFE3}\x{FFE4}\x{FFE5}-\x{FFE6}\x{FFE8}\x{FFE9}-\x{FFEC}\x{FFED}-\x{FFEE}\x{FFF0}-\x{FFF8}\x{FFF9}-\x{FFFB}\x{FFFC}-\x{FFFD}\x{FFFE}-\x{FFFF}\x{10101}\x{10140}-\x{10174}\x{10175}-\x{10178}\x{10179}-\x{10189}\x{1018A}-\x{1018B}\x{1018C}\x{10190}-\x{1019C}\x{101A0}\x{101FD}\x{102E0}\x{102E1}-\x{102FB}\x{10376}-\x{1037A}\x{10800}-\x{10805}\x{10806}-\x{10807}\x{10808}\x{10809}\x{1080A}-\x{10835}\x{10836}\x{10837}-\x{10838}\x{10839}-\x{1083B}\x{1083C}\x{1083D}-\x{1083E}\x{1083F}-\x{10855}\x{10856}\x{10857}\x{10858}-\x{1085F}\x{10860}-\x{10876}\x{10877}-\x{10878}\x{10879}-\x{1087F}\x{10880}-\x{1089E}\x{1089F}-\x{108A6}\x{108A7}-\x{108AF}\x{108B0}-\x{108DF}\x{108E0}-\x{108F2}\x{108F3}\x{108F4}-\x{108F5}\x{108F6}-\x{108FA}\x{108FB}-\x{108FF}\x{10900}-\x{10915}\x{10916}-\x{1091B}\x{1091C}-\x{1091E}\x{1091F}\x{10920}-\x{10939}\x{1093A}-\x{1093E}\x{1093F}\x{10940}-\x{1097F}\x{10980}-\x{109B7}\x{109B8}-\x{109BB}\x{109BC}-\x{109BD}\x{109BE}-\x{109BF}\x{109C0}-\x{109CF}\x{109D0}-\x{109D1}\x{109D2}-\x{109FF}\x{10A00}\x{10A01}-\x{10A03}\x{10A04}\x{10A05}-\x{10A06}\x{10A07}-\x{10A0B}\x{10A0C}-\x{10A0F}\x{10A10}-\x{10A13}\x{10A14}\x{10A15}-\x{10A17}\x{10A18}\x{10A19}-\x{10A35}\x{10A36}-\x{10A37}\x{10A38}-\x{10A3A}\x{10A3B}-\x{10A3E}\x{10A3F}\x{10A40}-\x{10A48}\x{10A49}-\x{10A4F}\x{10A50}-\x{10A58}\x{10A59}-\x{10A5F}\x{10A60}-\x{10A7C}\x{10A7D}-\x{10A7E}\x{10A7F}\x{10A80}-\x{10A9C}\x{10A9D}-\x{10A9F}\x{10AA0}-\x{10ABF}\x{10AC0}-\x{10AC7}\x{10AC8}\x{10AC9}-\x{10AE4}\x{10AE5}-\x{10AE6}\x{10AE7}-\x{10AEA}\x{10AEB}-\x{10AEF}\x{10AF0}-\x{10AF6}\x{10AF7}-\x{10AFF}\x{10B00}-\x{10B35}\x{10B36}-\x{10B38}\x{10B39}-\x{10B3F}\x{10B40}-\x{10B55}\x{10B56}-\x{10B57}\x{10B58}-\x{10B5F}\x{10B60}-\x{10B72}\x{10B73}-\x{10B77}\x{10B78}-\x{10B7F}\x{10B80}-\x{10B91}\x{10B92}-\x{10B98}\x{10B99}-\x{10B9C}\x{10B9D}-\x{10BA8}\x{10BA9}-\x{10BAF}\x{10BB0}-\x{10BFF}\x{10C00}-\x{10C48}\x{10C49}-\x{10C7F}\x{10C80}-\x{10CB2}\x{10CB3}-\x{10CBF}\x{10CC0}-\x{10CF2}\x{10CF3}-\x{10CF9}\x{10CFA}-\x{10CFF}\x{10D00}-\x{10D23}\x{10D24}-\x{10D27}\x{10D28}-\x{10D2F}\x{10D30}-\x{10D39}\x{10D3A}-\x{10D3F}\x{10D40}-\x{10E5F}\x{10E60}-\x{10E7E}\x{10E7F}\x{10E80}-\x{10EA9}\x{10EAA}\x{10EAB}-\x{10EAC}\x{10EAD}\x{10EAE}-\x{10EAF}\x{10EB0}-\x{10EB1}\x{10EB2}-\x{10EFF}\x{10F00}-\x{10F1C}\x{10F1D}-\x{10F26}\x{10F27}\x{10F28}-\x{10F2F}\x{10F30}-\x{10F45}\x{10F46}-\x{10F50}\x{10F51}-\x{10F54}\x{10F55}-\x{10F59}\x{10F5A}-\x{10F6F}\x{10F70}-\x{10FAF}\x{10FB0}-\x{10FC4}\x{10FC5}-\x{10FCB}\x{10FCC}-\x{10FDF}\x{10FE0}-\x{10FF6}\x{10FF7}-\x{10FFF}\x{11001}\x{11038}-\x{11046}\x{11052}-\x{11065}\x{1107F}-\x{11081}\x{110B3}-\x{110B6}\x{110B9}-\x{110BA}\x{11100}-\x{11102}\x{11127}-\x{1112B}\x{1112D}-\x{11134}\x{11173}\x{11180}-\x{11181}\x{111B6}-\x{111BE}\x{111C9}-\x{111CC}\x{111CF}\x{1122F}-\x{11231}\x{11234}\x{11236}-\x{11237}\x{1123E}\x{112DF}\x{112E3}-\x{112EA}\x{11300}-\x{11301}\x{1133B}-\x{1133C}\x{11340}\x{11366}-\x{1136C}\x{11370}-\x{11374}\x{11438}-\x{1143F}\x{11442}-\x{11444}\x{11446}\x{1145E}\x{114B3}-\x{114B8}\x{114BA}\x{114BF}-\x{114C0}\x{114C2}-\x{114C3}\x{115B2}-\x{115B5}\x{115BC}-\x{115BD}\x{115BF}-\x{115C0}\x{115DC}-\x{115DD}\x{11633}-\x{1163A}\x{1163D}\x{1163F}-\x{11640}\x{11660}-\x{1166C}\x{116AB}\x{116AD}\x{116B0}-\x{116B5}\x{116B7}\x{1171D}-\x{1171F}\x{11722}-\x{11725}\x{11727}-\x{1172B}\x{1182F}-\x{11837}\x{11839}-\x{1183A}\x{1193B}-\x{1193C}\x{1193E}\x{11943}\x{119D4}-\x{119D7}\x{119DA}-\x{119DB}\x{119E0}\x{11A01}-\x{11A06}\x{11A09}-\x{11A0A}\x{11A33}-\x{11A38}\x{11A3B}-\x{11A3E}\x{11A47}\x{11A51}-\x{11A56}\x{11A59}-\x{11A5B}\x{11A8A}-\x{11A96}\x{11A98}-\x{11A99}\x{11C30}-\x{11C36}\x{11C38}-\x{11C3D}\x{11C92}-\x{11CA7}\x{11CAA}-\x{11CB0}\x{11CB2}-\x{11CB3}\x{11CB5}-\x{11CB6}\x{11D31}-\x{11D36}\x{11D3A}\x{11D3C}-\x{11D3D}\x{11D3F}-\x{11D45}\x{11D47}\x{11D90}-\x{11D91}\x{11D95}\x{11D97}\x{11EF3}-\x{11EF4}\x{11FD5}-\x{11FDC}\x{11FDD}-\x{11FE0}\x{11FE1}-\x{11FF1}\x{16AF0}-\x{16AF4}\x{16B30}-\x{16B36}\x{16F4F}\x{16F8F}-\x{16F92}\x{16FE2}\x{16FE4}\x{1BC9D}-\x{1BC9E}\x{1BCA0}-\x{1BCA3}\x{1D167}-\x{1D169}\x{1D173}-\x{1D17A}\x{1D17B}-\x{1D182}\x{1D185}-\x{1D18B}\x{1D1AA}-\x{1D1AD}\x{1D200}-\x{1D241}\x{1D242}-\x{1D244}\x{1D245}\x{1D300}-\x{1D356}\x{1D6DB}\x{1D715}\x{1D74F}\x{1D789}\x{1D7C3}\x{1D7CE}-\x{1D7FF}\x{1DA00}-\x{1DA36}\x{1DA3B}-\x{1DA6C}\x{1DA75}\x{1DA84}\x{1DA9B}-\x{1DA9F}\x{1DAA1}-\x{1DAAF}\x{1E000}-\x{1E006}\x{1E008}-\x{1E018}\x{1E01B}-\x{1E021}\x{1E023}-\x{1E024}\x{1E026}-\x{1E02A}\x{1E130}-\x{1E136}\x{1E2EC}-\x{1E2EF}\x{1E2FF}\x{1E800}-\x{1E8C4}\x{1E8C5}-\x{1E8C6}\x{1E8C7}-\x{1E8CF}\x{1E8D0}-\x{1E8D6}\x{1E8D7}-\x{1E8FF}\x{1E900}-\x{1E943}\x{1E944}-\x{1E94A}\x{1E94B}\x{1E94C}-\x{1E94F}\x{1E950}-\x{1E959}\x{1E95A}-\x{1E95D}\x{1E95E}-\x{1E95F}\x{1E960}-\x{1EC6F}\x{1EC70}\x{1EC71}-\x{1ECAB}\x{1ECAC}\x{1ECAD}-\x{1ECAF}\x{1ECB0}\x{1ECB1}-\x{1ECB4}\x{1ECB5}-\x{1ECBF}\x{1ECC0}-\x{1ECFF}\x{1ED00}\x{1ED01}-\x{1ED2D}\x{1ED2E}\x{1ED2F}-\x{1ED3D}\x{1ED3E}-\x{1ED4F}\x{1ED50}-\x{1EDFF}\x{1EE00}-\x{1EE03}\x{1EE04}\x{1EE05}-\x{1EE1F}\x{1EE20}\x{1EE21}-\x{1EE22}\x{1EE23}\x{1EE24}\x{1EE25}-\x{1EE26}\x{1EE27}\x{1EE28}\x{1EE29}-\x{1EE32}\x{1EE33}\x{1EE34}-\x{1EE37}\x{1EE38}\x{1EE39}\x{1EE3A}\x{1EE3B}\x{1EE3C}-\x{1EE41}\x{1EE42}\x{1EE43}-\x{1EE46}\x{1EE47}\x{1EE48}\x{1EE49}\x{1EE4A}\x{1EE4B}\x{1EE4C}\x{1EE4D}-\x{1EE4F}\x{1EE50}\x{1EE51}-\x{1EE52}\x{1EE53}\x{1EE54}\x{1EE55}-\x{1EE56}\x{1EE57}\x{1EE58}\x{1EE59}\x{1EE5A}\x{1EE5B}\x{1EE5C}\x{1EE5D}\x{1EE5E}\x{1EE5F}\x{1EE60}\x{1EE61}-\x{1EE62}\x{1EE63}\x{1EE64}\x{1EE65}-\x{1EE66}\x{1EE67}-\x{1EE6A}\x{1EE6B}\x{1EE6C}-\x{1EE72}\x{1EE73}\x{1EE74}-\x{1EE77}\x{1EE78}\x{1EE79}-\x{1EE7C}\x{1EE7D}\x{1EE7E}\x{1EE7F}\x{1EE80}-\x{1EE89}\x{1EE8A}\x{1EE8B}-\x{1EE9B}\x{1EE9C}-\x{1EEA0}\x{1EEA1}-\x{1EEA3}\x{1EEA4}\x{1EEA5}-\x{1EEA9}\x{1EEAA}\x{1EEAB}-\x{1EEBB}\x{1EEBC}-\x{1EEEF}\x{1EEF0}-\x{1EEF1}\x{1EEF2}-\x{1EEFF}\x{1EF00}-\x{1EFFF}\x{1F000}-\x{1F02B}\x{1F030}-\x{1F093}\x{1F0A0}-\x{1F0AE}\x{1F0B1}-\x{1F0BF}\x{1F0C1}-\x{1F0CF}\x{1F0D1}-\x{1F0F5}\x{1F100}-\x{1F10A}\x{1F10B}-\x{1F10C}\x{1F10D}-\x{1F10F}\x{1F12F}\x{1F16A}-\x{1F16F}\x{1F1AD}\x{1F260}-\x{1F265}\x{1F300}-\x{1F3FA}\x{1F3FB}-\x{1F3FF}\x{1F400}-\x{1F6D7}\x{1F6E0}-\x{1F6EC}\x{1F6F0}-\x{1F6FC}\x{1F700}-\x{1F773}\x{1F780}-\x{1F7D8}\x{1F7E0}-\x{1F7EB}\x{1F800}-\x{1F80B}\x{1F810}-\x{1F847}\x{1F850}-\x{1F859}\x{1F860}-\x{1F887}\x{1F890}-\x{1F8AD}\x{1F8B0}-\x{1F8B1}\x{1F900}-\x{1F978}\x{1F97A}-\x{1F9CB}\x{1F9CD}-\x{1FA53}\x{1FA60}-\x{1FA6D}\x{1FA70}-\x{1FA74}\x{1FA78}-\x{1FA7A}\x{1FA80}-\x{1FA86}\x{1FA90}-\x{1FAA8}\x{1FAB0}-\x{1FAB6}\x{1FAC0}-\x{1FAC2}\x{1FAD0}-\x{1FAD6}\x{1FB00}-\x{1FB92}\x{1FB94}-\x{1FBCA}\x{1FBF0}-\x{1FBF9}\x{1FFFE}-\x{1FFFF}\x{2FFFE}-\x{2FFFF}\x{3FFFE}-\x{3FFFF}\x{4FFFE}-\x{4FFFF}\x{5FFFE}-\x{5FFFF}\x{6FFFE}-\x{6FFFF}\x{7FFFE}-\x{7FFFF}\x{8FFFE}-\x{8FFFF}\x{9FFFE}-\x{9FFFF}\x{AFFFE}-\x{AFFFF}\x{BFFFE}-\x{BFFFF}\x{CFFFE}-\x{CFFFF}\x{DFFFE}-\x{E0000}\x{E0001}\x{E0002}-\x{E001F}\x{E0020}-\x{E007F}\x{E0080}-\x{E00FF}\x{E0100}-\x{E01EF}\x{E01F0}-\x{E0FFF}\x{EFFFE}-\x{EFFFF}\x{FFFFE}-\x{FFFFF}\x{10FFFE}-\x{10FFFF}]/u';
+    const BIDI_STEP_3 = '/[\x{0030}-\x{0039}\x{00B2}-\x{00B3}\x{00B9}\x{0590}\x{05BE}\x{05C0}\x{05C3}\x{05C6}\x{05C8}-\x{05CF}\x{05D0}-\x{05EA}\x{05EB}-\x{05EE}\x{05EF}-\x{05F2}\x{05F3}-\x{05F4}\x{05F5}-\x{05FF}\x{0600}-\x{0605}\x{0608}\x{060B}\x{060D}\x{061B}\x{061C}\x{061D}\x{061E}-\x{061F}\x{0620}-\x{063F}\x{0640}\x{0641}-\x{064A}\x{0660}-\x{0669}\x{066B}-\x{066C}\x{066D}\x{066E}-\x{066F}\x{0671}-\x{06D3}\x{06D4}\x{06D5}\x{06DD}\x{06E5}-\x{06E6}\x{06EE}-\x{06EF}\x{06F0}-\x{06F9}\x{06FA}-\x{06FC}\x{06FD}-\x{06FE}\x{06FF}\x{0700}-\x{070D}\x{070E}\x{070F}\x{0710}\x{0712}-\x{072F}\x{074B}-\x{074C}\x{074D}-\x{07A5}\x{07B1}\x{07B2}-\x{07BF}\x{07C0}-\x{07C9}\x{07CA}-\x{07EA}\x{07F4}-\x{07F5}\x{07FA}\x{07FB}-\x{07FC}\x{07FE}-\x{07FF}\x{0800}-\x{0815}\x{081A}\x{0824}\x{0828}\x{082E}-\x{082F}\x{0830}-\x{083E}\x{083F}\x{0840}-\x{0858}\x{085C}-\x{085D}\x{085E}\x{085F}\x{0860}-\x{086A}\x{086B}-\x{086F}\x{0870}-\x{089F}\x{08A0}-\x{08B4}\x{08B5}\x{08B6}-\x{08C7}\x{08C8}-\x{08D2}\x{08E2}\x{200F}\x{2070}\x{2074}-\x{2079}\x{2080}-\x{2089}\x{2488}-\x{249B}\x{FB1D}\x{FB1F}-\x{FB28}\x{FB2A}-\x{FB36}\x{FB37}\x{FB38}-\x{FB3C}\x{FB3D}\x{FB3E}\x{FB3F}\x{FB40}-\x{FB41}\x{FB42}\x{FB43}-\x{FB44}\x{FB45}\x{FB46}-\x{FB4F}\x{FB50}-\x{FBB1}\x{FBB2}-\x{FBC1}\x{FBC2}-\x{FBD2}\x{FBD3}-\x{FD3D}\x{FD40}-\x{FD4F}\x{FD50}-\x{FD8F}\x{FD90}-\x{FD91}\x{FD92}-\x{FDC7}\x{FDC8}-\x{FDCF}\x{FDF0}-\x{FDFB}\x{FDFC}\x{FDFE}-\x{FDFF}\x{FE70}-\x{FE74}\x{FE75}\x{FE76}-\x{FEFC}\x{FEFD}-\x{FEFE}\x{FF10}-\x{FF19}\x{102E1}-\x{102FB}\x{10800}-\x{10805}\x{10806}-\x{10807}\x{10808}\x{10809}\x{1080A}-\x{10835}\x{10836}\x{10837}-\x{10838}\x{10839}-\x{1083B}\x{1083C}\x{1083D}-\x{1083E}\x{1083F}-\x{10855}\x{10856}\x{10857}\x{10858}-\x{1085F}\x{10860}-\x{10876}\x{10877}-\x{10878}\x{10879}-\x{1087F}\x{10880}-\x{1089E}\x{1089F}-\x{108A6}\x{108A7}-\x{108AF}\x{108B0}-\x{108DF}\x{108E0}-\x{108F2}\x{108F3}\x{108F4}-\x{108F5}\x{108F6}-\x{108FA}\x{108FB}-\x{108FF}\x{10900}-\x{10915}\x{10916}-\x{1091B}\x{1091C}-\x{1091E}\x{10920}-\x{10939}\x{1093A}-\x{1093E}\x{1093F}\x{10940}-\x{1097F}\x{10980}-\x{109B7}\x{109B8}-\x{109BB}\x{109BC}-\x{109BD}\x{109BE}-\x{109BF}\x{109C0}-\x{109CF}\x{109D0}-\x{109D1}\x{109D2}-\x{109FF}\x{10A00}\x{10A04}\x{10A07}-\x{10A0B}\x{10A10}-\x{10A13}\x{10A14}\x{10A15}-\x{10A17}\x{10A18}\x{10A19}-\x{10A35}\x{10A36}-\x{10A37}\x{10A3B}-\x{10A3E}\x{10A40}-\x{10A48}\x{10A49}-\x{10A4F}\x{10A50}-\x{10A58}\x{10A59}-\x{10A5F}\x{10A60}-\x{10A7C}\x{10A7D}-\x{10A7E}\x{10A7F}\x{10A80}-\x{10A9C}\x{10A9D}-\x{10A9F}\x{10AA0}-\x{10ABF}\x{10AC0}-\x{10AC7}\x{10AC8}\x{10AC9}-\x{10AE4}\x{10AE7}-\x{10AEA}\x{10AEB}-\x{10AEF}\x{10AF0}-\x{10AF6}\x{10AF7}-\x{10AFF}\x{10B00}-\x{10B35}\x{10B36}-\x{10B38}\x{10B40}-\x{10B55}\x{10B56}-\x{10B57}\x{10B58}-\x{10B5F}\x{10B60}-\x{10B72}\x{10B73}-\x{10B77}\x{10B78}-\x{10B7F}\x{10B80}-\x{10B91}\x{10B92}-\x{10B98}\x{10B99}-\x{10B9C}\x{10B9D}-\x{10BA8}\x{10BA9}-\x{10BAF}\x{10BB0}-\x{10BFF}\x{10C00}-\x{10C48}\x{10C49}-\x{10C7F}\x{10C80}-\x{10CB2}\x{10CB3}-\x{10CBF}\x{10CC0}-\x{10CF2}\x{10CF3}-\x{10CF9}\x{10CFA}-\x{10CFF}\x{10D00}-\x{10D23}\x{10D28}-\x{10D2F}\x{10D30}-\x{10D39}\x{10D3A}-\x{10D3F}\x{10D40}-\x{10E5F}\x{10E60}-\x{10E7E}\x{10E7F}\x{10E80}-\x{10EA9}\x{10EAA}\x{10EAD}\x{10EAE}-\x{10EAF}\x{10EB0}-\x{10EB1}\x{10EB2}-\x{10EFF}\x{10F00}-\x{10F1C}\x{10F1D}-\x{10F26}\x{10F27}\x{10F28}-\x{10F2F}\x{10F30}-\x{10F45}\x{10F51}-\x{10F54}\x{10F55}-\x{10F59}\x{10F5A}-\x{10F6F}\x{10F70}-\x{10FAF}\x{10FB0}-\x{10FC4}\x{10FC5}-\x{10FCB}\x{10FCC}-\x{10FDF}\x{10FE0}-\x{10FF6}\x{10FF7}-\x{10FFF}\x{1D7CE}-\x{1D7FF}\x{1E800}-\x{1E8C4}\x{1E8C5}-\x{1E8C6}\x{1E8C7}-\x{1E8CF}\x{1E8D7}-\x{1E8FF}\x{1E900}-\x{1E943}\x{1E94B}\x{1E94C}-\x{1E94F}\x{1E950}-\x{1E959}\x{1E95A}-\x{1E95D}\x{1E95E}-\x{1E95F}\x{1E960}-\x{1EC6F}\x{1EC70}\x{1EC71}-\x{1ECAB}\x{1ECAC}\x{1ECAD}-\x{1ECAF}\x{1ECB0}\x{1ECB1}-\x{1ECB4}\x{1ECB5}-\x{1ECBF}\x{1ECC0}-\x{1ECFF}\x{1ED00}\x{1ED01}-\x{1ED2D}\x{1ED2E}\x{1ED2F}-\x{1ED3D}\x{1ED3E}-\x{1ED4F}\x{1ED50}-\x{1EDFF}\x{1EE00}-\x{1EE03}\x{1EE04}\x{1EE05}-\x{1EE1F}\x{1EE20}\x{1EE21}-\x{1EE22}\x{1EE23}\x{1EE24}\x{1EE25}-\x{1EE26}\x{1EE27}\x{1EE28}\x{1EE29}-\x{1EE32}\x{1EE33}\x{1EE34}-\x{1EE37}\x{1EE38}\x{1EE39}\x{1EE3A}\x{1EE3B}\x{1EE3C}-\x{1EE41}\x{1EE42}\x{1EE43}-\x{1EE46}\x{1EE47}\x{1EE48}\x{1EE49}\x{1EE4A}\x{1EE4B}\x{1EE4C}\x{1EE4D}-\x{1EE4F}\x{1EE50}\x{1EE51}-\x{1EE52}\x{1EE53}\x{1EE54}\x{1EE55}-\x{1EE56}\x{1EE57}\x{1EE58}\x{1EE59}\x{1EE5A}\x{1EE5B}\x{1EE5C}\x{1EE5D}\x{1EE5E}\x{1EE5F}\x{1EE60}\x{1EE61}-\x{1EE62}\x{1EE63}\x{1EE64}\x{1EE65}-\x{1EE66}\x{1EE67}-\x{1EE6A}\x{1EE6B}\x{1EE6C}-\x{1EE72}\x{1EE73}\x{1EE74}-\x{1EE77}\x{1EE78}\x{1EE79}-\x{1EE7C}\x{1EE7D}\x{1EE7E}\x{1EE7F}\x{1EE80}-\x{1EE89}\x{1EE8A}\x{1EE8B}-\x{1EE9B}\x{1EE9C}-\x{1EEA0}\x{1EEA1}-\x{1EEA3}\x{1EEA4}\x{1EEA5}-\x{1EEA9}\x{1EEAA}\x{1EEAB}-\x{1EEBB}\x{1EEBC}-\x{1EEEF}\x{1EEF2}-\x{1EEFF}\x{1EF00}-\x{1EFFF}\x{1F100}-\x{1F10A}\x{1FBF0}-\x{1FBF9}][\x{0300}-\x{036F}\x{0483}-\x{0487}\x{0488}-\x{0489}\x{0591}-\x{05BD}\x{05BF}\x{05C1}-\x{05C2}\x{05C4}-\x{05C5}\x{05C7}\x{0610}-\x{061A}\x{064B}-\x{065F}\x{0670}\x{06D6}-\x{06DC}\x{06DF}-\x{06E4}\x{06E7}-\x{06E8}\x{06EA}-\x{06ED}\x{0711}\x{0730}-\x{074A}\x{07A6}-\x{07B0}\x{07EB}-\x{07F3}\x{07FD}\x{0816}-\x{0819}\x{081B}-\x{0823}\x{0825}-\x{0827}\x{0829}-\x{082D}\x{0859}-\x{085B}\x{08D3}-\x{08E1}\x{08E3}-\x{0902}\x{093A}\x{093C}\x{0941}-\x{0948}\x{094D}\x{0951}-\x{0957}\x{0962}-\x{0963}\x{0981}\x{09BC}\x{09C1}-\x{09C4}\x{09CD}\x{09E2}-\x{09E3}\x{09FE}\x{0A01}-\x{0A02}\x{0A3C}\x{0A41}-\x{0A42}\x{0A47}-\x{0A48}\x{0A4B}-\x{0A4D}\x{0A51}\x{0A70}-\x{0A71}\x{0A75}\x{0A81}-\x{0A82}\x{0ABC}\x{0AC1}-\x{0AC5}\x{0AC7}-\x{0AC8}\x{0ACD}\x{0AE2}-\x{0AE3}\x{0AFA}-\x{0AFF}\x{0B01}\x{0B3C}\x{0B3F}\x{0B41}-\x{0B44}\x{0B4D}\x{0B55}-\x{0B56}\x{0B62}-\x{0B63}\x{0B82}\x{0BC0}\x{0BCD}\x{0C00}\x{0C04}\x{0C3E}-\x{0C40}\x{0C46}-\x{0C48}\x{0C4A}-\x{0C4D}\x{0C55}-\x{0C56}\x{0C62}-\x{0C63}\x{0C81}\x{0CBC}\x{0CCC}-\x{0CCD}\x{0CE2}-\x{0CE3}\x{0D00}-\x{0D01}\x{0D3B}-\x{0D3C}\x{0D41}-\x{0D44}\x{0D4D}\x{0D62}-\x{0D63}\x{0D81}\x{0DCA}\x{0DD2}-\x{0DD4}\x{0DD6}\x{0E31}\x{0E34}-\x{0E3A}\x{0E47}-\x{0E4E}\x{0EB1}\x{0EB4}-\x{0EBC}\x{0EC8}-\x{0ECD}\x{0F18}-\x{0F19}\x{0F35}\x{0F37}\x{0F39}\x{0F71}-\x{0F7E}\x{0F80}-\x{0F84}\x{0F86}-\x{0F87}\x{0F8D}-\x{0F97}\x{0F99}-\x{0FBC}\x{0FC6}\x{102D}-\x{1030}\x{1032}-\x{1037}\x{1039}-\x{103A}\x{103D}-\x{103E}\x{1058}-\x{1059}\x{105E}-\x{1060}\x{1071}-\x{1074}\x{1082}\x{1085}-\x{1086}\x{108D}\x{109D}\x{135D}-\x{135F}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}-\x{1753}\x{1772}-\x{1773}\x{17B4}-\x{17B5}\x{17B7}-\x{17BD}\x{17C6}\x{17C9}-\x{17D3}\x{17DD}\x{180B}-\x{180D}\x{1885}-\x{1886}\x{18A9}\x{1920}-\x{1922}\x{1927}-\x{1928}\x{1932}\x{1939}-\x{193B}\x{1A17}-\x{1A18}\x{1A1B}\x{1A56}\x{1A58}-\x{1A5E}\x{1A60}\x{1A62}\x{1A65}-\x{1A6C}\x{1A73}-\x{1A7C}\x{1A7F}\x{1AB0}-\x{1ABD}\x{1ABE}\x{1ABF}-\x{1AC0}\x{1B00}-\x{1B03}\x{1B34}\x{1B36}-\x{1B3A}\x{1B3C}\x{1B42}\x{1B6B}-\x{1B73}\x{1B80}-\x{1B81}\x{1BA2}-\x{1BA5}\x{1BA8}-\x{1BA9}\x{1BAB}-\x{1BAD}\x{1BE6}\x{1BE8}-\x{1BE9}\x{1BED}\x{1BEF}-\x{1BF1}\x{1C2C}-\x{1C33}\x{1C36}-\x{1C37}\x{1CD0}-\x{1CD2}\x{1CD4}-\x{1CE0}\x{1CE2}-\x{1CE8}\x{1CED}\x{1CF4}\x{1CF8}-\x{1CF9}\x{1DC0}-\x{1DF9}\x{1DFB}-\x{1DFF}\x{20D0}-\x{20DC}\x{20DD}-\x{20E0}\x{20E1}\x{20E2}-\x{20E4}\x{20E5}-\x{20F0}\x{2CEF}-\x{2CF1}\x{2D7F}\x{2DE0}-\x{2DFF}\x{302A}-\x{302D}\x{3099}-\x{309A}\x{A66F}\x{A670}-\x{A672}\x{A674}-\x{A67D}\x{A69E}-\x{A69F}\x{A6F0}-\x{A6F1}\x{A802}\x{A806}\x{A80B}\x{A825}-\x{A826}\x{A82C}\x{A8C4}-\x{A8C5}\x{A8E0}-\x{A8F1}\x{A8FF}\x{A926}-\x{A92D}\x{A947}-\x{A951}\x{A980}-\x{A982}\x{A9B3}\x{A9B6}-\x{A9B9}\x{A9BC}-\x{A9BD}\x{A9E5}\x{AA29}-\x{AA2E}\x{AA31}-\x{AA32}\x{AA35}-\x{AA36}\x{AA43}\x{AA4C}\x{AA7C}\x{AAB0}\x{AAB2}-\x{AAB4}\x{AAB7}-\x{AAB8}\x{AABE}-\x{AABF}\x{AAC1}\x{AAEC}-\x{AAED}\x{AAF6}\x{ABE5}\x{ABE8}\x{ABED}\x{FB1E}\x{FE00}-\x{FE0F}\x{FE20}-\x{FE2F}\x{101FD}\x{102E0}\x{10376}-\x{1037A}\x{10A01}-\x{10A03}\x{10A05}-\x{10A06}\x{10A0C}-\x{10A0F}\x{10A38}-\x{10A3A}\x{10A3F}\x{10AE5}-\x{10AE6}\x{10D24}-\x{10D27}\x{10EAB}-\x{10EAC}\x{10F46}-\x{10F50}\x{11001}\x{11038}-\x{11046}\x{1107F}-\x{11081}\x{110B3}-\x{110B6}\x{110B9}-\x{110BA}\x{11100}-\x{11102}\x{11127}-\x{1112B}\x{1112D}-\x{11134}\x{11173}\x{11180}-\x{11181}\x{111B6}-\x{111BE}\x{111C9}-\x{111CC}\x{111CF}\x{1122F}-\x{11231}\x{11234}\x{11236}-\x{11237}\x{1123E}\x{112DF}\x{112E3}-\x{112EA}\x{11300}-\x{11301}\x{1133B}-\x{1133C}\x{11340}\x{11366}-\x{1136C}\x{11370}-\x{11374}\x{11438}-\x{1143F}\x{11442}-\x{11444}\x{11446}\x{1145E}\x{114B3}-\x{114B8}\x{114BA}\x{114BF}-\x{114C0}\x{114C2}-\x{114C3}\x{115B2}-\x{115B5}\x{115BC}-\x{115BD}\x{115BF}-\x{115C0}\x{115DC}-\x{115DD}\x{11633}-\x{1163A}\x{1163D}\x{1163F}-\x{11640}\x{116AB}\x{116AD}\x{116B0}-\x{116B5}\x{116B7}\x{1171D}-\x{1171F}\x{11722}-\x{11725}\x{11727}-\x{1172B}\x{1182F}-\x{11837}\x{11839}-\x{1183A}\x{1193B}-\x{1193C}\x{1193E}\x{11943}\x{119D4}-\x{119D7}\x{119DA}-\x{119DB}\x{119E0}\x{11A01}-\x{11A06}\x{11A09}-\x{11A0A}\x{11A33}-\x{11A38}\x{11A3B}-\x{11A3E}\x{11A47}\x{11A51}-\x{11A56}\x{11A59}-\x{11A5B}\x{11A8A}-\x{11A96}\x{11A98}-\x{11A99}\x{11C30}-\x{11C36}\x{11C38}-\x{11C3D}\x{11C92}-\x{11CA7}\x{11CAA}-\x{11CB0}\x{11CB2}-\x{11CB3}\x{11CB5}-\x{11CB6}\x{11D31}-\x{11D36}\x{11D3A}\x{11D3C}-\x{11D3D}\x{11D3F}-\x{11D45}\x{11D47}\x{11D90}-\x{11D91}\x{11D95}\x{11D97}\x{11EF3}-\x{11EF4}\x{16AF0}-\x{16AF4}\x{16B30}-\x{16B36}\x{16F4F}\x{16F8F}-\x{16F92}\x{16FE4}\x{1BC9D}-\x{1BC9E}\x{1D167}-\x{1D169}\x{1D17B}-\x{1D182}\x{1D185}-\x{1D18B}\x{1D1AA}-\x{1D1AD}\x{1D242}-\x{1D244}\x{1DA00}-\x{1DA36}\x{1DA3B}-\x{1DA6C}\x{1DA75}\x{1DA84}\x{1DA9B}-\x{1DA9F}\x{1DAA1}-\x{1DAAF}\x{1E000}-\x{1E006}\x{1E008}-\x{1E018}\x{1E01B}-\x{1E021}\x{1E023}-\x{1E024}\x{1E026}-\x{1E02A}\x{1E130}-\x{1E136}\x{1E2EC}-\x{1E2EF}\x{1E8D0}-\x{1E8D6}\x{1E944}-\x{1E94A}\x{E0100}-\x{E01EF}]*$/u';
+    const BIDI_STEP_4_AN = '/[\x{0600}-\x{0605}\x{0660}-\x{0669}\x{066B}-\x{066C}\x{06DD}\x{08E2}\x{10D30}-\x{10D39}\x{10E60}-\x{10E7E}]/u';
+    const BIDI_STEP_4_EN = '/[\x{0030}-\x{0039}\x{00B2}-\x{00B3}\x{00B9}\x{06F0}-\x{06F9}\x{2070}\x{2074}-\x{2079}\x{2080}-\x{2089}\x{2488}-\x{249B}\x{FF10}-\x{FF19}\x{102E1}-\x{102FB}\x{1D7CE}-\x{1D7FF}\x{1F100}-\x{1F10A}\x{1FBF0}-\x{1FBF9}]/u';
+    const BIDI_STEP_5 = '/[\x{0009}\x{000A}\x{000B}\x{000C}\x{000D}\x{001C}-\x{001E}\x{001F}\x{0020}\x{0085}\x{0590}\x{05BE}\x{05C0}\x{05C3}\x{05C6}\x{05C8}-\x{05CF}\x{05D0}-\x{05EA}\x{05EB}-\x{05EE}\x{05EF}-\x{05F2}\x{05F3}-\x{05F4}\x{05F5}-\x{05FF}\x{0600}-\x{0605}\x{0608}\x{060B}\x{060D}\x{061B}\x{061C}\x{061D}\x{061E}-\x{061F}\x{0620}-\x{063F}\x{0640}\x{0641}-\x{064A}\x{0660}-\x{0669}\x{066B}-\x{066C}\x{066D}\x{066E}-\x{066F}\x{0671}-\x{06D3}\x{06D4}\x{06D5}\x{06DD}\x{06E5}-\x{06E6}\x{06EE}-\x{06EF}\x{06FA}-\x{06FC}\x{06FD}-\x{06FE}\x{06FF}\x{0700}-\x{070D}\x{070E}\x{070F}\x{0710}\x{0712}-\x{072F}\x{074B}-\x{074C}\x{074D}-\x{07A5}\x{07B1}\x{07B2}-\x{07BF}\x{07C0}-\x{07C9}\x{07CA}-\x{07EA}\x{07F4}-\x{07F5}\x{07FA}\x{07FB}-\x{07FC}\x{07FE}-\x{07FF}\x{0800}-\x{0815}\x{081A}\x{0824}\x{0828}\x{082E}-\x{082F}\x{0830}-\x{083E}\x{083F}\x{0840}-\x{0858}\x{085C}-\x{085D}\x{085E}\x{085F}\x{0860}-\x{086A}\x{086B}-\x{086F}\x{0870}-\x{089F}\x{08A0}-\x{08B4}\x{08B5}\x{08B6}-\x{08C7}\x{08C8}-\x{08D2}\x{08E2}\x{1680}\x{2000}-\x{200A}\x{200F}\x{2028}\x{2029}\x{202A}\x{202B}\x{202C}\x{202D}\x{202E}\x{205F}\x{2066}\x{2067}\x{2068}\x{2069}\x{3000}\x{FB1D}\x{FB1F}-\x{FB28}\x{FB2A}-\x{FB36}\x{FB37}\x{FB38}-\x{FB3C}\x{FB3D}\x{FB3E}\x{FB3F}\x{FB40}-\x{FB41}\x{FB42}\x{FB43}-\x{FB44}\x{FB45}\x{FB46}-\x{FB4F}\x{FB50}-\x{FBB1}\x{FBB2}-\x{FBC1}\x{FBC2}-\x{FBD2}\x{FBD3}-\x{FD3D}\x{FD40}-\x{FD4F}\x{FD50}-\x{FD8F}\x{FD90}-\x{FD91}\x{FD92}-\x{FDC7}\x{FDC8}-\x{FDCF}\x{FDF0}-\x{FDFB}\x{FDFC}\x{FDFE}-\x{FDFF}\x{FE70}-\x{FE74}\x{FE75}\x{FE76}-\x{FEFC}\x{FEFD}-\x{FEFE}\x{10800}-\x{10805}\x{10806}-\x{10807}\x{10808}\x{10809}\x{1080A}-\x{10835}\x{10836}\x{10837}-\x{10838}\x{10839}-\x{1083B}\x{1083C}\x{1083D}-\x{1083E}\x{1083F}-\x{10855}\x{10856}\x{10857}\x{10858}-\x{1085F}\x{10860}-\x{10876}\x{10877}-\x{10878}\x{10879}-\x{1087F}\x{10880}-\x{1089E}\x{1089F}-\x{108A6}\x{108A7}-\x{108AF}\x{108B0}-\x{108DF}\x{108E0}-\x{108F2}\x{108F3}\x{108F4}-\x{108F5}\x{108F6}-\x{108FA}\x{108FB}-\x{108FF}\x{10900}-\x{10915}\x{10916}-\x{1091B}\x{1091C}-\x{1091E}\x{10920}-\x{10939}\x{1093A}-\x{1093E}\x{1093F}\x{10940}-\x{1097F}\x{10980}-\x{109B7}\x{109B8}-\x{109BB}\x{109BC}-\x{109BD}\x{109BE}-\x{109BF}\x{109C0}-\x{109CF}\x{109D0}-\x{109D1}\x{109D2}-\x{109FF}\x{10A00}\x{10A04}\x{10A07}-\x{10A0B}\x{10A10}-\x{10A13}\x{10A14}\x{10A15}-\x{10A17}\x{10A18}\x{10A19}-\x{10A35}\x{10A36}-\x{10A37}\x{10A3B}-\x{10A3E}\x{10A40}-\x{10A48}\x{10A49}-\x{10A4F}\x{10A50}-\x{10A58}\x{10A59}-\x{10A5F}\x{10A60}-\x{10A7C}\x{10A7D}-\x{10A7E}\x{10A7F}\x{10A80}-\x{10A9C}\x{10A9D}-\x{10A9F}\x{10AA0}-\x{10ABF}\x{10AC0}-\x{10AC7}\x{10AC8}\x{10AC9}-\x{10AE4}\x{10AE7}-\x{10AEA}\x{10AEB}-\x{10AEF}\x{10AF0}-\x{10AF6}\x{10AF7}-\x{10AFF}\x{10B00}-\x{10B35}\x{10B36}-\x{10B38}\x{10B40}-\x{10B55}\x{10B56}-\x{10B57}\x{10B58}-\x{10B5F}\x{10B60}-\x{10B72}\x{10B73}-\x{10B77}\x{10B78}-\x{10B7F}\x{10B80}-\x{10B91}\x{10B92}-\x{10B98}\x{10B99}-\x{10B9C}\x{10B9D}-\x{10BA8}\x{10BA9}-\x{10BAF}\x{10BB0}-\x{10BFF}\x{10C00}-\x{10C48}\x{10C49}-\x{10C7F}\x{10C80}-\x{10CB2}\x{10CB3}-\x{10CBF}\x{10CC0}-\x{10CF2}\x{10CF3}-\x{10CF9}\x{10CFA}-\x{10CFF}\x{10D00}-\x{10D23}\x{10D28}-\x{10D2F}\x{10D30}-\x{10D39}\x{10D3A}-\x{10D3F}\x{10D40}-\x{10E5F}\x{10E60}-\x{10E7E}\x{10E7F}\x{10E80}-\x{10EA9}\x{10EAA}\x{10EAD}\x{10EAE}-\x{10EAF}\x{10EB0}-\x{10EB1}\x{10EB2}-\x{10EFF}\x{10F00}-\x{10F1C}\x{10F1D}-\x{10F26}\x{10F27}\x{10F28}-\x{10F2F}\x{10F30}-\x{10F45}\x{10F51}-\x{10F54}\x{10F55}-\x{10F59}\x{10F5A}-\x{10F6F}\x{10F70}-\x{10FAF}\x{10FB0}-\x{10FC4}\x{10FC5}-\x{10FCB}\x{10FCC}-\x{10FDF}\x{10FE0}-\x{10FF6}\x{10FF7}-\x{10FFF}\x{1E800}-\x{1E8C4}\x{1E8C5}-\x{1E8C6}\x{1E8C7}-\x{1E8CF}\x{1E8D7}-\x{1E8FF}\x{1E900}-\x{1E943}\x{1E94B}\x{1E94C}-\x{1E94F}\x{1E950}-\x{1E959}\x{1E95A}-\x{1E95D}\x{1E95E}-\x{1E95F}\x{1E960}-\x{1EC6F}\x{1EC70}\x{1EC71}-\x{1ECAB}\x{1ECAC}\x{1ECAD}-\x{1ECAF}\x{1ECB0}\x{1ECB1}-\x{1ECB4}\x{1ECB5}-\x{1ECBF}\x{1ECC0}-\x{1ECFF}\x{1ED00}\x{1ED01}-\x{1ED2D}\x{1ED2E}\x{1ED2F}-\x{1ED3D}\x{1ED3E}-\x{1ED4F}\x{1ED50}-\x{1EDFF}\x{1EE00}-\x{1EE03}\x{1EE04}\x{1EE05}-\x{1EE1F}\x{1EE20}\x{1EE21}-\x{1EE22}\x{1EE23}\x{1EE24}\x{1EE25}-\x{1EE26}\x{1EE27}\x{1EE28}\x{1EE29}-\x{1EE32}\x{1EE33}\x{1EE34}-\x{1EE37}\x{1EE38}\x{1EE39}\x{1EE3A}\x{1EE3B}\x{1EE3C}-\x{1EE41}\x{1EE42}\x{1EE43}-\x{1EE46}\x{1EE47}\x{1EE48}\x{1EE49}\x{1EE4A}\x{1EE4B}\x{1EE4C}\x{1EE4D}-\x{1EE4F}\x{1EE50}\x{1EE51}-\x{1EE52}\x{1EE53}\x{1EE54}\x{1EE55}-\x{1EE56}\x{1EE57}\x{1EE58}\x{1EE59}\x{1EE5A}\x{1EE5B}\x{1EE5C}\x{1EE5D}\x{1EE5E}\x{1EE5F}\x{1EE60}\x{1EE61}-\x{1EE62}\x{1EE63}\x{1EE64}\x{1EE65}-\x{1EE66}\x{1EE67}-\x{1EE6A}\x{1EE6B}\x{1EE6C}-\x{1EE72}\x{1EE73}\x{1EE74}-\x{1EE77}\x{1EE78}\x{1EE79}-\x{1EE7C}\x{1EE7D}\x{1EE7E}\x{1EE7F}\x{1EE80}-\x{1EE89}\x{1EE8A}\x{1EE8B}-\x{1EE9B}\x{1EE9C}-\x{1EEA0}\x{1EEA1}-\x{1EEA3}\x{1EEA4}\x{1EEA5}-\x{1EEA9}\x{1EEAA}\x{1EEAB}-\x{1EEBB}\x{1EEBC}-\x{1EEEF}\x{1EEF2}-\x{1EEFF}\x{1EF00}-\x{1EFFF}]/u';
+    const BIDI_STEP_6 = '/[^\x{0000}-\x{0008}\x{0009}\x{000A}\x{000B}\x{000C}\x{000D}\x{000E}-\x{001B}\x{001C}-\x{001E}\x{001F}\x{0020}\x{0021}-\x{0022}\x{0023}\x{0024}\x{0025}\x{0026}-\x{0027}\x{0028}\x{0029}\x{002A}\x{002B}\x{002C}\x{002D}\x{002E}-\x{002F}\x{003A}\x{003B}\x{003C}-\x{003E}\x{003F}-\x{0040}\x{005B}\x{005C}\x{005D}\x{005E}\x{005F}\x{0060}\x{007B}\x{007C}\x{007D}\x{007E}\x{007F}-\x{0084}\x{0085}\x{0086}-\x{009F}\x{00A0}\x{00A1}\x{00A2}-\x{00A5}\x{00A6}\x{00A7}\x{00A8}\x{00A9}\x{00AB}\x{00AC}\x{00AD}\x{00AE}\x{00AF}\x{00B0}\x{00B1}\x{00B4}\x{00B6}-\x{00B7}\x{00B8}\x{00BB}\x{00BC}-\x{00BE}\x{00BF}\x{00D7}\x{00F7}\x{02B9}-\x{02BA}\x{02C2}-\x{02C5}\x{02C6}-\x{02CF}\x{02D2}-\x{02DF}\x{02E5}-\x{02EB}\x{02EC}\x{02ED}\x{02EF}-\x{02FF}\x{0300}-\x{036F}\x{0374}\x{0375}\x{037E}\x{0384}-\x{0385}\x{0387}\x{03F6}\x{0483}-\x{0487}\x{0488}-\x{0489}\x{058A}\x{058D}-\x{058E}\x{058F}\x{0590}\x{0591}-\x{05BD}\x{05BE}\x{05BF}\x{05C0}\x{05C1}-\x{05C2}\x{05C3}\x{05C4}-\x{05C5}\x{05C6}\x{05C7}\x{05C8}-\x{05CF}\x{05D0}-\x{05EA}\x{05EB}-\x{05EE}\x{05EF}-\x{05F2}\x{05F3}-\x{05F4}\x{05F5}-\x{05FF}\x{0600}-\x{0605}\x{0606}-\x{0607}\x{0608}\x{0609}-\x{060A}\x{060B}\x{060C}\x{060D}\x{060E}-\x{060F}\x{0610}-\x{061A}\x{061B}\x{061C}\x{061D}\x{061E}-\x{061F}\x{0620}-\x{063F}\x{0640}\x{0641}-\x{064A}\x{064B}-\x{065F}\x{0660}-\x{0669}\x{066A}\x{066B}-\x{066C}\x{066D}\x{066E}-\x{066F}\x{0670}\x{0671}-\x{06D3}\x{06D4}\x{06D5}\x{06D6}-\x{06DC}\x{06DD}\x{06DE}\x{06DF}-\x{06E4}\x{06E5}-\x{06E6}\x{06E7}-\x{06E8}\x{06E9}\x{06EA}-\x{06ED}\x{06EE}-\x{06EF}\x{06FA}-\x{06FC}\x{06FD}-\x{06FE}\x{06FF}\x{0700}-\x{070D}\x{070E}\x{070F}\x{0710}\x{0711}\x{0712}-\x{072F}\x{0730}-\x{074A}\x{074B}-\x{074C}\x{074D}-\x{07A5}\x{07A6}-\x{07B0}\x{07B1}\x{07B2}-\x{07BF}\x{07C0}-\x{07C9}\x{07CA}-\x{07EA}\x{07EB}-\x{07F3}\x{07F4}-\x{07F5}\x{07F6}\x{07F7}-\x{07F9}\x{07FA}\x{07FB}-\x{07FC}\x{07FD}\x{07FE}-\x{07FF}\x{0800}-\x{0815}\x{0816}-\x{0819}\x{081A}\x{081B}-\x{0823}\x{0824}\x{0825}-\x{0827}\x{0828}\x{0829}-\x{082D}\x{082E}-\x{082F}\x{0830}-\x{083E}\x{083F}\x{0840}-\x{0858}\x{0859}-\x{085B}\x{085C}-\x{085D}\x{085E}\x{085F}\x{0860}-\x{086A}\x{086B}-\x{086F}\x{0870}-\x{089F}\x{08A0}-\x{08B4}\x{08B5}\x{08B6}-\x{08C7}\x{08C8}-\x{08D2}\x{08D3}-\x{08E1}\x{08E2}\x{08E3}-\x{0902}\x{093A}\x{093C}\x{0941}-\x{0948}\x{094D}\x{0951}-\x{0957}\x{0962}-\x{0963}\x{0981}\x{09BC}\x{09C1}-\x{09C4}\x{09CD}\x{09E2}-\x{09E3}\x{09F2}-\x{09F3}\x{09FB}\x{09FE}\x{0A01}-\x{0A02}\x{0A3C}\x{0A41}-\x{0A42}\x{0A47}-\x{0A48}\x{0A4B}-\x{0A4D}\x{0A51}\x{0A70}-\x{0A71}\x{0A75}\x{0A81}-\x{0A82}\x{0ABC}\x{0AC1}-\x{0AC5}\x{0AC7}-\x{0AC8}\x{0ACD}\x{0AE2}-\x{0AE3}\x{0AF1}\x{0AFA}-\x{0AFF}\x{0B01}\x{0B3C}\x{0B3F}\x{0B41}-\x{0B44}\x{0B4D}\x{0B55}-\x{0B56}\x{0B62}-\x{0B63}\x{0B82}\x{0BC0}\x{0BCD}\x{0BF3}-\x{0BF8}\x{0BF9}\x{0BFA}\x{0C00}\x{0C04}\x{0C3E}-\x{0C40}\x{0C46}-\x{0C48}\x{0C4A}-\x{0C4D}\x{0C55}-\x{0C56}\x{0C62}-\x{0C63}\x{0C78}-\x{0C7E}\x{0C81}\x{0CBC}\x{0CCC}-\x{0CCD}\x{0CE2}-\x{0CE3}\x{0D00}-\x{0D01}\x{0D3B}-\x{0D3C}\x{0D41}-\x{0D44}\x{0D4D}\x{0D62}-\x{0D63}\x{0D81}\x{0DCA}\x{0DD2}-\x{0DD4}\x{0DD6}\x{0E31}\x{0E34}-\x{0E3A}\x{0E3F}\x{0E47}-\x{0E4E}\x{0EB1}\x{0EB4}-\x{0EBC}\x{0EC8}-\x{0ECD}\x{0F18}-\x{0F19}\x{0F35}\x{0F37}\x{0F39}\x{0F3A}\x{0F3B}\x{0F3C}\x{0F3D}\x{0F71}-\x{0F7E}\x{0F80}-\x{0F84}\x{0F86}-\x{0F87}\x{0F8D}-\x{0F97}\x{0F99}-\x{0FBC}\x{0FC6}\x{102D}-\x{1030}\x{1032}-\x{1037}\x{1039}-\x{103A}\x{103D}-\x{103E}\x{1058}-\x{1059}\x{105E}-\x{1060}\x{1071}-\x{1074}\x{1082}\x{1085}-\x{1086}\x{108D}\x{109D}\x{135D}-\x{135F}\x{1390}-\x{1399}\x{1400}\x{1680}\x{169B}\x{169C}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}-\x{1753}\x{1772}-\x{1773}\x{17B4}-\x{17B5}\x{17B7}-\x{17BD}\x{17C6}\x{17C9}-\x{17D3}\x{17DB}\x{17DD}\x{17F0}-\x{17F9}\x{1800}-\x{1805}\x{1806}\x{1807}-\x{180A}\x{180B}-\x{180D}\x{180E}\x{1885}-\x{1886}\x{18A9}\x{1920}-\x{1922}\x{1927}-\x{1928}\x{1932}\x{1939}-\x{193B}\x{1940}\x{1944}-\x{1945}\x{19DE}-\x{19FF}\x{1A17}-\x{1A18}\x{1A1B}\x{1A56}\x{1A58}-\x{1A5E}\x{1A60}\x{1A62}\x{1A65}-\x{1A6C}\x{1A73}-\x{1A7C}\x{1A7F}\x{1AB0}-\x{1ABD}\x{1ABE}\x{1ABF}-\x{1AC0}\x{1B00}-\x{1B03}\x{1B34}\x{1B36}-\x{1B3A}\x{1B3C}\x{1B42}\x{1B6B}-\x{1B73}\x{1B80}-\x{1B81}\x{1BA2}-\x{1BA5}\x{1BA8}-\x{1BA9}\x{1BAB}-\x{1BAD}\x{1BE6}\x{1BE8}-\x{1BE9}\x{1BED}\x{1BEF}-\x{1BF1}\x{1C2C}-\x{1C33}\x{1C36}-\x{1C37}\x{1CD0}-\x{1CD2}\x{1CD4}-\x{1CE0}\x{1CE2}-\x{1CE8}\x{1CED}\x{1CF4}\x{1CF8}-\x{1CF9}\x{1DC0}-\x{1DF9}\x{1DFB}-\x{1DFF}\x{1FBD}\x{1FBF}-\x{1FC1}\x{1FCD}-\x{1FCF}\x{1FDD}-\x{1FDF}\x{1FED}-\x{1FEF}\x{1FFD}-\x{1FFE}\x{2000}-\x{200A}\x{200B}-\x{200D}\x{200F}\x{2010}-\x{2015}\x{2016}-\x{2017}\x{2018}\x{2019}\x{201A}\x{201B}-\x{201C}\x{201D}\x{201E}\x{201F}\x{2020}-\x{2027}\x{2028}\x{2029}\x{202A}\x{202B}\x{202C}\x{202D}\x{202E}\x{202F}\x{2030}-\x{2034}\x{2035}-\x{2038}\x{2039}\x{203A}\x{203B}-\x{203E}\x{203F}-\x{2040}\x{2041}-\x{2043}\x{2044}\x{2045}\x{2046}\x{2047}-\x{2051}\x{2052}\x{2053}\x{2054}\x{2055}-\x{205E}\x{205F}\x{2060}-\x{2064}\x{2065}\x{2066}\x{2067}\x{2068}\x{2069}\x{206A}-\x{206F}\x{207A}-\x{207B}\x{207C}\x{207D}\x{207E}\x{208A}-\x{208B}\x{208C}\x{208D}\x{208E}\x{20A0}-\x{20BF}\x{20C0}-\x{20CF}\x{20D0}-\x{20DC}\x{20DD}-\x{20E0}\x{20E1}\x{20E2}-\x{20E4}\x{20E5}-\x{20F0}\x{2100}-\x{2101}\x{2103}-\x{2106}\x{2108}-\x{2109}\x{2114}\x{2116}-\x{2117}\x{2118}\x{211E}-\x{2123}\x{2125}\x{2127}\x{2129}\x{212E}\x{213A}-\x{213B}\x{2140}-\x{2144}\x{214A}\x{214B}\x{214C}-\x{214D}\x{2150}-\x{215F}\x{2189}\x{218A}-\x{218B}\x{2190}-\x{2194}\x{2195}-\x{2199}\x{219A}-\x{219B}\x{219C}-\x{219F}\x{21A0}\x{21A1}-\x{21A2}\x{21A3}\x{21A4}-\x{21A5}\x{21A6}\x{21A7}-\x{21AD}\x{21AE}\x{21AF}-\x{21CD}\x{21CE}-\x{21CF}\x{21D0}-\x{21D1}\x{21D2}\x{21D3}\x{21D4}\x{21D5}-\x{21F3}\x{21F4}-\x{2211}\x{2212}\x{2213}\x{2214}-\x{22FF}\x{2300}-\x{2307}\x{2308}\x{2309}\x{230A}\x{230B}\x{230C}-\x{231F}\x{2320}-\x{2321}\x{2322}-\x{2328}\x{2329}\x{232A}\x{232B}-\x{2335}\x{237B}\x{237C}\x{237D}-\x{2394}\x{2396}-\x{239A}\x{239B}-\x{23B3}\x{23B4}-\x{23DB}\x{23DC}-\x{23E1}\x{23E2}-\x{2426}\x{2440}-\x{244A}\x{2460}-\x{2487}\x{24EA}-\x{24FF}\x{2500}-\x{25B6}\x{25B7}\x{25B8}-\x{25C0}\x{25C1}\x{25C2}-\x{25F7}\x{25F8}-\x{25FF}\x{2600}-\x{266E}\x{266F}\x{2670}-\x{26AB}\x{26AD}-\x{2767}\x{2768}\x{2769}\x{276A}\x{276B}\x{276C}\x{276D}\x{276E}\x{276F}\x{2770}\x{2771}\x{2772}\x{2773}\x{2774}\x{2775}\x{2776}-\x{2793}\x{2794}-\x{27BF}\x{27C0}-\x{27C4}\x{27C5}\x{27C6}\x{27C7}-\x{27E5}\x{27E6}\x{27E7}\x{27E8}\x{27E9}\x{27EA}\x{27EB}\x{27EC}\x{27ED}\x{27EE}\x{27EF}\x{27F0}-\x{27FF}\x{2900}-\x{2982}\x{2983}\x{2984}\x{2985}\x{2986}\x{2987}\x{2988}\x{2989}\x{298A}\x{298B}\x{298C}\x{298D}\x{298E}\x{298F}\x{2990}\x{2991}\x{2992}\x{2993}\x{2994}\x{2995}\x{2996}\x{2997}\x{2998}\x{2999}-\x{29D7}\x{29D8}\x{29D9}\x{29DA}\x{29DB}\x{29DC}-\x{29FB}\x{29FC}\x{29FD}\x{29FE}-\x{2AFF}\x{2B00}-\x{2B2F}\x{2B30}-\x{2B44}\x{2B45}-\x{2B46}\x{2B47}-\x{2B4C}\x{2B4D}-\x{2B73}\x{2B76}-\x{2B95}\x{2B97}-\x{2BFF}\x{2CE5}-\x{2CEA}\x{2CEF}-\x{2CF1}\x{2CF9}-\x{2CFC}\x{2CFD}\x{2CFE}-\x{2CFF}\x{2D7F}\x{2DE0}-\x{2DFF}\x{2E00}-\x{2E01}\x{2E02}\x{2E03}\x{2E04}\x{2E05}\x{2E06}-\x{2E08}\x{2E09}\x{2E0A}\x{2E0B}\x{2E0C}\x{2E0D}\x{2E0E}-\x{2E16}\x{2E17}\x{2E18}-\x{2E19}\x{2E1A}\x{2E1B}\x{2E1C}\x{2E1D}\x{2E1E}-\x{2E1F}\x{2E20}\x{2E21}\x{2E22}\x{2E23}\x{2E24}\x{2E25}\x{2E26}\x{2E27}\x{2E28}\x{2E29}\x{2E2A}-\x{2E2E}\x{2E2F}\x{2E30}-\x{2E39}\x{2E3A}-\x{2E3B}\x{2E3C}-\x{2E3F}\x{2E40}\x{2E41}\x{2E42}\x{2E43}-\x{2E4F}\x{2E50}-\x{2E51}\x{2E52}\x{2E80}-\x{2E99}\x{2E9B}-\x{2EF3}\x{2F00}-\x{2FD5}\x{2FF0}-\x{2FFB}\x{3000}\x{3001}-\x{3003}\x{3004}\x{3008}\x{3009}\x{300A}\x{300B}\x{300C}\x{300D}\x{300E}\x{300F}\x{3010}\x{3011}\x{3012}-\x{3013}\x{3014}\x{3015}\x{3016}\x{3017}\x{3018}\x{3019}\x{301A}\x{301B}\x{301C}\x{301D}\x{301E}-\x{301F}\x{3020}\x{302A}-\x{302D}\x{3030}\x{3036}-\x{3037}\x{303D}\x{303E}-\x{303F}\x{3099}-\x{309A}\x{309B}-\x{309C}\x{30A0}\x{30FB}\x{31C0}-\x{31E3}\x{321D}-\x{321E}\x{3250}\x{3251}-\x{325F}\x{327C}-\x{327E}\x{32B1}-\x{32BF}\x{32CC}-\x{32CF}\x{3377}-\x{337A}\x{33DE}-\x{33DF}\x{33FF}\x{4DC0}-\x{4DFF}\x{A490}-\x{A4C6}\x{A60D}-\x{A60F}\x{A66F}\x{A670}-\x{A672}\x{A673}\x{A674}-\x{A67D}\x{A67E}\x{A67F}\x{A69E}-\x{A69F}\x{A6F0}-\x{A6F1}\x{A700}-\x{A716}\x{A717}-\x{A71F}\x{A720}-\x{A721}\x{A788}\x{A802}\x{A806}\x{A80B}\x{A825}-\x{A826}\x{A828}-\x{A82B}\x{A82C}\x{A838}\x{A839}\x{A874}-\x{A877}\x{A8C4}-\x{A8C5}\x{A8E0}-\x{A8F1}\x{A8FF}\x{A926}-\x{A92D}\x{A947}-\x{A951}\x{A980}-\x{A982}\x{A9B3}\x{A9B6}-\x{A9B9}\x{A9BC}-\x{A9BD}\x{A9E5}\x{AA29}-\x{AA2E}\x{AA31}-\x{AA32}\x{AA35}-\x{AA36}\x{AA43}\x{AA4C}\x{AA7C}\x{AAB0}\x{AAB2}-\x{AAB4}\x{AAB7}-\x{AAB8}\x{AABE}-\x{AABF}\x{AAC1}\x{AAEC}-\x{AAED}\x{AAF6}\x{AB6A}-\x{AB6B}\x{ABE5}\x{ABE8}\x{ABED}\x{FB1D}\x{FB1E}\x{FB1F}-\x{FB28}\x{FB29}\x{FB2A}-\x{FB36}\x{FB37}\x{FB38}-\x{FB3C}\x{FB3D}\x{FB3E}\x{FB3F}\x{FB40}-\x{FB41}\x{FB42}\x{FB43}-\x{FB44}\x{FB45}\x{FB46}-\x{FB4F}\x{FB50}-\x{FBB1}\x{FBB2}-\x{FBC1}\x{FBC2}-\x{FBD2}\x{FBD3}-\x{FD3D}\x{FD3E}\x{FD3F}\x{FD40}-\x{FD4F}\x{FD50}-\x{FD8F}\x{FD90}-\x{FD91}\x{FD92}-\x{FDC7}\x{FDC8}-\x{FDCF}\x{FDD0}-\x{FDEF}\x{FDF0}-\x{FDFB}\x{FDFC}\x{FDFD}\x{FDFE}-\x{FDFF}\x{FE00}-\x{FE0F}\x{FE10}-\x{FE16}\x{FE17}\x{FE18}\x{FE19}\x{FE20}-\x{FE2F}\x{FE30}\x{FE31}-\x{FE32}\x{FE33}-\x{FE34}\x{FE35}\x{FE36}\x{FE37}\x{FE38}\x{FE39}\x{FE3A}\x{FE3B}\x{FE3C}\x{FE3D}\x{FE3E}\x{FE3F}\x{FE40}\x{FE41}\x{FE42}\x{FE43}\x{FE44}\x{FE45}-\x{FE46}\x{FE47}\x{FE48}\x{FE49}-\x{FE4C}\x{FE4D}-\x{FE4F}\x{FE50}\x{FE51}\x{FE52}\x{FE54}\x{FE55}\x{FE56}-\x{FE57}\x{FE58}\x{FE59}\x{FE5A}\x{FE5B}\x{FE5C}\x{FE5D}\x{FE5E}\x{FE5F}\x{FE60}-\x{FE61}\x{FE62}\x{FE63}\x{FE64}-\x{FE66}\x{FE68}\x{FE69}\x{FE6A}\x{FE6B}\x{FE70}-\x{FE74}\x{FE75}\x{FE76}-\x{FEFC}\x{FEFD}-\x{FEFE}\x{FEFF}\x{FF01}-\x{FF02}\x{FF03}\x{FF04}\x{FF05}\x{FF06}-\x{FF07}\x{FF08}\x{FF09}\x{FF0A}\x{FF0B}\x{FF0C}\x{FF0D}\x{FF0E}-\x{FF0F}\x{FF1A}\x{FF1B}\x{FF1C}-\x{FF1E}\x{FF1F}-\x{FF20}\x{FF3B}\x{FF3C}\x{FF3D}\x{FF3E}\x{FF3F}\x{FF40}\x{FF5B}\x{FF5C}\x{FF5D}\x{FF5E}\x{FF5F}\x{FF60}\x{FF61}\x{FF62}\x{FF63}\x{FF64}-\x{FF65}\x{FFE0}-\x{FFE1}\x{FFE2}\x{FFE3}\x{FFE4}\x{FFE5}-\x{FFE6}\x{FFE8}\x{FFE9}-\x{FFEC}\x{FFED}-\x{FFEE}\x{FFF0}-\x{FFF8}\x{FFF9}-\x{FFFB}\x{FFFC}-\x{FFFD}\x{FFFE}-\x{FFFF}\x{10101}\x{10140}-\x{10174}\x{10175}-\x{10178}\x{10179}-\x{10189}\x{1018A}-\x{1018B}\x{1018C}\x{10190}-\x{1019C}\x{101A0}\x{101FD}\x{102E0}\x{10376}-\x{1037A}\x{10800}-\x{10805}\x{10806}-\x{10807}\x{10808}\x{10809}\x{1080A}-\x{10835}\x{10836}\x{10837}-\x{10838}\x{10839}-\x{1083B}\x{1083C}\x{1083D}-\x{1083E}\x{1083F}-\x{10855}\x{10856}\x{10857}\x{10858}-\x{1085F}\x{10860}-\x{10876}\x{10877}-\x{10878}\x{10879}-\x{1087F}\x{10880}-\x{1089E}\x{1089F}-\x{108A6}\x{108A7}-\x{108AF}\x{108B0}-\x{108DF}\x{108E0}-\x{108F2}\x{108F3}\x{108F4}-\x{108F5}\x{108F6}-\x{108FA}\x{108FB}-\x{108FF}\x{10900}-\x{10915}\x{10916}-\x{1091B}\x{1091C}-\x{1091E}\x{1091F}\x{10920}-\x{10939}\x{1093A}-\x{1093E}\x{1093F}\x{10940}-\x{1097F}\x{10980}-\x{109B7}\x{109B8}-\x{109BB}\x{109BC}-\x{109BD}\x{109BE}-\x{109BF}\x{109C0}-\x{109CF}\x{109D0}-\x{109D1}\x{109D2}-\x{109FF}\x{10A00}\x{10A01}-\x{10A03}\x{10A04}\x{10A05}-\x{10A06}\x{10A07}-\x{10A0B}\x{10A0C}-\x{10A0F}\x{10A10}-\x{10A13}\x{10A14}\x{10A15}-\x{10A17}\x{10A18}\x{10A19}-\x{10A35}\x{10A36}-\x{10A37}\x{10A38}-\x{10A3A}\x{10A3B}-\x{10A3E}\x{10A3F}\x{10A40}-\x{10A48}\x{10A49}-\x{10A4F}\x{10A50}-\x{10A58}\x{10A59}-\x{10A5F}\x{10A60}-\x{10A7C}\x{10A7D}-\x{10A7E}\x{10A7F}\x{10A80}-\x{10A9C}\x{10A9D}-\x{10A9F}\x{10AA0}-\x{10ABF}\x{10AC0}-\x{10AC7}\x{10AC8}\x{10AC9}-\x{10AE4}\x{10AE5}-\x{10AE6}\x{10AE7}-\x{10AEA}\x{10AEB}-\x{10AEF}\x{10AF0}-\x{10AF6}\x{10AF7}-\x{10AFF}\x{10B00}-\x{10B35}\x{10B36}-\x{10B38}\x{10B39}-\x{10B3F}\x{10B40}-\x{10B55}\x{10B56}-\x{10B57}\x{10B58}-\x{10B5F}\x{10B60}-\x{10B72}\x{10B73}-\x{10B77}\x{10B78}-\x{10B7F}\x{10B80}-\x{10B91}\x{10B92}-\x{10B98}\x{10B99}-\x{10B9C}\x{10B9D}-\x{10BA8}\x{10BA9}-\x{10BAF}\x{10BB0}-\x{10BFF}\x{10C00}-\x{10C48}\x{10C49}-\x{10C7F}\x{10C80}-\x{10CB2}\x{10CB3}-\x{10CBF}\x{10CC0}-\x{10CF2}\x{10CF3}-\x{10CF9}\x{10CFA}-\x{10CFF}\x{10D00}-\x{10D23}\x{10D24}-\x{10D27}\x{10D28}-\x{10D2F}\x{10D30}-\x{10D39}\x{10D3A}-\x{10D3F}\x{10D40}-\x{10E5F}\x{10E60}-\x{10E7E}\x{10E7F}\x{10E80}-\x{10EA9}\x{10EAA}\x{10EAB}-\x{10EAC}\x{10EAD}\x{10EAE}-\x{10EAF}\x{10EB0}-\x{10EB1}\x{10EB2}-\x{10EFF}\x{10F00}-\x{10F1C}\x{10F1D}-\x{10F26}\x{10F27}\x{10F28}-\x{10F2F}\x{10F30}-\x{10F45}\x{10F46}-\x{10F50}\x{10F51}-\x{10F54}\x{10F55}-\x{10F59}\x{10F5A}-\x{10F6F}\x{10F70}-\x{10FAF}\x{10FB0}-\x{10FC4}\x{10FC5}-\x{10FCB}\x{10FCC}-\x{10FDF}\x{10FE0}-\x{10FF6}\x{10FF7}-\x{10FFF}\x{11001}\x{11038}-\x{11046}\x{11052}-\x{11065}\x{1107F}-\x{11081}\x{110B3}-\x{110B6}\x{110B9}-\x{110BA}\x{11100}-\x{11102}\x{11127}-\x{1112B}\x{1112D}-\x{11134}\x{11173}\x{11180}-\x{11181}\x{111B6}-\x{111BE}\x{111C9}-\x{111CC}\x{111CF}\x{1122F}-\x{11231}\x{11234}\x{11236}-\x{11237}\x{1123E}\x{112DF}\x{112E3}-\x{112EA}\x{11300}-\x{11301}\x{1133B}-\x{1133C}\x{11340}\x{11366}-\x{1136C}\x{11370}-\x{11374}\x{11438}-\x{1143F}\x{11442}-\x{11444}\x{11446}\x{1145E}\x{114B3}-\x{114B8}\x{114BA}\x{114BF}-\x{114C0}\x{114C2}-\x{114C3}\x{115B2}-\x{115B5}\x{115BC}-\x{115BD}\x{115BF}-\x{115C0}\x{115DC}-\x{115DD}\x{11633}-\x{1163A}\x{1163D}\x{1163F}-\x{11640}\x{11660}-\x{1166C}\x{116AB}\x{116AD}\x{116B0}-\x{116B5}\x{116B7}\x{1171D}-\x{1171F}\x{11722}-\x{11725}\x{11727}-\x{1172B}\x{1182F}-\x{11837}\x{11839}-\x{1183A}\x{1193B}-\x{1193C}\x{1193E}\x{11943}\x{119D4}-\x{119D7}\x{119DA}-\x{119DB}\x{119E0}\x{11A01}-\x{11A06}\x{11A09}-\x{11A0A}\x{11A33}-\x{11A38}\x{11A3B}-\x{11A3E}\x{11A47}\x{11A51}-\x{11A56}\x{11A59}-\x{11A5B}\x{11A8A}-\x{11A96}\x{11A98}-\x{11A99}\x{11C30}-\x{11C36}\x{11C38}-\x{11C3D}\x{11C92}-\x{11CA7}\x{11CAA}-\x{11CB0}\x{11CB2}-\x{11CB3}\x{11CB5}-\x{11CB6}\x{11D31}-\x{11D36}\x{11D3A}\x{11D3C}-\x{11D3D}\x{11D3F}-\x{11D45}\x{11D47}\x{11D90}-\x{11D91}\x{11D95}\x{11D97}\x{11EF3}-\x{11EF4}\x{11FD5}-\x{11FDC}\x{11FDD}-\x{11FE0}\x{11FE1}-\x{11FF1}\x{16AF0}-\x{16AF4}\x{16B30}-\x{16B36}\x{16F4F}\x{16F8F}-\x{16F92}\x{16FE2}\x{16FE4}\x{1BC9D}-\x{1BC9E}\x{1BCA0}-\x{1BCA3}\x{1D167}-\x{1D169}\x{1D173}-\x{1D17A}\x{1D17B}-\x{1D182}\x{1D185}-\x{1D18B}\x{1D1AA}-\x{1D1AD}\x{1D200}-\x{1D241}\x{1D242}-\x{1D244}\x{1D245}\x{1D300}-\x{1D356}\x{1D6DB}\x{1D715}\x{1D74F}\x{1D789}\x{1D7C3}\x{1DA00}-\x{1DA36}\x{1DA3B}-\x{1DA6C}\x{1DA75}\x{1DA84}\x{1DA9B}-\x{1DA9F}\x{1DAA1}-\x{1DAAF}\x{1E000}-\x{1E006}\x{1E008}-\x{1E018}\x{1E01B}-\x{1E021}\x{1E023}-\x{1E024}\x{1E026}-\x{1E02A}\x{1E130}-\x{1E136}\x{1E2EC}-\x{1E2EF}\x{1E2FF}\x{1E800}-\x{1E8C4}\x{1E8C5}-\x{1E8C6}\x{1E8C7}-\x{1E8CF}\x{1E8D0}-\x{1E8D6}\x{1E8D7}-\x{1E8FF}\x{1E900}-\x{1E943}\x{1E944}-\x{1E94A}\x{1E94B}\x{1E94C}-\x{1E94F}\x{1E950}-\x{1E959}\x{1E95A}-\x{1E95D}\x{1E95E}-\x{1E95F}\x{1E960}-\x{1EC6F}\x{1EC70}\x{1EC71}-\x{1ECAB}\x{1ECAC}\x{1ECAD}-\x{1ECAF}\x{1ECB0}\x{1ECB1}-\x{1ECB4}\x{1ECB5}-\x{1ECBF}\x{1ECC0}-\x{1ECFF}\x{1ED00}\x{1ED01}-\x{1ED2D}\x{1ED2E}\x{1ED2F}-\x{1ED3D}\x{1ED3E}-\x{1ED4F}\x{1ED50}-\x{1EDFF}\x{1EE00}-\x{1EE03}\x{1EE04}\x{1EE05}-\x{1EE1F}\x{1EE20}\x{1EE21}-\x{1EE22}\x{1EE23}\x{1EE24}\x{1EE25}-\x{1EE26}\x{1EE27}\x{1EE28}\x{1EE29}-\x{1EE32}\x{1EE33}\x{1EE34}-\x{1EE37}\x{1EE38}\x{1EE39}\x{1EE3A}\x{1EE3B}\x{1EE3C}-\x{1EE41}\x{1EE42}\x{1EE43}-\x{1EE46}\x{1EE47}\x{1EE48}\x{1EE49}\x{1EE4A}\x{1EE4B}\x{1EE4C}\x{1EE4D}-\x{1EE4F}\x{1EE50}\x{1EE51}-\x{1EE52}\x{1EE53}\x{1EE54}\x{1EE55}-\x{1EE56}\x{1EE57}\x{1EE58}\x{1EE59}\x{1EE5A}\x{1EE5B}\x{1EE5C}\x{1EE5D}\x{1EE5E}\x{1EE5F}\x{1EE60}\x{1EE61}-\x{1EE62}\x{1EE63}\x{1EE64}\x{1EE65}-\x{1EE66}\x{1EE67}-\x{1EE6A}\x{1EE6B}\x{1EE6C}-\x{1EE72}\x{1EE73}\x{1EE74}-\x{1EE77}\x{1EE78}\x{1EE79}-\x{1EE7C}\x{1EE7D}\x{1EE7E}\x{1EE7F}\x{1EE80}-\x{1EE89}\x{1EE8A}\x{1EE8B}-\x{1EE9B}\x{1EE9C}-\x{1EEA0}\x{1EEA1}-\x{1EEA3}\x{1EEA4}\x{1EEA5}-\x{1EEA9}\x{1EEAA}\x{1EEAB}-\x{1EEBB}\x{1EEBC}-\x{1EEEF}\x{1EEF0}-\x{1EEF1}\x{1EEF2}-\x{1EEFF}\x{1EF00}-\x{1EFFF}\x{1F000}-\x{1F02B}\x{1F030}-\x{1F093}\x{1F0A0}-\x{1F0AE}\x{1F0B1}-\x{1F0BF}\x{1F0C1}-\x{1F0CF}\x{1F0D1}-\x{1F0F5}\x{1F10B}-\x{1F10C}\x{1F10D}-\x{1F10F}\x{1F12F}\x{1F16A}-\x{1F16F}\x{1F1AD}\x{1F260}-\x{1F265}\x{1F300}-\x{1F3FA}\x{1F3FB}-\x{1F3FF}\x{1F400}-\x{1F6D7}\x{1F6E0}-\x{1F6EC}\x{1F6F0}-\x{1F6FC}\x{1F700}-\x{1F773}\x{1F780}-\x{1F7D8}\x{1F7E0}-\x{1F7EB}\x{1F800}-\x{1F80B}\x{1F810}-\x{1F847}\x{1F850}-\x{1F859}\x{1F860}-\x{1F887}\x{1F890}-\x{1F8AD}\x{1F8B0}-\x{1F8B1}\x{1F900}-\x{1F978}\x{1F97A}-\x{1F9CB}\x{1F9CD}-\x{1FA53}\x{1FA60}-\x{1FA6D}\x{1FA70}-\x{1FA74}\x{1FA78}-\x{1FA7A}\x{1FA80}-\x{1FA86}\x{1FA90}-\x{1FAA8}\x{1FAB0}-\x{1FAB6}\x{1FAC0}-\x{1FAC2}\x{1FAD0}-\x{1FAD6}\x{1FB00}-\x{1FB92}\x{1FB94}-\x{1FBCA}\x{1FFFE}-\x{1FFFF}\x{2FFFE}-\x{2FFFF}\x{3FFFE}-\x{3FFFF}\x{4FFFE}-\x{4FFFF}\x{5FFFE}-\x{5FFFF}\x{6FFFE}-\x{6FFFF}\x{7FFFE}-\x{7FFFF}\x{8FFFE}-\x{8FFFF}\x{9FFFE}-\x{9FFFF}\x{AFFFE}-\x{AFFFF}\x{BFFFE}-\x{BFFFF}\x{CFFFE}-\x{CFFFF}\x{DFFFE}-\x{E0000}\x{E0001}\x{E0002}-\x{E001F}\x{E0020}-\x{E007F}\x{E0080}-\x{E00FF}\x{E0100}-\x{E01EF}\x{E01F0}-\x{E0FFF}\x{EFFFE}-\x{EFFFF}\x{FFFFE}-\x{FFFFF}\x{10FFFE}-\x{10FFFF}][\x{0300}-\x{036F}\x{0483}-\x{0487}\x{0488}-\x{0489}\x{0591}-\x{05BD}\x{05BF}\x{05C1}-\x{05C2}\x{05C4}-\x{05C5}\x{05C7}\x{0610}-\x{061A}\x{064B}-\x{065F}\x{0670}\x{06D6}-\x{06DC}\x{06DF}-\x{06E4}\x{06E7}-\x{06E8}\x{06EA}-\x{06ED}\x{0711}\x{0730}-\x{074A}\x{07A6}-\x{07B0}\x{07EB}-\x{07F3}\x{07FD}\x{0816}-\x{0819}\x{081B}-\x{0823}\x{0825}-\x{0827}\x{0829}-\x{082D}\x{0859}-\x{085B}\x{08D3}-\x{08E1}\x{08E3}-\x{0902}\x{093A}\x{093C}\x{0941}-\x{0948}\x{094D}\x{0951}-\x{0957}\x{0962}-\x{0963}\x{0981}\x{09BC}\x{09C1}-\x{09C4}\x{09CD}\x{09E2}-\x{09E3}\x{09FE}\x{0A01}-\x{0A02}\x{0A3C}\x{0A41}-\x{0A42}\x{0A47}-\x{0A48}\x{0A4B}-\x{0A4D}\x{0A51}\x{0A70}-\x{0A71}\x{0A75}\x{0A81}-\x{0A82}\x{0ABC}\x{0AC1}-\x{0AC5}\x{0AC7}-\x{0AC8}\x{0ACD}\x{0AE2}-\x{0AE3}\x{0AFA}-\x{0AFF}\x{0B01}\x{0B3C}\x{0B3F}\x{0B41}-\x{0B44}\x{0B4D}\x{0B55}-\x{0B56}\x{0B62}-\x{0B63}\x{0B82}\x{0BC0}\x{0BCD}\x{0C00}\x{0C04}\x{0C3E}-\x{0C40}\x{0C46}-\x{0C48}\x{0C4A}-\x{0C4D}\x{0C55}-\x{0C56}\x{0C62}-\x{0C63}\x{0C81}\x{0CBC}\x{0CCC}-\x{0CCD}\x{0CE2}-\x{0CE3}\x{0D00}-\x{0D01}\x{0D3B}-\x{0D3C}\x{0D41}-\x{0D44}\x{0D4D}\x{0D62}-\x{0D63}\x{0D81}\x{0DCA}\x{0DD2}-\x{0DD4}\x{0DD6}\x{0E31}\x{0E34}-\x{0E3A}\x{0E47}-\x{0E4E}\x{0EB1}\x{0EB4}-\x{0EBC}\x{0EC8}-\x{0ECD}\x{0F18}-\x{0F19}\x{0F35}\x{0F37}\x{0F39}\x{0F71}-\x{0F7E}\x{0F80}-\x{0F84}\x{0F86}-\x{0F87}\x{0F8D}-\x{0F97}\x{0F99}-\x{0FBC}\x{0FC6}\x{102D}-\x{1030}\x{1032}-\x{1037}\x{1039}-\x{103A}\x{103D}-\x{103E}\x{1058}-\x{1059}\x{105E}-\x{1060}\x{1071}-\x{1074}\x{1082}\x{1085}-\x{1086}\x{108D}\x{109D}\x{135D}-\x{135F}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}-\x{1753}\x{1772}-\x{1773}\x{17B4}-\x{17B5}\x{17B7}-\x{17BD}\x{17C6}\x{17C9}-\x{17D3}\x{17DD}\x{180B}-\x{180D}\x{1885}-\x{1886}\x{18A9}\x{1920}-\x{1922}\x{1927}-\x{1928}\x{1932}\x{1939}-\x{193B}\x{1A17}-\x{1A18}\x{1A1B}\x{1A56}\x{1A58}-\x{1A5E}\x{1A60}\x{1A62}\x{1A65}-\x{1A6C}\x{1A73}-\x{1A7C}\x{1A7F}\x{1AB0}-\x{1ABD}\x{1ABE}\x{1ABF}-\x{1AC0}\x{1B00}-\x{1B03}\x{1B34}\x{1B36}-\x{1B3A}\x{1B3C}\x{1B42}\x{1B6B}-\x{1B73}\x{1B80}-\x{1B81}\x{1BA2}-\x{1BA5}\x{1BA8}-\x{1BA9}\x{1BAB}-\x{1BAD}\x{1BE6}\x{1BE8}-\x{1BE9}\x{1BED}\x{1BEF}-\x{1BF1}\x{1C2C}-\x{1C33}\x{1C36}-\x{1C37}\x{1CD0}-\x{1CD2}\x{1CD4}-\x{1CE0}\x{1CE2}-\x{1CE8}\x{1CED}\x{1CF4}\x{1CF8}-\x{1CF9}\x{1DC0}-\x{1DF9}\x{1DFB}-\x{1DFF}\x{20D0}-\x{20DC}\x{20DD}-\x{20E0}\x{20E1}\x{20E2}-\x{20E4}\x{20E5}-\x{20F0}\x{2CEF}-\x{2CF1}\x{2D7F}\x{2DE0}-\x{2DFF}\x{302A}-\x{302D}\x{3099}-\x{309A}\x{A66F}\x{A670}-\x{A672}\x{A674}-\x{A67D}\x{A69E}-\x{A69F}\x{A6F0}-\x{A6F1}\x{A802}\x{A806}\x{A80B}\x{A825}-\x{A826}\x{A82C}\x{A8C4}-\x{A8C5}\x{A8E0}-\x{A8F1}\x{A8FF}\x{A926}-\x{A92D}\x{A947}-\x{A951}\x{A980}-\x{A982}\x{A9B3}\x{A9B6}-\x{A9B9}\x{A9BC}-\x{A9BD}\x{A9E5}\x{AA29}-\x{AA2E}\x{AA31}-\x{AA32}\x{AA35}-\x{AA36}\x{AA43}\x{AA4C}\x{AA7C}\x{AAB0}\x{AAB2}-\x{AAB4}\x{AAB7}-\x{AAB8}\x{AABE}-\x{AABF}\x{AAC1}\x{AAEC}-\x{AAED}\x{AAF6}\x{ABE5}\x{ABE8}\x{ABED}\x{FB1E}\x{FE00}-\x{FE0F}\x{FE20}-\x{FE2F}\x{101FD}\x{102E0}\x{10376}-\x{1037A}\x{10A01}-\x{10A03}\x{10A05}-\x{10A06}\x{10A0C}-\x{10A0F}\x{10A38}-\x{10A3A}\x{10A3F}\x{10AE5}-\x{10AE6}\x{10D24}-\x{10D27}\x{10EAB}-\x{10EAC}\x{10F46}-\x{10F50}\x{11001}\x{11038}-\x{11046}\x{1107F}-\x{11081}\x{110B3}-\x{110B6}\x{110B9}-\x{110BA}\x{11100}-\x{11102}\x{11127}-\x{1112B}\x{1112D}-\x{11134}\x{11173}\x{11180}-\x{11181}\x{111B6}-\x{111BE}\x{111C9}-\x{111CC}\x{111CF}\x{1122F}-\x{11231}\x{11234}\x{11236}-\x{11237}\x{1123E}\x{112DF}\x{112E3}-\x{112EA}\x{11300}-\x{11301}\x{1133B}-\x{1133C}\x{11340}\x{11366}-\x{1136C}\x{11370}-\x{11374}\x{11438}-\x{1143F}\x{11442}-\x{11444}\x{11446}\x{1145E}\x{114B3}-\x{114B8}\x{114BA}\x{114BF}-\x{114C0}\x{114C2}-\x{114C3}\x{115B2}-\x{115B5}\x{115BC}-\x{115BD}\x{115BF}-\x{115C0}\x{115DC}-\x{115DD}\x{11633}-\x{1163A}\x{1163D}\x{1163F}-\x{11640}\x{116AB}\x{116AD}\x{116B0}-\x{116B5}\x{116B7}\x{1171D}-\x{1171F}\x{11722}-\x{11725}\x{11727}-\x{1172B}\x{1182F}-\x{11837}\x{11839}-\x{1183A}\x{1193B}-\x{1193C}\x{1193E}\x{11943}\x{119D4}-\x{119D7}\x{119DA}-\x{119DB}\x{119E0}\x{11A01}-\x{11A06}\x{11A09}-\x{11A0A}\x{11A33}-\x{11A38}\x{11A3B}-\x{11A3E}\x{11A47}\x{11A51}-\x{11A56}\x{11A59}-\x{11A5B}\x{11A8A}-\x{11A96}\x{11A98}-\x{11A99}\x{11C30}-\x{11C36}\x{11C38}-\x{11C3D}\x{11C92}-\x{11CA7}\x{11CAA}-\x{11CB0}\x{11CB2}-\x{11CB3}\x{11CB5}-\x{11CB6}\x{11D31}-\x{11D36}\x{11D3A}\x{11D3C}-\x{11D3D}\x{11D3F}-\x{11D45}\x{11D47}\x{11D90}-\x{11D91}\x{11D95}\x{11D97}\x{11EF3}-\x{11EF4}\x{16AF0}-\x{16AF4}\x{16B30}-\x{16B36}\x{16F4F}\x{16F8F}-\x{16F92}\x{16FE4}\x{1BC9D}-\x{1BC9E}\x{1D167}-\x{1D169}\x{1D17B}-\x{1D182}\x{1D185}-\x{1D18B}\x{1D1AA}-\x{1D1AD}\x{1D242}-\x{1D244}\x{1DA00}-\x{1DA36}\x{1DA3B}-\x{1DA6C}\x{1DA75}\x{1DA84}\x{1DA9B}-\x{1DA9F}\x{1DAA1}-\x{1DAAF}\x{1E000}-\x{1E006}\x{1E008}-\x{1E018}\x{1E01B}-\x{1E021}\x{1E023}-\x{1E024}\x{1E026}-\x{1E02A}\x{1E130}-\x{1E136}\x{1E2EC}-\x{1E2EF}\x{1E8D0}-\x{1E8D6}\x{1E944}-\x{1E94A}\x{E0100}-\x{E01EF}]*$/u';
+
+    const ZWNJ = '/([\x{A872}\x{10ACD}\x{10AD7}\x{10D00}\x{10FCB}\x{0620}\x{0626}\x{0628}\x{062A}-\x{062E}\x{0633}-\x{063F}\x{0641}-\x{0647}\x{0649}-\x{064A}\x{066E}-\x{066F}\x{0678}-\x{0687}\x{069A}-\x{06BF}\x{06C1}-\x{06C2}\x{06CC}\x{06CE}\x{06D0}-\x{06D1}\x{06FA}-\x{06FC}\x{06FF}\x{0712}-\x{0714}\x{071A}-\x{071D}\x{071F}-\x{0727}\x{0729}\x{072B}\x{072D}-\x{072E}\x{074E}-\x{0758}\x{075C}-\x{076A}\x{076D}-\x{0770}\x{0772}\x{0775}-\x{0777}\x{077A}-\x{077F}\x{07CA}-\x{07EA}\x{0841}-\x{0845}\x{0848}\x{084A}-\x{0853}\x{0855}\x{0860}\x{0862}-\x{0865}\x{0868}\x{08A0}-\x{08A9}\x{08AF}-\x{08B0}\x{08B3}-\x{08B4}\x{08B6}-\x{08B8}\x{08BA}-\x{08C7}\x{1807}\x{1820}-\x{1842}\x{1843}\x{1844}-\x{1878}\x{1887}-\x{18A8}\x{18AA}\x{A840}-\x{A871}\x{10AC0}-\x{10AC4}\x{10AD3}-\x{10AD6}\x{10AD8}-\x{10ADC}\x{10ADE}-\x{10AE0}\x{10AEB}-\x{10AEE}\x{10B80}\x{10B82}\x{10B86}-\x{10B88}\x{10B8A}-\x{10B8B}\x{10B8D}\x{10B90}\x{10BAD}-\x{10BAE}\x{10D01}-\x{10D21}\x{10D23}\x{10F30}-\x{10F32}\x{10F34}-\x{10F44}\x{10F51}-\x{10F53}\x{10FB0}\x{10FB2}-\x{10FB3}\x{10FB8}\x{10FBB}-\x{10FBC}\x{10FBE}-\x{10FBF}\x{10FC1}\x{10FC4}\x{10FCA}\x{1E900}-\x{1E943}][\x{00AD}\x{0300}-\x{036F}\x{0483}-\x{0487}\x{0488}-\x{0489}\x{0591}-\x{05BD}\x{05BF}\x{05C1}-\x{05C2}\x{05C4}-\x{05C5}\x{05C7}\x{0610}-\x{061A}\x{061C}\x{064B}-\x{065F}\x{0670}\x{06D6}-\x{06DC}\x{06DF}-\x{06E4}\x{06E7}-\x{06E8}\x{06EA}-\x{06ED}\x{070F}\x{0711}\x{0730}-\x{074A}\x{07A6}-\x{07B0}\x{07EB}-\x{07F3}\x{07FD}\x{0816}-\x{0819}\x{081B}-\x{0823}\x{0825}-\x{0827}\x{0829}-\x{082D}\x{0859}-\x{085B}\x{08D3}-\x{08E1}\x{08E3}-\x{0902}\x{093A}\x{093C}\x{0941}-\x{0948}\x{094D}\x{0951}-\x{0957}\x{0962}-\x{0963}\x{0981}\x{09BC}\x{09C1}-\x{09C4}\x{09CD}\x{09E2}-\x{09E3}\x{09FE}\x{0A01}-\x{0A02}\x{0A3C}\x{0A41}-\x{0A42}\x{0A47}-\x{0A48}\x{0A4B}-\x{0A4D}\x{0A51}\x{0A70}-\x{0A71}\x{0A75}\x{0A81}-\x{0A82}\x{0ABC}\x{0AC1}-\x{0AC5}\x{0AC7}-\x{0AC8}\x{0ACD}\x{0AE2}-\x{0AE3}\x{0AFA}-\x{0AFF}\x{0B01}\x{0B3C}\x{0B3F}\x{0B41}-\x{0B44}\x{0B4D}\x{0B55}-\x{0B56}\x{0B62}-\x{0B63}\x{0B82}\x{0BC0}\x{0BCD}\x{0C00}\x{0C04}\x{0C3E}-\x{0C40}\x{0C46}-\x{0C48}\x{0C4A}-\x{0C4D}\x{0C55}-\x{0C56}\x{0C62}-\x{0C63}\x{0C81}\x{0CBC}\x{0CBF}\x{0CC6}\x{0CCC}-\x{0CCD}\x{0CE2}-\x{0CE3}\x{0D00}-\x{0D01}\x{0D3B}-\x{0D3C}\x{0D41}-\x{0D44}\x{0D4D}\x{0D62}-\x{0D63}\x{0D81}\x{0DCA}\x{0DD2}-\x{0DD4}\x{0DD6}\x{0E31}\x{0E34}-\x{0E3A}\x{0E47}-\x{0E4E}\x{0EB1}\x{0EB4}-\x{0EBC}\x{0EC8}-\x{0ECD}\x{0F18}-\x{0F19}\x{0F35}\x{0F37}\x{0F39}\x{0F71}-\x{0F7E}\x{0F80}-\x{0F84}\x{0F86}-\x{0F87}\x{0F8D}-\x{0F97}\x{0F99}-\x{0FBC}\x{0FC6}\x{102D}-\x{1030}\x{1032}-\x{1037}\x{1039}-\x{103A}\x{103D}-\x{103E}\x{1058}-\x{1059}\x{105E}-\x{1060}\x{1071}-\x{1074}\x{1082}\x{1085}-\x{1086}\x{108D}\x{109D}\x{135D}-\x{135F}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}-\x{1753}\x{1772}-\x{1773}\x{17B4}-\x{17B5}\x{17B7}-\x{17BD}\x{17C6}\x{17C9}-\x{17D3}\x{17DD}\x{180B}-\x{180D}\x{1885}-\x{1886}\x{18A9}\x{1920}-\x{1922}\x{1927}-\x{1928}\x{1932}\x{1939}-\x{193B}\x{1A17}-\x{1A18}\x{1A1B}\x{1A56}\x{1A58}-\x{1A5E}\x{1A60}\x{1A62}\x{1A65}-\x{1A6C}\x{1A73}-\x{1A7C}\x{1A7F}\x{1AB0}-\x{1ABD}\x{1ABE}\x{1ABF}-\x{1AC0}\x{1B00}-\x{1B03}\x{1B34}\x{1B36}-\x{1B3A}\x{1B3C}\x{1B42}\x{1B6B}-\x{1B73}\x{1B80}-\x{1B81}\x{1BA2}-\x{1BA5}\x{1BA8}-\x{1BA9}\x{1BAB}-\x{1BAD}\x{1BE6}\x{1BE8}-\x{1BE9}\x{1BED}\x{1BEF}-\x{1BF1}\x{1C2C}-\x{1C33}\x{1C36}-\x{1C37}\x{1CD0}-\x{1CD2}\x{1CD4}-\x{1CE0}\x{1CE2}-\x{1CE8}\x{1CED}\x{1CF4}\x{1CF8}-\x{1CF9}\x{1DC0}-\x{1DF9}\x{1DFB}-\x{1DFF}\x{200B}\x{200E}-\x{200F}\x{202A}-\x{202E}\x{2060}-\x{2064}\x{206A}-\x{206F}\x{20D0}-\x{20DC}\x{20DD}-\x{20E0}\x{20E1}\x{20E2}-\x{20E4}\x{20E5}-\x{20F0}\x{2CEF}-\x{2CF1}\x{2D7F}\x{2DE0}-\x{2DFF}\x{302A}-\x{302D}\x{3099}-\x{309A}\x{A66F}\x{A670}-\x{A672}\x{A674}-\x{A67D}\x{A69E}-\x{A69F}\x{A6F0}-\x{A6F1}\x{A802}\x{A806}\x{A80B}\x{A825}-\x{A826}\x{A82C}\x{A8C4}-\x{A8C5}\x{A8E0}-\x{A8F1}\x{A8FF}\x{A926}-\x{A92D}\x{A947}-\x{A951}\x{A980}-\x{A982}\x{A9B3}\x{A9B6}-\x{A9B9}\x{A9BC}-\x{A9BD}\x{A9E5}\x{AA29}-\x{AA2E}\x{AA31}-\x{AA32}\x{AA35}-\x{AA36}\x{AA43}\x{AA4C}\x{AA7C}\x{AAB0}\x{AAB2}-\x{AAB4}\x{AAB7}-\x{AAB8}\x{AABE}-\x{AABF}\x{AAC1}\x{AAEC}-\x{AAED}\x{AAF6}\x{ABE5}\x{ABE8}\x{ABED}\x{FB1E}\x{FE00}-\x{FE0F}\x{FE20}-\x{FE2F}\x{FEFF}\x{FFF9}-\x{FFFB}\x{101FD}\x{102E0}\x{10376}-\x{1037A}\x{10A01}-\x{10A03}\x{10A05}-\x{10A06}\x{10A0C}-\x{10A0F}\x{10A38}-\x{10A3A}\x{10A3F}\x{10AE5}-\x{10AE6}\x{10D24}-\x{10D27}\x{10EAB}-\x{10EAC}\x{10F46}-\x{10F50}\x{11001}\x{11038}-\x{11046}\x{1107F}-\x{11081}\x{110B3}-\x{110B6}\x{110B9}-\x{110BA}\x{11100}-\x{11102}\x{11127}-\x{1112B}\x{1112D}-\x{11134}\x{11173}\x{11180}-\x{11181}\x{111B6}-\x{111BE}\x{111C9}-\x{111CC}\x{111CF}\x{1122F}-\x{11231}\x{11234}\x{11236}-\x{11237}\x{1123E}\x{112DF}\x{112E3}-\x{112EA}\x{11300}-\x{11301}\x{1133B}-\x{1133C}\x{11340}\x{11366}-\x{1136C}\x{11370}-\x{11374}\x{11438}-\x{1143F}\x{11442}-\x{11444}\x{11446}\x{1145E}\x{114B3}-\x{114B8}\x{114BA}\x{114BF}-\x{114C0}\x{114C2}-\x{114C3}\x{115B2}-\x{115B5}\x{115BC}-\x{115BD}\x{115BF}-\x{115C0}\x{115DC}-\x{115DD}\x{11633}-\x{1163A}\x{1163D}\x{1163F}-\x{11640}\x{116AB}\x{116AD}\x{116B0}-\x{116B5}\x{116B7}\x{1171D}-\x{1171F}\x{11722}-\x{11725}\x{11727}-\x{1172B}\x{1182F}-\x{11837}\x{11839}-\x{1183A}\x{1193B}-\x{1193C}\x{1193E}\x{11943}\x{119D4}-\x{119D7}\x{119DA}-\x{119DB}\x{119E0}\x{11A01}-\x{11A0A}\x{11A33}-\x{11A38}\x{11A3B}-\x{11A3E}\x{11A47}\x{11A51}-\x{11A56}\x{11A59}-\x{11A5B}\x{11A8A}-\x{11A96}\x{11A98}-\x{11A99}\x{11C30}-\x{11C36}\x{11C38}-\x{11C3D}\x{11C3F}\x{11C92}-\x{11CA7}\x{11CAA}-\x{11CB0}\x{11CB2}-\x{11CB3}\x{11CB5}-\x{11CB6}\x{11D31}-\x{11D36}\x{11D3A}\x{11D3C}-\x{11D3D}\x{11D3F}-\x{11D45}\x{11D47}\x{11D90}-\x{11D91}\x{11D95}\x{11D97}\x{11EF3}-\x{11EF4}\x{13430}-\x{13438}\x{16AF0}-\x{16AF4}\x{16B30}-\x{16B36}\x{16F4F}\x{16F8F}-\x{16F92}\x{16FE4}\x{1BC9D}-\x{1BC9E}\x{1BCA0}-\x{1BCA3}\x{1D167}-\x{1D169}\x{1D173}-\x{1D17A}\x{1D17B}-\x{1D182}\x{1D185}-\x{1D18B}\x{1D1AA}-\x{1D1AD}\x{1D242}-\x{1D244}\x{1DA00}-\x{1DA36}\x{1DA3B}-\x{1DA6C}\x{1DA75}\x{1DA84}\x{1DA9B}-\x{1DA9F}\x{1DAA1}-\x{1DAAF}\x{1E000}-\x{1E006}\x{1E008}-\x{1E018}\x{1E01B}-\x{1E021}\x{1E023}-\x{1E024}\x{1E026}-\x{1E02A}\x{1E130}-\x{1E136}\x{1E2EC}-\x{1E2EF}\x{1E8D0}-\x{1E8D6}\x{1E944}-\x{1E94A}\x{1E94B}\x{E0001}\x{E0020}-\x{E007F}\x{E0100}-\x{E01EF}]*\x{200C}[\x{00AD}\x{0300}-\x{036F}\x{0483}-\x{0487}\x{0488}-\x{0489}\x{0591}-\x{05BD}\x{05BF}\x{05C1}-\x{05C2}\x{05C4}-\x{05C5}\x{05C7}\x{0610}-\x{061A}\x{061C}\x{064B}-\x{065F}\x{0670}\x{06D6}-\x{06DC}\x{06DF}-\x{06E4}\x{06E7}-\x{06E8}\x{06EA}-\x{06ED}\x{070F}\x{0711}\x{0730}-\x{074A}\x{07A6}-\x{07B0}\x{07EB}-\x{07F3}\x{07FD}\x{0816}-\x{0819}\x{081B}-\x{0823}\x{0825}-\x{0827}\x{0829}-\x{082D}\x{0859}-\x{085B}\x{08D3}-\x{08E1}\x{08E3}-\x{0902}\x{093A}\x{093C}\x{0941}-\x{0948}\x{094D}\x{0951}-\x{0957}\x{0962}-\x{0963}\x{0981}\x{09BC}\x{09C1}-\x{09C4}\x{09CD}\x{09E2}-\x{09E3}\x{09FE}\x{0A01}-\x{0A02}\x{0A3C}\x{0A41}-\x{0A42}\x{0A47}-\x{0A48}\x{0A4B}-\x{0A4D}\x{0A51}\x{0A70}-\x{0A71}\x{0A75}\x{0A81}-\x{0A82}\x{0ABC}\x{0AC1}-\x{0AC5}\x{0AC7}-\x{0AC8}\x{0ACD}\x{0AE2}-\x{0AE3}\x{0AFA}-\x{0AFF}\x{0B01}\x{0B3C}\x{0B3F}\x{0B41}-\x{0B44}\x{0B4D}\x{0B55}-\x{0B56}\x{0B62}-\x{0B63}\x{0B82}\x{0BC0}\x{0BCD}\x{0C00}\x{0C04}\x{0C3E}-\x{0C40}\x{0C46}-\x{0C48}\x{0C4A}-\x{0C4D}\x{0C55}-\x{0C56}\x{0C62}-\x{0C63}\x{0C81}\x{0CBC}\x{0CBF}\x{0CC6}\x{0CCC}-\x{0CCD}\x{0CE2}-\x{0CE3}\x{0D00}-\x{0D01}\x{0D3B}-\x{0D3C}\x{0D41}-\x{0D44}\x{0D4D}\x{0D62}-\x{0D63}\x{0D81}\x{0DCA}\x{0DD2}-\x{0DD4}\x{0DD6}\x{0E31}\x{0E34}-\x{0E3A}\x{0E47}-\x{0E4E}\x{0EB1}\x{0EB4}-\x{0EBC}\x{0EC8}-\x{0ECD}\x{0F18}-\x{0F19}\x{0F35}\x{0F37}\x{0F39}\x{0F71}-\x{0F7E}\x{0F80}-\x{0F84}\x{0F86}-\x{0F87}\x{0F8D}-\x{0F97}\x{0F99}-\x{0FBC}\x{0FC6}\x{102D}-\x{1030}\x{1032}-\x{1037}\x{1039}-\x{103A}\x{103D}-\x{103E}\x{1058}-\x{1059}\x{105E}-\x{1060}\x{1071}-\x{1074}\x{1082}\x{1085}-\x{1086}\x{108D}\x{109D}\x{135D}-\x{135F}\x{1712}-\x{1714}\x{1732}-\x{1734}\x{1752}-\x{1753}\x{1772}-\x{1773}\x{17B4}-\x{17B5}\x{17B7}-\x{17BD}\x{17C6}\x{17C9}-\x{17D3}\x{17DD}\x{180B}-\x{180D}\x{1885}-\x{1886}\x{18A9}\x{1920}-\x{1922}\x{1927}-\x{1928}\x{1932}\x{1939}-\x{193B}\x{1A17}-\x{1A18}\x{1A1B}\x{1A56}\x{1A58}-\x{1A5E}\x{1A60}\x{1A62}\x{1A65}-\x{1A6C}\x{1A73}-\x{1A7C}\x{1A7F}\x{1AB0}-\x{1ABD}\x{1ABE}\x{1ABF}-\x{1AC0}\x{1B00}-\x{1B03}\x{1B34}\x{1B36}-\x{1B3A}\x{1B3C}\x{1B42}\x{1B6B}-\x{1B73}\x{1B80}-\x{1B81}\x{1BA2}-\x{1BA5}\x{1BA8}-\x{1BA9}\x{1BAB}-\x{1BAD}\x{1BE6}\x{1BE8}-\x{1BE9}\x{1BED}\x{1BEF}-\x{1BF1}\x{1C2C}-\x{1C33}\x{1C36}-\x{1C37}\x{1CD0}-\x{1CD2}\x{1CD4}-\x{1CE0}\x{1CE2}-\x{1CE8}\x{1CED}\x{1CF4}\x{1CF8}-\x{1CF9}\x{1DC0}-\x{1DF9}\x{1DFB}-\x{1DFF}\x{200B}\x{200E}-\x{200F}\x{202A}-\x{202E}\x{2060}-\x{2064}\x{206A}-\x{206F}\x{20D0}-\x{20DC}\x{20DD}-\x{20E0}\x{20E1}\x{20E2}-\x{20E4}\x{20E5}-\x{20F0}\x{2CEF}-\x{2CF1}\x{2D7F}\x{2DE0}-\x{2DFF}\x{302A}-\x{302D}\x{3099}-\x{309A}\x{A66F}\x{A670}-\x{A672}\x{A674}-\x{A67D}\x{A69E}-\x{A69F}\x{A6F0}-\x{A6F1}\x{A802}\x{A806}\x{A80B}\x{A825}-\x{A826}\x{A82C}\x{A8C4}-\x{A8C5}\x{A8E0}-\x{A8F1}\x{A8FF}\x{A926}-\x{A92D}\x{A947}-\x{A951}\x{A980}-\x{A982}\x{A9B3}\x{A9B6}-\x{A9B9}\x{A9BC}-\x{A9BD}\x{A9E5}\x{AA29}-\x{AA2E}\x{AA31}-\x{AA32}\x{AA35}-\x{AA36}\x{AA43}\x{AA4C}\x{AA7C}\x{AAB0}\x{AAB2}-\x{AAB4}\x{AAB7}-\x{AAB8}\x{AABE}-\x{AABF}\x{AAC1}\x{AAEC}-\x{AAED}\x{AAF6}\x{ABE5}\x{ABE8}\x{ABED}\x{FB1E}\x{FE00}-\x{FE0F}\x{FE20}-\x{FE2F}\x{FEFF}\x{FFF9}-\x{FFFB}\x{101FD}\x{102E0}\x{10376}-\x{1037A}\x{10A01}-\x{10A03}\x{10A05}-\x{10A06}\x{10A0C}-\x{10A0F}\x{10A38}-\x{10A3A}\x{10A3F}\x{10AE5}-\x{10AE6}\x{10D24}-\x{10D27}\x{10EAB}-\x{10EAC}\x{10F46}-\x{10F50}\x{11001}\x{11038}-\x{11046}\x{1107F}-\x{11081}\x{110B3}-\x{110B6}\x{110B9}-\x{110BA}\x{11100}-\x{11102}\x{11127}-\x{1112B}\x{1112D}-\x{11134}\x{11173}\x{11180}-\x{11181}\x{111B6}-\x{111BE}\x{111C9}-\x{111CC}\x{111CF}\x{1122F}-\x{11231}\x{11234}\x{11236}-\x{11237}\x{1123E}\x{112DF}\x{112E3}-\x{112EA}\x{11300}-\x{11301}\x{1133B}-\x{1133C}\x{11340}\x{11366}-\x{1136C}\x{11370}-\x{11374}\x{11438}-\x{1143F}\x{11442}-\x{11444}\x{11446}\x{1145E}\x{114B3}-\x{114B8}\x{114BA}\x{114BF}-\x{114C0}\x{114C2}-\x{114C3}\x{115B2}-\x{115B5}\x{115BC}-\x{115BD}\x{115BF}-\x{115C0}\x{115DC}-\x{115DD}\x{11633}-\x{1163A}\x{1163D}\x{1163F}-\x{11640}\x{116AB}\x{116AD}\x{116B0}-\x{116B5}\x{116B7}\x{1171D}-\x{1171F}\x{11722}-\x{11725}\x{11727}-\x{1172B}\x{1182F}-\x{11837}\x{11839}-\x{1183A}\x{1193B}-\x{1193C}\x{1193E}\x{11943}\x{119D4}-\x{119D7}\x{119DA}-\x{119DB}\x{119E0}\x{11A01}-\x{11A0A}\x{11A33}-\x{11A38}\x{11A3B}-\x{11A3E}\x{11A47}\x{11A51}-\x{11A56}\x{11A59}-\x{11A5B}\x{11A8A}-\x{11A96}\x{11A98}-\x{11A99}\x{11C30}-\x{11C36}\x{11C38}-\x{11C3D}\x{11C3F}\x{11C92}-\x{11CA7}\x{11CAA}-\x{11CB0}\x{11CB2}-\x{11CB3}\x{11CB5}-\x{11CB6}\x{11D31}-\x{11D36}\x{11D3A}\x{11D3C}-\x{11D3D}\x{11D3F}-\x{11D45}\x{11D47}\x{11D90}-\x{11D91}\x{11D95}\x{11D97}\x{11EF3}-\x{11EF4}\x{13430}-\x{13438}\x{16AF0}-\x{16AF4}\x{16B30}-\x{16B36}\x{16F4F}\x{16F8F}-\x{16F92}\x{16FE4}\x{1BC9D}-\x{1BC9E}\x{1BCA0}-\x{1BCA3}\x{1D167}-\x{1D169}\x{1D173}-\x{1D17A}\x{1D17B}-\x{1D182}\x{1D185}-\x{1D18B}\x{1D1AA}-\x{1D1AD}\x{1D242}-\x{1D244}\x{1DA00}-\x{1DA36}\x{1DA3B}-\x{1DA6C}\x{1DA75}\x{1DA84}\x{1DA9B}-\x{1DA9F}\x{1DAA1}-\x{1DAAF}\x{1E000}-\x{1E006}\x{1E008}-\x{1E018}\x{1E01B}-\x{1E021}\x{1E023}-\x{1E024}\x{1E026}-\x{1E02A}\x{1E130}-\x{1E136}\x{1E2EC}-\x{1E2EF}\x{1E8D0}-\x{1E8D6}\x{1E944}-\x{1E94A}\x{1E94B}\x{E0001}\x{E0020}-\x{E007F}\x{E0100}-\x{E01EF}]*)[\x{0622}-\x{0625}\x{0627}\x{0629}\x{062F}-\x{0632}\x{0648}\x{0671}-\x{0673}\x{0675}-\x{0677}\x{0688}-\x{0699}\x{06C0}\x{06C3}-\x{06CB}\x{06CD}\x{06CF}\x{06D2}-\x{06D3}\x{06D5}\x{06EE}-\x{06EF}\x{0710}\x{0715}-\x{0719}\x{071E}\x{0728}\x{072A}\x{072C}\x{072F}\x{074D}\x{0759}-\x{075B}\x{076B}-\x{076C}\x{0771}\x{0773}-\x{0774}\x{0778}-\x{0779}\x{0840}\x{0846}-\x{0847}\x{0849}\x{0854}\x{0856}-\x{0858}\x{0867}\x{0869}-\x{086A}\x{08AA}-\x{08AC}\x{08AE}\x{08B1}-\x{08B2}\x{08B9}\x{10AC5}\x{10AC7}\x{10AC9}-\x{10ACA}\x{10ACE}-\x{10AD2}\x{10ADD}\x{10AE1}\x{10AE4}\x{10AEF}\x{10B81}\x{10B83}-\x{10B85}\x{10B89}\x{10B8C}\x{10B8E}-\x{10B8F}\x{10B91}\x{10BA9}-\x{10BAC}\x{10D22}\x{10F33}\x{10F54}\x{10FB4}-\x{10FB6}\x{10FB9}-\x{10FBA}\x{10FBD}\x{10FC2}-\x{10FC3}\x{10FC9}\x{0620}\x{0626}\x{0628}\x{062A}-\x{062E}\x{0633}-\x{063F}\x{0641}-\x{0647}\x{0649}-\x{064A}\x{066E}-\x{066F}\x{0678}-\x{0687}\x{069A}-\x{06BF}\x{06C1}-\x{06C2}\x{06CC}\x{06CE}\x{06D0}-\x{06D1}\x{06FA}-\x{06FC}\x{06FF}\x{0712}-\x{0714}\x{071A}-\x{071D}\x{071F}-\x{0727}\x{0729}\x{072B}\x{072D}-\x{072E}\x{074E}-\x{0758}\x{075C}-\x{076A}\x{076D}-\x{0770}\x{0772}\x{0775}-\x{0777}\x{077A}-\x{077F}\x{07CA}-\x{07EA}\x{0841}-\x{0845}\x{0848}\x{084A}-\x{0853}\x{0855}\x{0860}\x{0862}-\x{0865}\x{0868}\x{08A0}-\x{08A9}\x{08AF}-\x{08B0}\x{08B3}-\x{08B4}\x{08B6}-\x{08B8}\x{08BA}-\x{08C7}\x{1807}\x{1820}-\x{1842}\x{1843}\x{1844}-\x{1878}\x{1887}-\x{18A8}\x{18AA}\x{A840}-\x{A871}\x{10AC0}-\x{10AC4}\x{10AD3}-\x{10AD6}\x{10AD8}-\x{10ADC}\x{10ADE}-\x{10AE0}\x{10AEB}-\x{10AEE}\x{10B80}\x{10B82}\x{10B86}-\x{10B88}\x{10B8A}-\x{10B8B}\x{10B8D}\x{10B90}\x{10BAD}-\x{10BAE}\x{10D01}-\x{10D21}\x{10D23}\x{10F30}-\x{10F32}\x{10F34}-\x{10F44}\x{10F51}-\x{10F53}\x{10FB0}\x{10FB2}-\x{10FB3}\x{10FB8}\x{10FBB}-\x{10FBC}\x{10FBE}-\x{10FBF}\x{10FC1}\x{10FC4}\x{10FCA}\x{1E900}-\x{1E943}]/u';
+}
diff --git a/lib/symfony/polyfill-intl-idn/Resources/unidata/deviation.php b/lib/symfony/polyfill-intl-idn/Resources/unidata/deviation.php
new file mode 100644
index 000000000..0bbd33567
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Resources/unidata/deviation.php
@@ -0,0 +1,8 @@
+<?php
+
+return array (
+  223 => 'ss',
+  962 => 'σ',
+  8204 => '',
+  8205 => '',
+);
diff --git a/lib/symfony/polyfill-intl-idn/Resources/unidata/disallowed.php b/lib/symfony/polyfill-intl-idn/Resources/unidata/disallowed.php
new file mode 100644
index 000000000..25a5f564d
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Resources/unidata/disallowed.php
@@ -0,0 +1,2638 @@
+<?php
+
+return array (
+  888 => true,
+  889 => true,
+  896 => true,
+  897 => true,
+  898 => true,
+  899 => true,
+  907 => true,
+  909 => true,
+  930 => true,
+  1216 => true,
+  1328 => true,
+  1367 => true,
+  1368 => true,
+  1419 => true,
+  1420 => true,
+  1424 => true,
+  1480 => true,
+  1481 => true,
+  1482 => true,
+  1483 => true,
+  1484 => true,
+  1485 => true,
+  1486 => true,
+  1487 => true,
+  1515 => true,
+  1516 => true,
+  1517 => true,
+  1518 => true,
+  1525 => true,
+  1526 => true,
+  1527 => true,
+  1528 => true,
+  1529 => true,
+  1530 => true,
+  1531 => true,
+  1532 => true,
+  1533 => true,
+  1534 => true,
+  1535 => true,
+  1536 => true,
+  1537 => true,
+  1538 => true,
+  1539 => true,
+  1540 => true,
+  1541 => true,
+  1564 => true,
+  1565 => true,
+  1757 => true,
+  1806 => true,
+  1807 => true,
+  1867 => true,
+  1868 => true,
+  1970 => true,
+  1971 => true,
+  1972 => true,
+  1973 => true,
+  1974 => true,
+  1975 => true,
+  1976 => true,
+  1977 => true,
+  1978 => true,
+  1979 => true,
+  1980 => true,
+  1981 => true,
+  1982 => true,
+  1983 => true,
+  2043 => true,
+  2044 => true,
+  2094 => true,
+  2095 => true,
+  2111 => true,
+  2140 => true,
+  2141 => true,
+  2143 => true,
+  2229 => true,
+  2248 => true,
+  2249 => true,
+  2250 => true,
+  2251 => true,
+  2252 => true,
+  2253 => true,
+  2254 => true,
+  2255 => true,
+  2256 => true,
+  2257 => true,
+  2258 => true,
+  2274 => true,
+  2436 => true,
+  2445 => true,
+  2446 => true,
+  2449 => true,
+  2450 => true,
+  2473 => true,
+  2481 => true,
+  2483 => true,
+  2484 => true,
+  2485 => true,
+  2490 => true,
+  2491 => true,
+  2501 => true,
+  2502 => true,
+  2505 => true,
+  2506 => true,
+  2511 => true,
+  2512 => true,
+  2513 => true,
+  2514 => true,
+  2515 => true,
+  2516 => true,
+  2517 => true,
+  2518 => true,
+  2520 => true,
+  2521 => true,
+  2522 => true,
+  2523 => true,
+  2526 => true,
+  2532 => true,
+  2533 => true,
+  2559 => true,
+  2560 => true,
+  2564 => true,
+  2571 => true,
+  2572 => true,
+  2573 => true,
+  2574 => true,
+  2577 => true,
+  2578 => true,
+  2601 => true,
+  2609 => true,
+  2612 => true,
+  2615 => true,
+  2618 => true,
+  2619 => true,
+  2621 => true,
+  2627 => true,
+  2628 => true,
+  2629 => true,
+  2630 => true,
+  2633 => true,
+  2634 => true,
+  2638 => true,
+  2639 => true,
+  2640 => true,
+  2642 => true,
+  2643 => true,
+  2644 => true,
+  2645 => true,
+  2646 => true,
+  2647 => true,
+  2648 => true,
+  2653 => true,
+  2655 => true,
+  2656 => true,
+  2657 => true,
+  2658 => true,
+  2659 => true,
+  2660 => true,
+  2661 => true,
+  2679 => true,
+  2680 => true,
+  2681 => true,
+  2682 => true,
+  2683 => true,
+  2684 => true,
+  2685 => true,
+  2686 => true,
+  2687 => true,
+  2688 => true,
+  2692 => true,
+  2702 => true,
+  2706 => true,
+  2729 => true,
+  2737 => true,
+  2740 => true,
+  2746 => true,
+  2747 => true,
+  2758 => true,
+  2762 => true,
+  2766 => true,
+  2767 => true,
+  2769 => true,
+  2770 => true,
+  2771 => true,
+  2772 => true,
+  2773 => true,
+  2774 => true,
+  2775 => true,
+  2776 => true,
+  2777 => true,
+  2778 => true,
+  2779 => true,
+  2780 => true,
+  2781 => true,
+  2782 => true,
+  2783 => true,
+  2788 => true,
+  2789 => true,
+  2802 => true,
+  2803 => true,
+  2804 => true,
+  2805 => true,
+  2806 => true,
+  2807 => true,
+  2808 => true,
+  2816 => true,
+  2820 => true,
+  2829 => true,
+  2830 => true,
+  2833 => true,
+  2834 => true,
+  2857 => true,
+  2865 => true,
+  2868 => true,
+  2874 => true,
+  2875 => true,
+  2885 => true,
+  2886 => true,
+  2889 => true,
+  2890 => true,
+  2894 => true,
+  2895 => true,
+  2896 => true,
+  2897 => true,
+  2898 => true,
+  2899 => true,
+  2900 => true,
+  2904 => true,
+  2905 => true,
+  2906 => true,
+  2907 => true,
+  2910 => true,
+  2916 => true,
+  2917 => true,
+  2936 => true,
+  2937 => true,
+  2938 => true,
+  2939 => true,
+  2940 => true,
+  2941 => true,
+  2942 => true,
+  2943 => true,
+  2944 => true,
+  2945 => true,
+  2948 => true,
+  2955 => true,
+  2956 => true,
+  2957 => true,
+  2961 => true,
+  2966 => true,
+  2967 => true,
+  2968 => true,
+  2971 => true,
+  2973 => true,
+  2976 => true,
+  2977 => true,
+  2978 => true,
+  2981 => true,
+  2982 => true,
+  2983 => true,
+  2987 => true,
+  2988 => true,
+  2989 => true,
+  3002 => true,
+  3003 => true,
+  3004 => true,
+  3005 => true,
+  3011 => true,
+  3012 => true,
+  3013 => true,
+  3017 => true,
+  3022 => true,
+  3023 => true,
+  3025 => true,
+  3026 => true,
+  3027 => true,
+  3028 => true,
+  3029 => true,
+  3030 => true,
+  3032 => true,
+  3033 => true,
+  3034 => true,
+  3035 => true,
+  3036 => true,
+  3037 => true,
+  3038 => true,
+  3039 => true,
+  3040 => true,
+  3041 => true,
+  3042 => true,
+  3043 => true,
+  3044 => true,
+  3045 => true,
+  3067 => true,
+  3068 => true,
+  3069 => true,
+  3070 => true,
+  3071 => true,
+  3085 => true,
+  3089 => true,
+  3113 => true,
+  3130 => true,
+  3131 => true,
+  3132 => true,
+  3141 => true,
+  3145 => true,
+  3150 => true,
+  3151 => true,
+  3152 => true,
+  3153 => true,
+  3154 => true,
+  3155 => true,
+  3156 => true,
+  3159 => true,
+  3163 => true,
+  3164 => true,
+  3165 => true,
+  3166 => true,
+  3167 => true,
+  3172 => true,
+  3173 => true,
+  3184 => true,
+  3185 => true,
+  3186 => true,
+  3187 => true,
+  3188 => true,
+  3189 => true,
+  3190 => true,
+  3213 => true,
+  3217 => true,
+  3241 => true,
+  3252 => true,
+  3258 => true,
+  3259 => true,
+  3269 => true,
+  3273 => true,
+  3278 => true,
+  3279 => true,
+  3280 => true,
+  3281 => true,
+  3282 => true,
+  3283 => true,
+  3284 => true,
+  3287 => true,
+  3288 => true,
+  3289 => true,
+  3290 => true,
+  3291 => true,
+  3292 => true,
+  3293 => true,
+  3295 => true,
+  3300 => true,
+  3301 => true,
+  3312 => true,
+  3315 => true,
+  3316 => true,
+  3317 => true,
+  3318 => true,
+  3319 => true,
+  3320 => true,
+  3321 => true,
+  3322 => true,
+  3323 => true,
+  3324 => true,
+  3325 => true,
+  3326 => true,
+  3327 => true,
+  3341 => true,
+  3345 => true,
+  3397 => true,
+  3401 => true,
+  3408 => true,
+  3409 => true,
+  3410 => true,
+  3411 => true,
+  3428 => true,
+  3429 => true,
+  3456 => true,
+  3460 => true,
+  3479 => true,
+  3480 => true,
+  3481 => true,
+  3506 => true,
+  3516 => true,
+  3518 => true,
+  3519 => true,
+  3527 => true,
+  3528 => true,
+  3529 => true,
+  3531 => true,
+  3532 => true,
+  3533 => true,
+  3534 => true,
+  3541 => true,
+  3543 => true,
+  3552 => true,
+  3553 => true,
+  3554 => true,
+  3555 => true,
+  3556 => true,
+  3557 => true,
+  3568 => true,
+  3569 => true,
+  3573 => true,
+  3574 => true,
+  3575 => true,
+  3576 => true,
+  3577 => true,
+  3578 => true,
+  3579 => true,
+  3580 => true,
+  3581 => true,
+  3582 => true,
+  3583 => true,
+  3584 => true,
+  3643 => true,
+  3644 => true,
+  3645 => true,
+  3646 => true,
+  3715 => true,
+  3717 => true,
+  3723 => true,
+  3748 => true,
+  3750 => true,
+  3774 => true,
+  3775 => true,
+  3781 => true,
+  3783 => true,
+  3790 => true,
+  3791 => true,
+  3802 => true,
+  3803 => true,
+  3912 => true,
+  3949 => true,
+  3950 => true,
+  3951 => true,
+  3952 => true,
+  3992 => true,
+  4029 => true,
+  4045 => true,
+  4294 => true,
+  4296 => true,
+  4297 => true,
+  4298 => true,
+  4299 => true,
+  4300 => true,
+  4302 => true,
+  4303 => true,
+  4447 => true,
+  4448 => true,
+  4681 => true,
+  4686 => true,
+  4687 => true,
+  4695 => true,
+  4697 => true,
+  4702 => true,
+  4703 => true,
+  4745 => true,
+  4750 => true,
+  4751 => true,
+  4785 => true,
+  4790 => true,
+  4791 => true,
+  4799 => true,
+  4801 => true,
+  4806 => true,
+  4807 => true,
+  4823 => true,
+  4881 => true,
+  4886 => true,
+  4887 => true,
+  4955 => true,
+  4956 => true,
+  4989 => true,
+  4990 => true,
+  4991 => true,
+  5018 => true,
+  5019 => true,
+  5020 => true,
+  5021 => true,
+  5022 => true,
+  5023 => true,
+  5110 => true,
+  5111 => true,
+  5118 => true,
+  5119 => true,
+  5760 => true,
+  5789 => true,
+  5790 => true,
+  5791 => true,
+  5881 => true,
+  5882 => true,
+  5883 => true,
+  5884 => true,
+  5885 => true,
+  5886 => true,
+  5887 => true,
+  5901 => true,
+  5909 => true,
+  5910 => true,
+  5911 => true,
+  5912 => true,
+  5913 => true,
+  5914 => true,
+  5915 => true,
+  5916 => true,
+  5917 => true,
+  5918 => true,
+  5919 => true,
+  5943 => true,
+  5944 => true,
+  5945 => true,
+  5946 => true,
+  5947 => true,
+  5948 => true,
+  5949 => true,
+  5950 => true,
+  5951 => true,
+  5972 => true,
+  5973 => true,
+  5974 => true,
+  5975 => true,
+  5976 => true,
+  5977 => true,
+  5978 => true,
+  5979 => true,
+  5980 => true,
+  5981 => true,
+  5982 => true,
+  5983 => true,
+  5997 => true,
+  6001 => true,
+  6004 => true,
+  6005 => true,
+  6006 => true,
+  6007 => true,
+  6008 => true,
+  6009 => true,
+  6010 => true,
+  6011 => true,
+  6012 => true,
+  6013 => true,
+  6014 => true,
+  6015 => true,
+  6068 => true,
+  6069 => true,
+  6110 => true,
+  6111 => true,
+  6122 => true,
+  6123 => true,
+  6124 => true,
+  6125 => true,
+  6126 => true,
+  6127 => true,
+  6138 => true,
+  6139 => true,
+  6140 => true,
+  6141 => true,
+  6142 => true,
+  6143 => true,
+  6150 => true,
+  6158 => true,
+  6159 => true,
+  6170 => true,
+  6171 => true,
+  6172 => true,
+  6173 => true,
+  6174 => true,
+  6175 => true,
+  6265 => true,
+  6266 => true,
+  6267 => true,
+  6268 => true,
+  6269 => true,
+  6270 => true,
+  6271 => true,
+  6315 => true,
+  6316 => true,
+  6317 => true,
+  6318 => true,
+  6319 => true,
+  6390 => true,
+  6391 => true,
+  6392 => true,
+  6393 => true,
+  6394 => true,
+  6395 => true,
+  6396 => true,
+  6397 => true,
+  6398 => true,
+  6399 => true,
+  6431 => true,
+  6444 => true,
+  6445 => true,
+  6446 => true,
+  6447 => true,
+  6460 => true,
+  6461 => true,
+  6462 => true,
+  6463 => true,
+  6465 => true,
+  6466 => true,
+  6467 => true,
+  6510 => true,
+  6511 => true,
+  6517 => true,
+  6518 => true,
+  6519 => true,
+  6520 => true,
+  6521 => true,
+  6522 => true,
+  6523 => true,
+  6524 => true,
+  6525 => true,
+  6526 => true,
+  6527 => true,
+  6572 => true,
+  6573 => true,
+  6574 => true,
+  6575 => true,
+  6602 => true,
+  6603 => true,
+  6604 => true,
+  6605 => true,
+  6606 => true,
+  6607 => true,
+  6619 => true,
+  6620 => true,
+  6621 => true,
+  6684 => true,
+  6685 => true,
+  6751 => true,
+  6781 => true,
+  6782 => true,
+  6794 => true,
+  6795 => true,
+  6796 => true,
+  6797 => true,
+  6798 => true,
+  6799 => true,
+  6810 => true,
+  6811 => true,
+  6812 => true,
+  6813 => true,
+  6814 => true,
+  6815 => true,
+  6830 => true,
+  6831 => true,
+  6988 => true,
+  6989 => true,
+  6990 => true,
+  6991 => true,
+  7037 => true,
+  7038 => true,
+  7039 => true,
+  7156 => true,
+  7157 => true,
+  7158 => true,
+  7159 => true,
+  7160 => true,
+  7161 => true,
+  7162 => true,
+  7163 => true,
+  7224 => true,
+  7225 => true,
+  7226 => true,
+  7242 => true,
+  7243 => true,
+  7244 => true,
+  7305 => true,
+  7306 => true,
+  7307 => true,
+  7308 => true,
+  7309 => true,
+  7310 => true,
+  7311 => true,
+  7355 => true,
+  7356 => true,
+  7368 => true,
+  7369 => true,
+  7370 => true,
+  7371 => true,
+  7372 => true,
+  7373 => true,
+  7374 => true,
+  7375 => true,
+  7419 => true,
+  7420 => true,
+  7421 => true,
+  7422 => true,
+  7423 => true,
+  7674 => true,
+  7958 => true,
+  7959 => true,
+  7966 => true,
+  7967 => true,
+  8006 => true,
+  8007 => true,
+  8014 => true,
+  8015 => true,
+  8024 => true,
+  8026 => true,
+  8028 => true,
+  8030 => true,
+  8062 => true,
+  8063 => true,
+  8117 => true,
+  8133 => true,
+  8148 => true,
+  8149 => true,
+  8156 => true,
+  8176 => true,
+  8177 => true,
+  8181 => true,
+  8191 => true,
+  8206 => true,
+  8207 => true,
+  8228 => true,
+  8229 => true,
+  8230 => true,
+  8232 => true,
+  8233 => true,
+  8234 => true,
+  8235 => true,
+  8236 => true,
+  8237 => true,
+  8238 => true,
+  8289 => true,
+  8290 => true,
+  8291 => true,
+  8293 => true,
+  8294 => true,
+  8295 => true,
+  8296 => true,
+  8297 => true,
+  8298 => true,
+  8299 => true,
+  8300 => true,
+  8301 => true,
+  8302 => true,
+  8303 => true,
+  8306 => true,
+  8307 => true,
+  8335 => true,
+  8349 => true,
+  8350 => true,
+  8351 => true,
+  8384 => true,
+  8385 => true,
+  8386 => true,
+  8387 => true,
+  8388 => true,
+  8389 => true,
+  8390 => true,
+  8391 => true,
+  8392 => true,
+  8393 => true,
+  8394 => true,
+  8395 => true,
+  8396 => true,
+  8397 => true,
+  8398 => true,
+  8399 => true,
+  8433 => true,
+  8434 => true,
+  8435 => true,
+  8436 => true,
+  8437 => true,
+  8438 => true,
+  8439 => true,
+  8440 => true,
+  8441 => true,
+  8442 => true,
+  8443 => true,
+  8444 => true,
+  8445 => true,
+  8446 => true,
+  8447 => true,
+  8498 => true,
+  8579 => true,
+  8588 => true,
+  8589 => true,
+  8590 => true,
+  8591 => true,
+  9255 => true,
+  9256 => true,
+  9257 => true,
+  9258 => true,
+  9259 => true,
+  9260 => true,
+  9261 => true,
+  9262 => true,
+  9263 => true,
+  9264 => true,
+  9265 => true,
+  9266 => true,
+  9267 => true,
+  9268 => true,
+  9269 => true,
+  9270 => true,
+  9271 => true,
+  9272 => true,
+  9273 => true,
+  9274 => true,
+  9275 => true,
+  9276 => true,
+  9277 => true,
+  9278 => true,
+  9279 => true,
+  9291 => true,
+  9292 => true,
+  9293 => true,
+  9294 => true,
+  9295 => true,
+  9296 => true,
+  9297 => true,
+  9298 => true,
+  9299 => true,
+  9300 => true,
+  9301 => true,
+  9302 => true,
+  9303 => true,
+  9304 => true,
+  9305 => true,
+  9306 => true,
+  9307 => true,
+  9308 => true,
+  9309 => true,
+  9310 => true,
+  9311 => true,
+  9352 => true,
+  9353 => true,
+  9354 => true,
+  9355 => true,
+  9356 => true,
+  9357 => true,
+  9358 => true,
+  9359 => true,
+  9360 => true,
+  9361 => true,
+  9362 => true,
+  9363 => true,
+  9364 => true,
+  9365 => true,
+  9366 => true,
+  9367 => true,
+  9368 => true,
+  9369 => true,
+  9370 => true,
+  9371 => true,
+  11124 => true,
+  11125 => true,
+  11158 => true,
+  11311 => true,
+  11359 => true,
+  11508 => true,
+  11509 => true,
+  11510 => true,
+  11511 => true,
+  11512 => true,
+  11558 => true,
+  11560 => true,
+  11561 => true,
+  11562 => true,
+  11563 => true,
+  11564 => true,
+  11566 => true,
+  11567 => true,
+  11624 => true,
+  11625 => true,
+  11626 => true,
+  11627 => true,
+  11628 => true,
+  11629 => true,
+  11630 => true,
+  11633 => true,
+  11634 => true,
+  11635 => true,
+  11636 => true,
+  11637 => true,
+  11638 => true,
+  11639 => true,
+  11640 => true,
+  11641 => true,
+  11642 => true,
+  11643 => true,
+  11644 => true,
+  11645 => true,
+  11646 => true,
+  11671 => true,
+  11672 => true,
+  11673 => true,
+  11674 => true,
+  11675 => true,
+  11676 => true,
+  11677 => true,
+  11678 => true,
+  11679 => true,
+  11687 => true,
+  11695 => true,
+  11703 => true,
+  11711 => true,
+  11719 => true,
+  11727 => true,
+  11735 => true,
+  11743 => true,
+  11930 => true,
+  12020 => true,
+  12021 => true,
+  12022 => true,
+  12023 => true,
+  12024 => true,
+  12025 => true,
+  12026 => true,
+  12027 => true,
+  12028 => true,
+  12029 => true,
+  12030 => true,
+  12031 => true,
+  12246 => true,
+  12247 => true,
+  12248 => true,
+  12249 => true,
+  12250 => true,
+  12251 => true,
+  12252 => true,
+  12253 => true,
+  12254 => true,
+  12255 => true,
+  12256 => true,
+  12257 => true,
+  12258 => true,
+  12259 => true,
+  12260 => true,
+  12261 => true,
+  12262 => true,
+  12263 => true,
+  12264 => true,
+  12265 => true,
+  12266 => true,
+  12267 => true,
+  12268 => true,
+  12269 => true,
+  12270 => true,
+  12271 => true,
+  12272 => true,
+  12273 => true,
+  12274 => true,
+  12275 => true,
+  12276 => true,
+  12277 => true,
+  12278 => true,
+  12279 => true,
+  12280 => true,
+  12281 => true,
+  12282 => true,
+  12283 => true,
+  12284 => true,
+  12285 => true,
+  12286 => true,
+  12287 => true,
+  12352 => true,
+  12439 => true,
+  12440 => true,
+  12544 => true,
+  12545 => true,
+  12546 => true,
+  12547 => true,
+  12548 => true,
+  12592 => true,
+  12644 => true,
+  12687 => true,
+  12772 => true,
+  12773 => true,
+  12774 => true,
+  12775 => true,
+  12776 => true,
+  12777 => true,
+  12778 => true,
+  12779 => true,
+  12780 => true,
+  12781 => true,
+  12782 => true,
+  12783 => true,
+  12831 => true,
+  13250 => true,
+  13255 => true,
+  13272 => true,
+  40957 => true,
+  40958 => true,
+  40959 => true,
+  42125 => true,
+  42126 => true,
+  42127 => true,
+  42183 => true,
+  42184 => true,
+  42185 => true,
+  42186 => true,
+  42187 => true,
+  42188 => true,
+  42189 => true,
+  42190 => true,
+  42191 => true,
+  42540 => true,
+  42541 => true,
+  42542 => true,
+  42543 => true,
+  42544 => true,
+  42545 => true,
+  42546 => true,
+  42547 => true,
+  42548 => true,
+  42549 => true,
+  42550 => true,
+  42551 => true,
+  42552 => true,
+  42553 => true,
+  42554 => true,
+  42555 => true,
+  42556 => true,
+  42557 => true,
+  42558 => true,
+  42559 => true,
+  42744 => true,
+  42745 => true,
+  42746 => true,
+  42747 => true,
+  42748 => true,
+  42749 => true,
+  42750 => true,
+  42751 => true,
+  42944 => true,
+  42945 => true,
+  43053 => true,
+  43054 => true,
+  43055 => true,
+  43066 => true,
+  43067 => true,
+  43068 => true,
+  43069 => true,
+  43070 => true,
+  43071 => true,
+  43128 => true,
+  43129 => true,
+  43130 => true,
+  43131 => true,
+  43132 => true,
+  43133 => true,
+  43134 => true,
+  43135 => true,
+  43206 => true,
+  43207 => true,
+  43208 => true,
+  43209 => true,
+  43210 => true,
+  43211 => true,
+  43212 => true,
+  43213 => true,
+  43226 => true,
+  43227 => true,
+  43228 => true,
+  43229 => true,
+  43230 => true,
+  43231 => true,
+  43348 => true,
+  43349 => true,
+  43350 => true,
+  43351 => true,
+  43352 => true,
+  43353 => true,
+  43354 => true,
+  43355 => true,
+  43356 => true,
+  43357 => true,
+  43358 => true,
+  43389 => true,
+  43390 => true,
+  43391 => true,
+  43470 => true,
+  43482 => true,
+  43483 => true,
+  43484 => true,
+  43485 => true,
+  43519 => true,
+  43575 => true,
+  43576 => true,
+  43577 => true,
+  43578 => true,
+  43579 => true,
+  43580 => true,
+  43581 => true,
+  43582 => true,
+  43583 => true,
+  43598 => true,
+  43599 => true,
+  43610 => true,
+  43611 => true,
+  43715 => true,
+  43716 => true,
+  43717 => true,
+  43718 => true,
+  43719 => true,
+  43720 => true,
+  43721 => true,
+  43722 => true,
+  43723 => true,
+  43724 => true,
+  43725 => true,
+  43726 => true,
+  43727 => true,
+  43728 => true,
+  43729 => true,
+  43730 => true,
+  43731 => true,
+  43732 => true,
+  43733 => true,
+  43734 => true,
+  43735 => true,
+  43736 => true,
+  43737 => true,
+  43738 => true,
+  43767 => true,
+  43768 => true,
+  43769 => true,
+  43770 => true,
+  43771 => true,
+  43772 => true,
+  43773 => true,
+  43774 => true,
+  43775 => true,
+  43776 => true,
+  43783 => true,
+  43784 => true,
+  43791 => true,
+  43792 => true,
+  43799 => true,
+  43800 => true,
+  43801 => true,
+  43802 => true,
+  43803 => true,
+  43804 => true,
+  43805 => true,
+  43806 => true,
+  43807 => true,
+  43815 => true,
+  43823 => true,
+  43884 => true,
+  43885 => true,
+  43886 => true,
+  43887 => true,
+  44014 => true,
+  44015 => true,
+  44026 => true,
+  44027 => true,
+  44028 => true,
+  44029 => true,
+  44030 => true,
+  44031 => true,
+  55204 => true,
+  55205 => true,
+  55206 => true,
+  55207 => true,
+  55208 => true,
+  55209 => true,
+  55210 => true,
+  55211 => true,
+  55212 => true,
+  55213 => true,
+  55214 => true,
+  55215 => true,
+  55239 => true,
+  55240 => true,
+  55241 => true,
+  55242 => true,
+  55292 => true,
+  55293 => true,
+  55294 => true,
+  55295 => true,
+  64110 => true,
+  64111 => true,
+  64263 => true,
+  64264 => true,
+  64265 => true,
+  64266 => true,
+  64267 => true,
+  64268 => true,
+  64269 => true,
+  64270 => true,
+  64271 => true,
+  64272 => true,
+  64273 => true,
+  64274 => true,
+  64280 => true,
+  64281 => true,
+  64282 => true,
+  64283 => true,
+  64284 => true,
+  64311 => true,
+  64317 => true,
+  64319 => true,
+  64322 => true,
+  64325 => true,
+  64450 => true,
+  64451 => true,
+  64452 => true,
+  64453 => true,
+  64454 => true,
+  64455 => true,
+  64456 => true,
+  64457 => true,
+  64458 => true,
+  64459 => true,
+  64460 => true,
+  64461 => true,
+  64462 => true,
+  64463 => true,
+  64464 => true,
+  64465 => true,
+  64466 => true,
+  64832 => true,
+  64833 => true,
+  64834 => true,
+  64835 => true,
+  64836 => true,
+  64837 => true,
+  64838 => true,
+  64839 => true,
+  64840 => true,
+  64841 => true,
+  64842 => true,
+  64843 => true,
+  64844 => true,
+  64845 => true,
+  64846 => true,
+  64847 => true,
+  64912 => true,
+  64913 => true,
+  64968 => true,
+  64969 => true,
+  64970 => true,
+  64971 => true,
+  64972 => true,
+  64973 => true,
+  64974 => true,
+  64975 => true,
+  65022 => true,
+  65023 => true,
+  65042 => true,
+  65049 => true,
+  65050 => true,
+  65051 => true,
+  65052 => true,
+  65053 => true,
+  65054 => true,
+  65055 => true,
+  65072 => true,
+  65106 => true,
+  65107 => true,
+  65127 => true,
+  65132 => true,
+  65133 => true,
+  65134 => true,
+  65135 => true,
+  65141 => true,
+  65277 => true,
+  65278 => true,
+  65280 => true,
+  65440 => true,
+  65471 => true,
+  65472 => true,
+  65473 => true,
+  65480 => true,
+  65481 => true,
+  65488 => true,
+  65489 => true,
+  65496 => true,
+  65497 => true,
+  65501 => true,
+  65502 => true,
+  65503 => true,
+  65511 => true,
+  65519 => true,
+  65520 => true,
+  65521 => true,
+  65522 => true,
+  65523 => true,
+  65524 => true,
+  65525 => true,
+  65526 => true,
+  65527 => true,
+  65528 => true,
+  65529 => true,
+  65530 => true,
+  65531 => true,
+  65532 => true,
+  65533 => true,
+  65534 => true,
+  65535 => true,
+  65548 => true,
+  65575 => true,
+  65595 => true,
+  65598 => true,
+  65614 => true,
+  65615 => true,
+  65787 => true,
+  65788 => true,
+  65789 => true,
+  65790 => true,
+  65791 => true,
+  65795 => true,
+  65796 => true,
+  65797 => true,
+  65798 => true,
+  65844 => true,
+  65845 => true,
+  65846 => true,
+  65935 => true,
+  65949 => true,
+  65950 => true,
+  65951 => true,
+  66205 => true,
+  66206 => true,
+  66207 => true,
+  66257 => true,
+  66258 => true,
+  66259 => true,
+  66260 => true,
+  66261 => true,
+  66262 => true,
+  66263 => true,
+  66264 => true,
+  66265 => true,
+  66266 => true,
+  66267 => true,
+  66268 => true,
+  66269 => true,
+  66270 => true,
+  66271 => true,
+  66300 => true,
+  66301 => true,
+  66302 => true,
+  66303 => true,
+  66340 => true,
+  66341 => true,
+  66342 => true,
+  66343 => true,
+  66344 => true,
+  66345 => true,
+  66346 => true,
+  66347 => true,
+  66348 => true,
+  66379 => true,
+  66380 => true,
+  66381 => true,
+  66382 => true,
+  66383 => true,
+  66427 => true,
+  66428 => true,
+  66429 => true,
+  66430 => true,
+  66431 => true,
+  66462 => true,
+  66500 => true,
+  66501 => true,
+  66502 => true,
+  66503 => true,
+  66718 => true,
+  66719 => true,
+  66730 => true,
+  66731 => true,
+  66732 => true,
+  66733 => true,
+  66734 => true,
+  66735 => true,
+  66772 => true,
+  66773 => true,
+  66774 => true,
+  66775 => true,
+  66812 => true,
+  66813 => true,
+  66814 => true,
+  66815 => true,
+  66856 => true,
+  66857 => true,
+  66858 => true,
+  66859 => true,
+  66860 => true,
+  66861 => true,
+  66862 => true,
+  66863 => true,
+  66916 => true,
+  66917 => true,
+  66918 => true,
+  66919 => true,
+  66920 => true,
+  66921 => true,
+  66922 => true,
+  66923 => true,
+  66924 => true,
+  66925 => true,
+  66926 => true,
+  67383 => true,
+  67384 => true,
+  67385 => true,
+  67386 => true,
+  67387 => true,
+  67388 => true,
+  67389 => true,
+  67390 => true,
+  67391 => true,
+  67414 => true,
+  67415 => true,
+  67416 => true,
+  67417 => true,
+  67418 => true,
+  67419 => true,
+  67420 => true,
+  67421 => true,
+  67422 => true,
+  67423 => true,
+  67590 => true,
+  67591 => true,
+  67593 => true,
+  67638 => true,
+  67641 => true,
+  67642 => true,
+  67643 => true,
+  67645 => true,
+  67646 => true,
+  67670 => true,
+  67743 => true,
+  67744 => true,
+  67745 => true,
+  67746 => true,
+  67747 => true,
+  67748 => true,
+  67749 => true,
+  67750 => true,
+  67827 => true,
+  67830 => true,
+  67831 => true,
+  67832 => true,
+  67833 => true,
+  67834 => true,
+  67868 => true,
+  67869 => true,
+  67870 => true,
+  67898 => true,
+  67899 => true,
+  67900 => true,
+  67901 => true,
+  67902 => true,
+  68024 => true,
+  68025 => true,
+  68026 => true,
+  68027 => true,
+  68048 => true,
+  68049 => true,
+  68100 => true,
+  68103 => true,
+  68104 => true,
+  68105 => true,
+  68106 => true,
+  68107 => true,
+  68116 => true,
+  68120 => true,
+  68150 => true,
+  68151 => true,
+  68155 => true,
+  68156 => true,
+  68157 => true,
+  68158 => true,
+  68169 => true,
+  68170 => true,
+  68171 => true,
+  68172 => true,
+  68173 => true,
+  68174 => true,
+  68175 => true,
+  68185 => true,
+  68186 => true,
+  68187 => true,
+  68188 => true,
+  68189 => true,
+  68190 => true,
+  68191 => true,
+  68327 => true,
+  68328 => true,
+  68329 => true,
+  68330 => true,
+  68343 => true,
+  68344 => true,
+  68345 => true,
+  68346 => true,
+  68347 => true,
+  68348 => true,
+  68349 => true,
+  68350 => true,
+  68351 => true,
+  68406 => true,
+  68407 => true,
+  68408 => true,
+  68438 => true,
+  68439 => true,
+  68467 => true,
+  68468 => true,
+  68469 => true,
+  68470 => true,
+  68471 => true,
+  68498 => true,
+  68499 => true,
+  68500 => true,
+  68501 => true,
+  68502 => true,
+  68503 => true,
+  68504 => true,
+  68509 => true,
+  68510 => true,
+  68511 => true,
+  68512 => true,
+  68513 => true,
+  68514 => true,
+  68515 => true,
+  68516 => true,
+  68517 => true,
+  68518 => true,
+  68519 => true,
+  68520 => true,
+  68787 => true,
+  68788 => true,
+  68789 => true,
+  68790 => true,
+  68791 => true,
+  68792 => true,
+  68793 => true,
+  68794 => true,
+  68795 => true,
+  68796 => true,
+  68797 => true,
+  68798 => true,
+  68799 => true,
+  68851 => true,
+  68852 => true,
+  68853 => true,
+  68854 => true,
+  68855 => true,
+  68856 => true,
+  68857 => true,
+  68904 => true,
+  68905 => true,
+  68906 => true,
+  68907 => true,
+  68908 => true,
+  68909 => true,
+  68910 => true,
+  68911 => true,
+  69247 => true,
+  69290 => true,
+  69294 => true,
+  69295 => true,
+  69416 => true,
+  69417 => true,
+  69418 => true,
+  69419 => true,
+  69420 => true,
+  69421 => true,
+  69422 => true,
+  69423 => true,
+  69580 => true,
+  69581 => true,
+  69582 => true,
+  69583 => true,
+  69584 => true,
+  69585 => true,
+  69586 => true,
+  69587 => true,
+  69588 => true,
+  69589 => true,
+  69590 => true,
+  69591 => true,
+  69592 => true,
+  69593 => true,
+  69594 => true,
+  69595 => true,
+  69596 => true,
+  69597 => true,
+  69598 => true,
+  69599 => true,
+  69623 => true,
+  69624 => true,
+  69625 => true,
+  69626 => true,
+  69627 => true,
+  69628 => true,
+  69629 => true,
+  69630 => true,
+  69631 => true,
+  69710 => true,
+  69711 => true,
+  69712 => true,
+  69713 => true,
+  69744 => true,
+  69745 => true,
+  69746 => true,
+  69747 => true,
+  69748 => true,
+  69749 => true,
+  69750 => true,
+  69751 => true,
+  69752 => true,
+  69753 => true,
+  69754 => true,
+  69755 => true,
+  69756 => true,
+  69757 => true,
+  69758 => true,
+  69821 => true,
+  69826 => true,
+  69827 => true,
+  69828 => true,
+  69829 => true,
+  69830 => true,
+  69831 => true,
+  69832 => true,
+  69833 => true,
+  69834 => true,
+  69835 => true,
+  69836 => true,
+  69837 => true,
+  69838 => true,
+  69839 => true,
+  69865 => true,
+  69866 => true,
+  69867 => true,
+  69868 => true,
+  69869 => true,
+  69870 => true,
+  69871 => true,
+  69882 => true,
+  69883 => true,
+  69884 => true,
+  69885 => true,
+  69886 => true,
+  69887 => true,
+  69941 => true,
+  69960 => true,
+  69961 => true,
+  69962 => true,
+  69963 => true,
+  69964 => true,
+  69965 => true,
+  69966 => true,
+  69967 => true,
+  70007 => true,
+  70008 => true,
+  70009 => true,
+  70010 => true,
+  70011 => true,
+  70012 => true,
+  70013 => true,
+  70014 => true,
+  70015 => true,
+  70112 => true,
+  70133 => true,
+  70134 => true,
+  70135 => true,
+  70136 => true,
+  70137 => true,
+  70138 => true,
+  70139 => true,
+  70140 => true,
+  70141 => true,
+  70142 => true,
+  70143 => true,
+  70162 => true,
+  70279 => true,
+  70281 => true,
+  70286 => true,
+  70302 => true,
+  70314 => true,
+  70315 => true,
+  70316 => true,
+  70317 => true,
+  70318 => true,
+  70319 => true,
+  70379 => true,
+  70380 => true,
+  70381 => true,
+  70382 => true,
+  70383 => true,
+  70394 => true,
+  70395 => true,
+  70396 => true,
+  70397 => true,
+  70398 => true,
+  70399 => true,
+  70404 => true,
+  70413 => true,
+  70414 => true,
+  70417 => true,
+  70418 => true,
+  70441 => true,
+  70449 => true,
+  70452 => true,
+  70458 => true,
+  70469 => true,
+  70470 => true,
+  70473 => true,
+  70474 => true,
+  70478 => true,
+  70479 => true,
+  70481 => true,
+  70482 => true,
+  70483 => true,
+  70484 => true,
+  70485 => true,
+  70486 => true,
+  70488 => true,
+  70489 => true,
+  70490 => true,
+  70491 => true,
+  70492 => true,
+  70500 => true,
+  70501 => true,
+  70509 => true,
+  70510 => true,
+  70511 => true,
+  70748 => true,
+  70754 => true,
+  70755 => true,
+  70756 => true,
+  70757 => true,
+  70758 => true,
+  70759 => true,
+  70760 => true,
+  70761 => true,
+  70762 => true,
+  70763 => true,
+  70764 => true,
+  70765 => true,
+  70766 => true,
+  70767 => true,
+  70768 => true,
+  70769 => true,
+  70770 => true,
+  70771 => true,
+  70772 => true,
+  70773 => true,
+  70774 => true,
+  70775 => true,
+  70776 => true,
+  70777 => true,
+  70778 => true,
+  70779 => true,
+  70780 => true,
+  70781 => true,
+  70782 => true,
+  70783 => true,
+  70856 => true,
+  70857 => true,
+  70858 => true,
+  70859 => true,
+  70860 => true,
+  70861 => true,
+  70862 => true,
+  70863 => true,
+  71094 => true,
+  71095 => true,
+  71237 => true,
+  71238 => true,
+  71239 => true,
+  71240 => true,
+  71241 => true,
+  71242 => true,
+  71243 => true,
+  71244 => true,
+  71245 => true,
+  71246 => true,
+  71247 => true,
+  71258 => true,
+  71259 => true,
+  71260 => true,
+  71261 => true,
+  71262 => true,
+  71263 => true,
+  71277 => true,
+  71278 => true,
+  71279 => true,
+  71280 => true,
+  71281 => true,
+  71282 => true,
+  71283 => true,
+  71284 => true,
+  71285 => true,
+  71286 => true,
+  71287 => true,
+  71288 => true,
+  71289 => true,
+  71290 => true,
+  71291 => true,
+  71292 => true,
+  71293 => true,
+  71294 => true,
+  71295 => true,
+  71353 => true,
+  71354 => true,
+  71355 => true,
+  71356 => true,
+  71357 => true,
+  71358 => true,
+  71359 => true,
+  71451 => true,
+  71452 => true,
+  71468 => true,
+  71469 => true,
+  71470 => true,
+  71471 => true,
+  71923 => true,
+  71924 => true,
+  71925 => true,
+  71926 => true,
+  71927 => true,
+  71928 => true,
+  71929 => true,
+  71930 => true,
+  71931 => true,
+  71932 => true,
+  71933 => true,
+  71934 => true,
+  71943 => true,
+  71944 => true,
+  71946 => true,
+  71947 => true,
+  71956 => true,
+  71959 => true,
+  71990 => true,
+  71993 => true,
+  71994 => true,
+  72007 => true,
+  72008 => true,
+  72009 => true,
+  72010 => true,
+  72011 => true,
+  72012 => true,
+  72013 => true,
+  72014 => true,
+  72015 => true,
+  72104 => true,
+  72105 => true,
+  72152 => true,
+  72153 => true,
+  72165 => true,
+  72166 => true,
+  72167 => true,
+  72168 => true,
+  72169 => true,
+  72170 => true,
+  72171 => true,
+  72172 => true,
+  72173 => true,
+  72174 => true,
+  72175 => true,
+  72176 => true,
+  72177 => true,
+  72178 => true,
+  72179 => true,
+  72180 => true,
+  72181 => true,
+  72182 => true,
+  72183 => true,
+  72184 => true,
+  72185 => true,
+  72186 => true,
+  72187 => true,
+  72188 => true,
+  72189 => true,
+  72190 => true,
+  72191 => true,
+  72264 => true,
+  72265 => true,
+  72266 => true,
+  72267 => true,
+  72268 => true,
+  72269 => true,
+  72270 => true,
+  72271 => true,
+  72355 => true,
+  72356 => true,
+  72357 => true,
+  72358 => true,
+  72359 => true,
+  72360 => true,
+  72361 => true,
+  72362 => true,
+  72363 => true,
+  72364 => true,
+  72365 => true,
+  72366 => true,
+  72367 => true,
+  72368 => true,
+  72369 => true,
+  72370 => true,
+  72371 => true,
+  72372 => true,
+  72373 => true,
+  72374 => true,
+  72375 => true,
+  72376 => true,
+  72377 => true,
+  72378 => true,
+  72379 => true,
+  72380 => true,
+  72381 => true,
+  72382 => true,
+  72383 => true,
+  72713 => true,
+  72759 => true,
+  72774 => true,
+  72775 => true,
+  72776 => true,
+  72777 => true,
+  72778 => true,
+  72779 => true,
+  72780 => true,
+  72781 => true,
+  72782 => true,
+  72783 => true,
+  72813 => true,
+  72814 => true,
+  72815 => true,
+  72848 => true,
+  72849 => true,
+  72872 => true,
+  72967 => true,
+  72970 => true,
+  73015 => true,
+  73016 => true,
+  73017 => true,
+  73019 => true,
+  73022 => true,
+  73032 => true,
+  73033 => true,
+  73034 => true,
+  73035 => true,
+  73036 => true,
+  73037 => true,
+  73038 => true,
+  73039 => true,
+  73050 => true,
+  73051 => true,
+  73052 => true,
+  73053 => true,
+  73054 => true,
+  73055 => true,
+  73062 => true,
+  73065 => true,
+  73103 => true,
+  73106 => true,
+  73113 => true,
+  73114 => true,
+  73115 => true,
+  73116 => true,
+  73117 => true,
+  73118 => true,
+  73119 => true,
+  73649 => true,
+  73650 => true,
+  73651 => true,
+  73652 => true,
+  73653 => true,
+  73654 => true,
+  73655 => true,
+  73656 => true,
+  73657 => true,
+  73658 => true,
+  73659 => true,
+  73660 => true,
+  73661 => true,
+  73662 => true,
+  73663 => true,
+  73714 => true,
+  73715 => true,
+  73716 => true,
+  73717 => true,
+  73718 => true,
+  73719 => true,
+  73720 => true,
+  73721 => true,
+  73722 => true,
+  73723 => true,
+  73724 => true,
+  73725 => true,
+  73726 => true,
+  74863 => true,
+  74869 => true,
+  74870 => true,
+  74871 => true,
+  74872 => true,
+  74873 => true,
+  74874 => true,
+  74875 => true,
+  74876 => true,
+  74877 => true,
+  74878 => true,
+  74879 => true,
+  78895 => true,
+  78896 => true,
+  78897 => true,
+  78898 => true,
+  78899 => true,
+  78900 => true,
+  78901 => true,
+  78902 => true,
+  78903 => true,
+  78904 => true,
+  92729 => true,
+  92730 => true,
+  92731 => true,
+  92732 => true,
+  92733 => true,
+  92734 => true,
+  92735 => true,
+  92767 => true,
+  92778 => true,
+  92779 => true,
+  92780 => true,
+  92781 => true,
+  92910 => true,
+  92911 => true,
+  92918 => true,
+  92919 => true,
+  92920 => true,
+  92921 => true,
+  92922 => true,
+  92923 => true,
+  92924 => true,
+  92925 => true,
+  92926 => true,
+  92927 => true,
+  92998 => true,
+  92999 => true,
+  93000 => true,
+  93001 => true,
+  93002 => true,
+  93003 => true,
+  93004 => true,
+  93005 => true,
+  93006 => true,
+  93007 => true,
+  93018 => true,
+  93026 => true,
+  93048 => true,
+  93049 => true,
+  93050 => true,
+  93051 => true,
+  93052 => true,
+  94027 => true,
+  94028 => true,
+  94029 => true,
+  94030 => true,
+  94088 => true,
+  94089 => true,
+  94090 => true,
+  94091 => true,
+  94092 => true,
+  94093 => true,
+  94094 => true,
+  94181 => true,
+  94182 => true,
+  94183 => true,
+  94184 => true,
+  94185 => true,
+  94186 => true,
+  94187 => true,
+  94188 => true,
+  94189 => true,
+  94190 => true,
+  94191 => true,
+  94194 => true,
+  94195 => true,
+  94196 => true,
+  94197 => true,
+  94198 => true,
+  94199 => true,
+  94200 => true,
+  94201 => true,
+  94202 => true,
+  94203 => true,
+  94204 => true,
+  94205 => true,
+  94206 => true,
+  94207 => true,
+  100344 => true,
+  100345 => true,
+  100346 => true,
+  100347 => true,
+  100348 => true,
+  100349 => true,
+  100350 => true,
+  100351 => true,
+  110931 => true,
+  110932 => true,
+  110933 => true,
+  110934 => true,
+  110935 => true,
+  110936 => true,
+  110937 => true,
+  110938 => true,
+  110939 => true,
+  110940 => true,
+  110941 => true,
+  110942 => true,
+  110943 => true,
+  110944 => true,
+  110945 => true,
+  110946 => true,
+  110947 => true,
+  110952 => true,
+  110953 => true,
+  110954 => true,
+  110955 => true,
+  110956 => true,
+  110957 => true,
+  110958 => true,
+  110959 => true,
+  113771 => true,
+  113772 => true,
+  113773 => true,
+  113774 => true,
+  113775 => true,
+  113789 => true,
+  113790 => true,
+  113791 => true,
+  113801 => true,
+  113802 => true,
+  113803 => true,
+  113804 => true,
+  113805 => true,
+  113806 => true,
+  113807 => true,
+  113818 => true,
+  113819 => true,
+  119030 => true,
+  119031 => true,
+  119032 => true,
+  119033 => true,
+  119034 => true,
+  119035 => true,
+  119036 => true,
+  119037 => true,
+  119038 => true,
+  119039 => true,
+  119079 => true,
+  119080 => true,
+  119155 => true,
+  119156 => true,
+  119157 => true,
+  119158 => true,
+  119159 => true,
+  119160 => true,
+  119161 => true,
+  119162 => true,
+  119273 => true,
+  119274 => true,
+  119275 => true,
+  119276 => true,
+  119277 => true,
+  119278 => true,
+  119279 => true,
+  119280 => true,
+  119281 => true,
+  119282 => true,
+  119283 => true,
+  119284 => true,
+  119285 => true,
+  119286 => true,
+  119287 => true,
+  119288 => true,
+  119289 => true,
+  119290 => true,
+  119291 => true,
+  119292 => true,
+  119293 => true,
+  119294 => true,
+  119295 => true,
+  119540 => true,
+  119541 => true,
+  119542 => true,
+  119543 => true,
+  119544 => true,
+  119545 => true,
+  119546 => true,
+  119547 => true,
+  119548 => true,
+  119549 => true,
+  119550 => true,
+  119551 => true,
+  119639 => true,
+  119640 => true,
+  119641 => true,
+  119642 => true,
+  119643 => true,
+  119644 => true,
+  119645 => true,
+  119646 => true,
+  119647 => true,
+  119893 => true,
+  119965 => true,
+  119968 => true,
+  119969 => true,
+  119971 => true,
+  119972 => true,
+  119975 => true,
+  119976 => true,
+  119981 => true,
+  119994 => true,
+  119996 => true,
+  120004 => true,
+  120070 => true,
+  120075 => true,
+  120076 => true,
+  120085 => true,
+  120093 => true,
+  120122 => true,
+  120127 => true,
+  120133 => true,
+  120135 => true,
+  120136 => true,
+  120137 => true,
+  120145 => true,
+  120486 => true,
+  120487 => true,
+  120780 => true,
+  120781 => true,
+  121484 => true,
+  121485 => true,
+  121486 => true,
+  121487 => true,
+  121488 => true,
+  121489 => true,
+  121490 => true,
+  121491 => true,
+  121492 => true,
+  121493 => true,
+  121494 => true,
+  121495 => true,
+  121496 => true,
+  121497 => true,
+  121498 => true,
+  121504 => true,
+  122887 => true,
+  122905 => true,
+  122906 => true,
+  122914 => true,
+  122917 => true,
+  123181 => true,
+  123182 => true,
+  123183 => true,
+  123198 => true,
+  123199 => true,
+  123210 => true,
+  123211 => true,
+  123212 => true,
+  123213 => true,
+  123642 => true,
+  123643 => true,
+  123644 => true,
+  123645 => true,
+  123646 => true,
+  125125 => true,
+  125126 => true,
+  125260 => true,
+  125261 => true,
+  125262 => true,
+  125263 => true,
+  125274 => true,
+  125275 => true,
+  125276 => true,
+  125277 => true,
+  126468 => true,
+  126496 => true,
+  126499 => true,
+  126501 => true,
+  126502 => true,
+  126504 => true,
+  126515 => true,
+  126520 => true,
+  126522 => true,
+  126524 => true,
+  126525 => true,
+  126526 => true,
+  126527 => true,
+  126528 => true,
+  126529 => true,
+  126531 => true,
+  126532 => true,
+  126533 => true,
+  126534 => true,
+  126536 => true,
+  126538 => true,
+  126540 => true,
+  126544 => true,
+  126547 => true,
+  126549 => true,
+  126550 => true,
+  126552 => true,
+  126554 => true,
+  126556 => true,
+  126558 => true,
+  126560 => true,
+  126563 => true,
+  126565 => true,
+  126566 => true,
+  126571 => true,
+  126579 => true,
+  126584 => true,
+  126589 => true,
+  126591 => true,
+  126602 => true,
+  126620 => true,
+  126621 => true,
+  126622 => true,
+  126623 => true,
+  126624 => true,
+  126628 => true,
+  126634 => true,
+  127020 => true,
+  127021 => true,
+  127022 => true,
+  127023 => true,
+  127124 => true,
+  127125 => true,
+  127126 => true,
+  127127 => true,
+  127128 => true,
+  127129 => true,
+  127130 => true,
+  127131 => true,
+  127132 => true,
+  127133 => true,
+  127134 => true,
+  127135 => true,
+  127151 => true,
+  127152 => true,
+  127168 => true,
+  127184 => true,
+  127222 => true,
+  127223 => true,
+  127224 => true,
+  127225 => true,
+  127226 => true,
+  127227 => true,
+  127228 => true,
+  127229 => true,
+  127230 => true,
+  127231 => true,
+  127232 => true,
+  127491 => true,
+  127492 => true,
+  127493 => true,
+  127494 => true,
+  127495 => true,
+  127496 => true,
+  127497 => true,
+  127498 => true,
+  127499 => true,
+  127500 => true,
+  127501 => true,
+  127502 => true,
+  127503 => true,
+  127548 => true,
+  127549 => true,
+  127550 => true,
+  127551 => true,
+  127561 => true,
+  127562 => true,
+  127563 => true,
+  127564 => true,
+  127565 => true,
+  127566 => true,
+  127567 => true,
+  127570 => true,
+  127571 => true,
+  127572 => true,
+  127573 => true,
+  127574 => true,
+  127575 => true,
+  127576 => true,
+  127577 => true,
+  127578 => true,
+  127579 => true,
+  127580 => true,
+  127581 => true,
+  127582 => true,
+  127583 => true,
+  128728 => true,
+  128729 => true,
+  128730 => true,
+  128731 => true,
+  128732 => true,
+  128733 => true,
+  128734 => true,
+  128735 => true,
+  128749 => true,
+  128750 => true,
+  128751 => true,
+  128765 => true,
+  128766 => true,
+  128767 => true,
+  128884 => true,
+  128885 => true,
+  128886 => true,
+  128887 => true,
+  128888 => true,
+  128889 => true,
+  128890 => true,
+  128891 => true,
+  128892 => true,
+  128893 => true,
+  128894 => true,
+  128895 => true,
+  128985 => true,
+  128986 => true,
+  128987 => true,
+  128988 => true,
+  128989 => true,
+  128990 => true,
+  128991 => true,
+  129004 => true,
+  129005 => true,
+  129006 => true,
+  129007 => true,
+  129008 => true,
+  129009 => true,
+  129010 => true,
+  129011 => true,
+  129012 => true,
+  129013 => true,
+  129014 => true,
+  129015 => true,
+  129016 => true,
+  129017 => true,
+  129018 => true,
+  129019 => true,
+  129020 => true,
+  129021 => true,
+  129022 => true,
+  129023 => true,
+  129036 => true,
+  129037 => true,
+  129038 => true,
+  129039 => true,
+  129096 => true,
+  129097 => true,
+  129098 => true,
+  129099 => true,
+  129100 => true,
+  129101 => true,
+  129102 => true,
+  129103 => true,
+  129114 => true,
+  129115 => true,
+  129116 => true,
+  129117 => true,
+  129118 => true,
+  129119 => true,
+  129160 => true,
+  129161 => true,
+  129162 => true,
+  129163 => true,
+  129164 => true,
+  129165 => true,
+  129166 => true,
+  129167 => true,
+  129198 => true,
+  129199 => true,
+  129401 => true,
+  129484 => true,
+  129620 => true,
+  129621 => true,
+  129622 => true,
+  129623 => true,
+  129624 => true,
+  129625 => true,
+  129626 => true,
+  129627 => true,
+  129628 => true,
+  129629 => true,
+  129630 => true,
+  129631 => true,
+  129646 => true,
+  129647 => true,
+  129653 => true,
+  129654 => true,
+  129655 => true,
+  129659 => true,
+  129660 => true,
+  129661 => true,
+  129662 => true,
+  129663 => true,
+  129671 => true,
+  129672 => true,
+  129673 => true,
+  129674 => true,
+  129675 => true,
+  129676 => true,
+  129677 => true,
+  129678 => true,
+  129679 => true,
+  129705 => true,
+  129706 => true,
+  129707 => true,
+  129708 => true,
+  129709 => true,
+  129710 => true,
+  129711 => true,
+  129719 => true,
+  129720 => true,
+  129721 => true,
+  129722 => true,
+  129723 => true,
+  129724 => true,
+  129725 => true,
+  129726 => true,
+  129727 => true,
+  129731 => true,
+  129732 => true,
+  129733 => true,
+  129734 => true,
+  129735 => true,
+  129736 => true,
+  129737 => true,
+  129738 => true,
+  129739 => true,
+  129740 => true,
+  129741 => true,
+  129742 => true,
+  129743 => true,
+  129939 => true,
+  131070 => true,
+  131071 => true,
+  177973 => true,
+  177974 => true,
+  177975 => true,
+  177976 => true,
+  177977 => true,
+  177978 => true,
+  177979 => true,
+  177980 => true,
+  177981 => true,
+  177982 => true,
+  177983 => true,
+  178206 => true,
+  178207 => true,
+  183970 => true,
+  183971 => true,
+  183972 => true,
+  183973 => true,
+  183974 => true,
+  183975 => true,
+  183976 => true,
+  183977 => true,
+  183978 => true,
+  183979 => true,
+  183980 => true,
+  183981 => true,
+  183982 => true,
+  183983 => true,
+  194664 => true,
+  194676 => true,
+  194847 => true,
+  194911 => true,
+  195007 => true,
+  196606 => true,
+  196607 => true,
+  262142 => true,
+  262143 => true,
+  327678 => true,
+  327679 => true,
+  393214 => true,
+  393215 => true,
+  458750 => true,
+  458751 => true,
+  524286 => true,
+  524287 => true,
+  589822 => true,
+  589823 => true,
+  655358 => true,
+  655359 => true,
+  720894 => true,
+  720895 => true,
+  786430 => true,
+  786431 => true,
+  851966 => true,
+  851967 => true,
+  917502 => true,
+  917503 => true,
+  917504 => true,
+  917505 => true,
+  917506 => true,
+  917507 => true,
+  917508 => true,
+  917509 => true,
+  917510 => true,
+  917511 => true,
+  917512 => true,
+  917513 => true,
+  917514 => true,
+  917515 => true,
+  917516 => true,
+  917517 => true,
+  917518 => true,
+  917519 => true,
+  917520 => true,
+  917521 => true,
+  917522 => true,
+  917523 => true,
+  917524 => true,
+  917525 => true,
+  917526 => true,
+  917527 => true,
+  917528 => true,
+  917529 => true,
+  917530 => true,
+  917531 => true,
+  917532 => true,
+  917533 => true,
+  917534 => true,
+  917535 => true,
+  983038 => true,
+  983039 => true,
+  1048574 => true,
+  1048575 => true,
+  1114110 => true,
+  1114111 => true,
+);
diff --git a/lib/symfony/polyfill-intl-idn/Resources/unidata/disallowed_STD3_mapped.php b/lib/symfony/polyfill-intl-idn/Resources/unidata/disallowed_STD3_mapped.php
new file mode 100644
index 000000000..54f21cc0c
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Resources/unidata/disallowed_STD3_mapped.php
@@ -0,0 +1,308 @@
+<?php
+
+return array (
+  160 => ' ',
+  168 => ' ̈',
+  175 => ' Ì„',
+  180 => ' �',
+  184 => ' ̧',
+  728 => ' ̆',
+  729 => ' ̇',
+  730 => ' ÌŠ',
+  731 => ' ̨',
+  732 => ' ̃',
+  733 => ' Ì‹',
+  890 => ' ι',
+  894 => ';',
+  900 => ' �',
+  901 => ' ̈�',
+  8125 => ' Ì“',
+  8127 => ' Ì“',
+  8128 => ' Í‚',
+  8129 => ' ̈͂',
+  8141 => ' Ì“Ì€',
+  8142 => ' ̓�',
+  8143 => ' Ì“Í‚',
+  8157 => ' ̔̀',
+  8158 => ' ̔�',
+  8159 => ' ̔͂',
+  8173 => ' ̈̀',
+  8174 => ' ̈�',
+  8175 => '`',
+  8189 => ' �',
+  8190 => ' Ì”',
+  8192 => ' ',
+  8193 => ' ',
+  8194 => ' ',
+  8195 => ' ',
+  8196 => ' ',
+  8197 => ' ',
+  8198 => ' ',
+  8199 => ' ',
+  8200 => ' ',
+  8201 => ' ',
+  8202 => ' ',
+  8215 => ' ̳',
+  8239 => ' ',
+  8252 => '!!',
+  8254 => ' Ì…',
+  8263 => '??',
+  8264 => '?!',
+  8265 => '!?',
+  8287 => ' ',
+  8314 => '+',
+  8316 => '=',
+  8317 => '(',
+  8318 => ')',
+  8330 => '+',
+  8332 => '=',
+  8333 => '(',
+  8334 => ')',
+  8448 => 'a/c',
+  8449 => 'a/s',
+  8453 => 'c/o',
+  8454 => 'c/u',
+  9332 => '(1)',
+  9333 => '(2)',
+  9334 => '(3)',
+  9335 => '(4)',
+  9336 => '(5)',
+  9337 => '(6)',
+  9338 => '(7)',
+  9339 => '(8)',
+  9340 => '(9)',
+  9341 => '(10)',
+  9342 => '(11)',
+  9343 => '(12)',
+  9344 => '(13)',
+  9345 => '(14)',
+  9346 => '(15)',
+  9347 => '(16)',
+  9348 => '(17)',
+  9349 => '(18)',
+  9350 => '(19)',
+  9351 => '(20)',
+  9372 => '(a)',
+  9373 => '(b)',
+  9374 => '(c)',
+  9375 => '(d)',
+  9376 => '(e)',
+  9377 => '(f)',
+  9378 => '(g)',
+  9379 => '(h)',
+  9380 => '(i)',
+  9381 => '(j)',
+  9382 => '(k)',
+  9383 => '(l)',
+  9384 => '(m)',
+  9385 => '(n)',
+  9386 => '(o)',
+  9387 => '(p)',
+  9388 => '(q)',
+  9389 => '(r)',
+  9390 => '(s)',
+  9391 => '(t)',
+  9392 => '(u)',
+  9393 => '(v)',
+  9394 => '(w)',
+  9395 => '(x)',
+  9396 => '(y)',
+  9397 => '(z)',
+  10868 => '::=',
+  10869 => '==',
+  10870 => '===',
+  12288 => ' ',
+  12443 => ' ã‚™',
+  12444 => ' ã‚š',
+  12800 => '(á„€)',
+  12801 => '(á„‚)',
+  12802 => '(ᄃ)',
+  12803 => '(á„…)',
+  12804 => '(ᄆ)',
+  12805 => '(ᄇ)',
+  12806 => '(ᄉ)',
+  12807 => '(á„‹)',
+  12808 => '(ᄌ)',
+  12809 => '(á„Ž)',
+  12810 => '(�)',
+  12811 => '(�)',
+  12812 => '(á„‘)',
+  12813 => '(á„’)',
+  12814 => '(ê°€)',
+  12815 => '(나)',
+  12816 => '(다)',
+  12817 => '(�)',
+  12818 => '(마)',
+  12819 => '(ë°”)',
+  12820 => '(사)',
+  12821 => '(ì•„)',
+  12822 => '(�)',
+  12823 => '(ì°¨)',
+  12824 => '(ì¹´)',
+  12825 => '(타)',
+  12826 => '(파)',
+  12827 => '(하)',
+  12828 => '(주)',
+  12829 => '(오전)',
+  12830 => '(오후)',
+  12832 => '(一)',
+  12833 => '(二)',
+  12834 => '(三)',
+  12835 => '(å››)',
+  12836 => '(五)',
+  12837 => '(å…­)',
+  12838 => '(七)',
+  12839 => '(å…«)',
+  12840 => '(�)',
+  12841 => '(�)',
+  12842 => '(月)',
+  12843 => '(�)',
+  12844 => '(æ°´)',
+  12845 => '(木)',
+  12846 => '(金)',
+  12847 => '(土)',
+  12848 => '(æ—¥)',
+  12849 => '(æ ª)',
+  12850 => '(有)',
+  12851 => '(社)',
+  12852 => '(�)',
+  12853 => '(特)',
+  12854 => '(財)',
+  12855 => '(�)',
+  12856 => '(労)',
+  12857 => '(代)',
+  12858 => '(呼)',
+  12859 => '(å­¦)',
+  12860 => '(監)',
+  12861 => '(�)',
+  12862 => '(資)',
+  12863 => '(�)',
+  12864 => '(祭)',
+  12865 => '(休)',
+  12866 => '(自)',
+  12867 => '(至)',
+  64297 => '+',
+  64606 => ' ٌّ',
+  64607 => ' �ّ',
+  64608 => ' ÙŽÙ‘',
+  64609 => ' �ّ',
+  64610 => ' �ّ',
+  64611 => ' ّٰ',
+  65018 => 'صلى الله عليه وسلم',
+  65019 => 'جل جلاله',
+  65040 => ',',
+  65043 => ':',
+  65044 => ';',
+  65045 => '!',
+  65046 => '?',
+  65075 => '_',
+  65076 => '_',
+  65077 => '(',
+  65078 => ')',
+  65079 => '{',
+  65080 => '}',
+  65095 => '[',
+  65096 => ']',
+  65097 => ' Ì…',
+  65098 => ' Ì…',
+  65099 => ' Ì…',
+  65100 => ' Ì…',
+  65101 => '_',
+  65102 => '_',
+  65103 => '_',
+  65104 => ',',
+  65108 => ';',
+  65109 => ':',
+  65110 => '?',
+  65111 => '!',
+  65113 => '(',
+  65114 => ')',
+  65115 => '{',
+  65116 => '}',
+  65119 => '#',
+  65120 => '&',
+  65121 => '*',
+  65122 => '+',
+  65124 => '<',
+  65125 => '>',
+  65126 => '=',
+  65128 => '\\',
+  65129 => '$',
+  65130 => '%',
+  65131 => '@',
+  65136 => ' Ù‹',
+  65138 => ' ٌ',
+  65140 => ' Ù�',
+  65142 => ' ÙŽ',
+  65144 => ' Ù�',
+  65146 => ' Ù�',
+  65148 => ' Ù‘',
+  65150 => ' Ù’',
+  65281 => '!',
+  65282 => '"',
+  65283 => '#',
+  65284 => '$',
+  65285 => '%',
+  65286 => '&',
+  65287 => '\'',
+  65288 => '(',
+  65289 => ')',
+  65290 => '*',
+  65291 => '+',
+  65292 => ',',
+  65295 => '/',
+  65306 => ':',
+  65307 => ';',
+  65308 => '<',
+  65309 => '=',
+  65310 => '>',
+  65311 => '?',
+  65312 => '@',
+  65339 => '[',
+  65340 => '\\',
+  65341 => ']',
+  65342 => '^',
+  65343 => '_',
+  65344 => '`',
+  65371 => '{',
+  65372 => '|',
+  65373 => '}',
+  65374 => '~',
+  65507 => ' Ì„',
+  127233 => '0,',
+  127234 => '1,',
+  127235 => '2,',
+  127236 => '3,',
+  127237 => '4,',
+  127238 => '5,',
+  127239 => '6,',
+  127240 => '7,',
+  127241 => '8,',
+  127242 => '9,',
+  127248 => '(a)',
+  127249 => '(b)',
+  127250 => '(c)',
+  127251 => '(d)',
+  127252 => '(e)',
+  127253 => '(f)',
+  127254 => '(g)',
+  127255 => '(h)',
+  127256 => '(i)',
+  127257 => '(j)',
+  127258 => '(k)',
+  127259 => '(l)',
+  127260 => '(m)',
+  127261 => '(n)',
+  127262 => '(o)',
+  127263 => '(p)',
+  127264 => '(q)',
+  127265 => '(r)',
+  127266 => '(s)',
+  127267 => '(t)',
+  127268 => '(u)',
+  127269 => '(v)',
+  127270 => '(w)',
+  127271 => '(x)',
+  127272 => '(y)',
+  127273 => '(z)',
+);
diff --git a/lib/symfony/polyfill-intl-idn/Resources/unidata/disallowed_STD3_valid.php b/lib/symfony/polyfill-intl-idn/Resources/unidata/disallowed_STD3_valid.php
new file mode 100644
index 000000000..223396ec4
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Resources/unidata/disallowed_STD3_valid.php
@@ -0,0 +1,71 @@
+<?php
+
+return array (
+  0 => true,
+  1 => true,
+  2 => true,
+  3 => true,
+  4 => true,
+  5 => true,
+  6 => true,
+  7 => true,
+  8 => true,
+  9 => true,
+  10 => true,
+  11 => true,
+  12 => true,
+  13 => true,
+  14 => true,
+  15 => true,
+  16 => true,
+  17 => true,
+  18 => true,
+  19 => true,
+  20 => true,
+  21 => true,
+  22 => true,
+  23 => true,
+  24 => true,
+  25 => true,
+  26 => true,
+  27 => true,
+  28 => true,
+  29 => true,
+  30 => true,
+  31 => true,
+  32 => true,
+  33 => true,
+  34 => true,
+  35 => true,
+  36 => true,
+  37 => true,
+  38 => true,
+  39 => true,
+  40 => true,
+  41 => true,
+  42 => true,
+  43 => true,
+  44 => true,
+  47 => true,
+  58 => true,
+  59 => true,
+  60 => true,
+  61 => true,
+  62 => true,
+  63 => true,
+  64 => true,
+  91 => true,
+  92 => true,
+  93 => true,
+  94 => true,
+  95 => true,
+  96 => true,
+  123 => true,
+  124 => true,
+  125 => true,
+  126 => true,
+  127 => true,
+  8800 => true,
+  8814 => true,
+  8815 => true,
+);
diff --git a/lib/symfony/polyfill-intl-idn/Resources/unidata/ignored.php b/lib/symfony/polyfill-intl-idn/Resources/unidata/ignored.php
new file mode 100644
index 000000000..b37784413
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Resources/unidata/ignored.php
@@ -0,0 +1,273 @@
+<?php
+
+return array (
+  173 => true,
+  847 => true,
+  6155 => true,
+  6156 => true,
+  6157 => true,
+  8203 => true,
+  8288 => true,
+  8292 => true,
+  65024 => true,
+  65025 => true,
+  65026 => true,
+  65027 => true,
+  65028 => true,
+  65029 => true,
+  65030 => true,
+  65031 => true,
+  65032 => true,
+  65033 => true,
+  65034 => true,
+  65035 => true,
+  65036 => true,
+  65037 => true,
+  65038 => true,
+  65039 => true,
+  65279 => true,
+  113824 => true,
+  113825 => true,
+  113826 => true,
+  113827 => true,
+  917760 => true,
+  917761 => true,
+  917762 => true,
+  917763 => true,
+  917764 => true,
+  917765 => true,
+  917766 => true,
+  917767 => true,
+  917768 => true,
+  917769 => true,
+  917770 => true,
+  917771 => true,
+  917772 => true,
+  917773 => true,
+  917774 => true,
+  917775 => true,
+  917776 => true,
+  917777 => true,
+  917778 => true,
+  917779 => true,
+  917780 => true,
+  917781 => true,
+  917782 => true,
+  917783 => true,
+  917784 => true,
+  917785 => true,
+  917786 => true,
+  917787 => true,
+  917788 => true,
+  917789 => true,
+  917790 => true,
+  917791 => true,
+  917792 => true,
+  917793 => true,
+  917794 => true,
+  917795 => true,
+  917796 => true,
+  917797 => true,
+  917798 => true,
+  917799 => true,
+  917800 => true,
+  917801 => true,
+  917802 => true,
+  917803 => true,
+  917804 => true,
+  917805 => true,
+  917806 => true,
+  917807 => true,
+  917808 => true,
+  917809 => true,
+  917810 => true,
+  917811 => true,
+  917812 => true,
+  917813 => true,
+  917814 => true,
+  917815 => true,
+  917816 => true,
+  917817 => true,
+  917818 => true,
+  917819 => true,
+  917820 => true,
+  917821 => true,
+  917822 => true,
+  917823 => true,
+  917824 => true,
+  917825 => true,
+  917826 => true,
+  917827 => true,
+  917828 => true,
+  917829 => true,
+  917830 => true,
+  917831 => true,
+  917832 => true,
+  917833 => true,
+  917834 => true,
+  917835 => true,
+  917836 => true,
+  917837 => true,
+  917838 => true,
+  917839 => true,
+  917840 => true,
+  917841 => true,
+  917842 => true,
+  917843 => true,
+  917844 => true,
+  917845 => true,
+  917846 => true,
+  917847 => true,
+  917848 => true,
+  917849 => true,
+  917850 => true,
+  917851 => true,
+  917852 => true,
+  917853 => true,
+  917854 => true,
+  917855 => true,
+  917856 => true,
+  917857 => true,
+  917858 => true,
+  917859 => true,
+  917860 => true,
+  917861 => true,
+  917862 => true,
+  917863 => true,
+  917864 => true,
+  917865 => true,
+  917866 => true,
+  917867 => true,
+  917868 => true,
+  917869 => true,
+  917870 => true,
+  917871 => true,
+  917872 => true,
+  917873 => true,
+  917874 => true,
+  917875 => true,
+  917876 => true,
+  917877 => true,
+  917878 => true,
+  917879 => true,
+  917880 => true,
+  917881 => true,
+  917882 => true,
+  917883 => true,
+  917884 => true,
+  917885 => true,
+  917886 => true,
+  917887 => true,
+  917888 => true,
+  917889 => true,
+  917890 => true,
+  917891 => true,
+  917892 => true,
+  917893 => true,
+  917894 => true,
+  917895 => true,
+  917896 => true,
+  917897 => true,
+  917898 => true,
+  917899 => true,
+  917900 => true,
+  917901 => true,
+  917902 => true,
+  917903 => true,
+  917904 => true,
+  917905 => true,
+  917906 => true,
+  917907 => true,
+  917908 => true,
+  917909 => true,
+  917910 => true,
+  917911 => true,
+  917912 => true,
+  917913 => true,
+  917914 => true,
+  917915 => true,
+  917916 => true,
+  917917 => true,
+  917918 => true,
+  917919 => true,
+  917920 => true,
+  917921 => true,
+  917922 => true,
+  917923 => true,
+  917924 => true,
+  917925 => true,
+  917926 => true,
+  917927 => true,
+  917928 => true,
+  917929 => true,
+  917930 => true,
+  917931 => true,
+  917932 => true,
+  917933 => true,
+  917934 => true,
+  917935 => true,
+  917936 => true,
+  917937 => true,
+  917938 => true,
+  917939 => true,
+  917940 => true,
+  917941 => true,
+  917942 => true,
+  917943 => true,
+  917944 => true,
+  917945 => true,
+  917946 => true,
+  917947 => true,
+  917948 => true,
+  917949 => true,
+  917950 => true,
+  917951 => true,
+  917952 => true,
+  917953 => true,
+  917954 => true,
+  917955 => true,
+  917956 => true,
+  917957 => true,
+  917958 => true,
+  917959 => true,
+  917960 => true,
+  917961 => true,
+  917962 => true,
+  917963 => true,
+  917964 => true,
+  917965 => true,
+  917966 => true,
+  917967 => true,
+  917968 => true,
+  917969 => true,
+  917970 => true,
+  917971 => true,
+  917972 => true,
+  917973 => true,
+  917974 => true,
+  917975 => true,
+  917976 => true,
+  917977 => true,
+  917978 => true,
+  917979 => true,
+  917980 => true,
+  917981 => true,
+  917982 => true,
+  917983 => true,
+  917984 => true,
+  917985 => true,
+  917986 => true,
+  917987 => true,
+  917988 => true,
+  917989 => true,
+  917990 => true,
+  917991 => true,
+  917992 => true,
+  917993 => true,
+  917994 => true,
+  917995 => true,
+  917996 => true,
+  917997 => true,
+  917998 => true,
+  917999 => true,
+);
diff --git a/lib/symfony/polyfill-intl-idn/Resources/unidata/mapped.php b/lib/symfony/polyfill-intl-idn/Resources/unidata/mapped.php
new file mode 100644
index 000000000..9b85fe9d3
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Resources/unidata/mapped.php
@@ -0,0 +1,5778 @@
+<?php
+
+return array (
+  65 => 'a',
+  66 => 'b',
+  67 => 'c',
+  68 => 'd',
+  69 => 'e',
+  70 => 'f',
+  71 => 'g',
+  72 => 'h',
+  73 => 'i',
+  74 => 'j',
+  75 => 'k',
+  76 => 'l',
+  77 => 'm',
+  78 => 'n',
+  79 => 'o',
+  80 => 'p',
+  81 => 'q',
+  82 => 'r',
+  83 => 's',
+  84 => 't',
+  85 => 'u',
+  86 => 'v',
+  87 => 'w',
+  88 => 'x',
+  89 => 'y',
+  90 => 'z',
+  170 => 'a',
+  178 => '2',
+  179 => '3',
+  181 => 'μ',
+  185 => '1',
+  186 => 'o',
+  188 => '1�4',
+  189 => '1�2',
+  190 => '3�4',
+  192 => 'à',
+  193 => 'á',
+  194 => 'â',
+  195 => 'ã',
+  196 => 'ä',
+  197 => 'Ã¥',
+  198 => 'æ',
+  199 => 'ç',
+  200 => 'è',
+  201 => 'é',
+  202 => 'ê',
+  203 => 'ë',
+  204 => 'ì',
+  205 => 'í',
+  206 => 'î',
+  207 => 'ï',
+  208 => 'ð',
+  209 => 'ñ',
+  210 => 'ò',
+  211 => 'ó',
+  212 => 'ô',
+  213 => 'õ',
+  214 => 'ö',
+  216 => 'ø',
+  217 => 'ù',
+  218 => 'ú',
+  219 => 'û',
+  220 => 'ü',
+  221 => 'ý',
+  222 => 'þ',
+  256 => '�',
+  258 => 'ă',
+  260 => 'Ä…',
+  262 => 'ć',
+  264 => 'ĉ',
+  266 => 'Ä‹',
+  268 => '�',
+  270 => '�',
+  272 => 'Ä‘',
+  274 => 'Ä“',
+  276 => 'Ä•',
+  278 => 'Ä—',
+  280 => 'Ä™',
+  282 => 'Ä›',
+  284 => '�',
+  286 => 'ÄŸ',
+  288 => 'Ä¡',
+  290 => 'Ä£',
+  292 => 'Ä¥',
+  294 => 'ħ',
+  296 => 'Ä©',
+  298 => 'Ä«',
+  300 => 'Ä­',
+  302 => 'į',
+  304 => 'i̇',
+  306 => 'ij',
+  307 => 'ij',
+  308 => 'ĵ',
+  310 => 'Ä·',
+  313 => 'ĺ',
+  315 => 'ļ',
+  317 => 'ľ',
+  319 => 'l·',
+  320 => 'l·',
+  321 => 'Å‚',
+  323 => 'Å„',
+  325 => 'ņ',
+  327 => 'ň',
+  329 => 'ʼn',
+  330 => 'Å‹',
+  332 => '�',
+  334 => '�',
+  336 => 'Å‘',
+  338 => 'Å“',
+  340 => 'Å•',
+  342 => 'Å—',
+  344 => 'Å™',
+  346 => 'Å›',
+  348 => '�',
+  350 => 'ÅŸ',
+  352 => 'Å¡',
+  354 => 'Å£',
+  356 => 'Å¥',
+  358 => 'ŧ',
+  360 => 'Å©',
+  362 => 'Å«',
+  364 => 'Å­',
+  366 => 'ů',
+  368 => 'ű',
+  370 => 'ų',
+  372 => 'ŵ',
+  374 => 'Å·',
+  376 => 'ÿ',
+  377 => 'ź',
+  379 => 'ż',
+  381 => 'ž',
+  383 => 's',
+  385 => 'É“',
+  386 => 'ƃ',
+  388 => 'Æ…',
+  390 => 'É”',
+  391 => 'ƈ',
+  393 => 'É–',
+  394 => 'É—',
+  395 => 'ƌ',
+  398 => '�',
+  399 => 'É™',
+  400 => 'É›',
+  401 => 'Æ’',
+  403 => 'É ',
+  404 => 'É£',
+  406 => 'É©',
+  407 => 'ɨ',
+  408 => 'Æ™',
+  412 => 'ɯ',
+  413 => 'ɲ',
+  415 => 'ɵ',
+  416 => 'Æ¡',
+  418 => 'Æ£',
+  420 => 'Æ¥',
+  422 => 'Ê€',
+  423 => 'ƨ',
+  425 => 'ʃ',
+  428 => 'Æ­',
+  430 => 'ʈ',
+  431 => 'Æ°',
+  433 => 'ÊŠ',
+  434 => 'Ê‹',
+  435 => 'Æ´',
+  437 => 'ƶ',
+  439 => 'Ê’',
+  440 => 'ƹ',
+  444 => 'ƽ',
+  452 => 'dž',
+  453 => 'dž',
+  454 => 'dž',
+  455 => 'lj',
+  456 => 'lj',
+  457 => 'lj',
+  458 => 'nj',
+  459 => 'nj',
+  460 => 'nj',
+  461 => 'ÇŽ',
+  463 => '�',
+  465 => 'Ç’',
+  467 => 'Ç”',
+  469 => 'Ç–',
+  471 => 'ǘ',
+  473 => 'Çš',
+  475 => 'ǜ',
+  478 => 'ÇŸ',
+  480 => 'Ç¡',
+  482 => 'Ç£',
+  484 => 'Ç¥',
+  486 => 'ǧ',
+  488 => 'Ç©',
+  490 => 'Ç«',
+  492 => 'Ç­',
+  494 => 'ǯ',
+  497 => 'dz',
+  498 => 'dz',
+  499 => 'dz',
+  500 => 'ǵ',
+  502 => 'Æ•',
+  503 => 'Æ¿',
+  504 => 'ǹ',
+  506 => 'Ç»',
+  508 => 'ǽ',
+  510 => 'Ç¿',
+  512 => '�',
+  514 => 'ȃ',
+  516 => 'È…',
+  518 => 'ȇ',
+  520 => 'ȉ',
+  522 => 'È‹',
+  524 => '�',
+  526 => '�',
+  528 => 'È‘',
+  530 => 'È“',
+  532 => 'È•',
+  534 => 'È—',
+  536 => 'È™',
+  538 => 'È›',
+  540 => '�',
+  542 => 'ÈŸ',
+  544 => 'Æž',
+  546 => 'È£',
+  548 => 'È¥',
+  550 => 'ȧ',
+  552 => 'È©',
+  554 => 'È«',
+  556 => 'È­',
+  558 => 'ȯ',
+  560 => 'ȱ',
+  562 => 'ȳ',
+  570 => 'â±¥',
+  571 => 'ȼ',
+  573 => 'Æš',
+  574 => 'ⱦ',
+  577 => 'É‚',
+  579 => 'Æ€',
+  580 => 'ʉ',
+  581 => 'ʌ',
+  582 => 'ɇ',
+  584 => 'ɉ',
+  586 => 'É‹',
+  588 => '�',
+  590 => '�',
+  688 => 'h',
+  689 => 'ɦ',
+  690 => 'j',
+  691 => 'r',
+  692 => 'ɹ',
+  693 => 'É»',
+  694 => '�',
+  695 => 'w',
+  696 => 'y',
+  736 => 'É£',
+  737 => 'l',
+  738 => 's',
+  739 => 'x',
+  740 => 'Ê•',
+  832 => 'Ì€',
+  833 => '�',
+  835 => 'Ì“',
+  836 => '̈�',
+  837 => 'ι',
+  880 => 'ͱ',
+  882 => 'ͳ',
+  884 => 'ʹ',
+  886 => 'Í·',
+  895 => 'ϳ',
+  902 => 'ά',
+  903 => '·',
+  904 => 'έ',
+  905 => 'ή',
+  906 => 'ί',
+  908 => 'ό',
+  910 => '�',
+  911 => 'ÏŽ',
+  913 => 'α',
+  914 => 'β',
+  915 => 'γ',
+  916 => 'δ',
+  917 => 'ε',
+  918 => 'ζ',
+  919 => 'η',
+  920 => 'θ',
+  921 => 'ι',
+  922 => 'κ',
+  923 => 'λ',
+  924 => 'μ',
+  925 => 'ν',
+  926 => 'ξ',
+  927 => 'ο',
+  928 => 'Ï€',
+  929 => '�',
+  931 => 'σ',
+  932 => 'Ï„',
+  933 => 'Ï…',
+  934 => 'φ',
+  935 => 'χ',
+  936 => 'ψ',
+  937 => 'ω',
+  938 => 'ÏŠ',
+  939 => 'Ï‹',
+  975 => 'Ï—',
+  976 => 'β',
+  977 => 'θ',
+  978 => 'Ï…',
+  979 => '�',
+  980 => 'Ï‹',
+  981 => 'φ',
+  982 => 'Ï€',
+  984 => 'Ï™',
+  986 => 'Ï›',
+  988 => '�',
+  990 => 'ÏŸ',
+  992 => 'Ï¡',
+  994 => 'Ï£',
+  996 => 'Ï¥',
+  998 => 'ϧ',
+  1000 => 'Ï©',
+  1002 => 'Ï«',
+  1004 => 'Ï­',
+  1006 => 'ϯ',
+  1008 => 'κ',
+  1009 => '�',
+  1010 => 'σ',
+  1012 => 'θ',
+  1013 => 'ε',
+  1015 => 'ϸ',
+  1017 => 'σ',
+  1018 => 'Ï»',
+  1021 => 'Í»',
+  1022 => 'ͼ',
+  1023 => 'ͽ',
+  1024 => '�',
+  1025 => 'Ñ‘',
+  1026 => 'Ñ’',
+  1027 => 'Ñ“',
+  1028 => 'Ñ”',
+  1029 => 'Ñ•',
+  1030 => 'Ñ–',
+  1031 => 'Ñ—',
+  1032 => 'ј',
+  1033 => 'Ñ™',
+  1034 => 'Ñš',
+  1035 => 'Ñ›',
+  1036 => 'ќ',
+  1037 => '�',
+  1038 => 'Ñž',
+  1039 => 'ÑŸ',
+  1040 => 'а',
+  1041 => 'б',
+  1042 => 'в',
+  1043 => 'г',
+  1044 => 'д',
+  1045 => 'е',
+  1046 => 'ж',
+  1047 => 'з',
+  1048 => 'и',
+  1049 => 'й',
+  1050 => 'к',
+  1051 => 'л',
+  1052 => 'м',
+  1053 => 'н',
+  1054 => 'о',
+  1055 => 'п',
+  1056 => 'Ñ€',
+  1057 => '�',
+  1058 => 'Ñ‚',
+  1059 => 'у',
+  1060 => 'Ñ„',
+  1061 => 'Ñ…',
+  1062 => 'ц',
+  1063 => 'ч',
+  1064 => 'ш',
+  1065 => 'щ',
+  1066 => 'ÑŠ',
+  1067 => 'Ñ‹',
+  1068 => 'ь',
+  1069 => '�',
+  1070 => 'ÑŽ',
+  1071 => '�',
+  1120 => 'Ñ¡',
+  1122 => 'Ñ£',
+  1124 => 'Ñ¥',
+  1126 => 'ѧ',
+  1128 => 'Ñ©',
+  1130 => 'Ñ«',
+  1132 => 'Ñ­',
+  1134 => 'ѯ',
+  1136 => 'ѱ',
+  1138 => 'ѳ',
+  1140 => 'ѵ',
+  1142 => 'Ñ·',
+  1144 => 'ѹ',
+  1146 => 'Ñ»',
+  1148 => 'ѽ',
+  1150 => 'Ñ¿',
+  1152 => 'Ò�',
+  1162 => 'Ò‹',
+  1164 => 'Ò�',
+  1166 => 'Ò�',
+  1168 => 'Ò‘',
+  1170 => 'Ò“',
+  1172 => 'Ò•',
+  1174 => 'Ò—',
+  1176 => 'Ò™',
+  1178 => 'Ò›',
+  1180 => 'Ò�',
+  1182 => 'ÒŸ',
+  1184 => 'Ò¡',
+  1186 => 'Ò£',
+  1188 => 'Ò¥',
+  1190 => 'Ò§',
+  1192 => 'Ò©',
+  1194 => 'Ò«',
+  1196 => 'Ò­',
+  1198 => 'Ò¯',
+  1200 => 'Ò±',
+  1202 => 'Ò³',
+  1204 => 'Òµ',
+  1206 => 'Ò·',
+  1208 => 'Ò¹',
+  1210 => 'Ò»',
+  1212 => 'Ò½',
+  1214 => 'Ò¿',
+  1217 => 'Ó‚',
+  1219 => 'Ó„',
+  1221 => 'Ó†',
+  1223 => 'Óˆ',
+  1225 => 'ÓŠ',
+  1227 => 'ӌ',
+  1229 => 'ÓŽ',
+  1232 => 'Ó‘',
+  1234 => 'Ó“',
+  1236 => 'Ó•',
+  1238 => 'Ó—',
+  1240 => 'Ó™',
+  1242 => 'Ó›',
+  1244 => 'Ó�',
+  1246 => 'ÓŸ',
+  1248 => 'Ó¡',
+  1250 => 'Ó£',
+  1252 => 'Ó¥',
+  1254 => 'Ó§',
+  1256 => 'Ó©',
+  1258 => 'Ó«',
+  1260 => 'Ó­',
+  1262 => 'Ó¯',
+  1264 => 'Ó±',
+  1266 => 'Ó³',
+  1268 => 'Óµ',
+  1270 => 'Ó·',
+  1272 => 'Ó¹',
+  1274 => 'Ó»',
+  1276 => 'Ó½',
+  1278 => 'Ó¿',
+  1280 => 'Ô�',
+  1282 => 'Ôƒ',
+  1284 => 'Ô…',
+  1286 => 'Ô‡',
+  1288 => 'Ô‰',
+  1290 => 'Ô‹',
+  1292 => 'Ô�',
+  1294 => 'Ô�',
+  1296 => 'Ô‘',
+  1298 => 'Ô“',
+  1300 => 'Ô•',
+  1302 => 'Ô—',
+  1304 => 'Ô™',
+  1306 => 'Ô›',
+  1308 => 'Ô�',
+  1310 => 'ÔŸ',
+  1312 => 'Ô¡',
+  1314 => 'Ô£',
+  1316 => 'Ô¥',
+  1318 => 'Ô§',
+  1320 => 'Ô©',
+  1322 => 'Ô«',
+  1324 => 'Ô­',
+  1326 => 'Ô¯',
+  1329 => 'Õ¡',
+  1330 => 'Õ¢',
+  1331 => 'Õ£',
+  1332 => 'Õ¤',
+  1333 => 'Õ¥',
+  1334 => 'Õ¦',
+  1335 => 'Õ§',
+  1336 => 'Õ¨',
+  1337 => 'Õ©',
+  1338 => 'Õª',
+  1339 => 'Õ«',
+  1340 => 'Õ¬',
+  1341 => 'Õ­',
+  1342 => 'Õ®',
+  1343 => 'Õ¯',
+  1344 => 'Õ°',
+  1345 => 'Õ±',
+  1346 => 'Õ²',
+  1347 => 'Õ³',
+  1348 => 'Õ´',
+  1349 => 'Õµ',
+  1350 => 'Õ¶',
+  1351 => 'Õ·',
+  1352 => 'Õ¸',
+  1353 => 'Õ¹',
+  1354 => 'Õº',
+  1355 => 'Õ»',
+  1356 => 'Õ¼',
+  1357 => 'Õ½',
+  1358 => 'Õ¾',
+  1359 => 'Õ¿',
+  1360 => 'Ö€',
+  1361 => 'Ö�',
+  1362 => 'Ö‚',
+  1363 => 'Öƒ',
+  1364 => 'Ö„',
+  1365 => 'Ö…',
+  1366 => 'Ö†',
+  1415 => 'Õ¥Ö‚',
+  1653 => 'اٴ',
+  1654 => 'وٴ',
+  1655 => 'Û‡Ù´',
+  1656 => 'يٴ',
+  2392 => 'क़',
+  2393 => 'ख़',
+  2394 => 'ग़',
+  2395 => 'ज़',
+  2396 => 'ड़',
+  2397 => 'ढ़',
+  2398 => 'फ़',
+  2399 => 'य़',
+  2524 => 'ড়',
+  2525 => 'ঢ়',
+  2527 => 'য়',
+  2611 => 'ਲ਼',
+  2614 => 'ਸ਼',
+  2649 => 'ਖ਼',
+  2650 => 'ਗ਼',
+  2651 => 'ਜ਼',
+  2654 => 'ਫ਼',
+  2908 => 'ଡ଼',
+  2909 => 'ଢ଼',
+  3635 => '�า',
+  3763 => '�າ',
+  3804 => 'ຫນ',
+  3805 => 'ຫມ',
+  3852 => '་',
+  3907 => 'གྷ',
+  3917 => 'ཌྷ',
+  3922 => 'དྷ',
+  3927 => 'བྷ',
+  3932 => 'ཛྷ',
+  3945 => 'ཀྵ',
+  3955 => 'ཱི',
+  3957 => 'ཱུ',
+  3958 => 'ྲྀ',
+  3959 => 'ྲཱྀ',
+  3960 => 'ླྀ',
+  3961 => 'ླཱྀ',
+  3969 => 'ཱྀ',
+  3987 => 'ྒྷ',
+  3997 => 'ྜྷ',
+  4002 => 'ྡྷ',
+  4007 => 'ྦྷ',
+  4012 => 'ྫྷ',
+  4025 => '�ྵ',
+  4295 => 'â´§',
+  4301 => 'â´­',
+  4348 => 'ნ',
+  5112 => '�',
+  5113 => '�',
+  5114 => '�',
+  5115 => '�',
+  5116 => '�',
+  5117 => '�',
+  7296 => 'в',
+  7297 => 'д',
+  7298 => 'о',
+  7299 => '�',
+  7300 => 'Ñ‚',
+  7301 => 'Ñ‚',
+  7302 => 'ÑŠ',
+  7303 => 'Ñ£',
+  7304 => 'ꙋ',
+  7312 => '�',
+  7313 => 'ბ',
+  7314 => 'გ',
+  7315 => 'დ',
+  7316 => 'ე',
+  7317 => 'ვ',
+  7318 => 'ზ',
+  7319 => 'თ',
+  7320 => 'ი',
+  7321 => 'კ',
+  7322 => 'ლ',
+  7323 => 'მ',
+  7324 => 'ნ',
+  7325 => '�',
+  7326 => 'პ',
+  7327 => 'ჟ',
+  7328 => 'რ',
+  7329 => 'ს',
+  7330 => 'ტ',
+  7331 => 'უ',
+  7332 => 'ფ',
+  7333 => 'ქ',
+  7334 => 'ღ',
+  7335 => 'ყ',
+  7336 => 'შ',
+  7337 => 'ჩ',
+  7338 => 'ც',
+  7339 => 'ძ',
+  7340 => 'წ',
+  7341 => 'ჭ',
+  7342 => 'ხ',
+  7343 => 'ჯ',
+  7344 => 'ჰ',
+  7345 => 'ჱ',
+  7346 => 'ჲ',
+  7347 => 'ჳ',
+  7348 => 'ჴ',
+  7349 => 'ჵ',
+  7350 => 'ჶ',
+  7351 => 'ჷ',
+  7352 => 'ჸ',
+  7353 => 'ჹ',
+  7354 => 'ჺ',
+  7357 => 'ჽ',
+  7358 => 'ჾ',
+  7359 => 'ჿ',
+  7468 => 'a',
+  7469 => 'æ',
+  7470 => 'b',
+  7472 => 'd',
+  7473 => 'e',
+  7474 => '�',
+  7475 => 'g',
+  7476 => 'h',
+  7477 => 'i',
+  7478 => 'j',
+  7479 => 'k',
+  7480 => 'l',
+  7481 => 'm',
+  7482 => 'n',
+  7484 => 'o',
+  7485 => 'È£',
+  7486 => 'p',
+  7487 => 'r',
+  7488 => 't',
+  7489 => 'u',
+  7490 => 'w',
+  7491 => 'a',
+  7492 => '�',
+  7493 => 'É‘',
+  7494 => 'á´‚',
+  7495 => 'b',
+  7496 => 'd',
+  7497 => 'e',
+  7498 => 'É™',
+  7499 => 'É›',
+  7500 => 'ɜ',
+  7501 => 'g',
+  7503 => 'k',
+  7504 => 'm',
+  7505 => 'Å‹',
+  7506 => 'o',
+  7507 => 'É”',
+  7508 => 'á´–',
+  7509 => 'á´—',
+  7510 => 'p',
+  7511 => 't',
+  7512 => 'u',
+  7513 => 'á´�',
+  7514 => 'ɯ',
+  7515 => 'v',
+  7516 => 'á´¥',
+  7517 => 'β',
+  7518 => 'γ',
+  7519 => 'δ',
+  7520 => 'φ',
+  7521 => 'χ',
+  7522 => 'i',
+  7523 => 'r',
+  7524 => 'u',
+  7525 => 'v',
+  7526 => 'β',
+  7527 => 'γ',
+  7528 => '�',
+  7529 => 'φ',
+  7530 => 'χ',
+  7544 => 'н',
+  7579 => 'É’',
+  7580 => 'c',
+  7581 => 'É•',
+  7582 => 'ð',
+  7583 => 'ɜ',
+  7584 => 'f',
+  7585 => 'ÉŸ',
+  7586 => 'É¡',
+  7587 => 'É¥',
+  7588 => 'ɨ',
+  7589 => 'É©',
+  7590 => 'ɪ',
+  7591 => 'áµ»',
+  7592 => '�',
+  7593 => 'É­',
+  7594 => 'ᶅ',
+  7595 => 'ÊŸ',
+  7596 => 'ɱ',
+  7597 => 'É°',
+  7598 => 'ɲ',
+  7599 => 'ɳ',
+  7600 => 'É´',
+  7601 => 'ɵ',
+  7602 => 'ɸ',
+  7603 => 'Ê‚',
+  7604 => 'ʃ',
+  7605 => 'Æ«',
+  7606 => 'ʉ',
+  7607 => 'ÊŠ',
+  7608 => 'ᴜ',
+  7609 => 'Ê‹',
+  7610 => 'ʌ',
+  7611 => 'z',
+  7612 => '�',
+  7613 => 'Ê‘',
+  7614 => 'Ê’',
+  7615 => 'θ',
+  7680 => '�',
+  7682 => 'ḃ',
+  7684 => 'ḅ',
+  7686 => 'ḇ',
+  7688 => 'ḉ',
+  7690 => 'ḋ',
+  7692 => '�',
+  7694 => '�',
+  7696 => 'ḑ',
+  7698 => 'ḓ',
+  7700 => 'ḕ',
+  7702 => 'ḗ',
+  7704 => 'ḙ',
+  7706 => 'ḛ',
+  7708 => '�',
+  7710 => 'ḟ',
+  7712 => 'ḡ',
+  7714 => 'ḣ',
+  7716 => 'ḥ',
+  7718 => 'ḧ',
+  7720 => 'ḩ',
+  7722 => 'ḫ',
+  7724 => 'ḭ',
+  7726 => 'ḯ',
+  7728 => 'ḱ',
+  7730 => 'ḳ',
+  7732 => 'ḵ',
+  7734 => 'ḷ',
+  7736 => 'ḹ',
+  7738 => 'ḻ',
+  7740 => 'ḽ',
+  7742 => 'ḿ',
+  7744 => '�',
+  7746 => 'ṃ',
+  7748 => 'á¹…',
+  7750 => 'ṇ',
+  7752 => 'ṉ',
+  7754 => 'ṋ',
+  7756 => '�',
+  7758 => '�',
+  7760 => 'ṑ',
+  7762 => 'ṓ',
+  7764 => 'ṕ',
+  7766 => 'á¹—',
+  7768 => 'á¹™',
+  7770 => 'á¹›',
+  7772 => '�',
+  7774 => 'ṟ',
+  7776 => 'ṡ',
+  7778 => 'á¹£',
+  7780 => 'á¹¥',
+  7782 => 'ṧ',
+  7784 => 'ṩ',
+  7786 => 'ṫ',
+  7788 => 'á¹­',
+  7790 => 'ṯ',
+  7792 => 'á¹±',
+  7794 => 'á¹³',
+  7796 => 'á¹µ',
+  7798 => 'á¹·',
+  7800 => 'á¹¹',
+  7802 => 'á¹»',
+  7804 => 'á¹½',
+  7806 => 'ṿ',
+  7808 => '�',
+  7810 => 'ẃ',
+  7812 => 'ẅ',
+  7814 => 'ẇ',
+  7816 => 'ẉ',
+  7818 => 'ẋ',
+  7820 => '�',
+  7822 => '�',
+  7824 => 'ẑ',
+  7826 => 'ẓ',
+  7828 => 'ẕ',
+  7834 => 'aʾ',
+  7835 => 'ṡ',
+  7838 => 'ss',
+  7840 => 'ạ',
+  7842 => 'ả',
+  7844 => 'ấ',
+  7846 => 'ầ',
+  7848 => 'ẩ',
+  7850 => 'ẫ',
+  7852 => 'ậ',
+  7854 => 'ắ',
+  7856 => 'ằ',
+  7858 => 'ẳ',
+  7860 => 'ẵ',
+  7862 => 'ặ',
+  7864 => 'ẹ',
+  7866 => 'ẻ',
+  7868 => 'ẽ',
+  7870 => 'ế',
+  7872 => '�',
+  7874 => 'ể',
+  7876 => 'á»…',
+  7878 => 'ệ',
+  7880 => 'ỉ',
+  7882 => 'ị',
+  7884 => '�',
+  7886 => '�',
+  7888 => 'ố',
+  7890 => 'ồ',
+  7892 => 'ổ',
+  7894 => 'á»—',
+  7896 => 'á»™',
+  7898 => 'á»›',
+  7900 => '�',
+  7902 => 'ở',
+  7904 => 'ỡ',
+  7906 => 'ợ',
+  7908 => 'ụ',
+  7910 => 'ủ',
+  7912 => 'ứ',
+  7914 => 'ừ',
+  7916 => 'á»­',
+  7918 => 'ữ',
+  7920 => 'á»±',
+  7922 => 'ỳ',
+  7924 => 'ỵ',
+  7926 => 'á»·',
+  7928 => 'ỹ',
+  7930 => 'á»»',
+  7932 => 'ỽ',
+  7934 => 'ỿ',
+  7944 => 'á¼€',
+  7945 => '�',
+  7946 => 'ἂ',
+  7947 => 'ἃ',
+  7948 => 'ἄ',
+  7949 => 'á¼…',
+  7950 => 'ἆ',
+  7951 => 'ἇ',
+  7960 => '�',
+  7961 => 'ἑ',
+  7962 => 'á¼’',
+  7963 => 'ἓ',
+  7964 => 'á¼”',
+  7965 => 'ἕ',
+  7976 => 'á¼ ',
+  7977 => 'ἡ',
+  7978 => 'á¼¢',
+  7979 => 'á¼£',
+  7980 => 'ἤ',
+  7981 => 'á¼¥',
+  7982 => 'ἦ',
+  7983 => 'ἧ',
+  7992 => 'á¼°',
+  7993 => 'á¼±',
+  7994 => 'á¼²',
+  7995 => 'á¼³',
+  7996 => 'á¼´',
+  7997 => 'á¼µ',
+  7998 => 'ἶ',
+  7999 => 'á¼·',
+  8008 => 'á½€',
+  8009 => '�',
+  8010 => 'ὂ',
+  8011 => 'ὃ',
+  8012 => 'ὄ',
+  8013 => 'á½…',
+  8025 => 'ὑ',
+  8027 => 'ὓ',
+  8029 => 'ὕ',
+  8031 => 'á½—',
+  8040 => 'á½ ',
+  8041 => 'ὡ',
+  8042 => 'á½¢',
+  8043 => 'á½£',
+  8044 => 'ὤ',
+  8045 => 'á½¥',
+  8046 => 'ὦ',
+  8047 => 'ὧ',
+  8049 => 'ά',
+  8051 => 'έ',
+  8053 => 'ή',
+  8055 => 'ί',
+  8057 => 'ό',
+  8059 => '�',
+  8061 => 'ÏŽ',
+  8064 => 'ἀι',
+  8065 => '�ι',
+  8066 => 'ἂι',
+  8067 => 'ἃι',
+  8068 => 'ἄι',
+  8069 => 'ἅι',
+  8070 => 'ἆι',
+  8071 => 'ἇι',
+  8072 => 'ἀι',
+  8073 => '�ι',
+  8074 => 'ἂι',
+  8075 => 'ἃι',
+  8076 => 'ἄι',
+  8077 => 'ἅι',
+  8078 => 'ἆι',
+  8079 => 'ἇι',
+  8080 => 'ἠι',
+  8081 => 'ἡι',
+  8082 => 'ἢι',
+  8083 => 'ἣι',
+  8084 => 'ἤι',
+  8085 => 'ἥι',
+  8086 => 'ἦι',
+  8087 => 'ἧι',
+  8088 => 'ἠι',
+  8089 => 'ἡι',
+  8090 => 'ἢι',
+  8091 => 'ἣι',
+  8092 => 'ἤι',
+  8093 => 'ἥι',
+  8094 => 'ἦι',
+  8095 => 'ἧι',
+  8096 => 'ὠι',
+  8097 => 'ὡι',
+  8098 => 'ὢι',
+  8099 => 'ὣι',
+  8100 => 'ὤι',
+  8101 => 'ὥι',
+  8102 => 'ὦι',
+  8103 => 'ὧι',
+  8104 => 'ὠι',
+  8105 => 'ὡι',
+  8106 => 'ὢι',
+  8107 => 'ὣι',
+  8108 => 'ὤι',
+  8109 => 'ὥι',
+  8110 => 'ὦι',
+  8111 => 'ὧι',
+  8114 => 'ὰι',
+  8115 => 'αι',
+  8116 => 'άι',
+  8119 => 'ᾶι',
+  8120 => 'á¾°',
+  8121 => 'á¾±',
+  8122 => 'á½°',
+  8123 => 'ά',
+  8124 => 'αι',
+  8126 => 'ι',
+  8130 => 'ὴι',
+  8131 => 'ηι',
+  8132 => 'ήι',
+  8135 => 'ῆι',
+  8136 => 'á½²',
+  8137 => 'έ',
+  8138 => 'á½´',
+  8139 => 'ή',
+  8140 => 'ηι',
+  8147 => '�',
+  8152 => '�',
+  8153 => 'á¿‘',
+  8154 => 'ὶ',
+  8155 => 'ί',
+  8163 => 'ΰ',
+  8168 => 'á¿ ',
+  8169 => 'á¿¡',
+  8170 => 'ὺ',
+  8171 => '�',
+  8172 => 'á¿¥',
+  8178 => 'ὼι',
+  8179 => 'ωι',
+  8180 => 'ώι',
+  8183 => 'ῶι',
+  8184 => 'ὸ',
+  8185 => 'ό',
+  8186 => 'á½¼',
+  8187 => 'ÏŽ',
+  8188 => 'ωι',
+  8209 => '�',
+  8243 => '′′',
+  8244 => '′′′',
+  8246 => '‵‵',
+  8247 => '‵‵‵',
+  8279 => '′′′′',
+  8304 => '0',
+  8305 => 'i',
+  8308 => '4',
+  8309 => '5',
+  8310 => '6',
+  8311 => '7',
+  8312 => '8',
+  8313 => '9',
+  8315 => '−',
+  8319 => 'n',
+  8320 => '0',
+  8321 => '1',
+  8322 => '2',
+  8323 => '3',
+  8324 => '4',
+  8325 => '5',
+  8326 => '6',
+  8327 => '7',
+  8328 => '8',
+  8329 => '9',
+  8331 => '−',
+  8336 => 'a',
+  8337 => 'e',
+  8338 => 'o',
+  8339 => 'x',
+  8340 => 'É™',
+  8341 => 'h',
+  8342 => 'k',
+  8343 => 'l',
+  8344 => 'm',
+  8345 => 'n',
+  8346 => 'p',
+  8347 => 's',
+  8348 => 't',
+  8360 => 'rs',
+  8450 => 'c',
+  8451 => '°c',
+  8455 => 'É›',
+  8457 => '°f',
+  8458 => 'g',
+  8459 => 'h',
+  8460 => 'h',
+  8461 => 'h',
+  8462 => 'h',
+  8463 => 'ħ',
+  8464 => 'i',
+  8465 => 'i',
+  8466 => 'l',
+  8467 => 'l',
+  8469 => 'n',
+  8470 => 'no',
+  8473 => 'p',
+  8474 => 'q',
+  8475 => 'r',
+  8476 => 'r',
+  8477 => 'r',
+  8480 => 'sm',
+  8481 => 'tel',
+  8482 => 'tm',
+  8484 => 'z',
+  8486 => 'ω',
+  8488 => 'z',
+  8490 => 'k',
+  8491 => 'Ã¥',
+  8492 => 'b',
+  8493 => 'c',
+  8495 => 'e',
+  8496 => 'e',
+  8497 => 'f',
+  8499 => 'm',
+  8500 => 'o',
+  8501 => '�',
+  8502 => 'ב',
+  8503 => '×’',
+  8504 => 'ד',
+  8505 => 'i',
+  8507 => 'fax',
+  8508 => 'Ï€',
+  8509 => 'γ',
+  8510 => 'γ',
+  8511 => 'Ï€',
+  8512 => '∑',
+  8517 => 'd',
+  8518 => 'd',
+  8519 => 'e',
+  8520 => 'i',
+  8521 => 'j',
+  8528 => '1�7',
+  8529 => '1�9',
+  8530 => '1�10',
+  8531 => '1�3',
+  8532 => '2�3',
+  8533 => '1�5',
+  8534 => '2�5',
+  8535 => '3�5',
+  8536 => '4�5',
+  8537 => '1�6',
+  8538 => '5�6',
+  8539 => '1�8',
+  8540 => '3�8',
+  8541 => '5�8',
+  8542 => '7�8',
+  8543 => '1�',
+  8544 => 'i',
+  8545 => 'ii',
+  8546 => 'iii',
+  8547 => 'iv',
+  8548 => 'v',
+  8549 => 'vi',
+  8550 => 'vii',
+  8551 => 'viii',
+  8552 => 'ix',
+  8553 => 'x',
+  8554 => 'xi',
+  8555 => 'xii',
+  8556 => 'l',
+  8557 => 'c',
+  8558 => 'd',
+  8559 => 'm',
+  8560 => 'i',
+  8561 => 'ii',
+  8562 => 'iii',
+  8563 => 'iv',
+  8564 => 'v',
+  8565 => 'vi',
+  8566 => 'vii',
+  8567 => 'viii',
+  8568 => 'ix',
+  8569 => 'x',
+  8570 => 'xi',
+  8571 => 'xii',
+  8572 => 'l',
+  8573 => 'c',
+  8574 => 'd',
+  8575 => 'm',
+  8585 => '0�3',
+  8748 => '∫∫',
+  8749 => '∫∫∫',
+  8751 => '∮∮',
+  8752 => '∮∮∮',
+  9001 => '〈',
+  9002 => '〉',
+  9312 => '1',
+  9313 => '2',
+  9314 => '3',
+  9315 => '4',
+  9316 => '5',
+  9317 => '6',
+  9318 => '7',
+  9319 => '8',
+  9320 => '9',
+  9321 => '10',
+  9322 => '11',
+  9323 => '12',
+  9324 => '13',
+  9325 => '14',
+  9326 => '15',
+  9327 => '16',
+  9328 => '17',
+  9329 => '18',
+  9330 => '19',
+  9331 => '20',
+  9398 => 'a',
+  9399 => 'b',
+  9400 => 'c',
+  9401 => 'd',
+  9402 => 'e',
+  9403 => 'f',
+  9404 => 'g',
+  9405 => 'h',
+  9406 => 'i',
+  9407 => 'j',
+  9408 => 'k',
+  9409 => 'l',
+  9410 => 'm',
+  9411 => 'n',
+  9412 => 'o',
+  9413 => 'p',
+  9414 => 'q',
+  9415 => 'r',
+  9416 => 's',
+  9417 => 't',
+  9418 => 'u',
+  9419 => 'v',
+  9420 => 'w',
+  9421 => 'x',
+  9422 => 'y',
+  9423 => 'z',
+  9424 => 'a',
+  9425 => 'b',
+  9426 => 'c',
+  9427 => 'd',
+  9428 => 'e',
+  9429 => 'f',
+  9430 => 'g',
+  9431 => 'h',
+  9432 => 'i',
+  9433 => 'j',
+  9434 => 'k',
+  9435 => 'l',
+  9436 => 'm',
+  9437 => 'n',
+  9438 => 'o',
+  9439 => 'p',
+  9440 => 'q',
+  9441 => 'r',
+  9442 => 's',
+  9443 => 't',
+  9444 => 'u',
+  9445 => 'v',
+  9446 => 'w',
+  9447 => 'x',
+  9448 => 'y',
+  9449 => 'z',
+  9450 => '0',
+  10764 => '∫∫∫∫',
+  10972 => '�̸',
+  11264 => 'â°°',
+  11265 => 'â°±',
+  11266 => 'â°²',
+  11267 => 'â°³',
+  11268 => 'â°´',
+  11269 => 'â°µ',
+  11270 => 'â°¶',
+  11271 => 'â°·',
+  11272 => 'â°¸',
+  11273 => 'â°¹',
+  11274 => 'â°º',
+  11275 => 'â°»',
+  11276 => 'â°¼',
+  11277 => 'â°½',
+  11278 => 'â°¾',
+  11279 => 'â°¿',
+  11280 => 'â±€',
+  11281 => '�',
+  11282 => 'ⱂ',
+  11283 => 'ⱃ',
+  11284 => 'ⱄ',
+  11285 => 'â±…',
+  11286 => 'ⱆ',
+  11287 => 'ⱇ',
+  11288 => 'ⱈ',
+  11289 => 'ⱉ',
+  11290 => 'ⱊ',
+  11291 => 'ⱋ',
+  11292 => 'ⱌ',
+  11293 => '�',
+  11294 => 'ⱎ',
+  11295 => '�',
+  11296 => '�',
+  11297 => 'ⱑ',
+  11298 => 'â±’',
+  11299 => 'ⱓ',
+  11300 => 'â±”',
+  11301 => 'ⱕ',
+  11302 => 'â±–',
+  11303 => 'â±—',
+  11304 => 'ⱘ',
+  11305 => 'â±™',
+  11306 => 'ⱚ',
+  11307 => 'â±›',
+  11308 => 'ⱜ',
+  11309 => '�',
+  11310 => 'ⱞ',
+  11360 => 'ⱡ',
+  11362 => 'É«',
+  11363 => 'áµ½',
+  11364 => 'ɽ',
+  11367 => 'ⱨ',
+  11369 => 'ⱪ',
+  11371 => 'ⱬ',
+  11373 => 'É‘',
+  11374 => 'ɱ',
+  11375 => '�',
+  11376 => 'É’',
+  11378 => 'â±³',
+  11381 => 'ⱶ',
+  11388 => 'j',
+  11389 => 'v',
+  11390 => 'È¿',
+  11391 => 'É€',
+  11392 => '�',
+  11394 => 'ⲃ',
+  11396 => 'â²…',
+  11398 => 'ⲇ',
+  11400 => 'ⲉ',
+  11402 => 'ⲋ',
+  11404 => '�',
+  11406 => '�',
+  11408 => 'ⲑ',
+  11410 => 'ⲓ',
+  11412 => 'ⲕ',
+  11414 => 'â²—',
+  11416 => 'â²™',
+  11418 => 'â²›',
+  11420 => '�',
+  11422 => 'ⲟ',
+  11424 => 'ⲡ',
+  11426 => 'â²£',
+  11428 => 'â²¥',
+  11430 => 'ⲧ',
+  11432 => 'ⲩ',
+  11434 => 'ⲫ',
+  11436 => 'â²­',
+  11438 => 'ⲯ',
+  11440 => 'â²±',
+  11442 => 'â²³',
+  11444 => 'â²µ',
+  11446 => 'â²·',
+  11448 => 'â²¹',
+  11450 => 'â²»',
+  11452 => 'â²½',
+  11454 => 'ⲿ',
+  11456 => '�',
+  11458 => 'ⳃ',
+  11460 => 'â³…',
+  11462 => 'ⳇ',
+  11464 => 'ⳉ',
+  11466 => 'ⳋ',
+  11468 => '�',
+  11470 => '�',
+  11472 => 'ⳑ',
+  11474 => 'ⳓ',
+  11476 => 'ⳕ',
+  11478 => 'â³—',
+  11480 => 'â³™',
+  11482 => 'â³›',
+  11484 => '�',
+  11486 => 'ⳟ',
+  11488 => 'ⳡ',
+  11490 => 'â³£',
+  11499 => 'ⳬ',
+  11501 => 'â³®',
+  11506 => 'â³³',
+  11631 => 'ⵡ',
+  11935 => '�',
+  12019 => '龟',
+  12032 => '一',
+  12033 => '丨',
+  12034 => '丶',
+  12035 => '丿',
+  12036 => 'ä¹™',
+  12037 => '亅',
+  12038 => '二',
+  12039 => '亠',
+  12040 => '人',
+  12041 => 'å„¿',
+  12042 => 'å…¥',
+  12043 => 'å…«',
+  12044 => '冂',
+  12045 => '冖',
+  12046 => '冫',
+  12047 => '几',
+  12048 => '凵',
+  12049 => '刀',
+  12050 => '力',
+  12051 => '勹',
+  12052 => '匕',
+  12053 => '匚',
+  12054 => '匸',
+  12055 => '�',
+  12056 => '�',
+  12057 => '�',
+  12058 => '厂',
+  12059 => '厶',
+  12060 => '�',
+  12061 => '�',
+  12062 => 'å›—',
+  12063 => '土',
+  12064 => '士',
+  12065 => '夂',
+  12066 => '夊',
+  12067 => '夕',
+  12068 => '大',
+  12069 => '女',
+  12070 => 'å­�',
+  12071 => '宀',
+  12072 => '寸',
+  12073 => 'å°�',
+  12074 => 'å°¢',
+  12075 => 'å°¸',
+  12076 => 'å±®',
+  12077 => 'å±±',
+  12078 => 'å·›',
+  12079 => 'å·¥',
+  12080 => 'å·±',
+  12081 => 'å·¾',
+  12082 => 'å¹²',
+  12083 => '幺',
+  12084 => '广',
+  12085 => 'å»´',
+  12086 => '廾',
+  12087 => '弋',
+  12088 => '弓',
+  12089 => '�',
+  12090 => '彡',
+  12091 => 'å½³',
+  12092 => '心',
+  12093 => '戈',
+  12094 => '戶',
+  12095 => '手',
+  12096 => '支',
+  12097 => 'æ”´',
+  12098 => 'æ–‡',
+  12099 => 'æ–—',
+  12100 => 'æ–¤',
+  12101 => 'æ–¹',
+  12102 => 'æ— ',
+  12103 => 'æ—¥',
+  12104 => 'æ›°',
+  12105 => '月',
+  12106 => '木',
+  12107 => '欠',
+  12108 => 'æ­¢',
+  12109 => 'æ­¹',
+  12110 => '殳',
+  12111 => '毋',
+  12112 => '比',
+  12113 => '毛',
+  12114 => 'æ°�',
+  12115 => 'æ°”',
+  12116 => 'æ°´',
+  12117 => '�',
+  12118 => '爪',
+  12119 => '父',
+  12120 => '爻',
+  12121 => '爿',
+  12122 => '片',
+  12123 => '牙',
+  12124 => '牛',
+  12125 => '犬',
+  12126 => '玄',
+  12127 => '玉',
+  12128 => '瓜',
+  12129 => '瓦',
+  12130 => '甘',
+  12131 => '生',
+  12132 => '用',
+  12133 => 'ç”°',
+  12134 => 'ç–‹',
+  12135 => 'ç–’',
+  12136 => '癶',
+  12137 => '白',
+  12138 => 'çš®',
+  12139 => 'çš¿',
+  12140 => 'ç›®',
+  12141 => '矛',
+  12142 => '矢',
+  12143 => '石',
+  12144 => '示',
+  12145 => '禸',
+  12146 => '禾',
+  12147 => 'ç©´',
+  12148 => 'ç«‹',
+  12149 => '竹',
+  12150 => 'ç±³',
+  12151 => '糸',
+  12152 => '缶',
+  12153 => '网',
+  12154 => '羊',
+  12155 => 'ç¾½',
+  12156 => '�',
+  12157 => '而',
+  12158 => '耒',
+  12159 => '耳',
+  12160 => '�',
+  12161 => '肉',
+  12162 => '臣',
+  12163 => '自',
+  12164 => '至',
+  12165 => '臼',
+  12166 => '舌',
+  12167 => '舛',
+  12168 => '舟',
+  12169 => '艮',
+  12170 => '色',
+  12171 => '艸',
+  12172 => '�',
+  12173 => '虫',
+  12174 => 'è¡€',
+  12175 => '行',
+  12176 => 'è¡£',
+  12177 => '襾',
+  12178 => '見',
+  12179 => '角',
+  12180 => '言',
+  12181 => 'è°·',
+  12182 => '豆',
+  12183 => '豕',
+  12184 => '豸',
+  12185 => '�',
+  12186 => '赤',
+  12187 => 'èµ°',
+  12188 => '足',
+  12189 => '身',
+  12190 => '車',
+  12191 => 'è¾›',
+  12192 => 'è¾°',
+  12193 => 'è¾µ',
+  12194 => 'é‚‘',
+  12195 => 'é…‰',
+  12196 => '釆',
+  12197 => '里',
+  12198 => '金',
+  12199 => 'é•·',
+  12200 => 'é–€',
+  12201 => '阜',
+  12202 => '隶',
+  12203 => 'éš¹',
+  12204 => '雨',
+  12205 => '�',
+  12206 => '�',
+  12207 => '�',
+  12208 => '�',
+  12209 => '韋',
+  12210 => '韭',
+  12211 => '音',
+  12212 => 'é �',
+  12213 => '風',
+  12214 => '飛',
+  12215 => '食',
+  12216 => '首',
+  12217 => '香',
+  12218 => '馬',
+  12219 => '骨',
+  12220 => '高',
+  12221 => 'é«Ÿ',
+  12222 => '鬥',
+  12223 => '鬯',
+  12224 => '鬲',
+  12225 => '鬼',
+  12226 => 'é­š',
+  12227 => 'é³¥',
+  12228 => 'é¹µ',
+  12229 => '鹿',
+  12230 => '麥',
+  12231 => '麻',
+  12232 => '黃',
+  12233 => '�',
+  12234 => '黑',
+  12235 => '黹',
+  12236 => '黽',
+  12237 => '鼎',
+  12238 => '鼓',
+  12239 => 'é¼ ',
+  12240 => 'é¼»',
+  12241 => '齊',
+  12242 => 'é½’',
+  12243 => '�',
+  12244 => '龜',
+  12245 => 'é¾ ',
+  12290 => '.',
+  12342 => '〒',
+  12344 => '�',
+  12345 => '�',
+  12346 => '�',
+  12447 => 'より',
+  12543 => 'コト',
+  12593 => 'á„€',
+  12594 => '�',
+  12595 => 'ᆪ',
+  12596 => 'á„‚',
+  12597 => 'ᆬ',
+  12598 => 'ᆭ',
+  12599 => 'ᄃ',
+  12600 => 'á„„',
+  12601 => 'á„…',
+  12602 => 'ᆰ',
+  12603 => 'ᆱ',
+  12604 => 'ᆲ',
+  12605 => 'ᆳ',
+  12606 => 'ᆴ',
+  12607 => 'ᆵ',
+  12608 => 'á„š',
+  12609 => 'ᄆ',
+  12610 => 'ᄇ',
+  12611 => 'ᄈ',
+  12612 => 'á„¡',
+  12613 => 'ᄉ',
+  12614 => 'á„Š',
+  12615 => 'á„‹',
+  12616 => 'ᄌ',
+  12617 => '�',
+  12618 => 'á„Ž',
+  12619 => '�',
+  12620 => '�',
+  12621 => 'á„‘',
+  12622 => 'á„’',
+  12623 => 'á…¡',
+  12624 => 'á…¢',
+  12625 => 'á…£',
+  12626 => 'á…¤',
+  12627 => 'á…¥',
+  12628 => 'á…¦',
+  12629 => 'á…§',
+  12630 => 'á…¨',
+  12631 => 'á…©',
+  12632 => 'á…ª',
+  12633 => 'á…«',
+  12634 => 'á…¬',
+  12635 => 'á…­',
+  12636 => 'á…®',
+  12637 => 'á…¯',
+  12638 => 'á…°',
+  12639 => 'á…±',
+  12640 => 'á…²',
+  12641 => 'á…³',
+  12642 => 'á…´',
+  12643 => 'á…µ',
+  12645 => 'á„”',
+  12646 => 'á„•',
+  12647 => 'ᇇ',
+  12648 => 'ᇈ',
+  12649 => 'ᇌ',
+  12650 => 'ᇎ',
+  12651 => 'ᇓ',
+  12652 => 'ᇗ',
+  12653 => 'ᇙ',
+  12654 => 'ᄜ',
+  12655 => '�',
+  12656 => 'ᇟ',
+  12657 => '�',
+  12658 => 'á„ž',
+  12659 => 'á„ ',
+  12660 => 'á„¢',
+  12661 => 'á„£',
+  12662 => 'ᄧ',
+  12663 => 'á„©',
+  12664 => 'á„«',
+  12665 => 'ᄬ',
+  12666 => 'á„­',
+  12667 => 'á„®',
+  12668 => 'ᄯ',
+  12669 => 'ᄲ',
+  12670 => 'ᄶ',
+  12671 => 'á…€',
+  12672 => 'á…‡',
+  12673 => 'ᅌ',
+  12674 => 'ᇱ',
+  12675 => 'ᇲ',
+  12676 => 'á…—',
+  12677 => 'á…˜',
+  12678 => 'á…™',
+  12679 => 'ᆄ',
+  12680 => 'ᆅ',
+  12681 => 'ᆈ',
+  12682 => 'ᆑ',
+  12683 => 'ᆒ',
+  12684 => 'ᆔ',
+  12685 => 'ᆞ',
+  12686 => 'ᆡ',
+  12690 => '一',
+  12691 => '二',
+  12692 => '三',
+  12693 => 'å››',
+  12694 => '上',
+  12695 => '中',
+  12696 => '下',
+  12697 => '甲',
+  12698 => 'ä¹™',
+  12699 => '丙',
+  12700 => '�',
+  12701 => '天',
+  12702 => '地',
+  12703 => '人',
+  12868 => '�',
+  12869 => 'å¹¼',
+  12870 => 'æ–‡',
+  12871 => '�',
+  12880 => 'pte',
+  12881 => '21',
+  12882 => '22',
+  12883 => '23',
+  12884 => '24',
+  12885 => '25',
+  12886 => '26',
+  12887 => '27',
+  12888 => '28',
+  12889 => '29',
+  12890 => '30',
+  12891 => '31',
+  12892 => '32',
+  12893 => '33',
+  12894 => '34',
+  12895 => '35',
+  12896 => 'á„€',
+  12897 => 'á„‚',
+  12898 => 'ᄃ',
+  12899 => 'á„…',
+  12900 => 'ᄆ',
+  12901 => 'ᄇ',
+  12902 => 'ᄉ',
+  12903 => 'á„‹',
+  12904 => 'ᄌ',
+  12905 => 'á„Ž',
+  12906 => '�',
+  12907 => '�',
+  12908 => 'á„‘',
+  12909 => 'á„’',
+  12910 => 'ê°€',
+  12911 => '나',
+  12912 => '다',
+  12913 => '�',
+  12914 => '마',
+  12915 => 'ë°”',
+  12916 => '사',
+  12917 => 'ì•„',
+  12918 => '�',
+  12919 => 'ì°¨',
+  12920 => 'ì¹´',
+  12921 => '타',
+  12922 => '파',
+  12923 => '하',
+  12924 => '참고',
+  12925 => '주�',
+  12926 => 'ìš°',
+  12928 => '一',
+  12929 => '二',
+  12930 => '三',
+  12931 => 'å››',
+  12932 => '五',
+  12933 => 'å…­',
+  12934 => '七',
+  12935 => 'å…«',
+  12936 => '�',
+  12937 => '�',
+  12938 => '月',
+  12939 => '�',
+  12940 => 'æ°´',
+  12941 => '木',
+  12942 => '金',
+  12943 => '土',
+  12944 => 'æ—¥',
+  12945 => 'æ ª',
+  12946 => '有',
+  12947 => '社',
+  12948 => '�',
+  12949 => '特',
+  12950 => '財',
+  12951 => '�',
+  12952 => '労',
+  12953 => '秘',
+  12954 => 'ç”·',
+  12955 => '女',
+  12956 => '�',
+  12957 => '優',
+  12958 => '�',
+  12959 => '注',
+  12960 => 'é …',
+  12961 => '休',
+  12962 => '写',
+  12963 => 'æ­£',
+  12964 => '上',
+  12965 => '中',
+  12966 => '下',
+  12967 => 'å·¦',
+  12968 => '�',
+  12969 => '医',
+  12970 => 'å®—',
+  12971 => 'å­¦',
+  12972 => '監',
+  12973 => '�',
+  12974 => '資',
+  12975 => '�',
+  12976 => '夜',
+  12977 => '36',
+  12978 => '37',
+  12979 => '38',
+  12980 => '39',
+  12981 => '40',
+  12982 => '41',
+  12983 => '42',
+  12984 => '43',
+  12985 => '44',
+  12986 => '45',
+  12987 => '46',
+  12988 => '47',
+  12989 => '48',
+  12990 => '49',
+  12991 => '50',
+  12992 => '1月',
+  12993 => '2月',
+  12994 => '3月',
+  12995 => '4月',
+  12996 => '5月',
+  12997 => '6月',
+  12998 => '7月',
+  12999 => '8月',
+  13000 => '9月',
+  13001 => '10月',
+  13002 => '11月',
+  13003 => '12月',
+  13004 => 'hg',
+  13005 => 'erg',
+  13006 => 'ev',
+  13007 => 'ltd',
+  13008 => 'ã‚¢',
+  13009 => 'イ',
+  13010 => 'ウ',
+  13011 => 'エ',
+  13012 => 'オ',
+  13013 => 'ã‚«',
+  13014 => 'ã‚­',
+  13015 => 'ク',
+  13016 => 'ケ',
+  13017 => 'コ',
+  13018 => 'サ',
+  13019 => 'ã‚·',
+  13020 => 'ス',
+  13021 => 'ã‚»',
+  13022 => 'ソ',
+  13023 => 'ã‚¿',
+  13024 => '�',
+  13025 => 'ツ',
+  13026 => 'テ',
+  13027 => 'ト',
+  13028 => 'ナ',
+  13029 => 'ニ',
+  13030 => 'ヌ',
+  13031 => '�',
+  13032 => 'ノ',
+  13033 => '�',
+  13034 => 'ヒ',
+  13035 => 'フ',
+  13036 => 'ヘ',
+  13037 => 'ホ',
+  13038 => 'マ',
+  13039 => 'ミ',
+  13040 => 'ム',
+  13041 => 'メ',
+  13042 => 'モ',
+  13043 => 'ヤ',
+  13044 => 'ユ',
+  13045 => 'ヨ',
+  13046 => 'ラ',
+  13047 => 'リ',
+  13048 => 'ル',
+  13049 => 'レ',
+  13050 => 'ロ',
+  13051 => 'ワ',
+  13052 => 'ヰ',
+  13053 => 'ヱ',
+  13054 => 'ヲ',
+  13055 => '令和',
+  13056 => 'アパート',
+  13057 => 'アルファ',
+  13058 => 'アンペア',
+  13059 => 'アール',
+  13060 => 'イニング',
+  13061 => 'イン�',
+  13062 => 'ウォン',
+  13063 => 'エスクード',
+  13064 => 'エーカー',
+  13065 => 'オンス',
+  13066 => 'オーム',
+  13067 => 'カイリ',
+  13068 => 'カラット',
+  13069 => 'カロリー',
+  13070 => 'ガロン',
+  13071 => 'ガンマ',
+  13072 => 'ギガ',
+  13073 => 'ギニー',
+  13074 => 'キュリー',
+  13075 => 'ギルダー',
+  13076 => 'キロ',
+  13077 => 'キログラム',
+  13078 => 'キロメートル',
+  13079 => 'キロワット',
+  13080 => 'グラム',
+  13081 => 'グラムトン',
+  13082 => 'クルゼイロ',
+  13083 => 'クロー�',
+  13084 => 'ケース',
+  13085 => 'コルナ',
+  13086 => 'コー�',
+  13087 => 'サイクル',
+  13088 => 'サン�ーム',
+  13089 => 'シリング',
+  13090 => 'セン�',
+  13091 => 'セント',
+  13092 => 'ダース',
+  13093 => 'デシ',
+  13094 => 'ドル',
+  13095 => 'トン',
+  13096 => 'ナノ',
+  13097 => 'ノット',
+  13098 => '�イツ',
+  13099 => 'パーセント',
+  13100 => 'パーツ',
+  13101 => '�ーレル',
+  13102 => 'ピアストル',
+  13103 => 'ピクル',
+  13104 => 'ピコ',
+  13105 => 'ビル',
+  13106 => 'ファラッド',
+  13107 => 'フィート',
+  13108 => 'ブッシェル',
+  13109 => 'フラン',
+  13110 => 'ヘクタール',
+  13111 => 'ペソ',
+  13112 => 'ペニヒ',
+  13113 => 'ヘルツ',
+  13114 => 'ペンス',
+  13115 => 'ページ',
+  13116 => 'ベータ',
+  13117 => '�イント',
+  13118 => 'ボルト',
+  13119 => 'ホン',
+  13120 => '�ンド',
+  13121 => 'ホール',
+  13122 => 'ホーン',
+  13123 => 'マイクロ',
+  13124 => 'マイル',
+  13125 => 'マッ�',
+  13126 => 'マルク',
+  13127 => 'マンション',
+  13128 => 'ミクロン',
+  13129 => 'ミリ',
+  13130 => 'ミリ�ール',
+  13131 => 'メガ',
+  13132 => 'メガトン',
+  13133 => 'メートル',
+  13134 => 'ヤード',
+  13135 => 'ヤール',
+  13136 => 'ユアン',
+  13137 => 'リットル',
+  13138 => 'リラ',
+  13139 => 'ルピー',
+  13140 => 'ルーブル',
+  13141 => 'レム',
+  13142 => 'レントゲン',
+  13143 => 'ワット',
+  13144 => '0点',
+  13145 => '1点',
+  13146 => '2点',
+  13147 => '3点',
+  13148 => '4点',
+  13149 => '5点',
+  13150 => '6点',
+  13151 => '7点',
+  13152 => '8点',
+  13153 => '9点',
+  13154 => '10点',
+  13155 => '11点',
+  13156 => '12点',
+  13157 => '13点',
+  13158 => '14点',
+  13159 => '15点',
+  13160 => '16点',
+  13161 => '17点',
+  13162 => '18点',
+  13163 => '19点',
+  13164 => '20点',
+  13165 => '21点',
+  13166 => '22点',
+  13167 => '23点',
+  13168 => '24点',
+  13169 => 'hpa',
+  13170 => 'da',
+  13171 => 'au',
+  13172 => 'bar',
+  13173 => 'ov',
+  13174 => 'pc',
+  13175 => 'dm',
+  13176 => 'dm2',
+  13177 => 'dm3',
+  13178 => 'iu',
+  13179 => '平�',
+  13180 => '昭和',
+  13181 => '大正',
+  13182 => '明治',
+  13183 => '株�会社',
+  13184 => 'pa',
+  13185 => 'na',
+  13186 => 'μa',
+  13187 => 'ma',
+  13188 => 'ka',
+  13189 => 'kb',
+  13190 => 'mb',
+  13191 => 'gb',
+  13192 => 'cal',
+  13193 => 'kcal',
+  13194 => 'pf',
+  13195 => 'nf',
+  13196 => 'μf',
+  13197 => 'μg',
+  13198 => 'mg',
+  13199 => 'kg',
+  13200 => 'hz',
+  13201 => 'khz',
+  13202 => 'mhz',
+  13203 => 'ghz',
+  13204 => 'thz',
+  13205 => 'μl',
+  13206 => 'ml',
+  13207 => 'dl',
+  13208 => 'kl',
+  13209 => 'fm',
+  13210 => 'nm',
+  13211 => 'μm',
+  13212 => 'mm',
+  13213 => 'cm',
+  13214 => 'km',
+  13215 => 'mm2',
+  13216 => 'cm2',
+  13217 => 'm2',
+  13218 => 'km2',
+  13219 => 'mm3',
+  13220 => 'cm3',
+  13221 => 'm3',
+  13222 => 'km3',
+  13223 => 'm∕s',
+  13224 => 'm∕s2',
+  13225 => 'pa',
+  13226 => 'kpa',
+  13227 => 'mpa',
+  13228 => 'gpa',
+  13229 => 'rad',
+  13230 => 'rad∕s',
+  13231 => 'rad∕s2',
+  13232 => 'ps',
+  13233 => 'ns',
+  13234 => 'μs',
+  13235 => 'ms',
+  13236 => 'pv',
+  13237 => 'nv',
+  13238 => 'μv',
+  13239 => 'mv',
+  13240 => 'kv',
+  13241 => 'mv',
+  13242 => 'pw',
+  13243 => 'nw',
+  13244 => 'μw',
+  13245 => 'mw',
+  13246 => 'kw',
+  13247 => 'mw',
+  13248 => 'kω',
+  13249 => 'mω',
+  13251 => 'bq',
+  13252 => 'cc',
+  13253 => 'cd',
+  13254 => 'c∕kg',
+  13256 => 'db',
+  13257 => 'gy',
+  13258 => 'ha',
+  13259 => 'hp',
+  13260 => 'in',
+  13261 => 'kk',
+  13262 => 'km',
+  13263 => 'kt',
+  13264 => 'lm',
+  13265 => 'ln',
+  13266 => 'log',
+  13267 => 'lx',
+  13268 => 'mb',
+  13269 => 'mil',
+  13270 => 'mol',
+  13271 => 'ph',
+  13273 => 'ppm',
+  13274 => 'pr',
+  13275 => 'sr',
+  13276 => 'sv',
+  13277 => 'wb',
+  13278 => 'v∕m',
+  13279 => 'a∕m',
+  13280 => '1æ—¥',
+  13281 => '2æ—¥',
+  13282 => '3æ—¥',
+  13283 => '4æ—¥',
+  13284 => '5æ—¥',
+  13285 => '6æ—¥',
+  13286 => '7æ—¥',
+  13287 => '8æ—¥',
+  13288 => '9æ—¥',
+  13289 => '10æ—¥',
+  13290 => '11æ—¥',
+  13291 => '12æ—¥',
+  13292 => '13æ—¥',
+  13293 => '14æ—¥',
+  13294 => '15æ—¥',
+  13295 => '16æ—¥',
+  13296 => '17æ—¥',
+  13297 => '18æ—¥',
+  13298 => '19æ—¥',
+  13299 => '20æ—¥',
+  13300 => '21æ—¥',
+  13301 => '22æ—¥',
+  13302 => '23æ—¥',
+  13303 => '24æ—¥',
+  13304 => '25æ—¥',
+  13305 => '26æ—¥',
+  13306 => '27æ—¥',
+  13307 => '28æ—¥',
+  13308 => '29æ—¥',
+  13309 => '30æ—¥',
+  13310 => '31æ—¥',
+  13311 => 'gal',
+  42560 => '�',
+  42562 => 'ꙃ',
+  42564 => 'ê™…',
+  42566 => 'ꙇ',
+  42568 => 'ꙉ',
+  42570 => 'ꙋ',
+  42572 => '�',
+  42574 => '�',
+  42576 => 'ꙑ',
+  42578 => 'ꙓ',
+  42580 => 'ꙕ',
+  42582 => 'ê™—',
+  42584 => 'ê™™',
+  42586 => 'ê™›',
+  42588 => '�',
+  42590 => 'ꙟ',
+  42592 => 'ꙡ',
+  42594 => 'ꙣ',
+  42596 => 'ꙥ',
+  42598 => 'ꙧ',
+  42600 => 'ꙩ',
+  42602 => 'ꙫ',
+  42604 => 'ê™­',
+  42624 => '�',
+  42626 => 'ꚃ',
+  42628 => 'êš…',
+  42630 => 'ꚇ',
+  42632 => 'ꚉ',
+  42634 => 'êš‹',
+  42636 => '�',
+  42638 => '�',
+  42640 => 'êš‘',
+  42642 => 'êš“',
+  42644 => 'êš•',
+  42646 => 'êš—',
+  42648 => 'êš™',
+  42650 => 'êš›',
+  42652 => 'ÑŠ',
+  42653 => 'ь',
+  42786 => 'ꜣ',
+  42788 => 'ꜥ',
+  42790 => 'ꜧ',
+  42792 => 'ꜩ',
+  42794 => 'ꜫ',
+  42796 => 'ꜭ',
+  42798 => 'ꜯ',
+  42802 => 'ꜳ',
+  42804 => 'ꜵ',
+  42806 => 'ꜷ',
+  42808 => 'ꜹ',
+  42810 => 'ꜻ',
+  42812 => 'ꜽ',
+  42814 => 'ꜿ',
+  42816 => '�',
+  42818 => '�',
+  42820 => '�',
+  42822 => '�',
+  42824 => '�',
+  42826 => '�',
+  42828 => '�',
+  42830 => '�',
+  42832 => '�',
+  42834 => '�',
+  42836 => '�',
+  42838 => '�',
+  42840 => '�',
+  42842 => '�',
+  42844 => '�',
+  42846 => '�',
+  42848 => '�',
+  42850 => '�',
+  42852 => '�',
+  42854 => '�',
+  42856 => '�',
+  42858 => '�',
+  42860 => '�',
+  42862 => '�',
+  42864 => '�',
+  42873 => '�',
+  42875 => '�',
+  42877 => 'áµ¹',
+  42878 => '�',
+  42880 => '�',
+  42882 => 'ꞃ',
+  42884 => 'êž…',
+  42886 => 'ꞇ',
+  42891 => 'ꞌ',
+  42893 => 'É¥',
+  42896 => 'êž‘',
+  42898 => 'êž“',
+  42902 => 'êž—',
+  42904 => 'êž™',
+  42906 => 'êž›',
+  42908 => '�',
+  42910 => 'ꞟ',
+  42912 => 'êž¡',
+  42914 => 'ꞣ',
+  42916 => 'ꞥ',
+  42918 => 'ꞧ',
+  42920 => 'êž©',
+  42922 => 'ɦ',
+  42923 => 'ɜ',
+  42924 => 'É¡',
+  42925 => 'ɬ',
+  42926 => 'ɪ',
+  42928 => 'Êž',
+  42929 => 'ʇ',
+  42930 => '�',
+  42931 => 'ê­“',
+  42932 => 'êžµ',
+  42934 => 'êž·',
+  42936 => 'êž¹',
+  42938 => 'êž»',
+  42940 => 'êž½',
+  42942 => 'êž¿',
+  42946 => 'ꟃ',
+  42948 => 'êž”',
+  42949 => 'Ê‚',
+  42950 => 'ᶎ',
+  42951 => 'ꟈ',
+  42953 => 'ꟊ',
+  42997 => 'ꟶ',
+  43000 => 'ħ',
+  43001 => 'Å“',
+  43868 => 'ꜧ',
+  43869 => 'ꬷ',
+  43870 => 'É«',
+  43871 => 'ê­’',
+  43881 => '�',
+  43888 => 'Ꭰ',
+  43889 => 'Ꭱ',
+  43890 => 'Ꭲ',
+  43891 => 'Ꭳ',
+  43892 => 'Ꭴ',
+  43893 => 'Ꭵ',
+  43894 => 'Ꭶ',
+  43895 => 'Ꭷ',
+  43896 => 'Ꭸ',
+  43897 => 'Ꭹ',
+  43898 => 'Ꭺ',
+  43899 => 'Ꭻ',
+  43900 => 'Ꭼ',
+  43901 => 'Ꭽ',
+  43902 => 'Ꭾ',
+  43903 => 'Ꭿ',
+  43904 => 'Ꮀ',
+  43905 => 'Ꮁ',
+  43906 => 'Ꮂ',
+  43907 => 'Ꮃ',
+  43908 => 'Ꮄ',
+  43909 => 'Ꮅ',
+  43910 => 'Ꮆ',
+  43911 => 'Ꮇ',
+  43912 => 'Ꮈ',
+  43913 => 'Ꮉ',
+  43914 => 'Ꮊ',
+  43915 => 'Ꮋ',
+  43916 => 'Ꮌ',
+  43917 => 'Ꮍ',
+  43918 => 'Ꮎ',
+  43919 => 'Ꮏ',
+  43920 => '�',
+  43921 => '�',
+  43922 => '�',
+  43923 => '�',
+  43924 => '�',
+  43925 => '�',
+  43926 => '�',
+  43927 => '�',
+  43928 => '�',
+  43929 => '�',
+  43930 => '�',
+  43931 => '�',
+  43932 => '�',
+  43933 => '�',
+  43934 => '�',
+  43935 => '�',
+  43936 => '�',
+  43937 => '�',
+  43938 => '�',
+  43939 => '�',
+  43940 => '�',
+  43941 => '�',
+  43942 => '�',
+  43943 => '�',
+  43944 => '�',
+  43945 => '�',
+  43946 => '�',
+  43947 => '�',
+  43948 => '�',
+  43949 => '�',
+  43950 => '�',
+  43951 => '�',
+  43952 => '�',
+  43953 => '�',
+  43954 => '�',
+  43955 => '�',
+  43956 => '�',
+  43957 => '�',
+  43958 => '�',
+  43959 => '�',
+  43960 => '�',
+  43961 => '�',
+  43962 => '�',
+  43963 => '�',
+  43964 => '�',
+  43965 => '�',
+  43966 => '�',
+  43967 => '�',
+  63744 => '豈',
+  63745 => 'æ›´',
+  63746 => '車',
+  63747 => '賈',
+  63748 => '滑',
+  63749 => '串',
+  63750 => '�',
+  63751 => '龜',
+  63752 => '龜',
+  63753 => '契',
+  63754 => '金',
+  63755 => 'å–‡',
+  63756 => '奈',
+  63757 => '懶',
+  63758 => '癩',
+  63759 => 'ç¾…',
+  63760 => '蘿',
+  63761 => '螺',
+  63762 => '裸',
+  63763 => '�',
+  63764 => '樂',
+  63765 => 'æ´›',
+  63766 => '烙',
+  63767 => '�',
+  63768 => '�',
+  63769 => 'é…ª',
+  63770 => '駱',
+  63771 => '亂',
+  63772 => '�',
+  63773 => '欄',
+  63774 => '爛',
+  63775 => '蘭',
+  63776 => '鸞',
+  63777 => '�',
+  63778 => 'æ¿«',
+  63779 => 'è—�',
+  63780 => '襤',
+  63781 => '拉',
+  63782 => '臘',
+  63783 => 'è Ÿ',
+  63784 => '廊',
+  63785 => '朗',
+  63786 => '浪',
+  63787 => '狼',
+  63788 => '郎',
+  63789 => '來',
+  63790 => '冷',
+  63791 => 'å‹ž',
+  63792 => 'æ“„',
+  63793 => 'æ«“',
+  63794 => '�',
+  63795 => '盧',
+  63796 => '�',
+  63797 => '蘆',
+  63798 => '虜',
+  63799 => 'è·¯',
+  63800 => '露',
+  63801 => 'é­¯',
+  63802 => 'é·º',
+  63803 => '碌',
+  63804 => '祿',
+  63805 => '綠',
+  63806 => '�',
+  63807 => '錄',
+  63808 => '鹿',
+  63809 => 'è«–',
+  63810 => '壟',
+  63811 => '弄',
+  63812 => 'ç± ',
+  63813 => '�',
+  63814 => '牢',
+  63815 => '磊',
+  63816 => '賂',
+  63817 => 'é›·',
+  63818 => '壘',
+  63819 => 'å±¢',
+  63820 => '樓',
+  63821 => 'æ·š',
+  63822 => '�',
+  63823 => 'ç´¯',
+  63824 => '縷',
+  63825 => '陋',
+  63826 => 'å‹’',
+  63827 => 'è‚‹',
+  63828 => '凜',
+  63829 => '凌',
+  63830 => '稜',
+  63831 => '綾',
+  63832 => '�',
+  63833 => '陵',
+  63834 => '讀',
+  63835 => '�',
+  63836 => '樂',
+  63837 => '諾',
+  63838 => '丹',
+  63839 => '寧',
+  63840 => '怒',
+  63841 => '率',
+  63842 => 'ç•°',
+  63843 => '北',
+  63844 => '磻',
+  63845 => '便',
+  63846 => '復',
+  63847 => '�',
+  63848 => '泌',
+  63849 => '數',
+  63850 => 'ç´¢',
+  63851 => '�',
+  63852 => 'å¡ž',
+  63853 => '�',
+  63854 => '葉',
+  63855 => '說',
+  63856 => '殺',
+  63857 => 'è¾°',
+  63858 => '沈',
+  63859 => '拾',
+  63860 => 'è‹¥',
+  63861 => '掠',
+  63862 => 'ç•¥',
+  63863 => '亮',
+  63864 => 'å…©',
+  63865 => '凉',
+  63866 => '�',
+  63867 => '糧',
+  63868 => '良',
+  63869 => 'è«’',
+  63870 => '�',
+  63871 => '勵',
+  63872 => 'å‘‚',
+  63873 => '女',
+  63874 => '廬',
+  63875 => 'æ—…',
+  63876 => '濾',
+  63877 => '礪',
+  63878 => 'é–­',
+  63879 => '驪',
+  63880 => '麗',
+  63881 => '黎',
+  63882 => '力',
+  63883 => '曆',
+  63884 => 'æ­·',
+  63885 => 'è½¢',
+  63886 => 'å¹´',
+  63887 => '�',
+  63888 => '戀',
+  63889 => 'æ’š',
+  63890 => 'æ¼£',
+  63891 => 'ç…‰',
+  63892 => 'ç’‰',
+  63893 => '秊',
+  63894 => 'ç·´',
+  63895 => '�',
+  63896 => '輦',
+  63897 => 'è“®',
+  63898 => '連',
+  63899 => '�',
+  63900 => '列',
+  63901 => '劣',
+  63902 => 'å’½',
+  63903 => '烈',
+  63904 => '裂',
+  63905 => '說',
+  63906 => '廉',
+  63907 => '念',
+  63908 => '�',
+  63909 => 'æ®®',
+  63910 => 'ç°¾',
+  63911 => '�',
+  63912 => '令',
+  63913 => '囹',
+  63914 => '寧',
+  63915 => '嶺',
+  63916 => '怜',
+  63917 => '玲',
+  63918 => 'ç‘©',
+  63919 => '羚',
+  63920 => '�',
+  63921 => '鈴',
+  63922 => '零',
+  63923 => '�',
+  63924 => 'é ˜',
+  63925 => '例',
+  63926 => '禮',
+  63927 => '醴',
+  63928 => '隸',
+  63929 => '惡',
+  63930 => '了',
+  63931 => '僚',
+  63932 => '寮',
+  63933 => 'å°¿',
+  63934 => 'æ–™',
+  63935 => '樂',
+  63936 => '燎',
+  63937 => '療',
+  63938 => '蓼',
+  63939 => '�',
+  63940 => '�',
+  63941 => '暈',
+  63942 => '阮',
+  63943 => '劉',
+  63944 => '�',
+  63945 => '柳',
+  63946 => '�',
+  63947 => '溜',
+  63948 => '�',
+  63949 => 'ç•™',
+  63950 => 'ç¡«',
+  63951 => 'ç´�',
+  63952 => 'é¡ž',
+  63953 => 'å…­',
+  63954 => '戮',
+  63955 => '陸',
+  63956 => '倫',
+  63957 => 'å´™',
+  63958 => 'æ·ª',
+  63959 => '輪',
+  63960 => '律',
+  63961 => 'æ…„',
+  63962 => 'æ —',
+  63963 => '率',
+  63964 => '隆',
+  63965 => '利',
+  63966 => '�',
+  63967 => 'å±¥',
+  63968 => '易',
+  63969 => '�',
+  63970 => '梨',
+  63971 => 'æ³¥',
+  63972 => '�',
+  63973 => 'ç—¢',
+  63974 => 'ç½¹',
+  63975 => '�',
+  63976 => '裡',
+  63977 => '里',
+  63978 => '離',
+  63979 => '匿',
+  63980 => '溺',
+  63981 => '�',
+  63982 => '�',
+  63983 => 'ç’˜',
+  63984 => 'è—º',
+  63985 => '隣',
+  63986 => 'é±—',
+  63987 => '麟',
+  63988 => 'æž—',
+  63989 => 'æ·‹',
+  63990 => '臨',
+  63991 => 'ç«‹',
+  63992 => '笠',
+  63993 => 'ç²’',
+  63994 => 'ç‹€',
+  63995 => 'ç‚™',
+  63996 => 'è­˜',
+  63997 => '什',
+  63998 => '茶',
+  63999 => '刺',
+  64000 => '切',
+  64001 => '度',
+  64002 => 'æ‹“',
+  64003 => 'ç³–',
+  64004 => 'å®…',
+  64005 => 'æ´ž',
+  64006 => 'æš´',
+  64007 => 'è¼»',
+  64008 => '行',
+  64009 => '�',
+  64010 => '見',
+  64011 => '廓',
+  64012 => 'å…€',
+  64013 => 'å—€',
+  64016 => 'å¡š',
+  64018 => 'æ™´',
+  64021 => '凞',
+  64022 => '猪',
+  64023 => '益',
+  64024 => '礼',
+  64025 => '神',
+  64026 => '祥',
+  64027 => '�',
+  64028 => '�',
+  64029 => 'ç²¾',
+  64030 => 'ç¾½',
+  64032 => '蘒',
+  64034 => '諸',
+  64037 => '逸',
+  64038 => '都',
+  64042 => '飯',
+  64043 => '飼',
+  64044 => '館',
+  64045 => '鶴',
+  64046 => '郞',
+  64047 => 'éš·',
+  64048 => 'ä¾®',
+  64049 => '僧',
+  64050 => 'å…�',
+  64051 => '勉',
+  64052 => '勤',
+  64053 => '�',
+  64054 => 'å–�',
+  64055 => '嘆',
+  64056 => '器',
+  64057 => 'å¡€',
+  64058 => '墨',
+  64059 => '層',
+  64060 => 'å±®',
+  64061 => 'æ‚”',
+  64062 => 'æ…¨',
+  64063 => '憎',
+  64064 => '懲',
+  64065 => '�',
+  64066 => 'æ—¢',
+  64067 => 'æš‘',
+  64068 => '梅',
+  64069 => 'æµ·',
+  64070 => '渚',
+  64071 => 'æ¼¢',
+  64072 => 'ç…®',
+  64073 => '爫',
+  64074 => '�',
+  64075 => '碑',
+  64076 => '社',
+  64077 => '祉',
+  64078 => '祈',
+  64079 => '�',
+  64080 => '祖',
+  64081 => '�',
+  64082 => '�',
+  64083 => '禎',
+  64084 => 'ç©€',
+  64085 => '�',
+  64086 => '節',
+  64087 => 'ç·´',
+  64088 => '縉',
+  64089 => '�',
+  64090 => 'ç½²',
+  64091 => '者',
+  64092 => '臭',
+  64093 => '艹',
+  64094 => '艹',
+  64095 => 'è‘—',
+  64096 => '�',
+  64097 => '視',
+  64098 => '�',
+  64099 => '謹',
+  64100 => '賓',
+  64101 => 'è´ˆ',
+  64102 => '辶',
+  64103 => '逸',
+  64104 => '難',
+  64105 => '響',
+  64106 => 'é »',
+  64107 => '�',
+  64108 => '𤋮',
+  64109 => '舘',
+  64112 => '並',
+  64113 => '况',
+  64114 => 'å…¨',
+  64115 => 'ä¾€',
+  64116 => 'å……',
+  64117 => '冀',
+  64118 => '勇',
+  64119 => '勺',
+  64120 => 'å–�',
+  64121 => 'å••',
+  64122 => 'å–™',
+  64123 => 'å—¢',
+  64124 => 'å¡š',
+  64125 => '墳',
+  64126 => '奄',
+  64127 => '奔',
+  64128 => 'å©¢',
+  64129 => '嬨',
+  64130 => 'å»’',
+  64131 => 'å»™',
+  64132 => '彩',
+  64133 => 'å¾­',
+  64134 => '惘',
+  64135 => 'æ…Ž',
+  64136 => '愈',
+  64137 => '憎',
+  64138 => 'æ… ',
+  64139 => '懲',
+  64140 => '戴',
+  64141 => '�',
+  64142 => '�',
+  64143 => 'æ‘’',
+  64144 => 'æ•–',
+  64145 => 'æ™´',
+  64146 => '朗',
+  64147 => '望',
+  64148 => '�',
+  64149 => 'æ­¹',
+  64150 => '殺',
+  64151 => '�',
+  64152 => 'æ»›',
+  64153 => '滋',
+  64154 => 'æ¼¢',
+  64155 => '瀞',
+  64156 => 'ç…®',
+  64157 => '瞧',
+  64158 => '爵',
+  64159 => '犯',
+  64160 => '猪',
+  64161 => '瑱',
+  64162 => '甆',
+  64163 => 'ç”»',
+  64164 => '�',
+  64165 => '瘟',
+  64166 => '益',
+  64167 => 'ç››',
+  64168 => 'ç›´',
+  64169 => '�',
+  64170 => '�',
+  64171 => '磌',
+  64172 => '窱',
+  64173 => '節',
+  64174 => 'ç±»',
+  64175 => 'çµ›',
+  64176 => 'ç·´',
+  64177 => 'ç¼¾',
+  64178 => '者',
+  64179 => '�',
+  64180 => '�',
+  64181 => '�',
+  64182 => '�',
+  64183 => '覆',
+  64184 => '視',
+  64185 => '調',
+  64186 => '諸',
+  64187 => 'è«‹',
+  64188 => '�',
+  64189 => '諾',
+  64190 => 'è«­',
+  64191 => '謹',
+  64192 => '變',
+  64193 => 'è´ˆ',
+  64194 => '輸',
+  64195 => '�',
+  64196 => '醙',
+  64197 => '鉶',
+  64198 => '陼',
+  64199 => '難',
+  64200 => '�',
+  64201 => '韛',
+  64202 => '響',
+  64203 => 'é ‹',
+  64204 => 'é »',
+  64205 => '鬒',
+  64206 => '龜',
+  64207 => '𢡊',
+  64208 => '𢡄',
+  64209 => '�',
+  64210 => '�',
+  64211 => '䀘',
+  64212 => '䀹',
+  64213 => '𥉉',
+  64214 => '�',
+  64215 => '𧻓',
+  64216 => '齃',
+  64217 => '龎',
+  64256 => 'ff',
+  64257 => 'fi',
+  64258 => 'fl',
+  64259 => 'ffi',
+  64260 => 'ffl',
+  64261 => 'st',
+  64262 => 'st',
+  64275 => 'Õ´Õ¶',
+  64276 => 'Õ´Õ¥',
+  64277 => 'Õ´Õ«',
+  64278 => 'Õ¾Õ¶',
+  64279 => 'Õ´Õ­',
+  64285 => '×™Ö´',
+  64287 => 'ײַ',
+  64288 => '×¢',
+  64289 => '�',
+  64290 => 'ד',
+  64291 => '×”',
+  64292 => '×›',
+  64293 => 'ל',
+  64294 => '�',
+  64295 => 'ר',
+  64296 => 'ת',
+  64298 => 'ש�',
+  64299 => 'שׂ',
+  64300 => 'שּ�',
+  64301 => 'שּׂ',
+  64302 => '�ַ',
+  64303 => '�ָ',
+  64304 => '�ּ',
+  64305 => 'בּ',
+  64306 => '×’Ö¼',
+  64307 => 'דּ',
+  64308 => '×”Ö¼',
+  64309 => 'וּ',
+  64310 => '×–Ö¼',
+  64312 => 'טּ',
+  64313 => '×™Ö¼',
+  64314 => 'ךּ',
+  64315 => '×›Ö¼',
+  64316 => 'לּ',
+  64318 => 'מּ',
+  64320 => '× Ö¼',
+  64321 => 'סּ',
+  64323 => '×£Ö¼',
+  64324 => 'פּ',
+  64326 => 'צּ',
+  64327 => 'קּ',
+  64328 => 'רּ',
+  64329 => 'שּ',
+  64330 => 'תּ',
+  64331 => 'וֹ',
+  64332 => 'בֿ',
+  64333 => '×›Ö¿',
+  64334 => 'פֿ',
+  64335 => '�ל',
+  64336 => 'Ù±',
+  64337 => 'Ù±',
+  64338 => 'Ù»',
+  64339 => 'Ù»',
+  64340 => 'Ù»',
+  64341 => 'Ù»',
+  64342 => 'Ù¾',
+  64343 => 'Ù¾',
+  64344 => 'Ù¾',
+  64345 => 'Ù¾',
+  64346 => 'Ú€',
+  64347 => 'Ú€',
+  64348 => 'Ú€',
+  64349 => 'Ú€',
+  64350 => 'Ùº',
+  64351 => 'Ùº',
+  64352 => 'Ùº',
+  64353 => 'Ùº',
+  64354 => 'Ù¿',
+  64355 => 'Ù¿',
+  64356 => 'Ù¿',
+  64357 => 'Ù¿',
+  64358 => 'Ù¹',
+  64359 => 'Ù¹',
+  64360 => 'Ù¹',
+  64361 => 'Ù¹',
+  64362 => 'Ú¤',
+  64363 => 'Ú¤',
+  64364 => 'Ú¤',
+  64365 => 'Ú¤',
+  64366 => 'Ú¦',
+  64367 => 'Ú¦',
+  64368 => 'Ú¦',
+  64369 => 'Ú¦',
+  64370 => 'Ú„',
+  64371 => 'Ú„',
+  64372 => 'Ú„',
+  64373 => 'Ú„',
+  64374 => 'Úƒ',
+  64375 => 'Úƒ',
+  64376 => 'Úƒ',
+  64377 => 'Úƒ',
+  64378 => 'Ú†',
+  64379 => 'Ú†',
+  64380 => 'Ú†',
+  64381 => 'Ú†',
+  64382 => 'Ú‡',
+  64383 => 'Ú‡',
+  64384 => 'Ú‡',
+  64385 => 'Ú‡',
+  64386 => 'Ú�',
+  64387 => 'Ú�',
+  64388 => 'ڌ',
+  64389 => 'ڌ',
+  64390 => 'ÚŽ',
+  64391 => 'ÚŽ',
+  64392 => 'Úˆ',
+  64393 => 'Úˆ',
+  64394 => 'Ú˜',
+  64395 => 'Ú˜',
+  64396 => 'Ú‘',
+  64397 => 'Ú‘',
+  64398 => 'Ú©',
+  64399 => 'Ú©',
+  64400 => 'Ú©',
+  64401 => 'Ú©',
+  64402 => 'Ú¯',
+  64403 => 'Ú¯',
+  64404 => 'Ú¯',
+  64405 => 'Ú¯',
+  64406 => 'Ú³',
+  64407 => 'Ú³',
+  64408 => 'Ú³',
+  64409 => 'Ú³',
+  64410 => 'Ú±',
+  64411 => 'Ú±',
+  64412 => 'Ú±',
+  64413 => 'Ú±',
+  64414 => 'Úº',
+  64415 => 'Úº',
+  64416 => 'Ú»',
+  64417 => 'Ú»',
+  64418 => 'Ú»',
+  64419 => 'Ú»',
+  64420 => 'Û€',
+  64421 => 'Û€',
+  64422 => 'Û�',
+  64423 => 'Û�',
+  64424 => 'Û�',
+  64425 => 'Û�',
+  64426 => 'Ú¾',
+  64427 => 'Ú¾',
+  64428 => 'Ú¾',
+  64429 => 'Ú¾',
+  64430 => 'Û’',
+  64431 => 'Û’',
+  64432 => 'Û“',
+  64433 => 'Û“',
+  64467 => 'Ú­',
+  64468 => 'Ú­',
+  64469 => 'Ú­',
+  64470 => 'Ú­',
+  64471 => 'Û‡',
+  64472 => 'Û‡',
+  64473 => 'Û†',
+  64474 => 'Û†',
+  64475 => 'Ûˆ',
+  64476 => 'Ûˆ',
+  64477 => 'Û‡Ù´',
+  64478 => 'Û‹',
+  64479 => 'Û‹',
+  64480 => 'Û…',
+  64481 => 'Û…',
+  64482 => 'Û‰',
+  64483 => 'Û‰',
+  64484 => 'Û�',
+  64485 => 'Û�',
+  64486 => 'Û�',
+  64487 => 'Û�',
+  64488 => 'Ù‰',
+  64489 => 'Ù‰',
+  64490 => 'ئا',
+  64491 => 'ئا',
+  64492 => 'ئە',
+  64493 => 'ئە',
+  64494 => 'ئو',
+  64495 => 'ئو',
+  64496 => 'ئۇ',
+  64497 => 'ئۇ',
+  64498 => 'ئۆ',
+  64499 => 'ئۆ',
+  64500 => 'ئۈ',
+  64501 => 'ئۈ',
+  64502 => 'ئ�',
+  64503 => 'ئ�',
+  64504 => 'ئ�',
+  64505 => 'ئى',
+  64506 => 'ئى',
+  64507 => 'ئى',
+  64508 => 'ی',
+  64509 => 'ی',
+  64510 => 'ی',
+  64511 => 'ی',
+  64512 => 'ئج',
+  64513 => 'ئح',
+  64514 => 'ئم',
+  64515 => 'ئى',
+  64516 => 'ئي',
+  64517 => 'بج',
+  64518 => 'بح',
+  64519 => 'بخ',
+  64520 => 'بم',
+  64521 => 'بى',
+  64522 => 'بي',
+  64523 => 'تج',
+  64524 => 'تح',
+  64525 => 'تخ',
+  64526 => 'تم',
+  64527 => 'تى',
+  64528 => 'تي',
+  64529 => 'ثج',
+  64530 => 'ثم',
+  64531 => 'ثى',
+  64532 => 'ثي',
+  64533 => 'جح',
+  64534 => 'جم',
+  64535 => 'حج',
+  64536 => 'حم',
+  64537 => 'خج',
+  64538 => 'خح',
+  64539 => 'خم',
+  64540 => 'سج',
+  64541 => 'سح',
+  64542 => 'سخ',
+  64543 => 'سم',
+  64544 => 'صح',
+  64545 => 'صم',
+  64546 => 'ضج',
+  64547 => 'ضح',
+  64548 => 'ضخ',
+  64549 => 'ضم',
+  64550 => 'طح',
+  64551 => 'طم',
+  64552 => 'ظم',
+  64553 => 'عج',
+  64554 => 'عم',
+  64555 => 'غج',
+  64556 => 'غم',
+  64557 => '�ج',
+  64558 => '�ح',
+  64559 => '�خ',
+  64560 => '�م',
+  64561 => '�ى',
+  64562 => '�ي',
+  64563 => 'قح',
+  64564 => 'قم',
+  64565 => 'قى',
+  64566 => 'قي',
+  64567 => 'كا',
+  64568 => 'كج',
+  64569 => 'كح',
+  64570 => 'كخ',
+  64571 => 'كل',
+  64572 => 'كم',
+  64573 => 'كى',
+  64574 => 'كي',
+  64575 => 'لج',
+  64576 => 'لح',
+  64577 => 'لخ',
+  64578 => 'لم',
+  64579 => 'لى',
+  64580 => 'لي',
+  64581 => 'مج',
+  64582 => 'مح',
+  64583 => 'مخ',
+  64584 => 'مم',
+  64585 => 'مى',
+  64586 => 'مي',
+  64587 => 'نج',
+  64588 => 'نح',
+  64589 => 'نخ',
+  64590 => 'نم',
+  64591 => 'نى',
+  64592 => 'ني',
+  64593 => 'هج',
+  64594 => 'هم',
+  64595 => 'هى',
+  64596 => 'هي',
+  64597 => 'يج',
+  64598 => 'يح',
+  64599 => 'يخ',
+  64600 => 'يم',
+  64601 => 'يى',
+  64602 => 'يي',
+  64603 => 'ذٰ',
+  64604 => 'رٰ',
+  64605 => 'ىٰ',
+  64612 => 'ئر',
+  64613 => 'ئز',
+  64614 => 'ئم',
+  64615 => 'ئن',
+  64616 => 'ئى',
+  64617 => 'ئي',
+  64618 => 'بر',
+  64619 => 'بز',
+  64620 => 'بم',
+  64621 => 'بن',
+  64622 => 'بى',
+  64623 => 'بي',
+  64624 => 'تر',
+  64625 => 'تز',
+  64626 => 'تم',
+  64627 => 'تن',
+  64628 => 'تى',
+  64629 => 'تي',
+  64630 => 'ثر',
+  64631 => 'ثز',
+  64632 => 'ثم',
+  64633 => 'ثن',
+  64634 => 'ثى',
+  64635 => 'ثي',
+  64636 => '�ى',
+  64637 => '�ي',
+  64638 => 'قى',
+  64639 => 'قي',
+  64640 => 'كا',
+  64641 => 'كل',
+  64642 => 'كم',
+  64643 => 'كى',
+  64644 => 'كي',
+  64645 => 'لم',
+  64646 => 'لى',
+  64647 => 'لي',
+  64648 => 'ما',
+  64649 => 'مم',
+  64650 => 'نر',
+  64651 => 'نز',
+  64652 => 'نم',
+  64653 => 'نن',
+  64654 => 'نى',
+  64655 => 'ني',
+  64656 => 'ىٰ',
+  64657 => 'ير',
+  64658 => 'يز',
+  64659 => 'يم',
+  64660 => 'ين',
+  64661 => 'يى',
+  64662 => 'يي',
+  64663 => 'ئج',
+  64664 => 'ئح',
+  64665 => 'ئخ',
+  64666 => 'ئم',
+  64667 => 'ئه',
+  64668 => 'بج',
+  64669 => 'بح',
+  64670 => 'بخ',
+  64671 => 'بم',
+  64672 => 'به',
+  64673 => 'تج',
+  64674 => 'تح',
+  64675 => 'تخ',
+  64676 => 'تم',
+  64677 => 'ته',
+  64678 => 'ثم',
+  64679 => 'جح',
+  64680 => 'جم',
+  64681 => 'حج',
+  64682 => 'حم',
+  64683 => 'خج',
+  64684 => 'خم',
+  64685 => 'سج',
+  64686 => 'سح',
+  64687 => 'سخ',
+  64688 => 'سم',
+  64689 => 'صح',
+  64690 => 'صخ',
+  64691 => 'صم',
+  64692 => 'ضج',
+  64693 => 'ضح',
+  64694 => 'ضخ',
+  64695 => 'ضم',
+  64696 => 'طح',
+  64697 => 'ظم',
+  64698 => 'عج',
+  64699 => 'عم',
+  64700 => 'غج',
+  64701 => 'غم',
+  64702 => '�ج',
+  64703 => '�ح',
+  64704 => '�خ',
+  64705 => '�م',
+  64706 => 'قح',
+  64707 => 'قم',
+  64708 => 'كج',
+  64709 => 'كح',
+  64710 => 'كخ',
+  64711 => 'كل',
+  64712 => 'كم',
+  64713 => 'لج',
+  64714 => 'لح',
+  64715 => 'لخ',
+  64716 => 'لم',
+  64717 => 'له',
+  64718 => 'مج',
+  64719 => 'مح',
+  64720 => 'مخ',
+  64721 => 'مم',
+  64722 => 'نج',
+  64723 => 'نح',
+  64724 => 'نخ',
+  64725 => 'نم',
+  64726 => 'نه',
+  64727 => 'هج',
+  64728 => 'هم',
+  64729 => 'هٰ',
+  64730 => 'يج',
+  64731 => 'يح',
+  64732 => 'يخ',
+  64733 => 'يم',
+  64734 => 'يه',
+  64735 => 'ئم',
+  64736 => 'ئه',
+  64737 => 'بم',
+  64738 => 'به',
+  64739 => 'تم',
+  64740 => 'ته',
+  64741 => 'ثم',
+  64742 => 'ثه',
+  64743 => 'سم',
+  64744 => 'سه',
+  64745 => 'شم',
+  64746 => 'شه',
+  64747 => 'كل',
+  64748 => 'كم',
+  64749 => 'لم',
+  64750 => 'نم',
+  64751 => 'نه',
+  64752 => 'يم',
+  64753 => 'يه',
+  64754 => 'Ù€ÙŽÙ‘',
+  64755 => 'ـ�ّ',
+  64756 => 'ـ�ّ',
+  64757 => 'طى',
+  64758 => 'طي',
+  64759 => 'عى',
+  64760 => 'عي',
+  64761 => 'غى',
+  64762 => 'غي',
+  64763 => 'سى',
+  64764 => 'سي',
+  64765 => 'شى',
+  64766 => 'شي',
+  64767 => 'حى',
+  64768 => 'حي',
+  64769 => 'جى',
+  64770 => 'جي',
+  64771 => 'خى',
+  64772 => 'خي',
+  64773 => 'صى',
+  64774 => 'صي',
+  64775 => 'ضى',
+  64776 => 'ضي',
+  64777 => 'شج',
+  64778 => 'شح',
+  64779 => 'شخ',
+  64780 => 'شم',
+  64781 => 'شر',
+  64782 => 'سر',
+  64783 => 'صر',
+  64784 => 'ضر',
+  64785 => 'طى',
+  64786 => 'طي',
+  64787 => 'عى',
+  64788 => 'عي',
+  64789 => 'غى',
+  64790 => 'غي',
+  64791 => 'سى',
+  64792 => 'سي',
+  64793 => 'شى',
+  64794 => 'شي',
+  64795 => 'حى',
+  64796 => 'حي',
+  64797 => 'جى',
+  64798 => 'جي',
+  64799 => 'خى',
+  64800 => 'خي',
+  64801 => 'صى',
+  64802 => 'صي',
+  64803 => 'ضى',
+  64804 => 'ضي',
+  64805 => 'شج',
+  64806 => 'شح',
+  64807 => 'شخ',
+  64808 => 'شم',
+  64809 => 'شر',
+  64810 => 'سر',
+  64811 => 'صر',
+  64812 => 'ضر',
+  64813 => 'شج',
+  64814 => 'شح',
+  64815 => 'شخ',
+  64816 => 'شم',
+  64817 => 'سه',
+  64818 => 'شه',
+  64819 => 'طم',
+  64820 => 'سج',
+  64821 => 'سح',
+  64822 => 'سخ',
+  64823 => 'شج',
+  64824 => 'شح',
+  64825 => 'شخ',
+  64826 => 'طم',
+  64827 => 'ظم',
+  64828 => 'اً',
+  64829 => 'اً',
+  64848 => 'تجم',
+  64849 => 'تحج',
+  64850 => 'تحج',
+  64851 => 'تحم',
+  64852 => 'تخم',
+  64853 => 'تمج',
+  64854 => 'تمح',
+  64855 => 'تمخ',
+  64856 => 'جمح',
+  64857 => 'جمح',
+  64858 => 'حمي',
+  64859 => 'حمى',
+  64860 => 'سحج',
+  64861 => 'سجح',
+  64862 => 'سجى',
+  64863 => 'سمح',
+  64864 => 'سمح',
+  64865 => 'سمج',
+  64866 => 'سمم',
+  64867 => 'سمم',
+  64868 => 'صحح',
+  64869 => 'صحح',
+  64870 => 'صمم',
+  64871 => 'شحم',
+  64872 => 'شحم',
+  64873 => 'شجي',
+  64874 => 'شمخ',
+  64875 => 'شمخ',
+  64876 => 'شمم',
+  64877 => 'شمم',
+  64878 => 'ضحى',
+  64879 => 'ضخم',
+  64880 => 'ضخم',
+  64881 => 'طمح',
+  64882 => 'طمح',
+  64883 => 'طمم',
+  64884 => 'طمي',
+  64885 => 'عجم',
+  64886 => 'عمم',
+  64887 => 'عمم',
+  64888 => 'عمى',
+  64889 => 'غمم',
+  64890 => 'غمي',
+  64891 => 'غمى',
+  64892 => '�خم',
+  64893 => '�خم',
+  64894 => 'قمح',
+  64895 => 'قمم',
+  64896 => 'لحم',
+  64897 => 'لحي',
+  64898 => 'لحى',
+  64899 => 'لجج',
+  64900 => 'لجج',
+  64901 => 'لخم',
+  64902 => 'لخم',
+  64903 => 'لمح',
+  64904 => 'لمح',
+  64905 => 'محج',
+  64906 => 'محم',
+  64907 => 'محي',
+  64908 => 'مجح',
+  64909 => 'مجم',
+  64910 => 'مخج',
+  64911 => 'مخم',
+  64914 => 'مجخ',
+  64915 => 'همج',
+  64916 => 'همم',
+  64917 => 'نحم',
+  64918 => 'نحى',
+  64919 => 'نجم',
+  64920 => 'نجم',
+  64921 => 'نجى',
+  64922 => 'نمي',
+  64923 => 'نمى',
+  64924 => 'يمم',
+  64925 => 'يمم',
+  64926 => 'بخي',
+  64927 => 'تجي',
+  64928 => 'تجى',
+  64929 => 'تخي',
+  64930 => 'تخى',
+  64931 => 'تمي',
+  64932 => 'تمى',
+  64933 => 'جمي',
+  64934 => 'جحى',
+  64935 => 'جمى',
+  64936 => 'سخى',
+  64937 => 'صحي',
+  64938 => 'شحي',
+  64939 => 'ضحي',
+  64940 => 'لجي',
+  64941 => 'لمي',
+  64942 => 'يحي',
+  64943 => 'يجي',
+  64944 => 'يمي',
+  64945 => 'ممي',
+  64946 => 'قمي',
+  64947 => 'نحي',
+  64948 => 'قمح',
+  64949 => 'لحم',
+  64950 => 'عمي',
+  64951 => 'كمي',
+  64952 => 'نجح',
+  64953 => 'مخي',
+  64954 => 'لجم',
+  64955 => 'كمم',
+  64956 => 'لجم',
+  64957 => 'نجح',
+  64958 => 'جحي',
+  64959 => 'حجي',
+  64960 => 'مجي',
+  64961 => '�مي',
+  64962 => 'بحي',
+  64963 => 'كمم',
+  64964 => 'عجم',
+  64965 => 'صمم',
+  64966 => 'سخي',
+  64967 => 'نجي',
+  65008 => 'صلے',
+  65009 => 'قلے',
+  65010 => 'الله',
+  65011 => 'اكبر',
+  65012 => 'محمد',
+  65013 => 'صلعم',
+  65014 => 'رسول',
+  65015 => 'عليه',
+  65016 => 'وسلم',
+  65017 => 'صلى',
+  65020 => 'ریال',
+  65041 => '�',
+  65047 => '〖',
+  65048 => '〗',
+  65073 => '—',
+  65074 => '–',
+  65081 => '〔',
+  65082 => '〕',
+  65083 => '�',
+  65084 => '】',
+  65085 => '《',
+  65086 => '》',
+  65087 => '〈',
+  65088 => '〉',
+  65089 => '「',
+  65090 => '�',
+  65091 => '『',
+  65092 => '�',
+  65105 => '�',
+  65112 => '—',
+  65117 => '〔',
+  65118 => '〕',
+  65123 => '-',
+  65137 => 'ـً',
+  65143 => 'Ù€ÙŽ',
+  65145 => 'ـ�',
+  65147 => 'ـ�',
+  65149 => 'ـّ',
+  65151 => 'ـْ',
+  65152 => 'Ø¡',
+  65153 => 'Ø¢',
+  65154 => 'Ø¢',
+  65155 => 'Ø£',
+  65156 => 'Ø£',
+  65157 => 'ؤ',
+  65158 => 'ؤ',
+  65159 => 'Ø¥',
+  65160 => 'Ø¥',
+  65161 => 'ئ',
+  65162 => 'ئ',
+  65163 => 'ئ',
+  65164 => 'ئ',
+  65165 => 'ا',
+  65166 => 'ا',
+  65167 => 'ب',
+  65168 => 'ب',
+  65169 => 'ب',
+  65170 => 'ب',
+  65171 => 'Ø©',
+  65172 => 'Ø©',
+  65173 => 'ت',
+  65174 => 'ت',
+  65175 => 'ت',
+  65176 => 'ت',
+  65177 => 'Ø«',
+  65178 => 'Ø«',
+  65179 => 'Ø«',
+  65180 => 'Ø«',
+  65181 => 'ج',
+  65182 => 'ج',
+  65183 => 'ج',
+  65184 => 'ج',
+  65185 => 'Ø­',
+  65186 => 'Ø­',
+  65187 => 'Ø­',
+  65188 => 'Ø­',
+  65189 => 'Ø®',
+  65190 => 'Ø®',
+  65191 => 'Ø®',
+  65192 => 'Ø®',
+  65193 => 'د',
+  65194 => 'د',
+  65195 => 'Ø°',
+  65196 => 'Ø°',
+  65197 => 'ر',
+  65198 => 'ر',
+  65199 => 'ز',
+  65200 => 'ز',
+  65201 => 'س',
+  65202 => 'س',
+  65203 => 'س',
+  65204 => 'س',
+  65205 => 'Ø´',
+  65206 => 'Ø´',
+  65207 => 'Ø´',
+  65208 => 'Ø´',
+  65209 => 'ص',
+  65210 => 'ص',
+  65211 => 'ص',
+  65212 => 'ص',
+  65213 => 'ض',
+  65214 => 'ض',
+  65215 => 'ض',
+  65216 => 'ض',
+  65217 => 'Ø·',
+  65218 => 'Ø·',
+  65219 => 'Ø·',
+  65220 => 'Ø·',
+  65221 => 'ظ',
+  65222 => 'ظ',
+  65223 => 'ظ',
+  65224 => 'ظ',
+  65225 => 'ع',
+  65226 => 'ع',
+  65227 => 'ع',
+  65228 => 'ع',
+  65229 => 'غ',
+  65230 => 'غ',
+  65231 => 'غ',
+  65232 => 'غ',
+  65233 => 'Ù�',
+  65234 => 'Ù�',
+  65235 => 'Ù�',
+  65236 => 'Ù�',
+  65237 => 'Ù‚',
+  65238 => 'Ù‚',
+  65239 => 'Ù‚',
+  65240 => 'Ù‚',
+  65241 => 'Ùƒ',
+  65242 => 'Ùƒ',
+  65243 => 'Ùƒ',
+  65244 => 'Ùƒ',
+  65245 => 'Ù„',
+  65246 => 'Ù„',
+  65247 => 'Ù„',
+  65248 => 'Ù„',
+  65249 => 'Ù…',
+  65250 => 'Ù…',
+  65251 => 'Ù…',
+  65252 => 'Ù…',
+  65253 => 'Ù†',
+  65254 => 'Ù†',
+  65255 => 'Ù†',
+  65256 => 'Ù†',
+  65257 => 'Ù‡',
+  65258 => 'Ù‡',
+  65259 => 'Ù‡',
+  65260 => 'Ù‡',
+  65261 => 'Ùˆ',
+  65262 => 'Ùˆ',
+  65263 => 'Ù‰',
+  65264 => 'Ù‰',
+  65265 => 'ÙŠ',
+  65266 => 'ÙŠ',
+  65267 => 'ÙŠ',
+  65268 => 'ÙŠ',
+  65269 => 'لآ',
+  65270 => 'لآ',
+  65271 => 'لأ',
+  65272 => 'لأ',
+  65273 => 'لإ',
+  65274 => 'لإ',
+  65275 => 'لا',
+  65276 => 'لا',
+  65293 => '-',
+  65294 => '.',
+  65296 => '0',
+  65297 => '1',
+  65298 => '2',
+  65299 => '3',
+  65300 => '4',
+  65301 => '5',
+  65302 => '6',
+  65303 => '7',
+  65304 => '8',
+  65305 => '9',
+  65313 => 'a',
+  65314 => 'b',
+  65315 => 'c',
+  65316 => 'd',
+  65317 => 'e',
+  65318 => 'f',
+  65319 => 'g',
+  65320 => 'h',
+  65321 => 'i',
+  65322 => 'j',
+  65323 => 'k',
+  65324 => 'l',
+  65325 => 'm',
+  65326 => 'n',
+  65327 => 'o',
+  65328 => 'p',
+  65329 => 'q',
+  65330 => 'r',
+  65331 => 's',
+  65332 => 't',
+  65333 => 'u',
+  65334 => 'v',
+  65335 => 'w',
+  65336 => 'x',
+  65337 => 'y',
+  65338 => 'z',
+  65345 => 'a',
+  65346 => 'b',
+  65347 => 'c',
+  65348 => 'd',
+  65349 => 'e',
+  65350 => 'f',
+  65351 => 'g',
+  65352 => 'h',
+  65353 => 'i',
+  65354 => 'j',
+  65355 => 'k',
+  65356 => 'l',
+  65357 => 'm',
+  65358 => 'n',
+  65359 => 'o',
+  65360 => 'p',
+  65361 => 'q',
+  65362 => 'r',
+  65363 => 's',
+  65364 => 't',
+  65365 => 'u',
+  65366 => 'v',
+  65367 => 'w',
+  65368 => 'x',
+  65369 => 'y',
+  65370 => 'z',
+  65375 => '⦅',
+  65376 => '⦆',
+  65377 => '.',
+  65378 => '「',
+  65379 => '�',
+  65380 => '�',
+  65381 => '・',
+  65382 => 'ヲ',
+  65383 => 'ã‚¡',
+  65384 => 'ã‚£',
+  65385 => 'ã‚¥',
+  65386 => 'ェ',
+  65387 => 'ã‚©',
+  65388 => 'ャ',
+  65389 => 'ュ',
+  65390 => 'ョ',
+  65391 => 'ッ',
+  65392 => 'ー',
+  65393 => 'ã‚¢',
+  65394 => 'イ',
+  65395 => 'ウ',
+  65396 => 'エ',
+  65397 => 'オ',
+  65398 => 'ã‚«',
+  65399 => 'ã‚­',
+  65400 => 'ク',
+  65401 => 'ケ',
+  65402 => 'コ',
+  65403 => 'サ',
+  65404 => 'ã‚·',
+  65405 => 'ス',
+  65406 => 'ã‚»',
+  65407 => 'ソ',
+  65408 => 'ã‚¿',
+  65409 => '�',
+  65410 => 'ツ',
+  65411 => 'テ',
+  65412 => 'ト',
+  65413 => 'ナ',
+  65414 => 'ニ',
+  65415 => 'ヌ',
+  65416 => '�',
+  65417 => 'ノ',
+  65418 => '�',
+  65419 => 'ヒ',
+  65420 => 'フ',
+  65421 => 'ヘ',
+  65422 => 'ホ',
+  65423 => 'マ',
+  65424 => 'ミ',
+  65425 => 'ム',
+  65426 => 'メ',
+  65427 => 'モ',
+  65428 => 'ヤ',
+  65429 => 'ユ',
+  65430 => 'ヨ',
+  65431 => 'ラ',
+  65432 => 'リ',
+  65433 => 'ル',
+  65434 => 'レ',
+  65435 => 'ロ',
+  65436 => 'ワ',
+  65437 => 'ン',
+  65438 => 'ã‚™',
+  65439 => 'ã‚š',
+  65441 => 'á„€',
+  65442 => '�',
+  65443 => 'ᆪ',
+  65444 => 'á„‚',
+  65445 => 'ᆬ',
+  65446 => 'ᆭ',
+  65447 => 'ᄃ',
+  65448 => 'á„„',
+  65449 => 'á„…',
+  65450 => 'ᆰ',
+  65451 => 'ᆱ',
+  65452 => 'ᆲ',
+  65453 => 'ᆳ',
+  65454 => 'ᆴ',
+  65455 => 'ᆵ',
+  65456 => 'á„š',
+  65457 => 'ᄆ',
+  65458 => 'ᄇ',
+  65459 => 'ᄈ',
+  65460 => 'á„¡',
+  65461 => 'ᄉ',
+  65462 => 'á„Š',
+  65463 => 'á„‹',
+  65464 => 'ᄌ',
+  65465 => '�',
+  65466 => 'á„Ž',
+  65467 => '�',
+  65468 => '�',
+  65469 => 'á„‘',
+  65470 => 'á„’',
+  65474 => 'á…¡',
+  65475 => 'á…¢',
+  65476 => 'á…£',
+  65477 => 'á…¤',
+  65478 => 'á…¥',
+  65479 => 'á…¦',
+  65482 => 'á…§',
+  65483 => 'á…¨',
+  65484 => 'á…©',
+  65485 => 'á…ª',
+  65486 => 'á…«',
+  65487 => 'á…¬',
+  65490 => 'á…­',
+  65491 => 'á…®',
+  65492 => 'á…¯',
+  65493 => 'á…°',
+  65494 => 'á…±',
+  65495 => 'á…²',
+  65498 => 'á…³',
+  65499 => 'á…´',
+  65500 => 'á…µ',
+  65504 => '¢',
+  65505 => '£',
+  65506 => '¬',
+  65508 => '¦',
+  65509 => 'Â¥',
+  65510 => 'â‚©',
+  65512 => '│',
+  65513 => '�',
+  65514 => '↑',
+  65515 => '→',
+  65516 => '↓',
+  65517 => 'â– ',
+  65518 => 'â—‹',
+  66560 => '�',
+  66561 => '�',
+  66562 => '�',
+  66563 => '�',
+  66564 => '�',
+  66565 => '�',
+  66566 => '�',
+  66567 => '�',
+  66568 => '�',
+  66569 => '�',
+  66570 => '�',
+  66571 => '�',
+  66572 => '�',
+  66573 => '�',
+  66574 => '�',
+  66575 => '�',
+  66576 => '�',
+  66577 => '�',
+  66578 => '�',
+  66579 => '�',
+  66580 => '�',
+  66581 => '�',
+  66582 => '�',
+  66583 => '�',
+  66584 => '�',
+  66585 => '�',
+  66586 => '�',
+  66587 => '�',
+  66588 => '�',
+  66589 => '�',
+  66590 => '�',
+  66591 => '�',
+  66592 => '�',
+  66593 => '�',
+  66594 => '�',
+  66595 => '�',
+  66596 => '�',
+  66597 => '�',
+  66598 => '�',
+  66599 => '�',
+  66736 => '�',
+  66737 => '�',
+  66738 => '�',
+  66739 => '�',
+  66740 => '�',
+  66741 => '�',
+  66742 => '�',
+  66743 => '�',
+  66744 => '�',
+  66745 => '�',
+  66746 => '�',
+  66747 => '�',
+  66748 => '�',
+  66749 => '�',
+  66750 => '�',
+  66751 => '�',
+  66752 => '�',
+  66753 => '�',
+  66754 => '�',
+  66755 => '�',
+  66756 => '�',
+  66757 => '�',
+  66758 => '�',
+  66759 => '�',
+  66760 => '�',
+  66761 => '�',
+  66762 => '�',
+  66763 => '�',
+  66764 => '�',
+  66765 => '�',
+  66766 => '�',
+  66767 => '�',
+  66768 => '�',
+  66769 => '�',
+  66770 => '�',
+  66771 => '�',
+  68736 => '�',
+  68737 => '�',
+  68738 => '�',
+  68739 => '�',
+  68740 => '�',
+  68741 => '�',
+  68742 => '�',
+  68743 => '�',
+  68744 => '�',
+  68745 => '�',
+  68746 => '�',
+  68747 => '�',
+  68748 => '�',
+  68749 => '�',
+  68750 => '�',
+  68751 => '�',
+  68752 => '�',
+  68753 => '�',
+  68754 => '�',
+  68755 => '�',
+  68756 => '�',
+  68757 => '�',
+  68758 => '�',
+  68759 => '�',
+  68760 => '�',
+  68761 => '�',
+  68762 => '�',
+  68763 => '�',
+  68764 => '�',
+  68765 => '�',
+  68766 => '�',
+  68767 => '�',
+  68768 => '�',
+  68769 => '�',
+  68770 => '�',
+  68771 => '�',
+  68772 => '�',
+  68773 => '�',
+  68774 => '�',
+  68775 => '�',
+  68776 => '�',
+  68777 => '�',
+  68778 => '�',
+  68779 => '�',
+  68780 => '�',
+  68781 => '�',
+  68782 => '�',
+  68783 => '�',
+  68784 => '�',
+  68785 => '�',
+  68786 => '�',
+  71840 => 'ð‘£€',
+  71841 => '�',
+  71842 => '𑣂',
+  71843 => '𑣃',
+  71844 => '𑣄',
+  71845 => 'ð‘£…',
+  71846 => '𑣆',
+  71847 => '𑣇',
+  71848 => '𑣈',
+  71849 => '𑣉',
+  71850 => '𑣊',
+  71851 => '𑣋',
+  71852 => '𑣌',
+  71853 => '�',
+  71854 => '𑣎',
+  71855 => '�',
+  71856 => '�',
+  71857 => '𑣑',
+  71858 => 'ð‘£’',
+  71859 => '𑣓',
+  71860 => 'ð‘£”',
+  71861 => '𑣕',
+  71862 => 'ð‘£–',
+  71863 => 'ð‘£—',
+  71864 => '𑣘',
+  71865 => 'ð‘£™',
+  71866 => '𑣚',
+  71867 => 'ð‘£›',
+  71868 => '𑣜',
+  71869 => '�',
+  71870 => '𑣞',
+  71871 => '𑣟',
+  93760 => 'ð–¹ ',
+  93761 => '𖹡',
+  93762 => 'ð–¹¢',
+  93763 => 'ð–¹£',
+  93764 => '𖹤',
+  93765 => 'ð–¹¥',
+  93766 => '𖹦',
+  93767 => '𖹧',
+  93768 => '𖹨',
+  93769 => '𖹩',
+  93770 => '𖹪',
+  93771 => '𖹫',
+  93772 => '𖹬',
+  93773 => 'ð–¹­',
+  93774 => 'ð–¹®',
+  93775 => '𖹯',
+  93776 => 'ð–¹°',
+  93777 => 'ð–¹±',
+  93778 => 'ð–¹²',
+  93779 => 'ð–¹³',
+  93780 => 'ð–¹´',
+  93781 => 'ð–¹µ',
+  93782 => '𖹶',
+  93783 => 'ð–¹·',
+  93784 => '𖹸',
+  93785 => 'ð–¹¹',
+  93786 => '𖹺',
+  93787 => 'ð–¹»',
+  93788 => 'ð–¹¼',
+  93789 => 'ð–¹½',
+  93790 => 'ð–¹¾',
+  93791 => '𖹿',
+  119134 => '��',
+  119135 => '��',
+  119136 => '���',
+  119137 => '���',
+  119138 => '���',
+  119139 => '���',
+  119140 => '���',
+  119227 => '��',
+  119228 => '��',
+  119229 => '���',
+  119230 => '���',
+  119231 => '���',
+  119232 => '���',
+  119808 => 'a',
+  119809 => 'b',
+  119810 => 'c',
+  119811 => 'd',
+  119812 => 'e',
+  119813 => 'f',
+  119814 => 'g',
+  119815 => 'h',
+  119816 => 'i',
+  119817 => 'j',
+  119818 => 'k',
+  119819 => 'l',
+  119820 => 'm',
+  119821 => 'n',
+  119822 => 'o',
+  119823 => 'p',
+  119824 => 'q',
+  119825 => 'r',
+  119826 => 's',
+  119827 => 't',
+  119828 => 'u',
+  119829 => 'v',
+  119830 => 'w',
+  119831 => 'x',
+  119832 => 'y',
+  119833 => 'z',
+  119834 => 'a',
+  119835 => 'b',
+  119836 => 'c',
+  119837 => 'd',
+  119838 => 'e',
+  119839 => 'f',
+  119840 => 'g',
+  119841 => 'h',
+  119842 => 'i',
+  119843 => 'j',
+  119844 => 'k',
+  119845 => 'l',
+  119846 => 'm',
+  119847 => 'n',
+  119848 => 'o',
+  119849 => 'p',
+  119850 => 'q',
+  119851 => 'r',
+  119852 => 's',
+  119853 => 't',
+  119854 => 'u',
+  119855 => 'v',
+  119856 => 'w',
+  119857 => 'x',
+  119858 => 'y',
+  119859 => 'z',
+  119860 => 'a',
+  119861 => 'b',
+  119862 => 'c',
+  119863 => 'd',
+  119864 => 'e',
+  119865 => 'f',
+  119866 => 'g',
+  119867 => 'h',
+  119868 => 'i',
+  119869 => 'j',
+  119870 => 'k',
+  119871 => 'l',
+  119872 => 'm',
+  119873 => 'n',
+  119874 => 'o',
+  119875 => 'p',
+  119876 => 'q',
+  119877 => 'r',
+  119878 => 's',
+  119879 => 't',
+  119880 => 'u',
+  119881 => 'v',
+  119882 => 'w',
+  119883 => 'x',
+  119884 => 'y',
+  119885 => 'z',
+  119886 => 'a',
+  119887 => 'b',
+  119888 => 'c',
+  119889 => 'd',
+  119890 => 'e',
+  119891 => 'f',
+  119892 => 'g',
+  119894 => 'i',
+  119895 => 'j',
+  119896 => 'k',
+  119897 => 'l',
+  119898 => 'm',
+  119899 => 'n',
+  119900 => 'o',
+  119901 => 'p',
+  119902 => 'q',
+  119903 => 'r',
+  119904 => 's',
+  119905 => 't',
+  119906 => 'u',
+  119907 => 'v',
+  119908 => 'w',
+  119909 => 'x',
+  119910 => 'y',
+  119911 => 'z',
+  119912 => 'a',
+  119913 => 'b',
+  119914 => 'c',
+  119915 => 'd',
+  119916 => 'e',
+  119917 => 'f',
+  119918 => 'g',
+  119919 => 'h',
+  119920 => 'i',
+  119921 => 'j',
+  119922 => 'k',
+  119923 => 'l',
+  119924 => 'm',
+  119925 => 'n',
+  119926 => 'o',
+  119927 => 'p',
+  119928 => 'q',
+  119929 => 'r',
+  119930 => 's',
+  119931 => 't',
+  119932 => 'u',
+  119933 => 'v',
+  119934 => 'w',
+  119935 => 'x',
+  119936 => 'y',
+  119937 => 'z',
+  119938 => 'a',
+  119939 => 'b',
+  119940 => 'c',
+  119941 => 'd',
+  119942 => 'e',
+  119943 => 'f',
+  119944 => 'g',
+  119945 => 'h',
+  119946 => 'i',
+  119947 => 'j',
+  119948 => 'k',
+  119949 => 'l',
+  119950 => 'm',
+  119951 => 'n',
+  119952 => 'o',
+  119953 => 'p',
+  119954 => 'q',
+  119955 => 'r',
+  119956 => 's',
+  119957 => 't',
+  119958 => 'u',
+  119959 => 'v',
+  119960 => 'w',
+  119961 => 'x',
+  119962 => 'y',
+  119963 => 'z',
+  119964 => 'a',
+  119966 => 'c',
+  119967 => 'd',
+  119970 => 'g',
+  119973 => 'j',
+  119974 => 'k',
+  119977 => 'n',
+  119978 => 'o',
+  119979 => 'p',
+  119980 => 'q',
+  119982 => 's',
+  119983 => 't',
+  119984 => 'u',
+  119985 => 'v',
+  119986 => 'w',
+  119987 => 'x',
+  119988 => 'y',
+  119989 => 'z',
+  119990 => 'a',
+  119991 => 'b',
+  119992 => 'c',
+  119993 => 'd',
+  119995 => 'f',
+  119997 => 'h',
+  119998 => 'i',
+  119999 => 'j',
+  120000 => 'k',
+  120001 => 'l',
+  120002 => 'm',
+  120003 => 'n',
+  120005 => 'p',
+  120006 => 'q',
+  120007 => 'r',
+  120008 => 's',
+  120009 => 't',
+  120010 => 'u',
+  120011 => 'v',
+  120012 => 'w',
+  120013 => 'x',
+  120014 => 'y',
+  120015 => 'z',
+  120016 => 'a',
+  120017 => 'b',
+  120018 => 'c',
+  120019 => 'd',
+  120020 => 'e',
+  120021 => 'f',
+  120022 => 'g',
+  120023 => 'h',
+  120024 => 'i',
+  120025 => 'j',
+  120026 => 'k',
+  120027 => 'l',
+  120028 => 'm',
+  120029 => 'n',
+  120030 => 'o',
+  120031 => 'p',
+  120032 => 'q',
+  120033 => 'r',
+  120034 => 's',
+  120035 => 't',
+  120036 => 'u',
+  120037 => 'v',
+  120038 => 'w',
+  120039 => 'x',
+  120040 => 'y',
+  120041 => 'z',
+  120042 => 'a',
+  120043 => 'b',
+  120044 => 'c',
+  120045 => 'd',
+  120046 => 'e',
+  120047 => 'f',
+  120048 => 'g',
+  120049 => 'h',
+  120050 => 'i',
+  120051 => 'j',
+  120052 => 'k',
+  120053 => 'l',
+  120054 => 'm',
+  120055 => 'n',
+  120056 => 'o',
+  120057 => 'p',
+  120058 => 'q',
+  120059 => 'r',
+  120060 => 's',
+  120061 => 't',
+  120062 => 'u',
+  120063 => 'v',
+  120064 => 'w',
+  120065 => 'x',
+  120066 => 'y',
+  120067 => 'z',
+  120068 => 'a',
+  120069 => 'b',
+  120071 => 'd',
+  120072 => 'e',
+  120073 => 'f',
+  120074 => 'g',
+  120077 => 'j',
+  120078 => 'k',
+  120079 => 'l',
+  120080 => 'm',
+  120081 => 'n',
+  120082 => 'o',
+  120083 => 'p',
+  120084 => 'q',
+  120086 => 's',
+  120087 => 't',
+  120088 => 'u',
+  120089 => 'v',
+  120090 => 'w',
+  120091 => 'x',
+  120092 => 'y',
+  120094 => 'a',
+  120095 => 'b',
+  120096 => 'c',
+  120097 => 'd',
+  120098 => 'e',
+  120099 => 'f',
+  120100 => 'g',
+  120101 => 'h',
+  120102 => 'i',
+  120103 => 'j',
+  120104 => 'k',
+  120105 => 'l',
+  120106 => 'm',
+  120107 => 'n',
+  120108 => 'o',
+  120109 => 'p',
+  120110 => 'q',
+  120111 => 'r',
+  120112 => 's',
+  120113 => 't',
+  120114 => 'u',
+  120115 => 'v',
+  120116 => 'w',
+  120117 => 'x',
+  120118 => 'y',
+  120119 => 'z',
+  120120 => 'a',
+  120121 => 'b',
+  120123 => 'd',
+  120124 => 'e',
+  120125 => 'f',
+  120126 => 'g',
+  120128 => 'i',
+  120129 => 'j',
+  120130 => 'k',
+  120131 => 'l',
+  120132 => 'm',
+  120134 => 'o',
+  120138 => 's',
+  120139 => 't',
+  120140 => 'u',
+  120141 => 'v',
+  120142 => 'w',
+  120143 => 'x',
+  120144 => 'y',
+  120146 => 'a',
+  120147 => 'b',
+  120148 => 'c',
+  120149 => 'd',
+  120150 => 'e',
+  120151 => 'f',
+  120152 => 'g',
+  120153 => 'h',
+  120154 => 'i',
+  120155 => 'j',
+  120156 => 'k',
+  120157 => 'l',
+  120158 => 'm',
+  120159 => 'n',
+  120160 => 'o',
+  120161 => 'p',
+  120162 => 'q',
+  120163 => 'r',
+  120164 => 's',
+  120165 => 't',
+  120166 => 'u',
+  120167 => 'v',
+  120168 => 'w',
+  120169 => 'x',
+  120170 => 'y',
+  120171 => 'z',
+  120172 => 'a',
+  120173 => 'b',
+  120174 => 'c',
+  120175 => 'd',
+  120176 => 'e',
+  120177 => 'f',
+  120178 => 'g',
+  120179 => 'h',
+  120180 => 'i',
+  120181 => 'j',
+  120182 => 'k',
+  120183 => 'l',
+  120184 => 'm',
+  120185 => 'n',
+  120186 => 'o',
+  120187 => 'p',
+  120188 => 'q',
+  120189 => 'r',
+  120190 => 's',
+  120191 => 't',
+  120192 => 'u',
+  120193 => 'v',
+  120194 => 'w',
+  120195 => 'x',
+  120196 => 'y',
+  120197 => 'z',
+  120198 => 'a',
+  120199 => 'b',
+  120200 => 'c',
+  120201 => 'd',
+  120202 => 'e',
+  120203 => 'f',
+  120204 => 'g',
+  120205 => 'h',
+  120206 => 'i',
+  120207 => 'j',
+  120208 => 'k',
+  120209 => 'l',
+  120210 => 'm',
+  120211 => 'n',
+  120212 => 'o',
+  120213 => 'p',
+  120214 => 'q',
+  120215 => 'r',
+  120216 => 's',
+  120217 => 't',
+  120218 => 'u',
+  120219 => 'v',
+  120220 => 'w',
+  120221 => 'x',
+  120222 => 'y',
+  120223 => 'z',
+  120224 => 'a',
+  120225 => 'b',
+  120226 => 'c',
+  120227 => 'd',
+  120228 => 'e',
+  120229 => 'f',
+  120230 => 'g',
+  120231 => 'h',
+  120232 => 'i',
+  120233 => 'j',
+  120234 => 'k',
+  120235 => 'l',
+  120236 => 'm',
+  120237 => 'n',
+  120238 => 'o',
+  120239 => 'p',
+  120240 => 'q',
+  120241 => 'r',
+  120242 => 's',
+  120243 => 't',
+  120244 => 'u',
+  120245 => 'v',
+  120246 => 'w',
+  120247 => 'x',
+  120248 => 'y',
+  120249 => 'z',
+  120250 => 'a',
+  120251 => 'b',
+  120252 => 'c',
+  120253 => 'd',
+  120254 => 'e',
+  120255 => 'f',
+  120256 => 'g',
+  120257 => 'h',
+  120258 => 'i',
+  120259 => 'j',
+  120260 => 'k',
+  120261 => 'l',
+  120262 => 'm',
+  120263 => 'n',
+  120264 => 'o',
+  120265 => 'p',
+  120266 => 'q',
+  120267 => 'r',
+  120268 => 's',
+  120269 => 't',
+  120270 => 'u',
+  120271 => 'v',
+  120272 => 'w',
+  120273 => 'x',
+  120274 => 'y',
+  120275 => 'z',
+  120276 => 'a',
+  120277 => 'b',
+  120278 => 'c',
+  120279 => 'd',
+  120280 => 'e',
+  120281 => 'f',
+  120282 => 'g',
+  120283 => 'h',
+  120284 => 'i',
+  120285 => 'j',
+  120286 => 'k',
+  120287 => 'l',
+  120288 => 'm',
+  120289 => 'n',
+  120290 => 'o',
+  120291 => 'p',
+  120292 => 'q',
+  120293 => 'r',
+  120294 => 's',
+  120295 => 't',
+  120296 => 'u',
+  120297 => 'v',
+  120298 => 'w',
+  120299 => 'x',
+  120300 => 'y',
+  120301 => 'z',
+  120302 => 'a',
+  120303 => 'b',
+  120304 => 'c',
+  120305 => 'd',
+  120306 => 'e',
+  120307 => 'f',
+  120308 => 'g',
+  120309 => 'h',
+  120310 => 'i',
+  120311 => 'j',
+  120312 => 'k',
+  120313 => 'l',
+  120314 => 'm',
+  120315 => 'n',
+  120316 => 'o',
+  120317 => 'p',
+  120318 => 'q',
+  120319 => 'r',
+  120320 => 's',
+  120321 => 't',
+  120322 => 'u',
+  120323 => 'v',
+  120324 => 'w',
+  120325 => 'x',
+  120326 => 'y',
+  120327 => 'z',
+  120328 => 'a',
+  120329 => 'b',
+  120330 => 'c',
+  120331 => 'd',
+  120332 => 'e',
+  120333 => 'f',
+  120334 => 'g',
+  120335 => 'h',
+  120336 => 'i',
+  120337 => 'j',
+  120338 => 'k',
+  120339 => 'l',
+  120340 => 'm',
+  120341 => 'n',
+  120342 => 'o',
+  120343 => 'p',
+  120344 => 'q',
+  120345 => 'r',
+  120346 => 's',
+  120347 => 't',
+  120348 => 'u',
+  120349 => 'v',
+  120350 => 'w',
+  120351 => 'x',
+  120352 => 'y',
+  120353 => 'z',
+  120354 => 'a',
+  120355 => 'b',
+  120356 => 'c',
+  120357 => 'd',
+  120358 => 'e',
+  120359 => 'f',
+  120360 => 'g',
+  120361 => 'h',
+  120362 => 'i',
+  120363 => 'j',
+  120364 => 'k',
+  120365 => 'l',
+  120366 => 'm',
+  120367 => 'n',
+  120368 => 'o',
+  120369 => 'p',
+  120370 => 'q',
+  120371 => 'r',
+  120372 => 's',
+  120373 => 't',
+  120374 => 'u',
+  120375 => 'v',
+  120376 => 'w',
+  120377 => 'x',
+  120378 => 'y',
+  120379 => 'z',
+  120380 => 'a',
+  120381 => 'b',
+  120382 => 'c',
+  120383 => 'd',
+  120384 => 'e',
+  120385 => 'f',
+  120386 => 'g',
+  120387 => 'h',
+  120388 => 'i',
+  120389 => 'j',
+  120390 => 'k',
+  120391 => 'l',
+  120392 => 'm',
+  120393 => 'n',
+  120394 => 'o',
+  120395 => 'p',
+  120396 => 'q',
+  120397 => 'r',
+  120398 => 's',
+  120399 => 't',
+  120400 => 'u',
+  120401 => 'v',
+  120402 => 'w',
+  120403 => 'x',
+  120404 => 'y',
+  120405 => 'z',
+  120406 => 'a',
+  120407 => 'b',
+  120408 => 'c',
+  120409 => 'd',
+  120410 => 'e',
+  120411 => 'f',
+  120412 => 'g',
+  120413 => 'h',
+  120414 => 'i',
+  120415 => 'j',
+  120416 => 'k',
+  120417 => 'l',
+  120418 => 'm',
+  120419 => 'n',
+  120420 => 'o',
+  120421 => 'p',
+  120422 => 'q',
+  120423 => 'r',
+  120424 => 's',
+  120425 => 't',
+  120426 => 'u',
+  120427 => 'v',
+  120428 => 'w',
+  120429 => 'x',
+  120430 => 'y',
+  120431 => 'z',
+  120432 => 'a',
+  120433 => 'b',
+  120434 => 'c',
+  120435 => 'd',
+  120436 => 'e',
+  120437 => 'f',
+  120438 => 'g',
+  120439 => 'h',
+  120440 => 'i',
+  120441 => 'j',
+  120442 => 'k',
+  120443 => 'l',
+  120444 => 'm',
+  120445 => 'n',
+  120446 => 'o',
+  120447 => 'p',
+  120448 => 'q',
+  120449 => 'r',
+  120450 => 's',
+  120451 => 't',
+  120452 => 'u',
+  120453 => 'v',
+  120454 => 'w',
+  120455 => 'x',
+  120456 => 'y',
+  120457 => 'z',
+  120458 => 'a',
+  120459 => 'b',
+  120460 => 'c',
+  120461 => 'd',
+  120462 => 'e',
+  120463 => 'f',
+  120464 => 'g',
+  120465 => 'h',
+  120466 => 'i',
+  120467 => 'j',
+  120468 => 'k',
+  120469 => 'l',
+  120470 => 'm',
+  120471 => 'n',
+  120472 => 'o',
+  120473 => 'p',
+  120474 => 'q',
+  120475 => 'r',
+  120476 => 's',
+  120477 => 't',
+  120478 => 'u',
+  120479 => 'v',
+  120480 => 'w',
+  120481 => 'x',
+  120482 => 'y',
+  120483 => 'z',
+  120484 => 'ı',
+  120485 => 'È·',
+  120488 => 'α',
+  120489 => 'β',
+  120490 => 'γ',
+  120491 => 'δ',
+  120492 => 'ε',
+  120493 => 'ζ',
+  120494 => 'η',
+  120495 => 'θ',
+  120496 => 'ι',
+  120497 => 'κ',
+  120498 => 'λ',
+  120499 => 'μ',
+  120500 => 'ν',
+  120501 => 'ξ',
+  120502 => 'ο',
+  120503 => 'Ï€',
+  120504 => '�',
+  120505 => 'θ',
+  120506 => 'σ',
+  120507 => 'Ï„',
+  120508 => 'Ï…',
+  120509 => 'φ',
+  120510 => 'χ',
+  120511 => 'ψ',
+  120512 => 'ω',
+  120513 => '∇',
+  120514 => 'α',
+  120515 => 'β',
+  120516 => 'γ',
+  120517 => 'δ',
+  120518 => 'ε',
+  120519 => 'ζ',
+  120520 => 'η',
+  120521 => 'θ',
+  120522 => 'ι',
+  120523 => 'κ',
+  120524 => 'λ',
+  120525 => 'μ',
+  120526 => 'ν',
+  120527 => 'ξ',
+  120528 => 'ο',
+  120529 => 'Ï€',
+  120530 => '�',
+  120531 => 'σ',
+  120532 => 'σ',
+  120533 => 'Ï„',
+  120534 => 'Ï…',
+  120535 => 'φ',
+  120536 => 'χ',
+  120537 => 'ψ',
+  120538 => 'ω',
+  120539 => '∂',
+  120540 => 'ε',
+  120541 => 'θ',
+  120542 => 'κ',
+  120543 => 'φ',
+  120544 => '�',
+  120545 => 'Ï€',
+  120546 => 'α',
+  120547 => 'β',
+  120548 => 'γ',
+  120549 => 'δ',
+  120550 => 'ε',
+  120551 => 'ζ',
+  120552 => 'η',
+  120553 => 'θ',
+  120554 => 'ι',
+  120555 => 'κ',
+  120556 => 'λ',
+  120557 => 'μ',
+  120558 => 'ν',
+  120559 => 'ξ',
+  120560 => 'ο',
+  120561 => 'Ï€',
+  120562 => '�',
+  120563 => 'θ',
+  120564 => 'σ',
+  120565 => 'Ï„',
+  120566 => 'Ï…',
+  120567 => 'φ',
+  120568 => 'χ',
+  120569 => 'ψ',
+  120570 => 'ω',
+  120571 => '∇',
+  120572 => 'α',
+  120573 => 'β',
+  120574 => 'γ',
+  120575 => 'δ',
+  120576 => 'ε',
+  120577 => 'ζ',
+  120578 => 'η',
+  120579 => 'θ',
+  120580 => 'ι',
+  120581 => 'κ',
+  120582 => 'λ',
+  120583 => 'μ',
+  120584 => 'ν',
+  120585 => 'ξ',
+  120586 => 'ο',
+  120587 => 'Ï€',
+  120588 => '�',
+  120589 => 'σ',
+  120590 => 'σ',
+  120591 => 'Ï„',
+  120592 => 'Ï…',
+  120593 => 'φ',
+  120594 => 'χ',
+  120595 => 'ψ',
+  120596 => 'ω',
+  120597 => '∂',
+  120598 => 'ε',
+  120599 => 'θ',
+  120600 => 'κ',
+  120601 => 'φ',
+  120602 => '�',
+  120603 => 'Ï€',
+  120604 => 'α',
+  120605 => 'β',
+  120606 => 'γ',
+  120607 => 'δ',
+  120608 => 'ε',
+  120609 => 'ζ',
+  120610 => 'η',
+  120611 => 'θ',
+  120612 => 'ι',
+  120613 => 'κ',
+  120614 => 'λ',
+  120615 => 'μ',
+  120616 => 'ν',
+  120617 => 'ξ',
+  120618 => 'ο',
+  120619 => 'Ï€',
+  120620 => '�',
+  120621 => 'θ',
+  120622 => 'σ',
+  120623 => 'Ï„',
+  120624 => 'Ï…',
+  120625 => 'φ',
+  120626 => 'χ',
+  120627 => 'ψ',
+  120628 => 'ω',
+  120629 => '∇',
+  120630 => 'α',
+  120631 => 'β',
+  120632 => 'γ',
+  120633 => 'δ',
+  120634 => 'ε',
+  120635 => 'ζ',
+  120636 => 'η',
+  120637 => 'θ',
+  120638 => 'ι',
+  120639 => 'κ',
+  120640 => 'λ',
+  120641 => 'μ',
+  120642 => 'ν',
+  120643 => 'ξ',
+  120644 => 'ο',
+  120645 => 'Ï€',
+  120646 => '�',
+  120647 => 'σ',
+  120648 => 'σ',
+  120649 => 'Ï„',
+  120650 => 'Ï…',
+  120651 => 'φ',
+  120652 => 'χ',
+  120653 => 'ψ',
+  120654 => 'ω',
+  120655 => '∂',
+  120656 => 'ε',
+  120657 => 'θ',
+  120658 => 'κ',
+  120659 => 'φ',
+  120660 => '�',
+  120661 => 'Ï€',
+  120662 => 'α',
+  120663 => 'β',
+  120664 => 'γ',
+  120665 => 'δ',
+  120666 => 'ε',
+  120667 => 'ζ',
+  120668 => 'η',
+  120669 => 'θ',
+  120670 => 'ι',
+  120671 => 'κ',
+  120672 => 'λ',
+  120673 => 'μ',
+  120674 => 'ν',
+  120675 => 'ξ',
+  120676 => 'ο',
+  120677 => 'Ï€',
+  120678 => '�',
+  120679 => 'θ',
+  120680 => 'σ',
+  120681 => 'Ï„',
+  120682 => 'Ï…',
+  120683 => 'φ',
+  120684 => 'χ',
+  120685 => 'ψ',
+  120686 => 'ω',
+  120687 => '∇',
+  120688 => 'α',
+  120689 => 'β',
+  120690 => 'γ',
+  120691 => 'δ',
+  120692 => 'ε',
+  120693 => 'ζ',
+  120694 => 'η',
+  120695 => 'θ',
+  120696 => 'ι',
+  120697 => 'κ',
+  120698 => 'λ',
+  120699 => 'μ',
+  120700 => 'ν',
+  120701 => 'ξ',
+  120702 => 'ο',
+  120703 => 'Ï€',
+  120704 => '�',
+  120705 => 'σ',
+  120706 => 'σ',
+  120707 => 'Ï„',
+  120708 => 'Ï…',
+  120709 => 'φ',
+  120710 => 'χ',
+  120711 => 'ψ',
+  120712 => 'ω',
+  120713 => '∂',
+  120714 => 'ε',
+  120715 => 'θ',
+  120716 => 'κ',
+  120717 => 'φ',
+  120718 => '�',
+  120719 => 'Ï€',
+  120720 => 'α',
+  120721 => 'β',
+  120722 => 'γ',
+  120723 => 'δ',
+  120724 => 'ε',
+  120725 => 'ζ',
+  120726 => 'η',
+  120727 => 'θ',
+  120728 => 'ι',
+  120729 => 'κ',
+  120730 => 'λ',
+  120731 => 'μ',
+  120732 => 'ν',
+  120733 => 'ξ',
+  120734 => 'ο',
+  120735 => 'Ï€',
+  120736 => '�',
+  120737 => 'θ',
+  120738 => 'σ',
+  120739 => 'Ï„',
+  120740 => 'Ï…',
+  120741 => 'φ',
+  120742 => 'χ',
+  120743 => 'ψ',
+  120744 => 'ω',
+  120745 => '∇',
+  120746 => 'α',
+  120747 => 'β',
+  120748 => 'γ',
+  120749 => 'δ',
+  120750 => 'ε',
+  120751 => 'ζ',
+  120752 => 'η',
+  120753 => 'θ',
+  120754 => 'ι',
+  120755 => 'κ',
+  120756 => 'λ',
+  120757 => 'μ',
+  120758 => 'ν',
+  120759 => 'ξ',
+  120760 => 'ο',
+  120761 => 'Ï€',
+  120762 => '�',
+  120763 => 'σ',
+  120764 => 'σ',
+  120765 => 'Ï„',
+  120766 => 'Ï…',
+  120767 => 'φ',
+  120768 => 'χ',
+  120769 => 'ψ',
+  120770 => 'ω',
+  120771 => '∂',
+  120772 => 'ε',
+  120773 => 'θ',
+  120774 => 'κ',
+  120775 => 'φ',
+  120776 => '�',
+  120777 => 'Ï€',
+  120778 => '�',
+  120779 => '�',
+  120782 => '0',
+  120783 => '1',
+  120784 => '2',
+  120785 => '3',
+  120786 => '4',
+  120787 => '5',
+  120788 => '6',
+  120789 => '7',
+  120790 => '8',
+  120791 => '9',
+  120792 => '0',
+  120793 => '1',
+  120794 => '2',
+  120795 => '3',
+  120796 => '4',
+  120797 => '5',
+  120798 => '6',
+  120799 => '7',
+  120800 => '8',
+  120801 => '9',
+  120802 => '0',
+  120803 => '1',
+  120804 => '2',
+  120805 => '3',
+  120806 => '4',
+  120807 => '5',
+  120808 => '6',
+  120809 => '7',
+  120810 => '8',
+  120811 => '9',
+  120812 => '0',
+  120813 => '1',
+  120814 => '2',
+  120815 => '3',
+  120816 => '4',
+  120817 => '5',
+  120818 => '6',
+  120819 => '7',
+  120820 => '8',
+  120821 => '9',
+  120822 => '0',
+  120823 => '1',
+  120824 => '2',
+  120825 => '3',
+  120826 => '4',
+  120827 => '5',
+  120828 => '6',
+  120829 => '7',
+  120830 => '8',
+  120831 => '9',
+  125184 => '𞤢',
+  125185 => '𞤣',
+  125186 => '𞤤',
+  125187 => '𞤥',
+  125188 => '𞤦',
+  125189 => '𞤧',
+  125190 => '𞤨',
+  125191 => '𞤩',
+  125192 => '𞤪',
+  125193 => '𞤫',
+  125194 => '𞤬',
+  125195 => '𞤭',
+  125196 => '𞤮',
+  125197 => '𞤯',
+  125198 => '𞤰',
+  125199 => '𞤱',
+  125200 => '𞤲',
+  125201 => '𞤳',
+  125202 => '𞤴',
+  125203 => '𞤵',
+  125204 => '𞤶',
+  125205 => '𞤷',
+  125206 => '𞤸',
+  125207 => '𞤹',
+  125208 => '𞤺',
+  125209 => '𞤻',
+  125210 => '𞤼',
+  125211 => '𞤽',
+  125212 => '𞤾',
+  125213 => '𞤿',
+  125214 => '𞥀',
+  125215 => '�',
+  125216 => '𞥂',
+  125217 => '𞥃',
+  126464 => 'ا',
+  126465 => 'ب',
+  126466 => 'ج',
+  126467 => 'د',
+  126469 => 'Ùˆ',
+  126470 => 'ز',
+  126471 => 'Ø­',
+  126472 => 'Ø·',
+  126473 => 'ÙŠ',
+  126474 => 'Ùƒ',
+  126475 => 'Ù„',
+  126476 => 'Ù…',
+  126477 => 'Ù†',
+  126478 => 'س',
+  126479 => 'ع',
+  126480 => 'Ù�',
+  126481 => 'ص',
+  126482 => 'Ù‚',
+  126483 => 'ر',
+  126484 => 'Ø´',
+  126485 => 'ت',
+  126486 => 'Ø«',
+  126487 => 'Ø®',
+  126488 => 'Ø°',
+  126489 => 'ض',
+  126490 => 'ظ',
+  126491 => 'غ',
+  126492 => 'Ù®',
+  126493 => 'Úº',
+  126494 => 'Ú¡',
+  126495 => 'Ù¯',
+  126497 => 'ب',
+  126498 => 'ج',
+  126500 => 'Ù‡',
+  126503 => 'Ø­',
+  126505 => 'ÙŠ',
+  126506 => 'Ùƒ',
+  126507 => 'Ù„',
+  126508 => 'Ù…',
+  126509 => 'Ù†',
+  126510 => 'س',
+  126511 => 'ع',
+  126512 => 'Ù�',
+  126513 => 'ص',
+  126514 => 'Ù‚',
+  126516 => 'Ø´',
+  126517 => 'ت',
+  126518 => 'Ø«',
+  126519 => 'Ø®',
+  126521 => 'ض',
+  126523 => 'غ',
+  126530 => 'ج',
+  126535 => 'Ø­',
+  126537 => 'ÙŠ',
+  126539 => 'Ù„',
+  126541 => 'Ù†',
+  126542 => 'س',
+  126543 => 'ع',
+  126545 => 'ص',
+  126546 => 'Ù‚',
+  126548 => 'Ø´',
+  126551 => 'Ø®',
+  126553 => 'ض',
+  126555 => 'غ',
+  126557 => 'Úº',
+  126559 => 'Ù¯',
+  126561 => 'ب',
+  126562 => 'ج',
+  126564 => 'Ù‡',
+  126567 => 'Ø­',
+  126568 => 'Ø·',
+  126569 => 'ÙŠ',
+  126570 => 'Ùƒ',
+  126572 => 'Ù…',
+  126573 => 'Ù†',
+  126574 => 'س',
+  126575 => 'ع',
+  126576 => 'Ù�',
+  126577 => 'ص',
+  126578 => 'Ù‚',
+  126580 => 'Ø´',
+  126581 => 'ت',
+  126582 => 'Ø«',
+  126583 => 'Ø®',
+  126585 => 'ض',
+  126586 => 'ظ',
+  126587 => 'غ',
+  126588 => 'Ù®',
+  126590 => 'Ú¡',
+  126592 => 'ا',
+  126593 => 'ب',
+  126594 => 'ج',
+  126595 => 'د',
+  126596 => 'Ù‡',
+  126597 => 'Ùˆ',
+  126598 => 'ز',
+  126599 => 'Ø­',
+  126600 => 'Ø·',
+  126601 => 'ÙŠ',
+  126603 => 'Ù„',
+  126604 => 'Ù…',
+  126605 => 'Ù†',
+  126606 => 'س',
+  126607 => 'ع',
+  126608 => 'Ù�',
+  126609 => 'ص',
+  126610 => 'Ù‚',
+  126611 => 'ر',
+  126612 => 'Ø´',
+  126613 => 'ت',
+  126614 => 'Ø«',
+  126615 => 'Ø®',
+  126616 => 'Ø°',
+  126617 => 'ض',
+  126618 => 'ظ',
+  126619 => 'غ',
+  126625 => 'ب',
+  126626 => 'ج',
+  126627 => 'د',
+  126629 => 'Ùˆ',
+  126630 => 'ز',
+  126631 => 'Ø­',
+  126632 => 'Ø·',
+  126633 => 'ÙŠ',
+  126635 => 'Ù„',
+  126636 => 'Ù…',
+  126637 => 'Ù†',
+  126638 => 'س',
+  126639 => 'ع',
+  126640 => 'Ù�',
+  126641 => 'ص',
+  126642 => 'Ù‚',
+  126643 => 'ر',
+  126644 => 'Ø´',
+  126645 => 'ت',
+  126646 => 'Ø«',
+  126647 => 'Ø®',
+  126648 => 'Ø°',
+  126649 => 'ض',
+  126650 => 'ظ',
+  126651 => 'غ',
+  127274 => '〔s〕',
+  127275 => 'c',
+  127276 => 'r',
+  127277 => 'cd',
+  127278 => 'wz',
+  127280 => 'a',
+  127281 => 'b',
+  127282 => 'c',
+  127283 => 'd',
+  127284 => 'e',
+  127285 => 'f',
+  127286 => 'g',
+  127287 => 'h',
+  127288 => 'i',
+  127289 => 'j',
+  127290 => 'k',
+  127291 => 'l',
+  127292 => 'm',
+  127293 => 'n',
+  127294 => 'o',
+  127295 => 'p',
+  127296 => 'q',
+  127297 => 'r',
+  127298 => 's',
+  127299 => 't',
+  127300 => 'u',
+  127301 => 'v',
+  127302 => 'w',
+  127303 => 'x',
+  127304 => 'y',
+  127305 => 'z',
+  127306 => 'hv',
+  127307 => 'mv',
+  127308 => 'sd',
+  127309 => 'ss',
+  127310 => 'ppv',
+  127311 => 'wc',
+  127338 => 'mc',
+  127339 => 'md',
+  127340 => 'mr',
+  127376 => 'dj',
+  127488 => '��',
+  127489 => 'ココ',
+  127490 => 'サ',
+  127504 => '手',
+  127505 => 'å­—',
+  127506 => '�',
+  127507 => 'デ',
+  127508 => '二',
+  127509 => '多',
+  127510 => '解',
+  127511 => '天',
+  127512 => '交',
+  127513 => '映',
+  127514 => 'ç„¡',
+  127515 => 'æ–™',
+  127516 => '�',
+  127517 => '後',
+  127518 => '�',
+  127519 => 'æ–°',
+  127520 => '�',
+  127521 => '終',
+  127522 => '生',
+  127523 => '販',
+  127524 => '声',
+  127525 => '�',
+  127526 => 'æ¼”',
+  127527 => '投',
+  127528 => '�',
+  127529 => '一',
+  127530 => '三',
+  127531 => '�',
+  127532 => 'å·¦',
+  127533 => '中',
+  127534 => '�',
+  127535 => '指',
+  127536 => 'èµ°',
+  127537 => '打',
+  127538 => '�',
+  127539 => '空',
+  127540 => '�',
+  127541 => '満',
+  127542 => '有',
+  127543 => '月',
+  127544 => '申',
+  127545 => '割',
+  127546 => 'å–¶',
+  127547 => 'é…�',
+  127552 => '〔本〕',
+  127553 => '〔三〕',
+  127554 => '〔二〕',
+  127555 => '〔安〕',
+  127556 => '〔点〕',
+  127557 => '〔打〕',
+  127558 => '〔盗〕',
+  127559 => '〔�〕',
+  127560 => '〔敗〕',
+  127568 => 'å¾—',
+  127569 => '�',
+  130032 => '0',
+  130033 => '1',
+  130034 => '2',
+  130035 => '3',
+  130036 => '4',
+  130037 => '5',
+  130038 => '6',
+  130039 => '7',
+  130040 => '8',
+  130041 => '9',
+  194560 => '丽',
+  194561 => '丸',
+  194562 => '�',
+  194563 => 'ð „¢',
+  194564 => 'ä½ ',
+  194565 => 'ä¾®',
+  194566 => 'ä¾»',
+  194567 => '倂',
+  194568 => '�',
+  194569 => 'å‚™',
+  194570 => '僧',
+  194571 => '�',
+  194572 => 'ã’ž',
+  194573 => '𠘺',
+  194574 => 'å…�',
+  194575 => 'å…”',
+  194576 => 'å…¤',
+  194577 => 'å…·',
+  194578 => '𠔜',
+  194579 => 'ã’¹',
+  194580 => 'å…§',
+  194581 => '�',
+  194582 => 'ð •‹',
+  194583 => '冗',
+  194584 => '冤',
+  194585 => '仌',
+  194586 => '冬',
+  194587 => '况',
+  194588 => '𩇟',
+  194589 => '凵',
+  194590 => '刃',
+  194591 => 'ã“Ÿ',
+  194592 => '刻',
+  194593 => '剆',
+  194594 => '割',
+  194595 => '剷',
+  194596 => '㔕',
+  194597 => '勇',
+  194598 => '勉',
+  194599 => '勤',
+  194600 => '勺',
+  194601 => '包',
+  194602 => '匆',
+  194603 => '北',
+  194604 => '�',
+  194605 => '�',
+  194606 => '�',
+  194607 => '�',
+  194608 => '�',
+  194609 => '�',
+  194610 => '�',
+  194611 => '�',
+  194612 => '𠨬',
+  194613 => '�',
+  194614 => '�',
+  194615 => '�',
+  194616 => 'ð ­£',
+  194617 => '�',
+  194618 => '�',
+  194619 => '�',
+  194620 => 'å’ž',
+  194621 => '�',
+  194622 => '呈',
+  194623 => '周',
+  194624 => 'å’¢',
+  194625 => '哶',
+  194626 => '�',
+  194627 => 'å•“',
+  194628 => 'å•£',
+  194629 => 'å–„',
+  194630 => 'å–„',
+  194631 => 'å–™',
+  194632 => 'å–«',
+  194633 => 'å–³',
+  194634 => 'å—‚',
+  194635 => '圖',
+  194636 => '嘆',
+  194637 => '圗',
+  194638 => '噑',
+  194639 => 'å™´',
+  194640 => '切',
+  194641 => '壮',
+  194642 => '城',
+  194643 => '埴',
+  194644 => 'å �',
+  194645 => 'åž‹',
+  194646 => 'å ²',
+  194647 => 'å ±',
+  194648 => '墬',
+  194649 => '𡓤',
+  194650 => '売',
+  194651 => '壷',
+  194652 => '夆',
+  194653 => '多',
+  194654 => '夢',
+  194655 => '奢',
+  194656 => '𡚨',
+  194657 => '𡛪',
+  194658 => '姬',
+  194659 => '娛',
+  194660 => '娧',
+  194661 => '姘',
+  194662 => '婦',
+  194663 => 'ã›®',
+  194665 => '嬈',
+  194666 => '嬾',
+  194667 => '嬾',
+  194668 => '𡧈',
+  194669 => '寃',
+  194670 => '寘',
+  194671 => '寧',
+  194672 => '寳',
+  194673 => '𡬘',
+  194674 => '寿',
+  194675 => 'å°†',
+  194677 => 'å°¢',
+  194678 => '�',
+  194679 => 'å± ',
+  194680 => 'å±®',
+  194681 => 'å³€',
+  194682 => '�',
+  194683 => 'ð¡·¤',
+  194684 => '嵃',
+  194685 => 'ð¡·¦',
+  194686 => 'åµ®',
+  194687 => '嵫',
+  194688 => 'åµ¼',
+  194689 => 'å·¡',
+  194690 => 'å·¢',
+  194691 => 'ã ¯',
+  194692 => 'å·½',
+  194693 => '帨',
+  194694 => '帽',
+  194695 => '幩',
+  194696 => 'ã¡¢',
+  194697 => '𢆃',
+  194698 => '㡼',
+  194699 => '庰',
+  194700 => '庳',
+  194701 => '庶',
+  194702 => '廊',
+  194703 => '𪎒',
+  194704 => '廾',
+  194705 => '𢌱',
+  194706 => '𢌱',
+  194707 => '�',
+  194708 => 'å¼¢',
+  194709 => 'å¼¢',
+  194710 => '㣇',
+  194711 => '𣊸',
+  194712 => '𦇚',
+  194713 => 'å½¢',
+  194714 => '彫',
+  194715 => '㣣',
+  194716 => '徚',
+  194717 => '�',
+  194718 => 'å¿—',
+  194719 => '忹',
+  194720 => '�',
+  194721 => '㤺',
+  194722 => '㤜',
+  194723 => 'æ‚”',
+  194724 => '𢛔',
+  194725 => '惇',
+  194726 => 'æ…ˆ',
+  194727 => '慌',
+  194728 => 'æ…Ž',
+  194729 => '慌',
+  194730 => 'æ…º',
+  194731 => '憎',
+  194732 => '憲',
+  194733 => '憤',
+  194734 => '憯',
+  194735 => '懞',
+  194736 => '懲',
+  194737 => '懶',
+  194738 => '�',
+  194739 => '戛',
+  194740 => '�',
+  194741 => '抱',
+  194742 => 'æ‹”',
+  194743 => '�',
+  194744 => '𢬌',
+  194745 => '挽',
+  194746 => '拼',
+  194747 => '�',
+  194748 => '掃',
+  194749 => '�',
+  194750 => '𢯱',
+  194751 => '�',
+  194752 => '�',
+  194753 => '掩',
+  194754 => '㨮',
+  194755 => 'æ‘©',
+  194756 => '摾',
+  194757 => 'æ’�',
+  194758 => 'æ‘·',
+  194759 => '㩬',
+  194760 => '�',
+  194761 => '敬',
+  194762 => '𣀊',
+  194763 => 'æ—£',
+  194764 => '書',
+  194765 => '晉',
+  194766 => '㬙',
+  194767 => 'æš‘',
+  194768 => '㬈',
+  194769 => '㫤',
+  194770 => '冒',
+  194771 => '冕',
+  194772 => '最',
+  194773 => '暜',
+  194774 => 'è‚­',
+  194775 => '�',
+  194776 => '朗',
+  194777 => '望',
+  194778 => '朡',
+  194779 => '�',
+  194780 => '�',
+  194781 => '�',
+  194782 => 'ã­‰',
+  194783 => '柺',
+  194784 => 'æž…',
+  194785 => 'æ¡’',
+  194786 => '梅',
+  194787 => '𣑭',
+  194788 => '梎',
+  194789 => 'æ Ÿ',
+  194790 => '椔',
+  194791 => '�',
+  194792 => '楂',
+  194793 => '榣',
+  194794 => '槪',
+  194795 => '檨',
+  194796 => '𣚣',
+  194797 => 'æ«›',
+  194798 => 'ã°˜',
+  194799 => '次',
+  194800 => '𣢧',
+  194801 => 'æ­”',
+  194802 => '㱎',
+  194803 => 'æ­²',
+  194804 => '殟',
+  194805 => '殺',
+  194806 => 'æ®»',
+  194807 => '�',
+  194808 => 'ð¡´‹',
+  194809 => '𣫺',
+  194810 => '汎',
+  194811 => '𣲼',
+  194812 => '沿',
+  194813 => '�',
+  194814 => '汧',
+  194815 => 'æ´–',
+  194816 => 'æ´¾',
+  194817 => 'æµ·',
+  194818 => '�',
+  194819 => '浩',
+  194820 => '浸',
+  194821 => '涅',
+  194822 => '𣴞',
+  194823 => 'æ´´',
+  194824 => '港',
+  194825 => 'æ¹®',
+  194826 => 'ã´³',
+  194827 => '滋',
+  194828 => '滇',
+  194829 => '𣻑',
+  194830 => 'æ·¹',
+  194831 => 'æ½®',
+  194832 => '𣽞',
+  194833 => '𣾎',
+  194834 => '濆',
+  194835 => '瀹',
+  194836 => '瀞',
+  194837 => '瀛',
+  194838 => '㶖',
+  194839 => '�',
+  194840 => '�',
+  194841 => '�',
+  194842 => 'ç‚­',
+  194843 => '𠔥',
+  194844 => 'ç……',
+  194845 => '𤉣',
+  194846 => '熜',
+  194848 => '爨',
+  194849 => '爵',
+  194850 => '�',
+  194851 => '𤘈',
+  194852 => '犀',
+  194853 => '犕',
+  194854 => '𤜵',
+  194855 => '𤠔',
+  194856 => '�',
+  194857 => '王',
+  194858 => '㺬',
+  194859 => '玥',
+  194860 => '㺸',
+  194861 => '㺸',
+  194862 => '瑇',
+  194863 => '瑜',
+  194864 => '瑱',
+  194865 => 'ç’…',
+  194866 => 'ç“Š',
+  194867 => 'ã¼›',
+  194868 => '甤',
+  194869 => '𤰶',
+  194870 => '甾',
+  194871 => '𤲒',
+  194872 => 'ç•°',
+  194873 => '𢆟',
+  194874 => '�',
+  194875 => '𤾡',
+  194876 => '𤾸',
+  194877 => '�',
+  194878 => '㿼',
+  194879 => '䀈',
+  194880 => 'ç›´',
+  194881 => '𥃳',
+  194882 => '𥃲',
+  194883 => '𥄙',
+  194884 => '𥄳',
+  194885 => '眞',
+  194886 => '真',
+  194887 => '真',
+  194888 => '�',
+  194889 => '䀹',
+  194890 => 'çž‹',
+  194891 => '�',
+  194892 => 'ä‚–',
+  194893 => '�',
+  194894 => 'ç¡Ž',
+  194895 => '碌',
+  194896 => '磌',
+  194897 => '䃣',
+  194898 => '𥘦',
+  194899 => '祖',
+  194900 => '𥚚',
+  194901 => '𥛅',
+  194902 => '�',
+  194903 => '秫',
+  194904 => '䄯',
+  194905 => 'ç©€',
+  194906 => 'ç©Š',
+  194907 => '�',
+  194908 => '𥥼',
+  194909 => '𥪧',
+  194910 => '𥪧',
+  194912 => '䈂',
+  194913 => '𥮫',
+  194914 => '篆',
+  194915 => '築',
+  194916 => '䈧',
+  194917 => '𥲀',
+  194918 => 'ç³’',
+  194919 => '䊠',
+  194920 => '糨',
+  194921 => 'ç³£',
+  194922 => 'ç´€',
+  194923 => '𥾆',
+  194924 => 'çµ£',
+  194925 => '�',
+  194926 => 'ç·‡',
+  194927 => '縂',
+  194928 => 'ç¹…',
+  194929 => '䌴',
+  194930 => '𦈨',
+  194931 => '𦉇',
+  194932 => '�',
+  194933 => '𦋙',
+  194934 => '罺',
+  194935 => '𦌾',
+  194936 => '羕',
+  194937 => '翺',
+  194938 => '者',
+  194939 => '𦓚',
+  194940 => '𦔣',
+  194941 => '�',
+  194942 => '𦖨',
+  194943 => '�',
+  194944 => '�',
+  194945 => '�',
+  194946 => '育',
+  194947 => '脃',
+  194948 => '�',
+  194949 => '脾',
+  194950 => '媵',
+  194951 => '𦞧',
+  194952 => '𦞵',
+  194953 => '𣎓',
+  194954 => '𣎜',
+  194955 => '�',
+  194956 => '舄',
+  194957 => '辞',
+  194958 => 'ä‘«',
+  194959 => '芑',
+  194960 => '芋',
+  194961 => '�',
+  194962 => '劳',
+  194963 => '花',
+  194964 => '芳',
+  194965 => '芽',
+  194966 => '苦',
+  194967 => '𦬼',
+  194968 => 'è‹¥',
+  194969 => '�',
+  194970 => '�',
+  194971 => '莭',
+  194972 => '茣',
+  194973 => '莽',
+  194974 => '�',
+  194975 => 'è‘—',
+  194976 => '�',
+  194977 => '�',
+  194978 => '�',
+  194979 => '�',
+  194980 => '𦰶',
+  194981 => '𦵫',
+  194982 => '𦳕',
+  194983 => '䔫',
+  194984 => '蓱',
+  194985 => '蓳',
+  194986 => 'è”–',
+  194987 => '�',
+  194988 => '蕤',
+  194989 => '𦼬',
+  194990 => '�',
+  194991 => 'ä•¡',
+  194992 => '𦾱',
+  194993 => '𧃒',
+  194994 => 'ä•«',
+  194995 => '�',
+  194996 => '虜',
+  194997 => '虧',
+  194998 => '虩',
+  194999 => 'èš©',
+  195000 => '蚈',
+  195001 => '蜎',
+  195002 => '蛢',
+  195003 => '�',
+  195004 => '蜨',
+  195005 => '�',
+  195006 => '螆',
+  195008 => '蟡',
+  195009 => 'è �',
+  195010 => 'ä—¹',
+  195011 => 'è¡ ',
+  195012 => 'è¡£',
+  195013 => '𧙧',
+  195014 => '裗',
+  195015 => '裞',
+  195016 => '䘵',
+  195017 => '裺',
+  195018 => 'ã’»',
+  195019 => '𧢮',
+  195020 => '𧥦',
+  195021 => 'äš¾',
+  195022 => '䛇',
+  195023 => '誠',
+  195024 => 'è«­',
+  195025 => '變',
+  195026 => '豕',
+  195027 => '𧲨',
+  195028 => '貫',
+  195029 => '�',
+  195030 => 'è´›',
+  195031 => 'èµ·',
+  195032 => '𧼯',
+  195033 => 'ð  „',
+  195034 => 'è·‹',
+  195035 => '趼',
+  195036 => 'è·°',
+  195037 => '𠣞',
+  195038 => 'è»”',
+  195039 => '輸',
+  195040 => '𨗒',
+  195041 => '𨗭',
+  195042 => 'é‚”',
+  195043 => '郱',
+  195044 => 'é„‘',
+  195045 => '𨜮',
+  195046 => 'é„›',
+  195047 => '鈸',
+  195048 => 'é‹—',
+  195049 => '鋘',
+  195050 => '鉼',
+  195051 => '�',
+  195052 => '�',
+  195053 => '𨯺',
+  195054 => 'é–‹',
+  195055 => '䦕',
+  195056 => 'é–·',
+  195057 => '𨵷',
+  195058 => '䧦',
+  195059 => '雃',
+  195060 => '嶲',
+  195061 => '霣',
+  195062 => 'ð©……',
+  195063 => '𩈚',
+  195064 => 'ä©®',
+  195065 => '䩶',
+  195066 => '韠',
+  195067 => '�',
+  195068 => '䪲',
+  195069 => 'ð©’–',
+  195070 => 'é ‹',
+  195071 => 'é ‹',
+  195072 => 'é ©',
+  195073 => 'ð©–¶',
+  195074 => '飢',
+  195075 => '䬳',
+  195076 => '餩',
+  195077 => '馧',
+  195078 => '駂',
+  195079 => '駾',
+  195080 => '䯎',
+  195081 => '𩬰',
+  195082 => '鬒',
+  195083 => 'é±€',
+  195084 => 'é³½',
+  195085 => '䳎',
+  195086 => 'ä³­',
+  195087 => '鵧',
+  195088 => '𪃎',
+  195089 => '䳸',
+  195090 => '𪄅',
+  195091 => '𪈎',
+  195092 => '𪊑',
+  195093 => '麻',
+  195094 => 'äµ–',
+  195095 => '黹',
+  195096 => '黾',
+  195097 => 'é¼…',
+  195098 => '�',
+  195099 => 'é¼–',
+  195100 => 'é¼»',
+  195101 => '𪘀',
+);
diff --git a/lib/symfony/polyfill-intl-idn/Resources/unidata/virama.php b/lib/symfony/polyfill-intl-idn/Resources/unidata/virama.php
new file mode 100644
index 000000000..1958e37ed
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/Resources/unidata/virama.php
@@ -0,0 +1,65 @@
+<?php
+
+return array (
+  2381 => 9,
+  2509 => 9,
+  2637 => 9,
+  2765 => 9,
+  2893 => 9,
+  3021 => 9,
+  3149 => 9,
+  3277 => 9,
+  3387 => 9,
+  3388 => 9,
+  3405 => 9,
+  3530 => 9,
+  3642 => 9,
+  3770 => 9,
+  3972 => 9,
+  4153 => 9,
+  4154 => 9,
+  5908 => 9,
+  5940 => 9,
+  6098 => 9,
+  6752 => 9,
+  6980 => 9,
+  7082 => 9,
+  7083 => 9,
+  7154 => 9,
+  7155 => 9,
+  11647 => 9,
+  43014 => 9,
+  43052 => 9,
+  43204 => 9,
+  43347 => 9,
+  43456 => 9,
+  43766 => 9,
+  44013 => 9,
+  68159 => 9,
+  69702 => 9,
+  69759 => 9,
+  69817 => 9,
+  69939 => 9,
+  69940 => 9,
+  70080 => 9,
+  70197 => 9,
+  70378 => 9,
+  70477 => 9,
+  70722 => 9,
+  70850 => 9,
+  71103 => 9,
+  71231 => 9,
+  71350 => 9,
+  71467 => 9,
+  71737 => 9,
+  71997 => 9,
+  71998 => 9,
+  72160 => 9,
+  72244 => 9,
+  72263 => 9,
+  72345 => 9,
+  72767 => 9,
+  73028 => 9,
+  73029 => 9,
+  73111 => 9,
+);
diff --git a/lib/symfony/polyfill-intl-idn/bootstrap.php b/lib/symfony/polyfill-intl-idn/bootstrap.php
new file mode 100644
index 000000000..f02d5de73
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/bootstrap.php
@@ -0,0 +1,141 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Polyfill\Intl\Idn as p;
+
+if (extension_loaded('intl')) {
+    return;
+}
+
+if (!defined('U_IDNA_PROHIBITED_ERROR')) {
+    define('U_IDNA_PROHIBITED_ERROR', 66560);
+}
+if (!defined('U_IDNA_ERROR_START')) {
+    define('U_IDNA_ERROR_START', 66560);
+}
+if (!defined('U_IDNA_UNASSIGNED_ERROR')) {
+    define('U_IDNA_UNASSIGNED_ERROR', 66561);
+}
+if (!defined('U_IDNA_CHECK_BIDI_ERROR')) {
+    define('U_IDNA_CHECK_BIDI_ERROR', 66562);
+}
+if (!defined('U_IDNA_STD3_ASCII_RULES_ERROR')) {
+    define('U_IDNA_STD3_ASCII_RULES_ERROR', 66563);
+}
+if (!defined('U_IDNA_ACE_PREFIX_ERROR')) {
+    define('U_IDNA_ACE_PREFIX_ERROR', 66564);
+}
+if (!defined('U_IDNA_VERIFICATION_ERROR')) {
+    define('U_IDNA_VERIFICATION_ERROR', 66565);
+}
+if (!defined('U_IDNA_LABEL_TOO_LONG_ERROR')) {
+    define('U_IDNA_LABEL_TOO_LONG_ERROR', 66566);
+}
+if (!defined('U_IDNA_ZERO_LENGTH_LABEL_ERROR')) {
+    define('U_IDNA_ZERO_LENGTH_LABEL_ERROR', 66567);
+}
+if (!defined('U_IDNA_DOMAIN_NAME_TOO_LONG_ERROR')) {
+    define('U_IDNA_DOMAIN_NAME_TOO_LONG_ERROR', 66568);
+}
+if (!defined('U_IDNA_ERROR_LIMIT')) {
+    define('U_IDNA_ERROR_LIMIT', 66569);
+}
+if (!defined('U_STRINGPREP_PROHIBITED_ERROR')) {
+    define('U_STRINGPREP_PROHIBITED_ERROR', 66560);
+}
+if (!defined('U_STRINGPREP_UNASSIGNED_ERROR')) {
+    define('U_STRINGPREP_UNASSIGNED_ERROR', 66561);
+}
+if (!defined('U_STRINGPREP_CHECK_BIDI_ERROR')) {
+    define('U_STRINGPREP_CHECK_BIDI_ERROR', 66562);
+}
+if (!defined('IDNA_DEFAULT')) {
+    define('IDNA_DEFAULT', 0);
+}
+if (!defined('IDNA_ALLOW_UNASSIGNED')) {
+    define('IDNA_ALLOW_UNASSIGNED', 1);
+}
+if (!defined('IDNA_USE_STD3_RULES')) {
+    define('IDNA_USE_STD3_RULES', 2);
+}
+if (!defined('IDNA_CHECK_BIDI')) {
+    define('IDNA_CHECK_BIDI', 4);
+}
+if (!defined('IDNA_CHECK_CONTEXTJ')) {
+    define('IDNA_CHECK_CONTEXTJ', 8);
+}
+if (!defined('IDNA_NONTRANSITIONAL_TO_ASCII')) {
+    define('IDNA_NONTRANSITIONAL_TO_ASCII', 16);
+}
+if (!defined('IDNA_NONTRANSITIONAL_TO_UNICODE')) {
+    define('IDNA_NONTRANSITIONAL_TO_UNICODE', 32);
+}
+if (!defined('INTL_IDNA_VARIANT_2003')) {
+    define('INTL_IDNA_VARIANT_2003', 0);
+}
+if (!defined('INTL_IDNA_VARIANT_UTS46')) {
+    define('INTL_IDNA_VARIANT_UTS46', 1);
+}
+if (!defined('IDNA_ERROR_EMPTY_LABEL')) {
+    define('IDNA_ERROR_EMPTY_LABEL', 1);
+}
+if (!defined('IDNA_ERROR_LABEL_TOO_LONG')) {
+    define('IDNA_ERROR_LABEL_TOO_LONG', 2);
+}
+if (!defined('IDNA_ERROR_DOMAIN_NAME_TOO_LONG')) {
+    define('IDNA_ERROR_DOMAIN_NAME_TOO_LONG', 4);
+}
+if (!defined('IDNA_ERROR_LEADING_HYPHEN')) {
+    define('IDNA_ERROR_LEADING_HYPHEN', 8);
+}
+if (!defined('IDNA_ERROR_TRAILING_HYPHEN')) {
+    define('IDNA_ERROR_TRAILING_HYPHEN', 16);
+}
+if (!defined('IDNA_ERROR_HYPHEN_3_4')) {
+    define('IDNA_ERROR_HYPHEN_3_4', 32);
+}
+if (!defined('IDNA_ERROR_LEADING_COMBINING_MARK')) {
+    define('IDNA_ERROR_LEADING_COMBINING_MARK', 64);
+}
+if (!defined('IDNA_ERROR_DISALLOWED')) {
+    define('IDNA_ERROR_DISALLOWED', 128);
+}
+if (!defined('IDNA_ERROR_PUNYCODE')) {
+    define('IDNA_ERROR_PUNYCODE', 256);
+}
+if (!defined('IDNA_ERROR_LABEL_HAS_DOT')) {
+    define('IDNA_ERROR_LABEL_HAS_DOT', 512);
+}
+if (!defined('IDNA_ERROR_INVALID_ACE_LABEL')) {
+    define('IDNA_ERROR_INVALID_ACE_LABEL', 1024);
+}
+if (!defined('IDNA_ERROR_BIDI')) {
+    define('IDNA_ERROR_BIDI', 2048);
+}
+if (!defined('IDNA_ERROR_CONTEXTJ')) {
+    define('IDNA_ERROR_CONTEXTJ', 4096);
+}
+
+if (PHP_VERSION_ID < 70400) {
+    if (!function_exists('idn_to_ascii')) {
+        function idn_to_ascii($domain, $options = IDNA_DEFAULT, $variant = INTL_IDNA_VARIANT_2003, &$idna_info = array()) { return p\Idn::idn_to_ascii($domain, $options, $variant, $idna_info); }
+    }
+    if (!function_exists('idn_to_utf8')) {
+        function idn_to_utf8($domain, $options = IDNA_DEFAULT, $variant = INTL_IDNA_VARIANT_2003, &$idna_info = array()) { return p\Idn::idn_to_utf8($domain, $options, $variant, $idna_info); }
+    }
+} else {
+    if (!function_exists('idn_to_ascii')) {
+        function idn_to_ascii($domain, $options = IDNA_DEFAULT, $variant = INTL_IDNA_VARIANT_UTS46, &$idna_info = array()) { return p\Idn::idn_to_ascii($domain, $options, $variant, $idna_info); }
+    }
+    if (!function_exists('idn_to_utf8')) {
+        function idn_to_utf8($domain, $options = IDNA_DEFAULT, $variant = INTL_IDNA_VARIANT_UTS46, &$idna_info = array()) { return p\Idn::idn_to_utf8($domain, $options, $variant, $idna_info); }
+    }
+}
diff --git a/lib/symfony/polyfill-intl-idn/composer.json b/lib/symfony/polyfill-intl-idn/composer.json
new file mode 100644
index 000000000..bd89e6ed7
--- /dev/null
+++ b/lib/symfony/polyfill-intl-idn/composer.json
@@ -0,0 +1,45 @@
+{
+    "name": "symfony/polyfill-intl-idn",
+    "type": "library",
+    "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions",
+    "keywords": ["polyfill", "shim", "compatibility", "portable", "intl", "idn"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Laurent Bassin",
+            "email": "laurent@bassin.info"
+        },
+        {
+            "name": "Trevor Rowbotham",
+            "email": "trevor.rowbotham@pm.me"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3",
+        "symfony/polyfill-intl-normalizer": "^1.10",
+        "symfony/polyfill-php70": "^1.10",
+        "symfony/polyfill-php72": "^1.10"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Polyfill\\Intl\\Idn\\": "" },
+        "files": [ "bootstrap.php" ]
+    },
+    "suggest": {
+        "ext-intl": "For best performance"
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-main": "1.19-dev"
+        },
+        "thanks": {
+            "name": "symfony/polyfill",
+            "url": "https://github.com/symfony/polyfill"
+        }
+    }
+}
diff --git a/lib/symfony/polyfill-intl-normalizer/LICENSE b/lib/symfony/polyfill-intl-normalizer/LICENSE
new file mode 100644
index 000000000..4cd8bdd30
--- /dev/null
+++ b/lib/symfony/polyfill-intl-normalizer/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2015-2019 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/lib/symfony/polyfill-intl-normalizer/Normalizer.php b/lib/symfony/polyfill-intl-normalizer/Normalizer.php
new file mode 100644
index 000000000..a60fae620
--- /dev/null
+++ b/lib/symfony/polyfill-intl-normalizer/Normalizer.php
@@ -0,0 +1,308 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Intl\Normalizer;
+
+/**
+ * Normalizer is a PHP fallback implementation of the Normalizer class provided by the intl extension.
+ *
+ * It has been validated with Unicode 6.3 Normalization Conformance Test.
+ * See http://www.unicode.org/reports/tr15/ for detailed info about Unicode normalizations.
+ *
+ * @author Nicolas Grekas <p@tchwork.com>
+ *
+ * @internal
+ */
+class Normalizer
+{
+    const FORM_D = \Normalizer::FORM_D;
+    const FORM_KD = \Normalizer::FORM_KD;
+    const FORM_C = \Normalizer::FORM_C;
+    const FORM_KC = \Normalizer::FORM_KC;
+    const NFD = \Normalizer::NFD;
+    const NFKD = \Normalizer::NFKD;
+    const NFC = \Normalizer::NFC;
+    const NFKC = \Normalizer::NFKC;
+
+    private static $C;
+    private static $D;
+    private static $KD;
+    private static $cC;
+    private static $ulenMask = array("\xC0" => 2, "\xD0" => 2, "\xE0" => 3, "\xF0" => 4);
+    private static $ASCII = "\x20\x65\x69\x61\x73\x6E\x74\x72\x6F\x6C\x75\x64\x5D\x5B\x63\x6D\x70\x27\x0A\x67\x7C\x68\x76\x2E\x66\x62\x2C\x3A\x3D\x2D\x71\x31\x30\x43\x32\x2A\x79\x78\x29\x28\x4C\x39\x41\x53\x2F\x50\x22\x45\x6A\x4D\x49\x6B\x33\x3E\x35\x54\x3C\x44\x34\x7D\x42\x7B\x38\x46\x77\x52\x36\x37\x55\x47\x4E\x3B\x4A\x7A\x56\x23\x48\x4F\x57\x5F\x26\x21\x4B\x3F\x58\x51\x25\x59\x5C\x09\x5A\x2B\x7E\x5E\x24\x40\x60\x7F\x00\x01\x02\x03\x04\x05\x06\x07\x08\x0B\x0C\x0D\x0E\x0F\x10\x11\x12\x13\x14\x15\x16\x17\x18\x19\x1A\x1B\x1C\x1D\x1E\x1F";
+
+    public static function isNormalized($s, $form = self::NFC)
+    {
+        if (!\in_array($form, array(self::NFD, self::NFKD, self::NFC, self::NFKC))) {
+            return false;
+        }
+        $s = (string) $s;
+        if (!isset($s[strspn($s, self::$ASCII)])) {
+            return true;
+        }
+        if (self::NFC == $form && preg_match('//u', $s) && !preg_match('/[^\x00-\x{2FF}]/u', $s)) {
+            return true;
+        }
+
+        return self::normalize($s, $form) === $s;
+    }
+
+    public static function normalize($s, $form = self::NFC)
+    {
+        $s = (string) $s;
+        if (!preg_match('//u', $s)) {
+            return false;
+        }
+
+        switch ($form) {
+            case self::NFC: $C = true; $K = false; break;
+            case self::NFD: $C = false; $K = false; break;
+            case self::NFKC: $C = true; $K = true; break;
+            case self::NFKD: $C = false; $K = true; break;
+            default:
+                if (\defined('Normalizer::NONE') && \Normalizer::NONE == $form) {
+                    return $s;
+                }
+
+                return false;
+        }
+
+        if ('' === $s) {
+            return '';
+        }
+
+        if ($K && null === self::$KD) {
+            self::$KD = self::getData('compatibilityDecomposition');
+        }
+
+        if (null === self::$D) {
+            self::$D = self::getData('canonicalDecomposition');
+            self::$cC = self::getData('combiningClass');
+        }
+
+        if (null !== $mbEncoding = (2 /* MB_OVERLOAD_STRING */ & (int) ini_get('mbstring.func_overload')) ? mb_internal_encoding() : null) {
+            mb_internal_encoding('8bit');
+        }
+
+        $r = self::decompose($s, $K);
+
+        if ($C) {
+            if (null === self::$C) {
+                self::$C = self::getData('canonicalComposition');
+            }
+
+            $r = self::recompose($r);
+        }
+        if (null !== $mbEncoding) {
+            mb_internal_encoding($mbEncoding);
+        }
+
+        return $r;
+    }
+
+    private static function recompose($s)
+    {
+        $ASCII = self::$ASCII;
+        $compMap = self::$C;
+        $combClass = self::$cC;
+        $ulenMask = self::$ulenMask;
+
+        $result = $tail = '';
+
+        $i = $s[0] < "\x80" ? 1 : $ulenMask[$s[0] & "\xF0"];
+        $len = \strlen($s);
+
+        $lastUchr = substr($s, 0, $i);
+        $lastUcls = isset($combClass[$lastUchr]) ? 256 : 0;
+
+        while ($i < $len) {
+            if ($s[$i] < "\x80") {
+                // ASCII chars
+
+                if ($tail) {
+                    $lastUchr .= $tail;
+                    $tail = '';
+                }
+
+                if ($j = strspn($s, $ASCII, $i + 1)) {
+                    $lastUchr .= substr($s, $i, $j);
+                    $i += $j;
+                }
+
+                $result .= $lastUchr;
+                $lastUchr = $s[$i];
+                $lastUcls = 0;
+                ++$i;
+                continue;
+            }
+
+            $ulen = $ulenMask[$s[$i] & "\xF0"];
+            $uchr = substr($s, $i, $ulen);
+
+            if ($lastUchr < "\xE1\x84\x80" || "\xE1\x84\x92" < $lastUchr
+                || $uchr < "\xE1\x85\xA1" || "\xE1\x85\xB5" < $uchr
+                || $lastUcls) {
+                // Table lookup and combining chars composition
+
+                $ucls = isset($combClass[$uchr]) ? $combClass[$uchr] : 0;
+
+                if (isset($compMap[$lastUchr.$uchr]) && (!$lastUcls || $lastUcls < $ucls)) {
+                    $lastUchr = $compMap[$lastUchr.$uchr];
+                } elseif ($lastUcls = $ucls) {
+                    $tail .= $uchr;
+                } else {
+                    if ($tail) {
+                        $lastUchr .= $tail;
+                        $tail = '';
+                    }
+
+                    $result .= $lastUchr;
+                    $lastUchr = $uchr;
+                }
+            } else {
+                // Hangul chars
+
+                $L = \ord($lastUchr[2]) - 0x80;
+                $V = \ord($uchr[2]) - 0xA1;
+                $T = 0;
+
+                $uchr = substr($s, $i + $ulen, 3);
+
+                if ("\xE1\x86\xA7" <= $uchr && $uchr <= "\xE1\x87\x82") {
+                    $T = \ord($uchr[2]) - 0xA7;
+                    0 > $T && $T += 0x40;
+                    $ulen += 3;
+                }
+
+                $L = 0xAC00 + ($L * 21 + $V) * 28 + $T;
+                $lastUchr = \chr(0xE0 | $L >> 12).\chr(0x80 | $L >> 6 & 0x3F).\chr(0x80 | $L & 0x3F);
+            }
+
+            $i += $ulen;
+        }
+
+        return $result.$lastUchr.$tail;
+    }
+
+    private static function decompose($s, $c)
+    {
+        $result = '';
+
+        $ASCII = self::$ASCII;
+        $decompMap = self::$D;
+        $combClass = self::$cC;
+        $ulenMask = self::$ulenMask;
+        if ($c) {
+            $compatMap = self::$KD;
+        }
+
+        $c = array();
+        $i = 0;
+        $len = \strlen($s);
+
+        while ($i < $len) {
+            if ($s[$i] < "\x80") {
+                // ASCII chars
+
+                if ($c) {
+                    ksort($c);
+                    $result .= implode('', $c);
+                    $c = array();
+                }
+
+                $j = 1 + strspn($s, $ASCII, $i + 1);
+                $result .= substr($s, $i, $j);
+                $i += $j;
+                continue;
+            }
+
+            $ulen = $ulenMask[$s[$i] & "\xF0"];
+            $uchr = substr($s, $i, $ulen);
+            $i += $ulen;
+
+            if ($uchr < "\xEA\xB0\x80" || "\xED\x9E\xA3" < $uchr) {
+                // Table lookup
+
+                if ($uchr !== $j = isset($compatMap[$uchr]) ? $compatMap[$uchr] : (isset($decompMap[$uchr]) ? $decompMap[$uchr] : $uchr)) {
+                    $uchr = $j;
+
+                    $j = \strlen($uchr);
+                    $ulen = $uchr[0] < "\x80" ? 1 : $ulenMask[$uchr[0] & "\xF0"];
+
+                    if ($ulen != $j) {
+                        // Put trailing chars in $s
+
+                        $j -= $ulen;
+                        $i -= $j;
+
+                        if (0 > $i) {
+                            $s = str_repeat(' ', -$i).$s;
+                            $len -= $i;
+                            $i = 0;
+                        }
+
+                        while ($j--) {
+                            $s[$i + $j] = $uchr[$ulen + $j];
+                        }
+
+                        $uchr = substr($uchr, 0, $ulen);
+                    }
+                }
+                if (isset($combClass[$uchr])) {
+                    // Combining chars, for sorting
+
+                    if (!isset($c[$combClass[$uchr]])) {
+                        $c[$combClass[$uchr]] = '';
+                    }
+                    $c[$combClass[$uchr]] .= $uchr;
+                    continue;
+                }
+            } else {
+                // Hangul chars
+
+                $uchr = unpack('C*', $uchr);
+                $j = (($uchr[1] - 224) << 12) + (($uchr[2] - 128) << 6) + $uchr[3] - 0xAC80;
+
+                $uchr = "\xE1\x84".\chr(0x80 + (int) ($j / 588))
+                       ."\xE1\x85".\chr(0xA1 + (int) (($j % 588) / 28));
+
+                if ($j %= 28) {
+                    $uchr .= $j < 25
+                        ? ("\xE1\x86".\chr(0xA7 + $j))
+                        : ("\xE1\x87".\chr(0x67 + $j));
+                }
+            }
+            if ($c) {
+                ksort($c);
+                $result .= implode('', $c);
+                $c = array();
+            }
+
+            $result .= $uchr;
+        }
+
+        if ($c) {
+            ksort($c);
+            $result .= implode('', $c);
+        }
+
+        return $result;
+    }
+
+    private static function getData($file)
+    {
+        if (file_exists($file = __DIR__.'/Resources/unidata/'.$file.'.php')) {
+            return require $file;
+        }
+
+        return false;
+    }
+}
diff --git a/lib/symfony/polyfill-intl-normalizer/README.md b/lib/symfony/polyfill-intl-normalizer/README.md
new file mode 100644
index 000000000..15060c5f1
--- /dev/null
+++ b/lib/symfony/polyfill-intl-normalizer/README.md
@@ -0,0 +1,14 @@
+Symfony Polyfill / Intl: Normalizer
+===================================
+
+This component provides a fallback implementation for the
+[`Normalizer`](https://php.net/Normalizer) class provided
+by the [Intl](https://php.net/intl) extension.
+
+More information can be found in the
+[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
+
+License
+=======
+
+This library is released under the [MIT license](LICENSE).
diff --git a/lib/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php b/lib/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php
new file mode 100644
index 000000000..ca18eff36
--- /dev/null
+++ b/lib/symfony/polyfill-intl-normalizer/Resources/stubs/Normalizer.php
@@ -0,0 +1,17 @@
+<?php
+
+class Normalizer extends Symfony\Polyfill\Intl\Normalizer\Normalizer
+{
+    /**
+     * @deprecated since ICU 56 and removed in PHP 8
+     */
+    const NONE = 1;
+    const FORM_D = 2;
+    const FORM_KD = 3;
+    const FORM_C = 4;
+    const FORM_KC = 5;
+    const NFD = 2;
+    const NFKD = 3;
+    const NFC = 4;
+    const NFKC = 5;
+}
diff --git a/lib/symfony/polyfill-intl-normalizer/Resources/unidata/canonicalComposition.php b/lib/symfony/polyfill-intl-normalizer/Resources/unidata/canonicalComposition.php
new file mode 100644
index 000000000..db4764419
--- /dev/null
+++ b/lib/symfony/polyfill-intl-normalizer/Resources/unidata/canonicalComposition.php
@@ -0,0 +1,945 @@
+<?php
+
+return array (
+  'À' => 'À',
+  'A�' => '�',
+  'Â' => 'Â',
+  'Ã' => 'Ã',
+  'Ä' => 'Ä',
+  'AÌŠ' => 'Ã…',
+  'Ç' => 'Ç',
+  'È' => 'È',
+  'E�' => 'É',
+  'Ê' => 'Ê',
+  'Ë' => 'Ë',
+  'Ì' => 'Ì',
+  'I�' => '�',
+  'IÌ‚' => 'ÃŽ',
+  'Ï' => '�',
+  'Ñ' => 'Ñ',
+  'OÌ€' => 'Ã’',
+  'O�' => 'Ó',
+  'Ô' => 'Ô',
+  'Õ' => 'Õ',
+  'Ö' => 'Ö',
+  'Ù' => 'Ù',
+  'U�' => 'Ú',
+  'Û' => 'Û',
+  'Ü' => 'Ü',
+  'Y�' => '�',
+  'à' => 'à',
+  'a�' => 'á',
+  'â' => 'â',
+  'ã' => 'ã',
+  'ä' => 'ä',
+  'aÌŠ' => 'Ã¥',
+  'ç' => 'ç',
+  'è' => 'è',
+  'e�' => 'é',
+  'ê' => 'ê',
+  'ë' => 'ë',
+  'ì' => 'ì',
+  'i�' => 'í',
+  'î' => 'î',
+  'ï' => 'ï',
+  'ñ' => 'ñ',
+  'ò' => 'ò',
+  'o�' => 'ó',
+  'ô' => 'ô',
+  'õ' => 'õ',
+  'ö' => 'ö',
+  'ù' => 'ù',
+  'u�' => 'ú',
+  'û' => 'û',
+  'ü' => 'ü',
+  'y�' => 'ý',
+  'ÿ' => 'ÿ',
+  'AÌ„' => 'Ä€',
+  'ā' => '�',
+  'Ă' => 'Ă',
+  'ă' => 'ă',
+  'Ą' => 'Ą',
+  'ą' => 'ą',
+  'C�' => 'Ć',
+  'c�' => 'ć',
+  'Ĉ' => 'Ĉ',
+  'ĉ' => 'ĉ',
+  'Ċ' => 'Ċ',
+  'ċ' => 'ċ',
+  'Č' => 'Č',
+  'č' => '�',
+  'Ď' => 'Ď',
+  'ď' => '�',
+  'EÌ„' => 'Ä’',
+  'ē' => 'ē',
+  'Ĕ' => 'Ĕ',
+  'ĕ' => 'ĕ',
+  'Ė' => 'Ė',
+  'ė' => 'ė',
+  'Ę' => 'Ę',
+  'ę' => 'ę',
+  'Ě' => 'Ě',
+  'ě' => 'ě',
+  'Ĝ' => 'Ĝ',
+  'ĝ' => '�',
+  'Ğ' => 'Ğ',
+  'ğ' => 'ğ',
+  'Ġ' => 'Ġ',
+  'ġ' => 'ġ',
+  'Ģ' => 'Ģ',
+  'ģ' => 'ģ',
+  'Ĥ' => 'Ĥ',
+  'ĥ' => 'ĥ',
+  'Ĩ' => 'Ĩ',
+  'ĩ' => 'ĩ',
+  'Ī' => 'Ī',
+  'ī' => 'ī',
+  'Ĭ' => 'Ĭ',
+  'ĭ' => 'ĭ',
+  'Į' => 'Į',
+  'į' => 'į',
+  'İ' => 'İ',
+  'JÌ‚' => 'Ä´',
+  'ĵ' => 'ĵ',
+  'Ķ' => 'Ķ',
+  'ķ' => 'ķ',
+  'L�' => 'Ĺ',
+  'l�' => 'ĺ',
+  'Ļ' => 'Ļ',
+  'ļ' => 'ļ',
+  'Ľ' => 'Ľ',
+  'ľ' => 'ľ',
+  'N�' => 'Ń',
+  'n�' => 'ń',
+  'Ņ' => 'Ņ',
+  'ņ' => 'ņ',
+  'Ň' => 'Ň',
+  'ň' => 'ň',
+  'Ō' => 'Ō',
+  'ō' => '�',
+  'Ŏ' => 'Ŏ',
+  'ŏ' => '�',
+  'Ő' => '�',
+  'ő' => 'ő',
+  'R�' => 'Ŕ',
+  'r�' => 'ŕ',
+  'Ŗ' => 'Ŗ',
+  'ŗ' => 'ŗ',
+  'Ř' => 'Ř',
+  'ř' => 'ř',
+  'S�' => 'Ś',
+  's�' => 'ś',
+  'Ŝ' => 'Ŝ',
+  'ŝ' => '�',
+  'Ş' => 'Ş',
+  'ş' => 'ş',
+  'Š' => 'Š',
+  'š' => 'š',
+  'Ţ' => 'Ţ',
+  'ţ' => 'ţ',
+  'Ť' => 'Ť',
+  'ť' => 'ť',
+  'Ũ' => 'Ũ',
+  'ũ' => 'ũ',
+  'Ū' => 'Ū',
+  'ū' => 'ū',
+  'Ŭ' => 'Ŭ',
+  'ŭ' => 'ŭ',
+  'UÌŠ' => 'Å®',
+  'ů' => 'ů',
+  'UÌ‹' => 'Å°',
+  'ű' => 'ű',
+  'Ų' => 'Ų',
+  'ų' => 'ų',
+  'WÌ‚' => 'Å´',
+  'ŵ' => 'ŵ',
+  'Ŷ' => 'Ŷ',
+  'ŷ' => 'ŷ',
+  'Ÿ' => 'Ÿ',
+  'Z�' => 'Ź',
+  'z�' => 'ź',
+  'Ż' => 'Ż',
+  'ż' => 'ż',
+  'Ž' => 'Ž',
+  'ž' => 'ž',
+  'OÌ›' => 'Æ ',
+  'oÌ›' => 'Æ¡',
+  'Ư' => 'Ư',
+  'uÌ›' => 'Æ°',
+  'Ǎ' => '�',
+  'ǎ' => 'ǎ',
+  'Ǐ' => '�',
+  'ǐ' => '�',
+  'Ǒ' => 'Ǒ',
+  'ǒ' => 'ǒ',
+  'Ǔ' => 'Ǔ',
+  'ǔ' => 'ǔ',
+  'Ǖ' => 'Ǖ',
+  'ǖ' => 'ǖ',
+  'Ü�' => 'Ǘ',
+  'ü�' => 'ǘ',
+  'Ǚ' => 'Ǚ',
+  'ǚ' => 'ǚ',
+  'Ǜ' => 'Ǜ',
+  'ǜ' => 'ǜ',
+  'Ǟ' => 'Ǟ',
+  'ǟ' => 'ǟ',
+  'Ǡ' => 'Ǡ',
+  'ǡ' => 'ǡ',
+  'Ǣ' => 'Ǣ',
+  'ǣ' => 'ǣ',
+  'Ǧ' => 'Ǧ',
+  'ǧ' => 'ǧ',
+  'Ǩ' => 'Ǩ',
+  'ǩ' => 'ǩ',
+  'Ǫ' => 'Ǫ',
+  'ǫ' => 'ǫ',
+  'Ǭ' => 'Ǭ',
+  'Ç«Ì„' => 'Ç­',
+  'Ǯ' => 'Ǯ',
+  'ǯ' => 'ǯ',
+  'ǰ' => 'ǰ',
+  'G�' => 'Ǵ',
+  'g�' => 'ǵ',
+  'Ǹ' => 'Ǹ',
+  'ǹ' => 'ǹ',
+  'Å�' => 'Ǻ',
+  'å�' => 'ǻ',
+  'Æ�' => 'Ǽ',
+  'æ�' => 'ǽ',
+  'Ø�' => 'Ǿ',
+  'ø�' => 'ǿ',
+  'A�' => 'Ȁ',
+  'a�' => '�',
+  'AÌ‘' => 'È‚',
+  'ȃ' => 'ȃ',
+  'E�' => 'Ȅ',
+  'e�' => 'ȅ',
+  'Ȇ' => 'Ȇ',
+  'ȇ' => 'ȇ',
+  'I�' => 'Ȉ',
+  'i�' => 'ȉ',
+  'IÌ‘' => 'ÈŠ',
+  'ȋ' => 'ȋ',
+  'O�' => 'Ȍ',
+  'o�' => '�',
+  'OÌ‘' => 'ÈŽ',
+  'ȏ' => '�',
+  'R�' => '�',
+  'r�' => 'ȑ',
+  'RÌ‘' => 'È’',
+  'ȓ' => 'ȓ',
+  'U�' => 'Ȕ',
+  'u�' => 'ȕ',
+  'UÌ‘' => 'È–',
+  'ȗ' => 'ȗ',
+  'Ș' => 'Ș',
+  'ș' => 'ș',
+  'Ț' => 'Ț',
+  'ț' => 'ț',
+  'Ȟ' => 'Ȟ',
+  'ȟ' => 'ȟ',
+  'Ȧ' => 'Ȧ',
+  'ȧ' => 'ȧ',
+  'Ȩ' => 'Ȩ',
+  'ȩ' => 'ȩ',
+  'Ȫ' => 'Ȫ',
+  'ȫ' => 'ȫ',
+  'Ȭ' => 'Ȭ',
+  'ȭ' => 'ȭ',
+  'Ȯ' => 'Ȯ',
+  'ȯ' => 'ȯ',
+  'Ȱ' => 'Ȱ',
+  'ȱ' => 'ȱ',
+  'Ȳ' => 'Ȳ',
+  'ȳ' => 'ȳ',
+  '¨�' => '΅',
+  'Α�' => 'Ά',
+  'Ε�' => 'Έ',
+  'Η�' => 'Ή',
+  'Ι�' => 'Ί',
+  'Ο�' => 'Ό',
+  'Υ�' => 'Ύ',
+  'Ω�' => '�',
+  'ϊ�' => '�',
+  'Ϊ' => 'Ϊ',
+  'Ϋ' => 'Ϋ',
+  'α�' => 'ά',
+  'ε�' => 'έ',
+  'η�' => 'ή',
+  'ι�' => 'ί',
+  'ϋ�' => 'ΰ',
+  'ϊ' => 'ϊ',
+  'ϋ' => 'ϋ',
+  'ο�' => 'ό',
+  'υ�' => '�',
+  'ω�' => 'ώ',
+  'ϒ�' => 'ϓ',
+  'ϔ' => 'ϔ',
+  'Ѐ' => 'Ѐ',
+  'Ё' => '�',
+  'Г�' => 'Ѓ',
+  'Ї' => 'Ї',
+  'К�' => 'Ќ',
+  'Ѝ' => '�',
+  'Ў' => 'Ў',
+  'Й' => 'Й',
+  'й' => 'й',
+  'ѐ' => '�',
+  'ё' => 'ё',
+  'г�' => 'ѓ',
+  'ї' => 'ї',
+  'к�' => 'ќ',
+  'ѝ' => '�',
+  'ў' => 'ў',
+  'Ѵ�' => 'Ѷ',
+  'ѵ�' => 'ѷ',
+  'Ӂ' => '�',
+  'ӂ' => 'ӂ',
+  '�̆' => '�',
+  'ӑ' => 'ӑ',
+  '�̈' => 'Ӓ',
+  'ӓ' => 'ӓ',
+  'Ӗ' => 'Ӗ',
+  'ӗ' => 'ӗ',
+  'Ӛ' => 'Ӛ',
+  'ӛ' => 'ӛ',
+  'Ӝ' => 'Ӝ',
+  'ӝ' => '�',
+  'Ӟ' => 'Ӟ',
+  'ӟ' => 'ӟ',
+  'Ӣ' => 'Ӣ',
+  'ӣ' => 'ӣ',
+  'Ӥ' => 'Ӥ',
+  'ӥ' => 'ӥ',
+  'Ӧ' => 'Ӧ',
+  'ӧ' => 'ӧ',
+  'Ӫ' => 'Ӫ',
+  'ӫ' => 'ӫ',
+  'Ӭ' => 'Ӭ',
+  '�̈' => 'ӭ',
+  'Ӯ' => 'Ӯ',
+  'ӯ' => 'ӯ',
+  'Ӱ' => 'Ӱ',
+  'ӱ' => 'ӱ',
+  'Ӳ' => 'Ӳ',
+  'ӳ' => 'ӳ',
+  'Ӵ' => 'Ӵ',
+  'ӵ' => 'ӵ',
+  'Ӹ' => 'Ӹ',
+  'ӹ' => 'ӹ',
+  'آ' => 'آ',
+  'أ' => 'أ',
+  'ؤ' => 'ؤ',
+  'إ' => 'إ',
+  'ئ' => 'ئ',
+  'Û•Ù”' => 'Û€',
+  'Û�Ù”' => 'Û‚',
+  'Û’Ù”' => 'Û“',
+  'ऩ' => 'ऩ',
+  'ऱ' => 'ऱ',
+  'ऴ' => 'ऴ',
+  'ো' => 'ো',
+  'ৌ' => 'ৌ',
+  'ୈ' => 'ୈ',
+  'ୋ' => 'ୋ',
+  'ୌ' => 'ୌ',
+  'ஔ' => 'ஔ',
+  'ொ' => 'ொ',
+  'ோ' => 'ோ',
+  'ௌ' => 'ௌ',
+  'ై' => 'ై',
+  'ೀ' => 'ೀ',
+  'ೇ' => 'ೇ',
+  'ೈ' => 'ೈ',
+  'ೊ' => 'ೊ',
+  'ೋ' => 'ೋ',
+  'ൊ' => 'ൊ',
+  'ോ' => 'ോ',
+  'ൌ' => 'ൌ',
+  'ේ' => 'ේ',
+  'ෙ�' => 'ො',
+  'ෝ' => '�',
+  'ෞ' => 'ෞ',
+  'ဦ' => 'ဦ',
+  'ᬆ' => 'ᬆ',
+  'ᬈ' => 'ᬈ',
+  'ᬊ' => 'ᬊ',
+  'ᬌ' => 'ᬌ',
+  '�ᬵ' => 'ᬎ',
+  'ᬒ' => 'ᬒ',
+  'ᬻ' => 'ᬻ',
+  'ᬽ' => 'ᬽ',
+  'ᭀ' => 'ᭀ',
+  'ᭁ' => '�',
+  'ᭃ' => 'ᭃ',
+  'Ḁ' => 'Ḁ',
+  'ḁ' => '�',
+  'Ḃ' => 'Ḃ',
+  'ḃ' => 'ḃ',
+  'Ḅ' => 'Ḅ',
+  'ḅ' => 'ḅ',
+  'Ḇ' => 'Ḇ',
+  'ḇ' => 'ḇ',
+  'Ç�' => 'Ḉ',
+  'ç�' => 'ḉ',
+  'Ḋ' => 'Ḋ',
+  'ḋ' => 'ḋ',
+  'Ḍ' => 'Ḍ',
+  'ḍ' => '�',
+  'Ḏ' => 'Ḏ',
+  'ḏ' => '�',
+  'Ḑ' => '�',
+  'ḑ' => 'ḑ',
+  'Ḓ' => 'Ḓ',
+  'ḓ' => 'ḓ',
+  'Ḕ' => 'Ḕ',
+  'ḕ' => 'ḕ',
+  'Ē�' => 'Ḗ',
+  'ē�' => 'ḗ',
+  'Ḙ' => 'Ḙ',
+  'ḙ' => 'ḙ',
+  'Ḛ' => 'Ḛ',
+  'ḛ' => 'ḛ',
+  'Ḝ' => 'Ḝ',
+  'ḝ' => '�',
+  'Ḟ' => 'Ḟ',
+  'ḟ' => 'ḟ',
+  'Ḡ' => 'Ḡ',
+  'ḡ' => 'ḡ',
+  'Ḣ' => 'Ḣ',
+  'ḣ' => 'ḣ',
+  'Ḥ' => 'Ḥ',
+  'ḥ' => 'ḥ',
+  'Ḧ' => 'Ḧ',
+  'ḧ' => 'ḧ',
+  'Ḩ' => 'Ḩ',
+  'ḩ' => 'ḩ',
+  'Ḫ' => 'Ḫ',
+  'ḫ' => 'ḫ',
+  'Ḭ' => 'Ḭ',
+  'ḭ' => 'ḭ',
+  '��' => 'Ḯ',
+  'ï�' => 'ḯ',
+  'K�' => 'Ḱ',
+  'k�' => 'ḱ',
+  'Ḳ' => 'Ḳ',
+  'ḳ' => 'ḳ',
+  'Ḵ' => 'Ḵ',
+  'ḵ' => 'ḵ',
+  'Ḷ' => 'Ḷ',
+  'ḷ' => 'ḷ',
+  'Ḹ' => 'Ḹ',
+  'ḹ' => 'ḹ',
+  'Ḻ' => 'Ḻ',
+  'ḻ' => 'ḻ',
+  'Ḽ' => 'Ḽ',
+  'ḽ' => 'ḽ',
+  'M�' => 'Ḿ',
+  'm�' => 'ḿ',
+  'Ṁ' => 'Ṁ',
+  'ṁ' => '�',
+  'Ṃ' => 'Ṃ',
+  'ṃ' => 'ṃ',
+  'Ṅ' => 'Ṅ',
+  'ṅ' => 'ṅ',
+  'Ṇ' => 'Ṇ',
+  'ṇ' => 'ṇ',
+  'Ṉ' => 'Ṉ',
+  'ṉ' => 'ṉ',
+  'Ṋ' => 'Ṋ',
+  'ṋ' => 'ṋ',
+  'Õ�' => 'Ṍ',
+  'õ�' => '�',
+  'Ṏ' => 'Ṏ',
+  'ṏ' => '�',
+  'Ṑ' => '�',
+  '�̀' => 'ṑ',
+  'Ō�' => 'Ṓ',
+  '��' => 'ṓ',
+  'P�' => 'Ṕ',
+  'p�' => 'ṕ',
+  'Ṗ' => 'Ṗ',
+  'ṗ' => 'ṗ',
+  'Ṙ' => 'Ṙ',
+  'ṙ' => 'ṙ',
+  'Ṛ' => 'Ṛ',
+  'ṛ' => 'ṛ',
+  'Ṝ' => 'Ṝ',
+  'ṝ' => '�',
+  'Ṟ' => 'Ṟ',
+  'ṟ' => 'ṟ',
+  'Ṡ' => 'Ṡ',
+  'ṡ' => 'ṡ',
+  'SÌ£' => 'á¹¢',
+  'ṣ' => 'ṣ',
+  'Ṥ' => 'Ṥ',
+  'ṥ' => 'ṥ',
+  'Ṧ' => 'Ṧ',
+  'ṧ' => 'ṧ',
+  'Ṩ' => 'Ṩ',
+  'ṩ' => 'ṩ',
+  'Ṫ' => 'Ṫ',
+  'ṫ' => 'ṫ',
+  'Ṭ' => 'Ṭ',
+  'ṭ' => 'ṭ',
+  'Ṯ' => 'Ṯ',
+  'ṯ' => 'ṯ',
+  'TÌ­' => 'á¹°',
+  'tÌ­' => 'á¹±',
+  'Ṳ' => 'Ṳ',
+  'ṳ' => 'ṳ',
+  'UÌ°' => 'á¹´',
+  'uÌ°' => 'á¹µ',
+  'Ṷ' => 'Ṷ',
+  'uÌ­' => 'á¹·',
+  'Ũ�' => 'Ṹ',
+  'ũ�' => 'ṹ',
+  'Ṻ' => 'Ṻ',
+  'ṻ' => 'ṻ',
+  'Ṽ' => 'Ṽ',
+  'ṽ' => 'ṽ',
+  'VÌ£' => 'á¹¾',
+  'ṿ' => 'ṿ',
+  'Ẁ' => 'Ẁ',
+  'ẁ' => '�',
+  'W�' => 'Ẃ',
+  'w�' => 'ẃ',
+  'Ẅ' => 'Ẅ',
+  'ẅ' => 'ẅ',
+  'Ẇ' => 'Ẇ',
+  'ẇ' => 'ẇ',
+  'Ẉ' => 'Ẉ',
+  'ẉ' => 'ẉ',
+  'Ẋ' => 'Ẋ',
+  'ẋ' => 'ẋ',
+  'Ẍ' => 'Ẍ',
+  'ẍ' => '�',
+  'Ẏ' => 'Ẏ',
+  'ẏ' => '�',
+  'Ẑ' => '�',
+  'ẑ' => 'ẑ',
+  'Ẓ' => 'Ẓ',
+  'ẓ' => 'ẓ',
+  'Ẕ' => 'Ẕ',
+  'ẕ' => 'ẕ',
+  'ẖ' => 'ẖ',
+  'ẗ' => 'ẗ',
+  'ẘ' => 'ẘ',
+  'ẙ' => 'ẙ',
+  'ẛ' => 'ẛ',
+  'Ạ' => 'Ạ',
+  'ạ' => 'ạ',
+  'Ả' => 'Ả',
+  'ả' => 'ả',
+  'Â�' => 'Ấ',
+  'â�' => 'ấ',
+  'Ầ' => 'Ầ',
+  'ầ' => 'ầ',
+  'Ẩ' => 'Ẩ',
+  'ẩ' => 'ẩ',
+  'Ẫ' => 'Ẫ',
+  'ẫ' => 'ẫ',
+  'Ậ' => 'Ậ',
+  'ậ' => 'ậ',
+  'Ă�' => 'Ắ',
+  'ă�' => 'ắ',
+  'Ằ' => 'Ằ',
+  'ằ' => 'ằ',
+  'Ẳ' => 'Ẳ',
+  'ẳ' => 'ẳ',
+  'Ẵ' => 'Ẵ',
+  'ẵ' => 'ẵ',
+  'Ặ' => 'Ặ',
+  'ặ' => 'ặ',
+  'Ẹ' => 'Ẹ',
+  'ẹ' => 'ẹ',
+  'Ẻ' => 'Ẻ',
+  'ẻ' => 'ẻ',
+  'Ẽ' => 'Ẽ',
+  'ẽ' => 'ẽ',
+  'Ê�' => 'Ế',
+  'ê�' => 'ế',
+  'Ề' => 'Ề',
+  'ề' => '�',
+  'Ể' => 'Ể',
+  'ể' => 'ể',
+  'Ễ' => 'Ễ',
+  'ễ' => 'ễ',
+  'Ệ' => 'Ệ',
+  'ệ' => 'ệ',
+  'Ỉ' => 'Ỉ',
+  'ỉ' => 'ỉ',
+  'Ị' => 'Ị',
+  'ị' => 'ị',
+  'Ọ' => 'Ọ',
+  'ọ' => '�',
+  'Ỏ' => 'Ỏ',
+  'ỏ' => '�',
+  'Ô�' => '�',
+  'ô�' => 'ố',
+  'Ồ' => 'Ồ',
+  'ồ' => 'ồ',
+  'Ổ' => 'Ổ',
+  'ổ' => 'ổ',
+  'Ỗ' => 'Ỗ',
+  'ỗ' => 'ỗ',
+  'Ộ' => 'Ộ',
+  '�̂' => 'ộ',
+  'Ơ�' => 'Ớ',
+  'ơ�' => 'ớ',
+  'Ờ' => 'Ờ',
+  'ờ' => '�',
+  'Ở' => 'Ở',
+  'ở' => 'ở',
+  'Ỡ' => 'Ỡ',
+  'ỡ' => 'ỡ',
+  'Ợ' => 'Ợ',
+  'ợ' => 'ợ',
+  'Ụ' => 'Ụ',
+  'ụ' => 'ụ',
+  'Ủ' => 'Ủ',
+  'ủ' => 'ủ',
+  'Ư�' => 'Ứ',
+  'ư�' => 'ứ',
+  'Ừ' => 'Ừ',
+  'ừ' => 'ừ',
+  'Ử' => 'Ử',
+  'ử' => 'ử',
+  'Ữ' => 'Ữ',
+  'ữ' => 'ữ',
+  'Ự' => 'Ự',
+  'Æ°Ì£' => 'á»±',
+  'Ỳ' => 'Ỳ',
+  'ỳ' => 'ỳ',
+  'YÌ£' => 'á»´',
+  'ỵ' => 'ỵ',
+  'Ỷ' => 'Ỷ',
+  'ỷ' => 'ỷ',
+  'Ỹ' => 'Ỹ',
+  'ỹ' => 'ỹ',
+  'ἀ' => 'ἀ',
+  'ἁ' => '�',
+  'ἂ' => 'ἂ',
+  '�̀' => 'ἃ',
+  'ἀ�' => 'ἄ',
+  '��' => 'ἅ',
+  'ἆ' => 'ἆ',
+  '�͂' => 'ἇ',
+  'Ἀ' => 'Ἀ',
+  'Ἁ' => 'Ἁ',
+  'Ἂ' => 'Ἂ',
+  'Ἃ' => 'Ἃ',
+  'Ἀ�' => 'Ἄ',
+  'Ἁ�' => '�',
+  'Ἆ' => 'Ἆ',
+  'Ἇ' => '�',
+  'ἐ' => '�',
+  'ἑ' => 'ἑ',
+  '�̀' => 'ἒ',
+  'ἓ' => 'ἓ',
+  '��' => 'ἔ',
+  'ἑ�' => 'ἕ',
+  'Ἐ' => 'Ἐ',
+  'Ἑ' => 'Ἑ',
+  'Ἒ' => 'Ἒ',
+  'Ἓ' => 'Ἓ',
+  'Ἐ�' => 'Ἔ',
+  'Ἑ�' => '�',
+  'ἠ' => 'ἠ',
+  'ἡ' => 'ἡ',
+  'ἢ' => 'ἢ',
+  'ἣ' => 'ἣ',
+  'ἠ�' => 'ἤ',
+  'ἡ�' => 'ἥ',
+  'ἦ' => 'ἦ',
+  'ἧ' => 'ἧ',
+  'Ἠ' => 'Ἠ',
+  'Ἡ' => 'Ἡ',
+  'Ἢ' => 'Ἢ',
+  'Ἣ' => 'Ἣ',
+  'Ἠ�' => 'Ἤ',
+  'Ἡ�' => 'Ἥ',
+  'Ἦ' => 'Ἦ',
+  'Ἧ' => 'Ἧ',
+  'ἰ' => 'ἰ',
+  'ἱ' => 'ἱ',
+  'á¼°Ì€' => 'á¼²',
+  'ἳ' => 'ἳ',
+  'ἰ�' => 'ἴ',
+  'ἱ�' => 'ἵ',
+  'ἶ' => 'ἶ',
+  'ἷ' => 'ἷ',
+  'Ἰ' => 'Ἰ',
+  'Ἱ' => 'Ἱ',
+  'Ἲ' => 'Ἲ',
+  'Ἳ' => 'Ἳ',
+  'Ἰ�' => 'Ἴ',
+  'Ἱ�' => 'Ἵ',
+  'Ἶ' => 'Ἶ',
+  'Ἷ' => 'Ἷ',
+  'ὀ' => 'ὀ',
+  'ὁ' => '�',
+  'ὂ' => 'ὂ',
+  '�̀' => 'ὃ',
+  'ὀ�' => 'ὄ',
+  '��' => 'ὅ',
+  'Ὀ' => 'Ὀ',
+  'Ὁ' => 'Ὁ',
+  'Ὂ' => 'Ὂ',
+  'Ὃ' => 'Ὃ',
+  'Ὀ�' => 'Ὄ',
+  'Ὁ�' => '�',
+  'ὐ' => '�',
+  'ὑ' => 'ὑ',
+  '�̀' => 'ὒ',
+  'ὓ' => 'ὓ',
+  '��' => 'ὔ',
+  'ὑ�' => 'ὕ',
+  '�͂' => 'ὖ',
+  'ὗ' => 'ὗ',
+  'Ὑ' => 'Ὑ',
+  'Ὓ' => 'Ὓ',
+  'Ὑ�' => '�',
+  'Ὗ' => 'Ὗ',
+  'ὠ' => 'ὠ',
+  'ὡ' => 'ὡ',
+  'ὢ' => 'ὢ',
+  'ὣ' => 'ὣ',
+  'ὠ�' => 'ὤ',
+  'ὡ�' => 'ὥ',
+  'ὦ' => 'ὦ',
+  'ὧ' => 'ὧ',
+  'Ὠ' => 'Ὠ',
+  'Ὡ' => 'Ὡ',
+  'Ὢ' => 'Ὢ',
+  'Ὣ' => 'Ὣ',
+  'Ὠ�' => 'Ὤ',
+  'Ὡ�' => 'Ὥ',
+  'Ὦ' => 'Ὦ',
+  'Ὧ' => 'Ὧ',
+  'ὰ' => 'ὰ',
+  'ὲ' => 'ὲ',
+  'ὴ' => 'ὴ',
+  'ὶ' => 'ὶ',
+  'ὸ' => 'ὸ',
+  'ὺ' => 'ὺ',
+  'ὼ' => 'ὼ',
+  'ᾀ' => 'ᾀ',
+  '�ͅ' => '�',
+  'ᾂ' => 'ᾂ',
+  'ᾃ' => 'ᾃ',
+  'ᾄ' => 'ᾄ',
+  'á¼…Í…' => 'á¾…',
+  'ᾆ' => 'ᾆ',
+  'ᾇ' => 'ᾇ',
+  'ᾈ' => 'ᾈ',
+  'ᾉ' => 'ᾉ',
+  'ᾊ' => 'ᾊ',
+  'ᾋ' => 'ᾋ',
+  'ᾌ' => 'ᾌ',
+  '�ͅ' => '�',
+  'ᾎ' => 'ᾎ',
+  '�ͅ' => '�',
+  'ᾐ' => '�',
+  'ᾑ' => 'ᾑ',
+  'ᾒ' => 'ᾒ',
+  'ᾓ' => 'ᾓ',
+  'ᾔ' => 'ᾔ',
+  'ᾕ' => 'ᾕ',
+  'ᾖ' => 'ᾖ',
+  'ᾗ' => 'ᾗ',
+  'ᾘ' => 'ᾘ',
+  'ᾙ' => 'ᾙ',
+  'ᾚ' => 'ᾚ',
+  'ᾛ' => 'ᾛ',
+  'ᾜ' => 'ᾜ',
+  'ᾝ' => '�',
+  'ᾞ' => 'ᾞ',
+  'ᾟ' => 'ᾟ',
+  'á½ Í…' => 'á¾ ',
+  'ᾡ' => 'ᾡ',
+  'ᾢ' => 'ᾢ',
+  'ᾣ' => 'ᾣ',
+  'ᾤ' => 'ᾤ',
+  'ᾥ' => 'ᾥ',
+  'ᾦ' => 'ᾦ',
+  'ᾧ' => 'ᾧ',
+  'ᾨ' => 'ᾨ',
+  'ᾩ' => 'ᾩ',
+  'ᾪ' => 'ᾪ',
+  'ᾫ' => 'ᾫ',
+  'ᾬ' => 'ᾬ',
+  'á½­Í…' => 'á¾­',
+  'ᾮ' => 'ᾮ',
+  'ᾯ' => 'ᾯ',
+  'ᾰ' => 'ᾰ',
+  'ᾱ' => 'ᾱ',
+  'á½°Í…' => 'á¾²',
+  'ᾳ' => 'ᾳ',
+  'ᾴ' => 'ᾴ',
+  'ᾶ' => 'ᾶ',
+  'ᾷ' => 'ᾷ',
+  'Ᾰ' => 'Ᾰ',
+  'Ᾱ' => 'Ᾱ',
+  'Ὰ' => 'Ὰ',
+  'ᾼ' => 'ᾼ',
+  '῁' => '�',
+  'á½´Í…' => 'á¿‚',
+  'ῃ' => 'ῃ',
+  'ῄ' => 'ῄ',
+  'ῆ' => 'ῆ',
+  'ῇ' => 'ῇ',
+  'Ὲ' => 'Ὲ',
+  'Ὴ' => 'Ὴ',
+  'ῌ' => 'ῌ',
+  '῍' => '�',
+  '᾿�' => '῎',
+  '῏' => '�',
+  'ῐ' => '�',
+  'ῑ' => 'ῑ',
+  'ÏŠÌ€' => 'á¿’',
+  'ῖ' => 'ῖ',
+  'ÏŠÍ‚' => 'á¿—',
+  'Ῐ' => 'Ῐ',
+  'Ῑ' => 'Ῑ',
+  'Ὶ' => 'Ὶ',
+  '῝' => '�',
+  '῾�' => '῞',
+  '῟' => '῟',
+  'ῠ' => 'ῠ',
+  'Ï…Ì„' => 'á¿¡',
+  'Ï‹Ì€' => 'á¿¢',
+  '�̓' => 'ῤ',
+  '�̔' => 'ῥ',
+  'ῦ' => 'ῦ',
+  'ῧ' => 'ῧ',
+  'Ῠ' => 'Ῠ',
+  'Ῡ' => 'Ῡ',
+  'Ὺ' => 'Ὺ',
+  'Ῥ' => 'Ῥ',
+  '῭' => '῭',
+  'ῲ' => 'ῲ',
+  'ῳ' => 'ῳ',
+  'ÏŽÍ…' => 'á¿´',
+  'ῶ' => 'ῶ',
+  'ῷ' => 'ῷ',
+  'Ὸ' => 'Ὸ',
+  'Ὼ' => 'Ὼ',
+  'ῼ' => 'ῼ',
+  '�̸' => '↚',
+  '↛' => '↛',
+  '↮' => '↮',
+  '�̸' => '�',
+  '⇎' => '⇎',
+  '⇏' => '�',
+  '∄' => '∄',
+  '∉' => '∉',
+  '∌' => '∌',
+  '∤' => '∤',
+  '∦' => '∦',
+  '≁' => '�',
+  '≄' => '≄',
+  '≇' => '≇',
+  '≉' => '≉',
+  '≠' => '≠',
+  '≢' => '≢',
+  '�̸' => '≭',
+  '≮' => '≮',
+  '≯' => '≯',
+  '≰' => '≰',
+  '≱' => '≱',
+  '≴' => '≴',
+  '≵' => '≵',
+  '≸' => '≸',
+  '≹' => '≹',
+  '⊀' => '⊀',
+  '⊁' => '�',
+  '⊄' => '⊄',
+  '⊅' => '⊅',
+  '⊈' => '⊈',
+  '⊉' => '⊉',
+  '⊬' => '⊬',
+  '⊭' => '⊭',
+  '⊮' => '⊮',
+  '⊯' => '⊯',
+  '⋠' => '⋠',
+  '⋡' => '⋡',
+  '⋢' => '⋢',
+  '⋣' => '⋣',
+  '⋪' => '⋪',
+  '⋫' => '⋫',
+  '⋬' => '⋬',
+  '⋭' => '⋭',
+  '�゙' => '�',
+  '�゙' => '�',
+  '�゙' => '�',
+  '�゙' => '�',
+  '�゙' => '�',
+  '�゙' => '�',
+  '�゙' => '�',
+  '�゙' => '�',
+  '�゙' => '�',
+  '�゙' => '�',
+  '�゙' => '�',
+  '�゙' => '�',
+  '�゙' => '�',
+  '�゙' => '�',
+  '�゙' => '�',
+  '�゙' => '�',
+  '�゚' => '�',
+  '�゙' => '�',
+  '�゚' => '�',
+  '�゙' => '�',
+  '�゚' => '�',
+  '�゙' => '�',
+  '�゚' => '�',
+  '�゙' => '�',
+  '�゚' => '�',
+  '�゙' => 'ゔ',
+  '�゙' => 'ゞ',
+  'ガ' => 'ガ',
+  'ã‚­ã‚™' => 'ã‚®',
+  'グ' => 'グ',
+  'ゲ' => 'ゲ',
+  'ゴ' => 'ゴ',
+  'ザ' => 'ザ',
+  'ジ' => 'ジ',
+  'ズ' => 'ズ',
+  'ゼ' => 'ゼ',
+  'ゾ' => 'ゾ',
+  'ダ' => 'ダ',
+  '�゙' => 'ヂ',
+  'ヅ' => 'ヅ',
+  'デ' => 'デ',
+  'ド' => 'ド',
+  '�゙' => '�',
+  '�゚' => 'パ',
+  'ビ' => 'ビ',
+  'ピ' => 'ピ',
+  'ブ' => 'ブ',
+  'プ' => 'プ',
+  'ベ' => 'ベ',
+  'ペ' => 'ペ',
+  'ボ' => 'ボ',
+  'ポ' => '�',
+  'ヴ' => 'ヴ',
+  'ヷ' => 'ヷ',
+  'ヸ' => 'ヸ',
+  'ヹ' => 'ヹ',
+  'ヺ' => 'ヺ',
+  'ヾ' => 'ヾ',
+  '𑂚' => '𑂚',
+  '𑂜' => '𑂜',
+  '𑂫' => '𑂫',
+  '𑄮' => '𑄮',
+  '𑄯' => '𑄯',
+  '�𑌾' => '�',
+  '��' => '�',
+  '𑒻' => '𑒻',
+  '𑒼' => '𑒼',
+  '𑒾' => '𑒾',
+  '𑖺' => '𑖺',
+  '𑖻' => '𑖻',
+  '𑤸' => '𑤸',
+);
diff --git a/lib/symfony/polyfill-intl-normalizer/Resources/unidata/canonicalDecomposition.php b/lib/symfony/polyfill-intl-normalizer/Resources/unidata/canonicalDecomposition.php
new file mode 100644
index 000000000..5a3e8e096
--- /dev/null
+++ b/lib/symfony/polyfill-intl-normalizer/Resources/unidata/canonicalDecomposition.php
@@ -0,0 +1,2065 @@
+<?php
+
+return array (
+  'À' => 'À',
+  '�' => 'A�',
+  'Â' => 'Â',
+  'Ã' => 'Ã',
+  'Ä' => 'Ä',
+  'Ã…' => 'AÌŠ',
+  'Ç' => 'Ç',
+  'È' => 'È',
+  'É' => 'E�',
+  'Ê' => 'Ê',
+  'Ë' => 'Ë',
+  'Ì' => 'Ì',
+  '�' => 'I�',
+  'ÃŽ' => 'IÌ‚',
+  '�' => 'Ï',
+  'Ñ' => 'Ñ',
+  'Ã’' => 'OÌ€',
+  'Ó' => 'O�',
+  'Ô' => 'Ô',
+  'Õ' => 'Õ',
+  'Ö' => 'Ö',
+  'Ù' => 'Ù',
+  'Ú' => 'U�',
+  'Û' => 'Û',
+  'Ü' => 'Ü',
+  '�' => 'Y�',
+  'à' => 'à',
+  'á' => 'a�',
+  'â' => 'â',
+  'ã' => 'ã',
+  'ä' => 'ä',
+  'Ã¥' => 'aÌŠ',
+  'ç' => 'ç',
+  'è' => 'è',
+  'é' => 'e�',
+  'ê' => 'ê',
+  'ë' => 'ë',
+  'ì' => 'ì',
+  'í' => 'i�',
+  'î' => 'î',
+  'ï' => 'ï',
+  'ñ' => 'ñ',
+  'ò' => 'ò',
+  'ó' => 'o�',
+  'ô' => 'ô',
+  'õ' => 'õ',
+  'ö' => 'ö',
+  'ù' => 'ù',
+  'ú' => 'u�',
+  'û' => 'û',
+  'ü' => 'ü',
+  'ý' => 'y�',
+  'ÿ' => 'ÿ',
+  'Ä€' => 'AÌ„',
+  '�' => 'ā',
+  'Ă' => 'Ă',
+  'ă' => 'ă',
+  'Ą' => 'Ą',
+  'ą' => 'ą',
+  'Ć' => 'C�',
+  'ć' => 'c�',
+  'Ĉ' => 'Ĉ',
+  'ĉ' => 'ĉ',
+  'Ċ' => 'Ċ',
+  'ċ' => 'ċ',
+  'Č' => 'Č',
+  '�' => 'č',
+  'Ď' => 'Ď',
+  '�' => 'ď',
+  'Ä’' => 'EÌ„',
+  'ē' => 'ē',
+  'Ĕ' => 'Ĕ',
+  'ĕ' => 'ĕ',
+  'Ė' => 'Ė',
+  'ė' => 'ė',
+  'Ę' => 'Ę',
+  'ę' => 'ę',
+  'Ě' => 'Ě',
+  'ě' => 'ě',
+  'Ĝ' => 'Ĝ',
+  '�' => 'ĝ',
+  'Ğ' => 'Ğ',
+  'ğ' => 'ğ',
+  'Ġ' => 'Ġ',
+  'ġ' => 'ġ',
+  'Ģ' => 'Ģ',
+  'ģ' => 'ģ',
+  'Ĥ' => 'Ĥ',
+  'ĥ' => 'ĥ',
+  'Ĩ' => 'Ĩ',
+  'ĩ' => 'ĩ',
+  'Ī' => 'Ī',
+  'ī' => 'ī',
+  'Ĭ' => 'Ĭ',
+  'ĭ' => 'ĭ',
+  'Į' => 'Į',
+  'į' => 'į',
+  'İ' => 'İ',
+  'Ä´' => 'JÌ‚',
+  'ĵ' => 'ĵ',
+  'Ķ' => 'Ķ',
+  'ķ' => 'ķ',
+  'Ĺ' => 'L�',
+  'ĺ' => 'l�',
+  'Ļ' => 'Ļ',
+  'ļ' => 'ļ',
+  'Ľ' => 'Ľ',
+  'ľ' => 'ľ',
+  'Ń' => 'N�',
+  'ń' => 'n�',
+  'Ņ' => 'Ņ',
+  'ņ' => 'ņ',
+  'Ň' => 'Ň',
+  'ň' => 'ň',
+  'Ō' => 'Ō',
+  '�' => 'ō',
+  'Ŏ' => 'Ŏ',
+  '�' => 'ŏ',
+  '�' => 'Ő',
+  'ő' => 'ő',
+  'Ŕ' => 'R�',
+  'ŕ' => 'r�',
+  'Ŗ' => 'Ŗ',
+  'ŗ' => 'ŗ',
+  'Ř' => 'Ř',
+  'ř' => 'ř',
+  'Ś' => 'S�',
+  'ś' => 's�',
+  'Ŝ' => 'Ŝ',
+  '�' => 'ŝ',
+  'Ş' => 'Ş',
+  'ş' => 'ş',
+  'Š' => 'Š',
+  'š' => 'š',
+  'Ţ' => 'Ţ',
+  'ţ' => 'ţ',
+  'Ť' => 'Ť',
+  'ť' => 'ť',
+  'Ũ' => 'Ũ',
+  'ũ' => 'ũ',
+  'Ū' => 'Ū',
+  'ū' => 'ū',
+  'Ŭ' => 'Ŭ',
+  'ŭ' => 'ŭ',
+  'Å®' => 'UÌŠ',
+  'ů' => 'ů',
+  'Å°' => 'UÌ‹',
+  'ű' => 'ű',
+  'Ų' => 'Ų',
+  'ų' => 'ų',
+  'Å´' => 'WÌ‚',
+  'ŵ' => 'ŵ',
+  'Ŷ' => 'Ŷ',
+  'ŷ' => 'ŷ',
+  'Ÿ' => 'Ÿ',
+  'Ź' => 'Z�',
+  'ź' => 'z�',
+  'Ż' => 'Ż',
+  'ż' => 'ż',
+  'Ž' => 'Ž',
+  'ž' => 'ž',
+  'Æ ' => 'OÌ›',
+  'Æ¡' => 'oÌ›',
+  'Ư' => 'Ư',
+  'Æ°' => 'uÌ›',
+  '�' => 'Ǎ',
+  'ǎ' => 'ǎ',
+  '�' => 'Ǐ',
+  '�' => 'ǐ',
+  'Ǒ' => 'Ǒ',
+  'ǒ' => 'ǒ',
+  'Ǔ' => 'Ǔ',
+  'ǔ' => 'ǔ',
+  'Ǖ' => 'Ǖ',
+  'ǖ' => 'ǖ',
+  'Ǘ' => 'Ü�',
+  'ǘ' => 'ü�',
+  'Ǚ' => 'Ǚ',
+  'ǚ' => 'ǚ',
+  'Ǜ' => 'Ǜ',
+  'ǜ' => 'ǜ',
+  'Ǟ' => 'Ǟ',
+  'ǟ' => 'ǟ',
+  'Ǡ' => 'Ǡ',
+  'ǡ' => 'ǡ',
+  'Ǣ' => 'Ǣ',
+  'ǣ' => 'ǣ',
+  'Ǧ' => 'Ǧ',
+  'ǧ' => 'ǧ',
+  'Ǩ' => 'Ǩ',
+  'ǩ' => 'ǩ',
+  'Ǫ' => 'Ǫ',
+  'ǫ' => 'ǫ',
+  'Ǭ' => 'Ǭ',
+  'ǭ' => 'ǭ',
+  'Ǯ' => 'Ǯ',
+  'ǯ' => 'ǯ',
+  'ǰ' => 'ǰ',
+  'Ǵ' => 'G�',
+  'ǵ' => 'g�',
+  'Ǹ' => 'Ǹ',
+  'ǹ' => 'ǹ',
+  'Ǻ' => 'Å�',
+  'ǻ' => 'å�',
+  'Ǽ' => 'Æ�',
+  'ǽ' => 'æ�',
+  'Ǿ' => 'Ø�',
+  'ǿ' => 'ø�',
+  'Ȁ' => 'A�',
+  '�' => 'a�',
+  'È‚' => 'AÌ‘',
+  'ȃ' => 'ȃ',
+  'Ȅ' => 'E�',
+  'ȅ' => 'e�',
+  'Ȇ' => 'Ȇ',
+  'ȇ' => 'ȇ',
+  'Ȉ' => 'I�',
+  'ȉ' => 'i�',
+  'ÈŠ' => 'IÌ‘',
+  'ȋ' => 'ȋ',
+  'Ȍ' => 'O�',
+  '�' => 'o�',
+  'ÈŽ' => 'OÌ‘',
+  '�' => 'ȏ',
+  '�' => 'R�',
+  'ȑ' => 'r�',
+  'È’' => 'RÌ‘',
+  'ȓ' => 'ȓ',
+  'Ȕ' => 'U�',
+  'ȕ' => 'u�',
+  'È–' => 'UÌ‘',
+  'ȗ' => 'ȗ',
+  'Ș' => 'Ș',
+  'ș' => 'ș',
+  'Ț' => 'Ț',
+  'ț' => 'ț',
+  'Ȟ' => 'Ȟ',
+  'ȟ' => 'ȟ',
+  'Ȧ' => 'Ȧ',
+  'ȧ' => 'ȧ',
+  'Ȩ' => 'Ȩ',
+  'ȩ' => 'ȩ',
+  'Ȫ' => 'Ȫ',
+  'ȫ' => 'ȫ',
+  'Ȭ' => 'Ȭ',
+  'ȭ' => 'ȭ',
+  'Ȯ' => 'Ȯ',
+  'ȯ' => 'ȯ',
+  'Ȱ' => 'Ȱ',
+  'ȱ' => 'ȱ',
+  'Ȳ' => 'Ȳ',
+  'ȳ' => 'ȳ',
+  'Í€' => 'Ì€',
+  '�' => '�',
+  '̓' => '̓',
+  '̈́' => '̈�',
+  'ʹ' => 'ʹ',
+  ';' => ';',
+  '΅' => '¨�',
+  'Ά' => 'Α�',
+  '·' => '·',
+  'Έ' => 'Ε�',
+  'Ή' => 'Η�',
+  'Ί' => 'Ι�',
+  'Ό' => 'Ο�',
+  'Ύ' => 'Υ�',
+  '�' => 'Ω�',
+  '�' => 'ϊ�',
+  'Ϊ' => 'Ϊ',
+  'Ϋ' => 'Ϋ',
+  'ά' => 'α�',
+  'έ' => 'ε�',
+  'ή' => 'η�',
+  'ί' => 'ι�',
+  'ΰ' => 'ϋ�',
+  'ϊ' => 'ϊ',
+  'ϋ' => 'ϋ',
+  'ό' => 'ο�',
+  '�' => 'υ�',
+  'ώ' => 'ω�',
+  'ϓ' => 'ϒ�',
+  'ϔ' => 'ϔ',
+  'Ѐ' => 'Ѐ',
+  '�' => 'Ё',
+  'Ѓ' => 'Г�',
+  'Ї' => 'Ї',
+  'Ќ' => 'К�',
+  '�' => 'Ѝ',
+  'Ў' => 'Ў',
+  'Й' => 'Й',
+  'й' => 'й',
+  '�' => 'ѐ',
+  'ё' => 'ё',
+  'ѓ' => 'г�',
+  'ї' => 'ї',
+  'ќ' => 'к�',
+  '�' => 'ѝ',
+  'ў' => 'ў',
+  'Ѷ' => 'Ѵ�',
+  'ѷ' => 'ѵ�',
+  '�' => 'Ӂ',
+  'ӂ' => 'ӂ',
+  '�' => '�̆',
+  'ӑ' => 'ӑ',
+  'Ӓ' => '�̈',
+  'ӓ' => 'ӓ',
+  'Ӗ' => 'Ӗ',
+  'ӗ' => 'ӗ',
+  'Ӛ' => 'Ӛ',
+  'ӛ' => 'ӛ',
+  'Ӝ' => 'Ӝ',
+  '�' => 'ӝ',
+  'Ӟ' => 'Ӟ',
+  'ӟ' => 'ӟ',
+  'Ӣ' => 'Ӣ',
+  'ӣ' => 'ӣ',
+  'Ӥ' => 'Ӥ',
+  'ӥ' => 'ӥ',
+  'Ӧ' => 'Ӧ',
+  'ӧ' => 'ӧ',
+  'Ӫ' => 'Ӫ',
+  'ӫ' => 'ӫ',
+  'Ӭ' => 'Ӭ',
+  'ӭ' => '�̈',
+  'Ӯ' => 'Ӯ',
+  'ӯ' => 'ӯ',
+  'Ӱ' => 'Ӱ',
+  'ӱ' => 'ӱ',
+  'Ӳ' => 'Ӳ',
+  'ӳ' => 'ӳ',
+  'Ӵ' => 'Ӵ',
+  'ӵ' => 'ӵ',
+  'Ӹ' => 'Ӹ',
+  'ӹ' => 'ӹ',
+  'آ' => 'آ',
+  'أ' => 'أ',
+  'ؤ' => 'ؤ',
+  'إ' => 'إ',
+  'ئ' => 'ئ',
+  'Û€' => 'Û•Ù”',
+  'Û‚' => 'Û�Ù”',
+  'Û“' => 'Û’Ù”',
+  'ऩ' => 'ऩ',
+  'ऱ' => 'ऱ',
+  'ऴ' => 'ऴ',
+  'क़' => 'क़',
+  'ख़' => 'ख़',
+  'ग़' => 'ग़',
+  'ज़' => 'ज़',
+  'ड़' => 'ड़',
+  '�' => 'ढ़',
+  'फ़' => 'फ़',
+  'य़' => 'य़',
+  'ো' => 'ো',
+  'ৌ' => 'ৌ',
+  'ড়' => 'ড়',
+  '�' => 'ঢ়',
+  'য়' => 'য়',
+  'ਲ਼' => 'ਲ਼',
+  'ਸ਼' => 'ਸ਼',
+  'ਖ਼' => 'ਖ਼',
+  'ਗ਼' => 'ਗ਼',
+  'ਜ਼' => 'ਜ਼',
+  'ਫ਼' => 'ਫ਼',
+  'ୈ' => 'ୈ',
+  'ୋ' => 'ୋ',
+  'ୌ' => 'ୌ',
+  'ଡ଼' => 'ଡ଼',
+  '�' => 'ଢ଼',
+  'ஔ' => 'ஔ',
+  'ொ' => 'ொ',
+  'ோ' => 'ோ',
+  'ௌ' => 'ௌ',
+  'ై' => 'ై',
+  'ೀ' => 'ೀ',
+  'ೇ' => 'ೇ',
+  'ೈ' => 'ೈ',
+  'ೊ' => 'ೊ',
+  'ೋ' => 'ೋ',
+  'ൊ' => 'ൊ',
+  'ോ' => 'ോ',
+  'ൌ' => 'ൌ',
+  'ේ' => 'ේ',
+  'ො' => 'ෙ�',
+  '�' => 'ෙ�්',
+  'ෞ' => 'ෞ',
+  'གྷ' => 'གྷ',
+  '�' => 'ཌྷ',
+  'དྷ' => 'དྷ',
+  'བྷ' => 'བྷ',
+  'ཛྷ' => 'ཛྷ',
+  'ཀྵ' => 'ཀྵ',
+  'ཱི' => 'ཱི',
+  'ཱུ' => 'ཱུ',
+  'ྲྀ' => 'ྲྀ',
+  'ླྀ' => 'ླྀ',
+  '�' => 'ཱྀ',
+  'ྒྷ' => 'ྒྷ',
+  '�' => 'ྜྷ',
+  'ྡྷ' => 'ྡྷ',
+  'ྦྷ' => 'ྦྷ',
+  'ྫྷ' => 'ྫྷ',
+  'ྐྵ' => '�ྵ',
+  'ဦ' => 'ဦ',
+  'ᬆ' => 'ᬆ',
+  'ᬈ' => 'ᬈ',
+  'ᬊ' => 'ᬊ',
+  'ᬌ' => 'ᬌ',
+  'ᬎ' => '�ᬵ',
+  'ᬒ' => 'ᬒ',
+  'ᬻ' => 'ᬻ',
+  'ᬽ' => 'ᬽ',
+  'ᭀ' => 'ᭀ',
+  '�' => 'ᭁ',
+  'ᭃ' => 'ᭃ',
+  'Ḁ' => 'Ḁ',
+  '�' => 'ḁ',
+  'Ḃ' => 'Ḃ',
+  'ḃ' => 'ḃ',
+  'Ḅ' => 'Ḅ',
+  'ḅ' => 'ḅ',
+  'Ḇ' => 'Ḇ',
+  'ḇ' => 'ḇ',
+  'Ḉ' => 'Ç�',
+  'ḉ' => 'ç�',
+  'Ḋ' => 'Ḋ',
+  'ḋ' => 'ḋ',
+  'Ḍ' => 'Ḍ',
+  '�' => 'ḍ',
+  'Ḏ' => 'Ḏ',
+  '�' => 'ḏ',
+  '�' => 'Ḑ',
+  'ḑ' => 'ḑ',
+  'Ḓ' => 'Ḓ',
+  'ḓ' => 'ḓ',
+  'Ḕ' => 'Ḕ',
+  'ḕ' => 'ḕ',
+  'Ḗ' => 'Ē�',
+  'ḗ' => 'ē�',
+  'Ḙ' => 'Ḙ',
+  'ḙ' => 'ḙ',
+  'Ḛ' => 'Ḛ',
+  'ḛ' => 'ḛ',
+  'Ḝ' => 'Ḝ',
+  '�' => 'ḝ',
+  'Ḟ' => 'Ḟ',
+  'ḟ' => 'ḟ',
+  'Ḡ' => 'Ḡ',
+  'ḡ' => 'ḡ',
+  'Ḣ' => 'Ḣ',
+  'ḣ' => 'ḣ',
+  'Ḥ' => 'Ḥ',
+  'ḥ' => 'ḥ',
+  'Ḧ' => 'Ḧ',
+  'ḧ' => 'ḧ',
+  'Ḩ' => 'Ḩ',
+  'ḩ' => 'ḩ',
+  'Ḫ' => 'Ḫ',
+  'ḫ' => 'ḫ',
+  'Ḭ' => 'Ḭ',
+  'ḭ' => 'ḭ',
+  'Ḯ' => 'Ï�',
+  'ḯ' => 'ï�',
+  'Ḱ' => 'K�',
+  'ḱ' => 'k�',
+  'Ḳ' => 'Ḳ',
+  'ḳ' => 'ḳ',
+  'Ḵ' => 'Ḵ',
+  'ḵ' => 'ḵ',
+  'Ḷ' => 'Ḷ',
+  'ḷ' => 'ḷ',
+  'Ḹ' => 'Ḹ',
+  'ḹ' => 'ḹ',
+  'Ḻ' => 'Ḻ',
+  'ḻ' => 'ḻ',
+  'Ḽ' => 'Ḽ',
+  'ḽ' => 'ḽ',
+  'Ḿ' => 'M�',
+  'ḿ' => 'm�',
+  'Ṁ' => 'Ṁ',
+  '�' => 'ṁ',
+  'Ṃ' => 'Ṃ',
+  'ṃ' => 'ṃ',
+  'Ṅ' => 'Ṅ',
+  'ṅ' => 'ṅ',
+  'Ṇ' => 'Ṇ',
+  'ṇ' => 'ṇ',
+  'Ṉ' => 'Ṉ',
+  'ṉ' => 'ṉ',
+  'Ṋ' => 'Ṋ',
+  'ṋ' => 'ṋ',
+  'Ṍ' => 'Õ�',
+  '�' => 'õ�',
+  'Ṏ' => 'Ṏ',
+  '�' => 'ṏ',
+  '�' => 'Ṑ',
+  'ṑ' => 'ṑ',
+  'Ṓ' => 'Ō�',
+  'ṓ' => 'ō�',
+  'Ṕ' => 'P�',
+  'ṕ' => 'p�',
+  'Ṗ' => 'Ṗ',
+  'ṗ' => 'ṗ',
+  'Ṙ' => 'Ṙ',
+  'ṙ' => 'ṙ',
+  'Ṛ' => 'Ṛ',
+  'ṛ' => 'ṛ',
+  'Ṝ' => 'Ṝ',
+  '�' => 'ṝ',
+  'Ṟ' => 'Ṟ',
+  'ṟ' => 'ṟ',
+  'Ṡ' => 'Ṡ',
+  'ṡ' => 'ṡ',
+  'á¹¢' => 'SÌ£',
+  'ṣ' => 'ṣ',
+  'Ṥ' => 'S�̇',
+  'ṥ' => 's�̇',
+  'Ṧ' => 'Ṧ',
+  'ṧ' => 'ṧ',
+  'Ṩ' => 'Ṩ',
+  'ṩ' => 'ṩ',
+  'Ṫ' => 'Ṫ',
+  'ṫ' => 'ṫ',
+  'Ṭ' => 'Ṭ',
+  'ṭ' => 'ṭ',
+  'Ṯ' => 'Ṯ',
+  'ṯ' => 'ṯ',
+  'á¹°' => 'TÌ­',
+  'á¹±' => 'tÌ­',
+  'Ṳ' => 'Ṳ',
+  'ṳ' => 'ṳ',
+  'á¹´' => 'UÌ°',
+  'á¹µ' => 'uÌ°',
+  'Ṷ' => 'Ṷ',
+  'á¹·' => 'uÌ­',
+  'Ṹ' => 'Ũ�',
+  'ṹ' => 'ũ�',
+  'Ṻ' => 'Ṻ',
+  'ṻ' => 'ṻ',
+  'Ṽ' => 'Ṽ',
+  'ṽ' => 'ṽ',
+  'á¹¾' => 'VÌ£',
+  'ṿ' => 'ṿ',
+  'Ẁ' => 'Ẁ',
+  '�' => 'ẁ',
+  'Ẃ' => 'W�',
+  'ẃ' => 'w�',
+  'Ẅ' => 'Ẅ',
+  'ẅ' => 'ẅ',
+  'Ẇ' => 'Ẇ',
+  'ẇ' => 'ẇ',
+  'Ẉ' => 'Ẉ',
+  'ẉ' => 'ẉ',
+  'Ẋ' => 'Ẋ',
+  'ẋ' => 'ẋ',
+  'Ẍ' => 'Ẍ',
+  '�' => 'ẍ',
+  'Ẏ' => 'Ẏ',
+  '�' => 'ẏ',
+  '�' => 'Ẑ',
+  'ẑ' => 'ẑ',
+  'Ẓ' => 'Ẓ',
+  'ẓ' => 'ẓ',
+  'Ẕ' => 'Ẕ',
+  'ẕ' => 'ẕ',
+  'ẖ' => 'ẖ',
+  'ẗ' => 'ẗ',
+  'ẘ' => 'ẘ',
+  'ẙ' => 'ẙ',
+  'ẛ' => 'ẛ',
+  'Ạ' => 'Ạ',
+  'ạ' => 'ạ',
+  'Ả' => 'Ả',
+  'ả' => 'ả',
+  'Ấ' => 'Â�',
+  'ấ' => 'â�',
+  'Ầ' => 'Ầ',
+  'ầ' => 'ầ',
+  'Ẩ' => 'Ẩ',
+  'ẩ' => 'ẩ',
+  'Ẫ' => 'Ẫ',
+  'ẫ' => 'ẫ',
+  'Ậ' => 'Ậ',
+  'ậ' => 'ậ',
+  'Ắ' => 'Ă�',
+  'ắ' => 'ă�',
+  'Ằ' => 'Ằ',
+  'ằ' => 'ằ',
+  'Ẳ' => 'Ẳ',
+  'ẳ' => 'ẳ',
+  'Ẵ' => 'Ẵ',
+  'ẵ' => 'ẵ',
+  'Ặ' => 'Ặ',
+  'ặ' => 'ặ',
+  'Ẹ' => 'Ẹ',
+  'ẹ' => 'ẹ',
+  'Ẻ' => 'Ẻ',
+  'ẻ' => 'ẻ',
+  'Ẽ' => 'Ẽ',
+  'ẽ' => 'ẽ',
+  'Ế' => 'Ê�',
+  'ế' => 'ê�',
+  'Ề' => 'Ề',
+  '�' => 'ề',
+  'Ể' => 'Ể',
+  'ể' => 'ể',
+  'Ễ' => 'Ễ',
+  'ễ' => 'ễ',
+  'Ệ' => 'Ệ',
+  'ệ' => 'ệ',
+  'Ỉ' => 'Ỉ',
+  'ỉ' => 'ỉ',
+  'Ị' => 'Ị',
+  'ị' => 'ị',
+  'Ọ' => 'Ọ',
+  '�' => 'ọ',
+  'Ỏ' => 'Ỏ',
+  '�' => 'ỏ',
+  '�' => 'Ô�',
+  'ố' => 'ô�',
+  'á»’' => 'OÌ‚Ì€',
+  'ồ' => 'ồ',
+  'Ổ' => 'Ổ',
+  'ổ' => 'ổ',
+  'Ỗ' => 'Ỗ',
+  'ỗ' => 'ỗ',
+  'Ộ' => 'Ộ',
+  'ộ' => 'ộ',
+  'Ớ' => 'Ơ�',
+  'ớ' => 'ơ�',
+  'Ờ' => 'Ờ',
+  '�' => 'ờ',
+  'Ở' => 'Ở',
+  'ở' => 'ở',
+  'Ỡ' => 'Ỡ',
+  'ỡ' => 'ỡ',
+  'Ợ' => 'Ợ',
+  'ợ' => 'ợ',
+  'Ụ' => 'Ụ',
+  'ụ' => 'ụ',
+  'Ủ' => 'Ủ',
+  'ủ' => 'ủ',
+  'Ứ' => 'Ư�',
+  'ứ' => 'ư�',
+  'Ừ' => 'Ừ',
+  'ừ' => 'ừ',
+  'Ử' => 'Ử',
+  'ử' => 'ử',
+  'Ữ' => 'Ữ',
+  'ữ' => 'ữ',
+  'Ự' => 'Ự',
+  'ự' => 'ự',
+  'Ỳ' => 'Ỳ',
+  'ỳ' => 'ỳ',
+  'á»´' => 'YÌ£',
+  'ỵ' => 'ỵ',
+  'Ỷ' => 'Ỷ',
+  'ỷ' => 'ỷ',
+  'Ỹ' => 'Ỹ',
+  'ỹ' => 'ỹ',
+  'ἀ' => 'ἀ',
+  '�' => 'ἁ',
+  'ἂ' => 'ἂ',
+  'ἃ' => 'ἃ',
+  'ἄ' => 'ἀ�',
+  'ἅ' => 'ἁ�',
+  'ἆ' => 'ἆ',
+  'ἇ' => 'ἇ',
+  'Ἀ' => 'Ἀ',
+  'Ἁ' => 'Ἁ',
+  'Ἂ' => 'Ἂ',
+  'Ἃ' => 'Ἃ',
+  'Ἄ' => 'Ἀ�',
+  '�' => 'Ἁ�',
+  'Ἆ' => 'Ἆ',
+  '�' => 'Ἇ',
+  '�' => 'ἐ',
+  'ἑ' => 'ἑ',
+  'ἒ' => 'ἒ',
+  'ἓ' => 'ἓ',
+  'ἔ' => 'ἐ�',
+  'ἕ' => 'ἑ�',
+  'Ἐ' => 'Ἐ',
+  'Ἑ' => 'Ἑ',
+  'Ἒ' => 'Ἒ',
+  'Ἓ' => 'Ἓ',
+  'Ἔ' => 'Ἐ�',
+  '�' => 'Ἑ�',
+  'ἠ' => 'ἠ',
+  'ἡ' => 'ἡ',
+  'ἢ' => 'ἢ',
+  'ἣ' => 'ἣ',
+  'ἤ' => 'ἠ�',
+  'ἥ' => 'ἡ�',
+  'ἦ' => 'ἦ',
+  'ἧ' => 'ἧ',
+  'Ἠ' => 'Ἠ',
+  'Ἡ' => 'Ἡ',
+  'Ἢ' => 'Ἢ',
+  'Ἣ' => 'Ἣ',
+  'Ἤ' => 'Ἠ�',
+  'Ἥ' => 'Ἡ�',
+  'Ἦ' => 'Ἦ',
+  'Ἧ' => 'Ἧ',
+  'ἰ' => 'ἰ',
+  'ἱ' => 'ἱ',
+  'ἲ' => 'ἲ',
+  'ἳ' => 'ἳ',
+  'ἴ' => 'ἰ�',
+  'ἵ' => 'ἱ�',
+  'ἶ' => 'ἶ',
+  'ἷ' => 'ἷ',
+  'Ἰ' => 'Ἰ',
+  'Ἱ' => 'Ἱ',
+  'Ἲ' => 'Ἲ',
+  'Ἳ' => 'Ἳ',
+  'Ἴ' => 'Ἰ�',
+  'Ἵ' => 'Ἱ�',
+  'Ἶ' => 'Ἶ',
+  'Ἷ' => 'Ἷ',
+  'ὀ' => 'ὀ',
+  '�' => 'ὁ',
+  'ὂ' => 'ὂ',
+  'ὃ' => 'ὃ',
+  'ὄ' => 'ὀ�',
+  'ὅ' => 'ὁ�',
+  'Ὀ' => 'Ὀ',
+  'Ὁ' => 'Ὁ',
+  'Ὂ' => 'Ὂ',
+  'Ὃ' => 'Ὃ',
+  'Ὄ' => 'Ὀ�',
+  '�' => 'Ὁ�',
+  '�' => 'ὐ',
+  'ὑ' => 'ὑ',
+  'á½’' => 'Ï…Ì“Ì€',
+  'ὓ' => 'ὓ',
+  'ὔ' => 'ὐ�',
+  'ὕ' => 'ὑ�',
+  'á½–' => 'Ï…Ì“Í‚',
+  'ὗ' => 'ὗ',
+  'Ὑ' => 'Ὑ',
+  'Ὓ' => 'Ὓ',
+  '�' => 'Ὑ�',
+  'Ὗ' => 'Ὗ',
+  'ὠ' => 'ὠ',
+  'ὡ' => 'ὡ',
+  'ὢ' => 'ὢ',
+  'ὣ' => 'ὣ',
+  'ὤ' => 'ὠ�',
+  'ὥ' => 'ὡ�',
+  'ὦ' => 'ὦ',
+  'ὧ' => 'ὧ',
+  'Ὠ' => 'Ὠ',
+  'Ὡ' => 'Ὡ',
+  'Ὢ' => 'Ὢ',
+  'Ὣ' => 'Ὣ',
+  'Ὤ' => 'Ὠ�',
+  'Ὥ' => 'Ὡ�',
+  'Ὦ' => 'Ὦ',
+  'Ὧ' => 'Ὧ',
+  'ὰ' => 'ὰ',
+  'ά' => 'α�',
+  'ὲ' => 'ὲ',
+  'έ' => 'ε�',
+  'ὴ' => 'ὴ',
+  'ή' => 'η�',
+  'ὶ' => 'ὶ',
+  'ί' => 'ι�',
+  'ὸ' => 'ὸ',
+  'ό' => 'ο�',
+  'ὺ' => 'ὺ',
+  'ύ' => 'υ�',
+  'ὼ' => 'ὼ',
+  'ώ' => 'ω�',
+  'ᾀ' => 'ᾀ',
+  '�' => 'ᾁ',
+  'ᾂ' => 'ᾂ',
+  'ᾃ' => 'ᾃ',
+  'ᾄ' => 'ἀ�ͅ',
+  'ᾅ' => 'ἁ�ͅ',
+  'ᾆ' => 'ᾆ',
+  'ᾇ' => 'ᾇ',
+  'ᾈ' => 'ᾈ',
+  'ᾉ' => 'ᾉ',
+  'ᾊ' => 'ᾊ',
+  'ᾋ' => 'ᾋ',
+  'ᾌ' => 'Ἀ�ͅ',
+  '�' => 'Ἁ�ͅ',
+  'ᾎ' => 'ᾎ',
+  '�' => 'ᾏ',
+  '�' => 'ᾐ',
+  'ᾑ' => 'ᾑ',
+  'ᾒ' => 'ᾒ',
+  'ᾓ' => 'ᾓ',
+  'ᾔ' => 'ἠ�ͅ',
+  'ᾕ' => 'ἡ�ͅ',
+  'ᾖ' => 'ᾖ',
+  'ᾗ' => 'ᾗ',
+  'ᾘ' => 'ᾘ',
+  'ᾙ' => 'ᾙ',
+  'ᾚ' => 'ᾚ',
+  'ᾛ' => 'ᾛ',
+  'ᾜ' => 'Ἠ�ͅ',
+  '�' => 'Ἡ�ͅ',
+  'ᾞ' => 'ᾞ',
+  'ᾟ' => 'ᾟ',
+  'ᾠ' => 'ᾠ',
+  'ᾡ' => 'ᾡ',
+  'ᾢ' => 'ᾢ',
+  'ᾣ' => 'ᾣ',
+  'ᾤ' => 'ὠ�ͅ',
+  'ᾥ' => 'ὡ�ͅ',
+  'ᾦ' => 'ᾦ',
+  'ᾧ' => 'ᾧ',
+  'ᾨ' => 'ᾨ',
+  'ᾩ' => 'ᾩ',
+  'ᾪ' => 'ᾪ',
+  'ᾫ' => 'ᾫ',
+  'ᾬ' => 'Ὠ�ͅ',
+  'ᾭ' => 'Ὡ�ͅ',
+  'ᾮ' => 'ᾮ',
+  'ᾯ' => 'ᾯ',
+  'ᾰ' => 'ᾰ',
+  'ᾱ' => 'ᾱ',
+  'ᾲ' => 'ᾲ',
+  'ᾳ' => 'ᾳ',
+  'ᾴ' => 'α�ͅ',
+  'ᾶ' => 'ᾶ',
+  'ᾷ' => 'ᾷ',
+  'Ᾰ' => 'Ᾰ',
+  'Ᾱ' => 'Ᾱ',
+  'Ὰ' => 'Ὰ',
+  'Ά' => 'Α�',
+  'ᾼ' => 'ᾼ',
+  'ι' => 'ι',
+  '�' => '῁',
+  'ῂ' => 'ῂ',
+  'ῃ' => 'ῃ',
+  'ῄ' => 'η�ͅ',
+  'ῆ' => 'ῆ',
+  'ῇ' => 'ῇ',
+  'Ὲ' => 'Ὲ',
+  'Έ' => 'Ε�',
+  'Ὴ' => 'Ὴ',
+  'Ή' => 'Η�',
+  'ῌ' => 'ῌ',
+  '�' => '῍',
+  '῎' => '᾿�',
+  '�' => '῏',
+  '�' => 'ῐ',
+  'ῑ' => 'ῑ',
+  'ῒ' => 'ῒ',
+  'ΐ' => 'ϊ�',
+  'ῖ' => 'ῖ',
+  'ῗ' => 'ῗ',
+  'Ῐ' => 'Ῐ',
+  'Ῑ' => 'Ῑ',
+  'Ὶ' => 'Ὶ',
+  'Ί' => 'Ι�',
+  '�' => '῝',
+  '῞' => '῾�',
+  '῟' => '῟',
+  'ῠ' => 'ῠ',
+  'á¿¡' => 'Ï…Ì„',
+  'ῢ' => 'ῢ',
+  'ΰ' => 'ϋ�',
+  'ῤ' => '�̓',
+  'ῥ' => '�̔',
+  'ῦ' => 'ῦ',
+  'ῧ' => 'ῧ',
+  'Ῠ' => 'Ῠ',
+  'Ῡ' => 'Ῡ',
+  'Ὺ' => 'Ὺ',
+  'Ύ' => 'Υ�',
+  'Ῥ' => 'Ῥ',
+  '῭' => '῭',
+  '΅' => '¨�',
+  '`' => '`',
+  'ῲ' => 'ῲ',
+  'ῳ' => 'ῳ',
+  'ῴ' => 'ω�ͅ',
+  'ῶ' => 'ῶ',
+  'ῷ' => 'ῷ',
+  'Ὸ' => 'Ὸ',
+  'Ό' => 'Ο�',
+  'Ὼ' => 'Ὼ',
+  'Ώ' => 'Ω�',
+  'ῼ' => 'ῼ',
+  '´' => '´',
+  ' ' => ' ',
+  '�' => ' ',
+  'Ω' => 'Ω',
+  'K' => 'K',
+  'â„«' => 'AÌŠ',
+  '↚' => '�̸',
+  '↛' => '↛',
+  '↮' => '↮',
+  '�' => '�̸',
+  '⇎' => '⇎',
+  '�' => '⇏',
+  '∄' => '∄',
+  '∉' => '∉',
+  '∌' => '∌',
+  '∤' => '∤',
+  '∦' => '∦',
+  '�' => '≁',
+  '≄' => '≄',
+  '≇' => '≇',
+  '≉' => '≉',
+  '≠' => '≠',
+  '≢' => '≢',
+  '≭' => '�̸',
+  '≮' => '≮',
+  '≯' => '≯',
+  '≰' => '≰',
+  '≱' => '≱',
+  '≴' => '≴',
+  '≵' => '≵',
+  '≸' => '≸',
+  '≹' => '≹',
+  '⊀' => '⊀',
+  '�' => '⊁',
+  '⊄' => '⊄',
+  '⊅' => '⊅',
+  '⊈' => '⊈',
+  '⊉' => '⊉',
+  '⊬' => '⊬',
+  '⊭' => '⊭',
+  '⊮' => '⊮',
+  '⊯' => '⊯',
+  '⋠' => '⋠',
+  '⋡' => '⋡',
+  '⋢' => '⋢',
+  '⋣' => '⋣',
+  '⋪' => '⋪',
+  '⋫' => '⋫',
+  '⋬' => '⋬',
+  '⋭' => '⋭',
+  '〈' => '〈',
+  '〉' => '〉',
+  '⫝̸' => '�̸',
+  '�' => '�゙',
+  '�' => '�゙',
+  '�' => '�゙',
+  '�' => '�゙',
+  '�' => '�゙',
+  '�' => '�゙',
+  '�' => '�゙',
+  '�' => '�゙',
+  '�' => '�゙',
+  '�' => '�゙',
+  '�' => '�゙',
+  '�' => '�゙',
+  '�' => '�゙',
+  '�' => '�゙',
+  '�' => '�゙',
+  '�' => '�゙',
+  '�' => '�゚',
+  '�' => '�゙',
+  '�' => '�゚',
+  '�' => '�゙',
+  '�' => '�゚',
+  '�' => '�゙',
+  '�' => '�゚',
+  '�' => '�゙',
+  '�' => '�゚',
+  'ゔ' => '�゙',
+  'ゞ' => '�゙',
+  'ガ' => 'ガ',
+  'ã‚®' => 'ã‚­ã‚™',
+  'グ' => 'グ',
+  'ゲ' => 'ゲ',
+  'ゴ' => 'ゴ',
+  'ザ' => 'ザ',
+  'ジ' => 'ジ',
+  'ズ' => 'ズ',
+  'ゼ' => 'ゼ',
+  'ゾ' => 'ゾ',
+  'ダ' => 'ダ',
+  'ヂ' => '�゙',
+  'ヅ' => 'ヅ',
+  'デ' => 'デ',
+  'ド' => 'ド',
+  '�' => '�゙',
+  'パ' => '�゚',
+  'ビ' => 'ビ',
+  'ピ' => 'ピ',
+  'ブ' => 'ブ',
+  'プ' => 'プ',
+  'ベ' => 'ベ',
+  'ペ' => 'ペ',
+  'ボ' => 'ボ',
+  '�' => 'ポ',
+  'ヴ' => 'ヴ',
+  'ヷ' => 'ヷ',
+  'ヸ' => 'ヸ',
+  'ヹ' => 'ヹ',
+  'ヺ' => 'ヺ',
+  'ヾ' => 'ヾ',
+  '豈' => '豈',
+  '�' => '更',
+  '車' => '車',
+  '賈' => '賈',
+  '滑' => '滑',
+  '串' => '串',
+  '句' => '�',
+  '龜' => '龜',
+  '龜' => '龜',
+  '契' => '契',
+  '金' => '金',
+  '喇' => '喇',
+  '奈' => '奈',
+  '�' => '懶',
+  '癩' => '癩',
+  '�' => '羅',
+  '�' => '蘿',
+  '螺' => '螺',
+  '裸' => '裸',
+  '邏' => '�',
+  '樂' => '樂',
+  '洛' => '洛',
+  '烙' => '烙',
+  '珞' => '�',
+  '落' => '�',
+  '酪' => '酪',
+  '駱' => '駱',
+  '亂' => '亂',
+  '卵' => '�',
+  '�' => '欄',
+  '爛' => '爛',
+  '蘭' => '蘭',
+  '鸞' => '鸞',
+  '嵐' => '�',
+  '濫' => '濫',
+  '藍' => '�',
+  '襤' => '襤',
+  '拉' => '拉',
+  '臘' => '臘',
+  '蠟' => '蠟',
+  '廊' => '廊',
+  '朗' => '朗',
+  '浪' => '浪',
+  '狼' => '狼',
+  '郎' => '郎',
+  '來' => '來',
+  '冷' => '冷',
+  '勞' => '勞',
+  '擄' => '擄',
+  '櫓' => '櫓',
+  '爐' => '�',
+  '盧' => '盧',
+  '老' => '�',
+  '蘆' => '蘆',
+  '虜' => '虜',
+  '路' => '路',
+  '露' => '露',
+  '魯' => '魯',
+  '鷺' => '鷺',
+  '碌' => '碌',
+  '祿' => '祿',
+  '綠' => '綠',
+  '菉' => '�',
+  '錄' => '錄',
+  '鹿' => '鹿',
+  '�' => '論',
+  '壟' => '壟',
+  '弄' => '弄',
+  '籠' => '籠',
+  '聾' => '�',
+  '牢' => '牢',
+  '磊' => '磊',
+  '賂' => '賂',
+  '雷' => '雷',
+  '壘' => '壘',
+  '屢' => '屢',
+  '樓' => '樓',
+  '�' => '淚',
+  '漏' => '�',
+  '�' => '累',
+  '�' => '縷',
+  '陋' => '陋',
+  '勒' => '勒',
+  '肋' => '肋',
+  '凜' => '凜',
+  '凌' => '凌',
+  '稜' => '稜',
+  '綾' => '綾',
+  '菱' => '�',
+  '陵' => '陵',
+  '讀' => '讀',
+  '拏' => '�',
+  '樂' => '樂',
+  '�' => '諾',
+  '丹' => '丹',
+  '寧' => '寧',
+  '怒' => '怒',
+  '率' => '率',
+  '異' => '異',
+  '北' => '北',
+  '磻' => '磻',
+  '便' => '便',
+  '復' => '復',
+  '不' => '�',
+  '泌' => '泌',
+  '數' => '數',
+  '索' => '索',
+  '參' => '�',
+  '塞' => '塞',
+  '省' => '�',
+  '葉' => '葉',
+  '說' => '說',
+  '殺' => '殺',
+  '辰' => '辰',
+  '沈' => '沈',
+  '拾' => '拾',
+  '若' => '若',
+  '掠' => '掠',
+  '略' => '略',
+  '亮' => '亮',
+  '兩' => '兩',
+  '凉' => '凉',
+  '梁' => '�',
+  '糧' => '糧',
+  '良' => '良',
+  '諒' => '諒',
+  '量' => '�',
+  '勵' => '勵',
+  '呂' => '呂',
+  '�' => '女',
+  '廬' => '廬',
+  '旅' => '旅',
+  '濾' => '濾',
+  '礪' => '礪',
+  '閭' => '閭',
+  '驪' => '驪',
+  '麗' => '麗',
+  '黎' => '黎',
+  '力' => '力',
+  '曆' => '曆',
+  '歷' => '歷',
+  '�' => '轢',
+  '年' => '年',
+  '�' => '�',
+  '�' => '戀',
+  '撚' => '撚',
+  '漣' => '漣',
+  '煉' => '煉',
+  '璉' => '璉',
+  '秊' => '秊',
+  '練' => '練',
+  '聯' => '�',
+  '輦' => '輦',
+  '蓮' => '蓮',
+  '連' => '連',
+  '鍊' => '�',
+  '列' => '列',
+  '�' => '劣',
+  '咽' => '咽',
+  '烈' => '烈',
+  '裂' => '裂',
+  '說' => '說',
+  '廉' => '廉',
+  '念' => '念',
+  '捻' => '�',
+  '殮' => '殮',
+  '簾' => '簾',
+  '獵' => '�',
+  '令' => '令',
+  '囹' => '囹',
+  '寧' => '寧',
+  '嶺' => '嶺',
+  '怜' => '怜',
+  '玲' => '玲',
+  '瑩' => '瑩',
+  '羚' => '羚',
+  '聆' => '�',
+  '鈴' => '鈴',
+  '零' => '零',
+  '靈' => '�',
+  '領' => '領',
+  '例' => '例',
+  '禮' => '禮',
+  '醴' => '醴',
+  '隸' => '隸',
+  '惡' => '惡',
+  '了' => '了',
+  '僚' => '僚',
+  '寮' => '寮',
+  '尿' => '尿',
+  '料' => '料',
+  '樂' => '樂',
+  '燎' => '燎',
+  '�' => '療',
+  '蓼' => '蓼',
+  '遼' => '�',
+  '龍' => '�',
+  '暈' => '暈',
+  '阮' => '阮',
+  '劉' => '劉',
+  '杻' => '�',
+  '柳' => '柳',
+  '流' => '�',
+  '溜' => '溜',
+  '琉' => '�',
+  '�' => '留',
+  '硫' => '硫',
+  '�' => '�',
+  '�' => '類',
+  '六' => '六',
+  '戮' => '戮',
+  '陸' => '陸',
+  '倫' => '倫',
+  '崙' => '崙',
+  '淪' => '淪',
+  '輪' => '輪',
+  '律' => '律',
+  '慄' => '慄',
+  '栗' => '栗',
+  '率' => '率',
+  '隆' => '隆',
+  '�' => '利',
+  '吏' => '�',
+  '履' => '履',
+  '易' => '易',
+  '李' => '�',
+  '梨' => '梨',
+  '泥' => '泥',
+  '理' => '�',
+  '痢' => '痢',
+  '罹' => '罹',
+  '裏' => '�',
+  '裡' => '裡',
+  '里' => '里',
+  '離' => '離',
+  '匿' => '匿',
+  '溺' => '溺',
+  '吝' => '�',
+  '燐' => '�',
+  '璘' => '璘',
+  '藺' => '藺',
+  '隣' => '隣',
+  '鱗' => '鱗',
+  '麟' => '麟',
+  '林' => '林',
+  '淋' => '淋',
+  '臨' => '臨',
+  '立' => '立',
+  '笠' => '笠',
+  '粒' => '粒',
+  '狀' => '狀',
+  '炙' => '炙',
+  '識' => '識',
+  '什' => '什',
+  '茶' => '茶',
+  '刺' => '刺',
+  '切' => '切',
+  '�' => '度',
+  '拓' => '拓',
+  '糖' => '糖',
+  '宅' => '宅',
+  '洞' => '洞',
+  '暴' => '暴',
+  '輻' => '輻',
+  '行' => '行',
+  '降' => '�',
+  '見' => '見',
+  '廓' => '廓',
+  '兀' => '兀',
+  '�' => '嗀',
+  '�' => '塚',
+  '晴' => '晴',
+  '凞' => '凞',
+  '猪' => '猪',
+  '益' => '益',
+  '礼' => '礼',
+  '神' => '神',
+  '祥' => '祥',
+  '福' => '�',
+  '靖' => '�',
+  '�' => '精',
+  '羽' => '羽',
+  '蘒' => '蘒',
+  '諸' => '諸',
+  '逸' => '逸',
+  '都' => '都',
+  '飯' => '飯',
+  '飼' => '飼',
+  '館' => '館',
+  '鶴' => '鶴',
+  '郞' => '郞',
+  '隷' => '隷',
+  '侮' => '侮',
+  '僧' => '僧',
+  '免' => '�',
+  '勉' => '勉',
+  '勤' => '勤',
+  '卑' => '�',
+  '喝' => '�',
+  '嘆' => '嘆',
+  '器' => '器',
+  '塀' => '塀',
+  '墨' => '墨',
+  '層' => '層',
+  '屮' => '屮',
+  '悔' => '悔',
+  '慨' => '慨',
+  '憎' => '憎',
+  '懲' => '懲',
+  '�' => '�',
+  'ï©‚' => 'æ—¢',
+  '暑' => '暑',
+  '梅' => '梅',
+  'ï©…' => 'æµ·',
+  '渚' => '渚',
+  '漢' => '漢',
+  '煮' => '煮',
+  '爫' => '爫',
+  '琢' => '�',
+  '碑' => '碑',
+  '社' => '社',
+  '�' => '祉',
+  '祈' => '祈',
+  '�' => '�',
+  '�' => '祖',
+  '祝' => '�',
+  '禍' => '�',
+  '禎' => '禎',
+  'ï©”' => 'ç©€',
+  '突' => '�',
+  '節' => '節',
+  'ï©—' => 'ç·´',
+  '縉' => '縉',
+  '繁' => '�',
+  'ï©š' => 'ç½²',
+  '者' => '者',
+  '臭' => '臭',
+  '�' => '艹',
+  '艹' => '艹',
+  'ï©Ÿ' => 'è‘—',
+  '褐' => '�',
+  '視' => '視',
+  '謁' => '�',
+  '謹' => '謹',
+  '賓' => '賓',
+  'ï©¥' => 'è´ˆ',
+  '辶' => '辶',
+  '逸' => '逸',
+  '難' => '難',
+  '響' => '響',
+  '頻' => '頻',
+  '恵' => '�',
+  '𤋮' => '𤋮',
+  '舘' => '舘',
+  '並' => '並',
+  '况' => '况',
+  '全' => '全',
+  '侀' => '侀',
+  'ï©´' => 'å……',
+  '冀' => '冀',
+  '勇' => '勇',
+  '勺' => '勺',
+  '喝' => '�',
+  '啕' => '啕',
+  '喙' => '喙',
+  'ï©»' => 'å—¢',
+  '塚' => '塚',
+  '墳' => '墳',
+  '奄' => '奄',
+  '奔' => '奔',
+  '婢' => '婢',
+  '�' => '嬨',
+  '廒' => '廒',
+  '廙' => '廙',
+  '彩' => '彩',
+  '徭' => '徭',
+  '惘' => '惘',
+  '慎' => '慎',
+  '愈' => '愈',
+  '憎' => '憎',
+  '慠' => '慠',
+  '懲' => '懲',
+  '戴' => '戴',
+  '�' => '�',
+  '搜' => '�',
+  '�' => '摒',
+  '�' => '敖',
+  '晴' => '晴',
+  '朗' => '朗',
+  '望' => '望',
+  '杖' => '�',
+  '歹' => '歹',
+  '殺' => '殺',
+  '流' => '�',
+  '滛' => '滛',
+  '滋' => '滋',
+  '漢' => '漢',
+  '瀞' => '瀞',
+  '煮' => '煮',
+  '�' => '瞧',
+  '爵' => '爵',
+  '犯' => '犯',
+  '猪' => '猪',
+  '瑱' => '瑱',
+  '甆' => '甆',
+  '画' => '画',
+  '瘝' => '�',
+  '瘟' => '瘟',
+  '益' => '益',
+  '盛' => '盛',
+  '直' => '直',
+  '睊' => '�',
+  '着' => '�',
+  '磌' => '磌',
+  '窱' => '窱',
+  '節' => '節',
+  '类' => '类',
+  '絛' => '絛',
+  '練' => '練',
+  '缾' => '缾',
+  '者' => '者',
+  '荒' => '�',
+  '華' => '�',
+  '蝹' => '�',
+  '襁' => '�',
+  '覆' => '覆',
+  '視' => '視',
+  '調' => '調',
+  '諸' => '諸',
+  '請' => '請',
+  '謁' => '�',
+  '諾' => '諾',
+  '諭' => '諭',
+  '謹' => '謹',
+  '變' => '變',
+  '�' => '贈',
+  '輸' => '輸',
+  '遲' => '�',
+  '醙' => '醙',
+  '鉶' => '鉶',
+  '陼' => '陼',
+  '難' => '難',
+  '靖' => '�',
+  '韛' => '韛',
+  '響' => '響',
+  'ï«‹' => 'é ‹',
+  '頻' => '頻',
+  '�' => '鬒',
+  '龜' => '龜',
+  '�' => '𢡊',
+  '�' => '𢡄',
+  '𣏕' => '�',
+  '㮝' => '�',
+  '䀘' => '䀘',
+  '䀹' => '䀹',
+  '𥉉' => '𥉉',
+  '𥳐' => '�',
+  '𧻓' => '𧻓',
+  '齃' => '齃',
+  '龎' => '龎',
+  '�' => 'יִ',
+  'ײַ' => 'ײַ',
+  'שׁ' => 'ש�',
+  'שׂ' => 'שׂ',
+  'שּׁ' => 'שּ�',
+  'שּׂ' => 'שּׂ',
+  'אַ' => '�ַ',
+  'אָ' => '�ָ',
+  'אּ' => '�ּ',
+  'בּ' => 'בּ',
+  'גּ' => 'גּ',
+  'דּ' => 'דּ',
+  'הּ' => 'הּ',
+  'וּ' => 'וּ',
+  'זּ' => 'זּ',
+  'טּ' => 'טּ',
+  'יּ' => 'יּ',
+  'ךּ' => 'ךּ',
+  'כּ' => 'כּ',
+  'לּ' => 'לּ',
+  'מּ' => 'מּ',
+  'ï­€' => '× Ö¼',
+  '�' => 'סּ',
+  'ï­ƒ' => '×£Ö¼',
+  'פּ' => 'פּ',
+  'צּ' => 'צּ',
+  'קּ' => 'קּ',
+  'רּ' => 'רּ',
+  'שּ' => 'שּ',
+  'תּ' => 'תּ',
+  'וֹ' => 'וֹ',
+  'בֿ' => 'בֿ',
+  'ï­�' => '×›Ö¿',
+  'פֿ' => 'פֿ',
+  '𑂚' => '𑂚',
+  '𑂜' => '𑂜',
+  '𑂫' => '𑂫',
+  '𑄮' => '𑄮',
+  '𑄯' => '𑄯',
+  '�' => '�𑌾',
+  '�' => '��',
+  '𑒻' => '𑒻',
+  '𑒼' => '𑒼',
+  '𑒾' => '𑒾',
+  '𑖺' => '𑖺',
+  '𑖻' => '𑖻',
+  '𑤸' => '𑤸',
+  '�' => '��',
+  '�' => '��',
+  '�' => '���',
+  '�' => '���',
+  '�' => '���',
+  '�' => '���',
+  '�' => '���',
+  '�' => '��',
+  '�' => '��',
+  '�' => '���',
+  '�' => '���',
+  '�' => '���',
+  '�' => '���',
+  '丽' => '丽',
+  '�' => '丸',
+  '乁' => '�',
+  '𠄢' => '𠄢',
+  '你' => '你',
+  '侮' => '侮',
+  '侻' => '侻',
+  '倂' => '倂',
+  '偺' => '�',
+  '備' => '備',
+  '僧' => '僧',
+  '像' => '�',
+  '㒞' => '㒞',
+  '�' => '𠘺',
+  '免' => '�',
+  '�' => '兔',
+  '�' => '兤',
+  '具' => '具',
+  '𠔜' => '𠔜',
+  '㒹' => '㒹',
+  '內' => '內',
+  '再' => '�',
+  '𠕋' => '𠕋',
+  '冗' => '冗',
+  '冤' => '冤',
+  '仌' => '仌',
+  '冬' => '冬',
+  '况' => '况',
+  '𩇟' => '𩇟',
+  '�' => '凵',
+  '刃' => '刃',
+  '㓟' => '㓟',
+  '刻' => '刻',
+  '剆' => '剆',
+  '割' => '割',
+  '剷' => '剷',
+  '㔕' => '㔕',
+  '勇' => '勇',
+  '勉' => '勉',
+  '勤' => '勤',
+  '勺' => '勺',
+  '包' => '包',
+  '匆' => '匆',
+  '北' => '北',
+  '卉' => '�',
+  '卑' => '�',
+  '博' => '�',
+  '即' => '�',
+  '卽' => '�',
+  '卿' => '�',
+  '卿' => '�',
+  '卿' => '�',
+  '𠨬' => '𠨬',
+  '灰' => '�',
+  '及' => '�',
+  '叟' => '�',
+  '𠭣' => '𠭣',
+  '叫' => '�',
+  '叱' => '�',
+  '吆' => '�',
+  '咞' => '咞',
+  '吸' => '�',
+  '呈' => '呈',
+  '周' => '周',
+  '咢' => '咢',
+  '�' => '哶',
+  '唐' => '�',
+  '啓' => '啓',
+  '啣' => '啣',
+  '善' => '善',
+  '善' => '善',
+  '喙' => '喙',
+  '喫' => '喫',
+  '喳' => '喳',
+  '嗂' => '嗂',
+  '圖' => '圖',
+  '嘆' => '嘆',
+  '�' => '圗',
+  '噑' => '噑',
+  '�' => '噴',
+  '�' => '切',
+  '壮' => '壮',
+  '城' => '城',
+  '埴' => '埴',
+  '堍' => '�',
+  '型' => '型',
+  '堲' => '堲',
+  '報' => '報',
+  '墬' => '墬',
+  '𡓤' => '𡓤',
+  '売' => '売',
+  '壷' => '壷',
+  '夆' => '夆',
+  '�' => '多',
+  '夢' => '夢',
+  '奢' => '奢',
+  '𡚨' => '𡚨',
+  '𡛪' => '𡛪',
+  '姬' => '姬',
+  '娛' => '娛',
+  '娧' => '娧',
+  '姘' => '姘',
+  '婦' => '婦',
+  '㛮' => '㛮',
+  '㛼' => '㛼',
+  '嬈' => '嬈',
+  '嬾' => '嬾',
+  '嬾' => '嬾',
+  '𡧈' => '𡧈',
+  '寃' => '寃',
+  '寘' => '寘',
+  '寧' => '寧',
+  '寳' => '寳',
+  '𡬘' => '𡬘',
+  '寿' => '寿',
+  '将' => '将',
+  '当' => '当',
+  '尢' => '尢',
+  '㞁' => '�',
+  '屠' => '屠',
+  '屮' => '屮',
+  '峀' => '峀',
+  '岍' => '�',
+  '𡷤' => '𡷤',
+  '嵃' => '嵃',
+  '𡷦' => '𡷦',
+  '嵮' => '嵮',
+  '嵫' => '嵫',
+  '嵼' => '嵼',
+  '�' => '巡',
+  '巢' => '巢',
+  '㠯' => '㠯',
+  '巽' => '巽',
+  '帨' => '帨',
+  '帽' => '帽',
+  '幩' => '幩',
+  '㡢' => '㡢',
+  '𢆃' => '𢆃',
+  '㡼' => '㡼',
+  '庰' => '庰',
+  '庳' => '庳',
+  '�' => '庶',
+  '廊' => '廊',
+  '�' => '𪎒',
+  '�' => '廾',
+  '𢌱' => '𢌱',
+  '𢌱' => '𢌱',
+  '舁' => '�',
+  '弢' => '弢',
+  '弢' => '弢',
+  '㣇' => '㣇',
+  '𣊸' => '𣊸',
+  '𦇚' => '𦇚',
+  '形' => '形',
+  '彫' => '彫',
+  '㣣' => '㣣',
+  '徚' => '徚',
+  '�' => '�',
+  '志' => '志',
+  '忹' => '忹',
+  '悁' => '�',
+  '㤺' => '㤺',
+  '㤜' => '㤜',
+  '悔' => '悔',
+  '𢛔' => '𢛔',
+  '惇' => '惇',
+  '慈' => '慈',
+  '慌' => '慌',
+  '慎' => '慎',
+  '慌' => '慌',
+  '慺' => '慺',
+  '憎' => '憎',
+  '憲' => '憲',
+  '憤' => '憤',
+  '憯' => '憯',
+  '懞' => '懞',
+  '懲' => '懲',
+  '懶' => '懶',
+  '成' => '�',
+  '戛' => '戛',
+  '扝' => '�',
+  '抱' => '抱',
+  '拔' => '拔',
+  '捐' => '�',
+  '𢬌' => '𢬌',
+  '挽' => '挽',
+  '拼' => '拼',
+  '捨' => '�',
+  '掃' => '掃',
+  '揤' => '�',
+  '𢯱' => '𢯱',
+  '搢' => '�',
+  '揅' => '�',
+  '�' => '掩',
+  '㨮' => '㨮',
+  '摩' => '摩',
+  '摾' => '摾',
+  '撝' => '�',
+  '摷' => '摷',
+  '㩬' => '㩬',
+  '敏' => '�',
+  '敬' => '敬',
+  '𣀊' => '𣀊',
+  '旣' => '旣',
+  '書' => '書',
+  '�' => '晉',
+  '㬙' => '㬙',
+  '�' => '暑',
+  '�' => '㬈',
+  '㫤' => '㫤',
+  '冒' => '冒',
+  '冕' => '冕',
+  '最' => '最',
+  '暜' => '暜',
+  '肭' => '肭',
+  '䏙' => '�',
+  '朗' => '朗',
+  '望' => '望',
+  '朡' => '朡',
+  '杞' => '�',
+  '杓' => '�',
+  '�' => '�',
+  '㭉' => '㭉',
+  '柺' => '柺',
+  '枅' => '枅',
+  '桒' => '桒',
+  '梅' => '梅',
+  '𣑭' => '𣑭',
+  '梎' => '梎',
+  '栟' => '栟',
+  '椔' => '椔',
+  '㮝' => '�',
+  '楂' => '楂',
+  '榣' => '榣',
+  '槪' => '槪',
+  '檨' => '檨',
+  '𣚣' => '𣚣',
+  '櫛' => '櫛',
+  '㰘' => '㰘',
+  '次' => '次',
+  '𣢧' => '𣢧',
+  '歔' => '歔',
+  '㱎' => '㱎',
+  '歲' => '歲',
+  '殟' => '殟',
+  '殺' => '殺',
+  '殻' => '殻',
+  '𣪍' => '�',
+  '𡴋' => '𡴋',
+  '𣫺' => '𣫺',
+  '汎' => '汎',
+  '𣲼' => '𣲼',
+  '沿' => '沿',
+  '泍' => '�',
+  '汧' => '汧',
+  '洖' => '洖',
+  '派' => '派',
+  '�' => '海',
+  '流' => '�',
+  '浩' => '浩',
+  '浸' => '浸',
+  '涅' => '涅',
+  '𣴞' => '𣴞',
+  '洴' => '洴',
+  '港' => '港',
+  '湮' => '湮',
+  '㴳' => '㴳',
+  '滋' => '滋',
+  '滇' => '滇',
+  '�' => '𣻑',
+  '淹' => '淹',
+  '�' => '潮',
+  '�' => '𣽞',
+  '𣾎' => '𣾎',
+  '濆' => '濆',
+  '瀹' => '瀹',
+  '瀞' => '瀞',
+  '瀛' => '瀛',
+  '㶖' => '㶖',
+  '灊' => '�',
+  '災' => '�',
+  '灷' => '�',
+  '炭' => '炭',
+  '𠔥' => '𠔥',
+  '煅' => '煅',
+  '�' => '𤉣',
+  '熜' => '熜',
+  '𤎫' => '𤎫',
+  '爨' => '爨',
+  '爵' => '爵',
+  '牐' => '�',
+  '𤘈' => '𤘈',
+  '犀' => '犀',
+  '犕' => '犕',
+  '𤜵' => '𤜵',
+  '𤠔' => '𤠔',
+  '獺' => '�',
+  '王' => '王',
+  '㺬' => '㺬',
+  '玥' => '玥',
+  '㺸' => '㺸',
+  '㺸' => '㺸',
+  '瑇' => '瑇',
+  '瑜' => '瑜',
+  '瑱' => '瑱',
+  '璅' => '璅',
+  '瓊' => '瓊',
+  '㼛' => '㼛',
+  '甤' => '甤',
+  '𤰶' => '𤰶',
+  '甾' => '甾',
+  '𤲒' => '𤲒',
+  '異' => '異',
+  '𢆟' => '𢆟',
+  '瘐' => '�',
+  '𤾡' => '𤾡',
+  '𤾸' => '𤾸',
+  '𥁄' => '�',
+  '㿼' => '㿼',
+  '䀈' => '䀈',
+  '直' => '直',
+  '�' => '𥃳',
+  '𥃲' => '𥃲',
+  '𥄙' => '𥄙',
+  '𥄳' => '𥄳',
+  '眞' => '眞',
+  '真' => '真',
+  '真' => '真',
+  '睊' => '�',
+  '䀹' => '䀹',
+  '瞋' => '瞋',
+  '䁆' => '�',
+  '䂖' => '䂖',
+  '�' => '�',
+  '硎' => '硎',
+  '�' => '碌',
+  '�' => '磌',
+  '䃣' => '䃣',
+  '𥘦' => '𥘦',
+  '祖' => '祖',
+  '𥚚' => '𥚚',
+  '𥛅' => '𥛅',
+  '福' => '�',
+  '秫' => '秫',
+  '䄯' => '䄯',
+  '穀' => '穀',
+  '穊' => '穊',
+  '穏' => '�',
+  '𥥼' => '𥥼',
+  '�' => '𥪧',
+  '𥪧' => '𥪧',
+  '竮' => '竮',
+  '䈂' => '䈂',
+  '𥮫' => '𥮫',
+  '篆' => '篆',
+  '築' => '築',
+  '䈧' => '䈧',
+  '𥲀' => '𥲀',
+  '糒' => '糒',
+  '䊠' => '䊠',
+  '糨' => '糨',
+  '糣' => '糣',
+  '紀' => '紀',
+  '𥾆' => '𥾆',
+  '絣' => '絣',
+  '䌁' => '�',
+  '緇' => '緇',
+  '縂' => '縂',
+  '繅' => '繅',
+  '䌴' => '䌴',
+  '𦈨' => '𦈨',
+  '𦉇' => '𦉇',
+  '䍙' => '�',
+  '𦋙' => '𦋙',
+  '罺' => '罺',
+  '𦌾' => '𦌾',
+  '羕' => '羕',
+  '翺' => '翺',
+  '者' => '者',
+  '𦓚' => '𦓚',
+  '𦔣' => '𦔣',
+  '聠' => '�',
+  '𦖨' => '𦖨',
+  '聰' => '�',
+  '𣍟' => '�',
+  '�' => '�',
+  '育' => '育',
+  '脃' => '脃',
+  '䐋' => '�',
+  '脾' => '脾',
+  '媵' => '媵',
+  '𦞧' => '𦞧',
+  '𦞵' => '𦞵',
+  '𣎓' => '𣎓',
+  '𣎜' => '𣎜',
+  '舁' => '�',
+  '舄' => '舄',
+  '�' => '辞',
+  '䑫' => '䑫',
+  '�' => '芑',
+  '�' => '芋',
+  '芝' => '�',
+  '劳' => '劳',
+  '花' => '花',
+  '芳' => '芳',
+  '芽' => '芽',
+  '苦' => '苦',
+  '𦬼' => '𦬼',
+  '若' => '若',
+  '茝' => '�',
+  '荣' => '�',
+  '莭' => '莭',
+  '茣' => '茣',
+  '�' => '莽',
+  '菧' => '�',
+  '著' => '著',
+  '荓' => '�',
+  '菊' => '�',
+  '菌' => '�',
+  '菜' => '�',
+  '𦰶' => '𦰶',
+  '𦵫' => '𦵫',
+  '𦳕' => '𦳕',
+  '䔫' => '䔫',
+  '蓱' => '蓱',
+  '蓳' => '蓳',
+  '蔖' => '蔖',
+  '𧏊' => '�',
+  '蕤' => '蕤',
+  '𦼬' => '𦼬',
+  '䕝' => '�',
+  '䕡' => '䕡',
+  '𦾱' => '𦾱',
+  '𧃒' => '𧃒',
+  '䕫' => '䕫',
+  '虐' => '�',
+  '虜' => '虜',
+  '虧' => '虧',
+  '虩' => '虩',
+  '蚩' => '蚩',
+  '蚈' => '蚈',
+  '蜎' => '蜎',
+  '蛢' => '蛢',
+  '蝹' => '�',
+  '蜨' => '蜨',
+  '蝫' => '�',
+  '螆' => '螆',
+  '䗗' => '䗗',
+  '蟡' => '蟡',
+  '�' => '�',
+  '䗹' => '䗹',
+  '衠' => '衠',
+  '衣' => '衣',
+  '𧙧' => '𧙧',
+  '裗' => '裗',
+  '裞' => '裞',
+  '䘵' => '䘵',
+  '裺' => '裺',
+  '㒻' => '㒻',
+  '𧢮' => '𧢮',
+  '𧥦' => '𧥦',
+  '�' => '䚾',
+  '䛇' => '䛇',
+  '�' => '誠',
+  '�' => '諭',
+  '變' => '變',
+  '豕' => '豕',
+  '𧲨' => '𧲨',
+  '貫' => '貫',
+  '賁' => '�',
+  '贛' => '贛',
+  '起' => '起',
+  '𧼯' => '𧼯',
+  '𠠄' => '𠠄',
+  '跋' => '跋',
+  '趼' => '趼',
+  '跰' => '跰',
+  '�' => '𠣞',
+  '軔' => '軔',
+  '輸' => '輸',
+  '𨗒' => '𨗒',
+  '𨗭' => '𨗭',
+  '邔' => '邔',
+  '郱' => '郱',
+  '鄑' => '鄑',
+  '𨜮' => '𨜮',
+  '鄛' => '鄛',
+  '鈸' => '鈸',
+  '鋗' => '鋗',
+  '鋘' => '鋘',
+  '鉼' => '鉼',
+  '鏹' => '�',
+  '鐕' => '�',
+  '𨯺' => '𨯺',
+  '開' => '開',
+  '䦕' => '䦕',
+  '閷' => '閷',
+  '𨵷' => '𨵷',
+  '䧦' => '䧦',
+  '雃' => '雃',
+  '嶲' => '嶲',
+  '霣' => '霣',
+  '𩅅' => '𩅅',
+  '𩈚' => '𩈚',
+  '䩮' => '䩮',
+  '䩶' => '䩶',
+  '韠' => '韠',
+  '𩐊' => '�',
+  '䪲' => '䪲',
+  '𩒖' => '𩒖',
+  '頋' => '頋',
+  '頋' => '頋',
+  '頩' => '頩',
+  '�' => '𩖶',
+  '飢' => '飢',
+  '䬳' => '䬳',
+  '餩' => '餩',
+  '馧' => '馧',
+  '駂' => '駂',
+  '駾' => '駾',
+  '䯎' => '䯎',
+  '𩬰' => '𩬰',
+  '鬒' => '鬒',
+  '鱀' => '鱀',
+  '鳽' => '鳽',
+  '�' => '䳎',
+  '䳭' => '䳭',
+  '�' => '鵧',
+  '�' => '𪃎',
+  '䳸' => '䳸',
+  '𪄅' => '𪄅',
+  '𪈎' => '𪈎',
+  '𪊑' => '𪊑',
+  '麻' => '麻',
+  '䵖' => '䵖',
+  '黹' => '黹',
+  '黾' => '黾',
+  '鼅' => '鼅',
+  '鼏' => '�',
+  '鼖' => '鼖',
+  '鼻' => '鼻',
+  '�' => '𪘀',
+);
diff --git a/lib/symfony/polyfill-intl-normalizer/Resources/unidata/combiningClass.php b/lib/symfony/polyfill-intl-normalizer/Resources/unidata/combiningClass.php
new file mode 100644
index 000000000..ec90f36eb
--- /dev/null
+++ b/lib/symfony/polyfill-intl-normalizer/Resources/unidata/combiningClass.php
@@ -0,0 +1,876 @@
+<?php
+
+return array (
+  'Ì€' => 230,
+  '�' => 230,
+  'Ì‚' => 230,
+  '̃' => 230,
+  'Ì„' => 230,
+  'Ì…' => 230,
+  '̆' => 230,
+  '̇' => 230,
+  '̈' => 230,
+  '̉' => 230,
+  'ÌŠ' => 230,
+  'Ì‹' => 230,
+  '̌' => 230,
+  '�' => 230,
+  'ÌŽ' => 230,
+  '�' => 230,
+  '�' => 230,
+  'Ì‘' => 230,
+  'Ì’' => 230,
+  'Ì“' => 230,
+  'Ì”' => 230,
+  'Ì•' => 232,
+  'Ì–' => 220,
+  'Ì—' => 220,
+  '̘' => 220,
+  'Ì™' => 220,
+  'Ìš' => 232,
+  'Ì›' => 216,
+  '̜' => 220,
+  '�' => 220,
+  'Ìž' => 220,
+  'ÌŸ' => 220,
+  'Ì ' => 220,
+  'Ì¡' => 202,
+  'Ì¢' => 202,
+  'Ì£' => 220,
+  '̤' => 220,
+  'Ì¥' => 220,
+  '̦' => 220,
+  '̧' => 202,
+  '̨' => 202,
+  'Ì©' => 220,
+  '̪' => 220,
+  'Ì«' => 220,
+  '̬' => 220,
+  'Ì­' => 220,
+  'Ì®' => 220,
+  '̯' => 220,
+  'Ì°' => 220,
+  '̱' => 220,
+  '̲' => 220,
+  '̳' => 220,
+  'Ì´' => 1,
+  '̵' => 1,
+  '̶' => 1,
+  'Ì·' => 1,
+  '̸' => 1,
+  '̹' => 220,
+  '̺' => 220,
+  'Ì»' => 220,
+  '̼' => 220,
+  '̽' => 230,
+  '̾' => 230,
+  'Ì¿' => 230,
+  'Í€' => 230,
+  '�' => 230,
+  'Í‚' => 230,
+  '̓' => 230,
+  'Í„' => 230,
+  'Í…' => 240,
+  '͆' => 230,
+  '͇' => 220,
+  '͈' => 220,
+  '͉' => 220,
+  'ÍŠ' => 230,
+  'Í‹' => 230,
+  '͌' => 230,
+  '�' => 220,
+  'ÍŽ' => 220,
+  '�' => 230,
+  'Í‘' => 230,
+  'Í’' => 230,
+  'Í“' => 220,
+  'Í”' => 220,
+  'Í•' => 220,
+  'Í–' => 220,
+  'Í—' => 230,
+  '͘' => 232,
+  'Í™' => 220,
+  'Íš' => 220,
+  'Í›' => 230,
+  '͜' => 233,
+  '�' => 234,
+  'Íž' => 234,
+  'ÍŸ' => 233,
+  'Í ' => 234,
+  'Í¡' => 234,
+  'Í¢' => 233,
+  'Í£' => 230,
+  'ͤ' => 230,
+  'Í¥' => 230,
+  'ͦ' => 230,
+  'ͧ' => 230,
+  'ͨ' => 230,
+  'Í©' => 230,
+  'ͪ' => 230,
+  'Í«' => 230,
+  'ͬ' => 230,
+  'Í­' => 230,
+  'Í®' => 230,
+  'ͯ' => 230,
+  'Òƒ' => 230,
+  'Ò„' => 230,
+  'Ò…' => 230,
+  'Ò†' => 230,
+  'Ò‡' => 230,
+  'Ö‘' => 220,
+  'Ö’' => 230,
+  'Ö“' => 230,
+  'Ö”' => 230,
+  'Ö•' => 230,
+  'Ö–' => 220,
+  'Ö—' => 230,
+  'Ö˜' => 230,
+  'Ö™' => 230,
+  'Öš' => 222,
+  'Ö›' => 220,
+  '֜' => 230,
+  'Ö�' => 230,
+  'Öž' => 230,
+  'ÖŸ' => 230,
+  'Ö ' => 230,
+  'Ö¡' => 230,
+  'Ö¢' => 220,
+  'Ö£' => 220,
+  'Ö¤' => 220,
+  'Ö¥' => 220,
+  'Ö¦' => 220,
+  'Ö§' => 220,
+  'Ö¨' => 230,
+  'Ö©' => 230,
+  'Öª' => 220,
+  'Ö«' => 230,
+  'Ö¬' => 230,
+  'Ö­' => 222,
+  'Ö®' => 228,
+  'Ö¯' => 230,
+  'Ö°' => 10,
+  'Ö±' => 11,
+  'Ö²' => 12,
+  'Ö³' => 13,
+  'Ö´' => 14,
+  'Öµ' => 15,
+  'Ö¶' => 16,
+  'Ö·' => 17,
+  'Ö¸' => 18,
+  'Ö¹' => 19,
+  'Öº' => 19,
+  'Ö»' => 20,
+  'Ö¼' => 21,
+  'Ö½' => 22,
+  'Ö¿' => 23,
+  '�' => 24,
+  'ׂ' => 25,
+  'ׄ' => 230,
+  '×…' => 220,
+  'ׇ' => 18,
+  '�' => 230,
+  'Ø‘' => 230,
+  'Ø’' => 230,
+  'Ø“' => 230,
+  'Ø”' => 230,
+  'Ø•' => 230,
+  'Ø–' => 230,
+  'Ø—' => 230,
+  'ؘ' => 30,
+  'Ø™' => 31,
+  'Øš' => 32,
+  'Ù‹' => 27,
+  'ٌ' => 28,
+  'Ù�' => 29,
+  'ÙŽ' => 30,
+  'Ù�' => 31,
+  'Ù�' => 32,
+  'Ù‘' => 33,
+  'Ù’' => 34,
+  'Ù“' => 230,
+  'Ù”' => 230,
+  'Ù•' => 220,
+  'Ù–' => 220,
+  'Ù—' => 230,
+  'Ù˜' => 230,
+  'Ù™' => 230,
+  'Ùš' => 230,
+  'Ù›' => 230,
+  'ٜ' => 220,
+  'Ù�' => 230,
+  'Ùž' => 230,
+  'ÙŸ' => 220,
+  'Ù°' => 35,
+  'Û–' => 230,
+  'Û—' => 230,
+  'Û˜' => 230,
+  'Û™' => 230,
+  'Ûš' => 230,
+  'Û›' => 230,
+  'ۜ' => 230,
+  'ÛŸ' => 230,
+  'Û ' => 230,
+  'Û¡' => 230,
+  'Û¢' => 230,
+  'Û£' => 220,
+  'Û¤' => 230,
+  'Û§' => 230,
+  'Û¨' => 230,
+  'Ûª' => 220,
+  'Û«' => 230,
+  'Û¬' => 230,
+  'Û­' => 220,
+  'Ü‘' => 36,
+  'Ü°' => 230,
+  'ܱ' => 220,
+  'ܲ' => 230,
+  'ܳ' => 230,
+  'Ü´' => 220,
+  'ܵ' => 230,
+  'ܶ' => 230,
+  'Ü·' => 220,
+  'ܸ' => 220,
+  'ܹ' => 220,
+  'ܺ' => 230,
+  'Ü»' => 220,
+  'ܼ' => 220,
+  'ܽ' => 230,
+  'ܾ' => 220,
+  'Ü¿' => 230,
+  'Ý€' => 230,
+  '�' => 230,
+  'Ý‚' => 220,
+  '݃' => 230,
+  'Ý„' => 220,
+  'Ý…' => 230,
+  '݆' => 220,
+  '݇' => 230,
+  '݈' => 220,
+  '݉' => 230,
+  'ÝŠ' => 230,
+  'ß«' => 230,
+  '߬' => 230,
+  'ß­' => 230,
+  'ß®' => 230,
+  '߯' => 230,
+  'ß°' => 230,
+  'ß±' => 230,
+  'ß²' => 220,
+  'ß³' => 230,
+  'ß½' => 220,
+  'à –' => 230,
+  'à —' => 230,
+  'à ˜' => 230,
+  'à ™' => 230,
+  'à ›' => 230,
+  'ࠜ' => 230,
+  'à �' => 230,
+  'à ž' => 230,
+  'à Ÿ' => 230,
+  'à  ' => 230,
+  'à ¡' => 230,
+  'à ¢' => 230,
+  'à £' => 230,
+  'à ¥' => 230,
+  'à ¦' => 230,
+  'à §' => 230,
+  'à ©' => 230,
+  'à ª' => 230,
+  'à «' => 230,
+  'à ¬' => 230,
+  'à ­' => 230,
+  'à¡™' => 220,
+  'à¡š' => 220,
+  'à¡›' => 220,
+  '࣓' => 220,
+  'ࣔ' => 230,
+  'ࣕ' => 230,
+  'ࣖ' => 230,
+  'ࣗ' => 230,
+  'ࣘ' => 230,
+  'ࣙ' => 230,
+  'ࣚ' => 230,
+  'ࣛ' => 230,
+  'ࣜ' => 230,
+  '�' => 230,
+  'ࣞ' => 230,
+  'ࣟ' => 230,
+  '࣠' => 230,
+  '࣡' => 230,
+  'ࣣ' => 220,
+  'ࣤ' => 230,
+  'ࣥ' => 230,
+  'ࣦ' => 220,
+  'ࣧ' => 230,
+  'ࣨ' => 230,
+  'ࣩ' => 220,
+  '࣪' => 230,
+  '࣫' => 230,
+  '࣬' => 230,
+  '࣭' => 220,
+  '࣮' => 220,
+  '࣯' => 220,
+  'ࣰ' => 27,
+  'ࣱ' => 28,
+  'ࣲ' => 29,
+  'ࣳ' => 230,
+  'ࣴ' => 230,
+  'ࣵ' => 230,
+  'ࣶ' => 220,
+  'ࣷ' => 230,
+  'ࣸ' => 230,
+  'ࣹ' => 220,
+  'ࣺ' => 220,
+  'ࣻ' => 230,
+  'ࣼ' => 230,
+  'ࣽ' => 230,
+  'ࣾ' => 230,
+  'ࣿ' => 230,
+  '़' => 7,
+  '�' => 9,
+  '॑' => 230,
+  '॒' => 220,
+  '॓' => 230,
+  '॔' => 230,
+  '়' => 7,
+  '�' => 9,
+  '৾' => 230,
+  '਼' => 7,
+  '�' => 9,
+  '઼' => 7,
+  '�' => 9,
+  '଼' => 7,
+  'à­�' => 9,
+  '�' => 9,
+  '�' => 9,
+  'ౕ' => 84,
+  'à±–' => 91,
+  '಼' => 7,
+  '�' => 9,
+  'à´»' => 9,
+  'à´¼' => 9,
+  '�' => 9,
+  'à·Š' => 9,
+  'ุ' => 103,
+  'ู' => 103,
+  'ฺ' => 9,
+  '่' => 107,
+  '้' => 107,
+  '๊' => 107,
+  '๋' => 107,
+  'ຸ' => 118,
+  'ູ' => 118,
+  '຺' => 9,
+  '່' => 122,
+  '້' => 122,
+  '໊' => 122,
+  '໋' => 122,
+  '༘' => 220,
+  '༙' => 220,
+  '༵' => 220,
+  '༷' => 220,
+  '༹' => 216,
+  'ཱ' => 129,
+  'ི' => 130,
+  'ུ' => 132,
+  'ེ' => 130,
+  'ཻ' => 130,
+  'ོ' => 130,
+  'ཽ' => 130,
+  'ྀ' => 130,
+  'ྂ' => 230,
+  'ྃ' => 230,
+  '྄' => 9,
+  '྆' => 230,
+  '྇' => 230,
+  '࿆' => 220,
+  '့' => 7,
+  '္' => 9,
+  '်' => 9,
+  '�' => 220,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '᜔' => 9,
+  '᜴' => 9,
+  '្' => 9,
+  '�' => 230,
+  'ᢩ' => 228,
+  '᤹' => 222,
+  '᤺' => 230,
+  '᤻' => 220,
+  'ᨗ' => 230,
+  'ᨘ' => 220,
+  'á© ' => 9,
+  '᩵' => 230,
+  '᩶' => 230,
+  'á©·' => 230,
+  '᩸' => 230,
+  '᩹' => 230,
+  '᩺' => 230,
+  'á©»' => 230,
+  '᩼' => 230,
+  'á©¿' => 220,
+  '᪰' => 230,
+  '᪱' => 230,
+  '᪲' => 230,
+  '᪳' => 230,
+  '᪴' => 230,
+  '᪵' => 220,
+  '᪶' => 220,
+  '᪷' => 220,
+  '᪸' => 220,
+  '᪹' => 220,
+  '᪺' => 220,
+  '᪻' => 230,
+  '᪼' => 230,
+  '᪽' => 220,
+  'ᪿ' => 220,
+  'á«€' => 220,
+  '᬴' => 7,
+  'á­„' => 9,
+  'á­«' => 230,
+  'á­¬' => 220,
+  'á­­' => 230,
+  'á­®' => 230,
+  'á­¯' => 230,
+  'á­°' => 230,
+  'á­±' => 230,
+  'á­²' => 230,
+  'á­³' => 230,
+  '᮪' => 9,
+  '᮫' => 9,
+  '᯦' => 7,
+  '᯲' => 9,
+  '᯳' => 9,
+  'á°·' => 7,
+  '�' => 230,
+  '᳑' => 230,
+  'á³’' => 230,
+  'á³”' => 1,
+  '᳕' => 220,
+  'á³–' => 220,
+  'á³—' => 220,
+  '᳘' => 220,
+  'á³™' => 220,
+  '᳚' => 230,
+  'á³›' => 230,
+  '᳜' => 220,
+  '�' => 220,
+  '᳞' => 220,
+  '᳟' => 220,
+  'á³ ' => 230,
+  'á³¢' => 1,
+  'á³£' => 1,
+  '᳤' => 1,
+  'á³¥' => 1,
+  '᳦' => 1,
+  '᳧' => 1,
+  '᳨' => 1,
+  'á³­' => 220,
+  'á³´' => 230,
+  '᳸' => 230,
+  'á³¹' => 230,
+  'á·€' => 230,
+  'á·�' => 230,
+  'á·‚' => 220,
+  'á·ƒ' => 230,
+  'á·„' => 230,
+  'á·…' => 230,
+  'á·†' => 230,
+  'á·‡' => 230,
+  'á·ˆ' => 230,
+  'á·‰' => 230,
+  'á·Š' => 220,
+  'á·‹' => 230,
+  '᷌' => 230,
+  'á·�' => 234,
+  'á·Ž' => 214,
+  'á·�' => 220,
+  'á·�' => 202,
+  'á·‘' => 230,
+  'á·’' => 230,
+  'á·“' => 230,
+  'á·”' => 230,
+  'á·•' => 230,
+  'á·–' => 230,
+  'á·—' => 230,
+  'á·˜' => 230,
+  'á·™' => 230,
+  'á·š' => 230,
+  'á·›' => 230,
+  'ᷜ' => 230,
+  'á·�' => 230,
+  'á·ž' => 230,
+  'á·Ÿ' => 230,
+  'á· ' => 230,
+  'á·¡' => 230,
+  'á·¢' => 230,
+  'á·£' => 230,
+  'á·¤' => 230,
+  'á·¥' => 230,
+  'á·¦' => 230,
+  'á·§' => 230,
+  'á·¨' => 230,
+  'á·©' => 230,
+  'á·ª' => 230,
+  'á·«' => 230,
+  'á·¬' => 230,
+  'á·­' => 230,
+  'á·®' => 230,
+  'á·¯' => 230,
+  'á·°' => 230,
+  'á·±' => 230,
+  'á·²' => 230,
+  'á·³' => 230,
+  'á·´' => 230,
+  'á·µ' => 230,
+  'á·¶' => 232,
+  'á··' => 228,
+  'á·¸' => 228,
+  'á·¹' => 220,
+  'á·»' => 230,
+  'á·¼' => 233,
+  'á·½' => 220,
+  'á·¾' => 230,
+  'á·¿' => 220,
+  '�' => 230,
+  '⃑' => 230,
+  '⃒' => 1,
+  '⃓' => 1,
+  '⃔' => 230,
+  '⃕' => 230,
+  '⃖' => 230,
+  '⃗' => 230,
+  '⃘' => 1,
+  '⃙' => 1,
+  '⃚' => 1,
+  '⃛' => 230,
+  '⃜' => 230,
+  '⃡' => 230,
+  '⃥' => 1,
+  '⃦' => 1,
+  '⃧' => 230,
+  '⃨' => 220,
+  '⃩' => 230,
+  '⃪' => 1,
+  '⃫' => 1,
+  '⃬' => 220,
+  '⃭' => 220,
+  '⃮' => 220,
+  '⃯' => 220,
+  '⃰' => 230,
+  '⳯' => 230,
+  'â³°' => 230,
+  'â³±' => 230,
+  '⵿' => 9,
+  'â· ' => 230,
+  'â·¡' => 230,
+  'â·¢' => 230,
+  'â·£' => 230,
+  'â·¤' => 230,
+  'â·¥' => 230,
+  'â·¦' => 230,
+  'â·§' => 230,
+  'â·¨' => 230,
+  'â·©' => 230,
+  'â·ª' => 230,
+  'â·«' => 230,
+  'â·¬' => 230,
+  'â·­' => 230,
+  'â·®' => 230,
+  'â·¯' => 230,
+  'â·°' => 230,
+  'â·±' => 230,
+  'â·²' => 230,
+  'â·³' => 230,
+  'â·´' => 230,
+  'â·µ' => 230,
+  'â·¶' => 230,
+  'â··' => 230,
+  'â·¸' => 230,
+  'â·¹' => 230,
+  'â·º' => 230,
+  'â·»' => 230,
+  'â·¼' => 230,
+  'â·½' => 230,
+  'â·¾' => 230,
+  'â·¿' => 230,
+  '〪' => 218,
+  '〫' => 228,
+  '〬' => 232,
+  '〭' => 222,
+  '〮' => 224,
+  '〯' => 224,
+  'ã‚™' => 8,
+  'ã‚š' => 8,
+  '꙯' => 230,
+  'ê™´' => 230,
+  'ꙵ' => 230,
+  'ꙶ' => 230,
+  'ê™·' => 230,
+  'ꙸ' => 230,
+  'ꙹ' => 230,
+  'ꙺ' => 230,
+  'ê™»' => 230,
+  '꙼' => 230,
+  '꙽' => 230,
+  'êšž' => 230,
+  'ꚟ' => 230,
+  'ê›°' => 230,
+  'ê›±' => 230,
+  'ê †' => 9,
+  'ê ¬' => 9,
+  '꣄' => 9,
+  '꣠' => 230,
+  '꣡' => 230,
+  '꣢' => 230,
+  '꣣' => 230,
+  '꣤' => 230,
+  '꣥' => 230,
+  '꣦' => 230,
+  '꣧' => 230,
+  '꣨' => 230,
+  '꣩' => 230,
+  '꣪' => 230,
+  '꣫' => 230,
+  '꣬' => 230,
+  '꣭' => 230,
+  '꣮' => 230,
+  '꣯' => 230,
+  '꣰' => 230,
+  '꣱' => 230,
+  '꤫' => 220,
+  '꤬' => 220,
+  '꤭' => 220,
+  '꥓' => 9,
+  '꦳' => 7,
+  '꧀' => 9,
+  'ꪰ' => 230,
+  'ꪲ' => 230,
+  'ꪳ' => 230,
+  'ꪴ' => 220,
+  'ꪷ' => 230,
+  'ꪸ' => 230,
+  'ꪾ' => 230,
+  '꪿' => 230,
+  '�' => 230,
+  '꫶' => 9,
+  '꯭' => 9,
+  'ﬞ' => 26,
+  '︠' => 230,
+  '︡' => 230,
+  '︢' => 230,
+  '︣' => 230,
+  '︤' => 230,
+  '︥' => 230,
+  '︦' => 230,
+  '︧' => 220,
+  '︨' => 220,
+  '︩' => 220,
+  '︪' => 220,
+  '︫' => 220,
+  '︬' => 220,
+  '︭' => 220,
+  '︮' => 230,
+  '︯' => 230,
+  '�' => 220,
+  '�' => 220,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 220,
+  '�' => 230,
+  '�' => 230,
+  '�' => 1,
+  '�' => 220,
+  '�' => 9,
+  '�' => 230,
+  '�' => 220,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 220,
+  '�' => 220,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 220,
+  '�' => 230,
+  '�' => 220,
+  '�' => 220,
+  '�' => 220,
+  '�' => 220,
+  '�' => 9,
+  '�' => 9,
+  'ð‘‚¹' => 9,
+  '𑂺' => 7,
+  'ð‘„€' => 230,
+  '�' => 230,
+  'ð‘„‚' => 230,
+  'ð‘„³' => 9,
+  'ð‘„´' => 9,
+  'ð‘…³' => 7,
+  '𑇀' => 9,
+  '𑇊' => 7,
+  '𑈵' => 9,
+  '𑈶' => 7,
+  'ð‘‹©' => 7,
+  '𑋪' => 9,
+  '𑌻' => 7,
+  '𑌼' => 7,
+  '�' => 9,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  'ð‘‘‚' => 9,
+  '𑑆' => 7,
+  'ð‘‘ž' => 230,
+  'ð‘“‚' => 9,
+  '𑓃' => 7,
+  'ð‘–¿' => 9,
+  'ð‘—€' => 7,
+  '𑘿' => 9,
+  '𑚶' => 9,
+  'ð‘š·' => 7,
+  '𑜫' => 9,
+  'ð‘ ¹' => 9,
+  'ð‘ º' => 7,
+  '𑤽' => 9,
+  '𑤾' => 9,
+  '𑥃' => 7,
+  '𑧠' => 9,
+  '𑨴' => 9,
+  '𑩇' => 9,
+  '𑪙' => 9,
+  'ð‘°¿' => 9,
+  '𑵂' => 7,
+  '𑵄' => 9,
+  '𑵅' => 9,
+  '𑶗' => 9,
+  'ð–«°' => 1,
+  'ð–«±' => 1,
+  'ð–«²' => 1,
+  'ð–«³' => 1,
+  'ð–«´' => 1,
+  'ð–¬°' => 230,
+  '𖬱' => 230,
+  '𖬲' => 230,
+  '𖬳' => 230,
+  'ð–¬´' => 230,
+  '𖬵' => 230,
+  '𖬶' => 230,
+  'ð–¿°' => 6,
+  'ð–¿±' => 6,
+  '𛲞' => 1,
+  '�' => 216,
+  '�' => 216,
+  '�' => 1,
+  '�' => 1,
+  '�' => 1,
+  '�' => 226,
+  '�' => 216,
+  '�' => 216,
+  '�' => 216,
+  '�' => 216,
+  '�' => 216,
+  '�' => 220,
+  '�' => 220,
+  '�' => 220,
+  '�' => 220,
+  '�' => 220,
+  '�' => 220,
+  '�' => 220,
+  '�' => 220,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 220,
+  '�' => 220,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '�' => 230,
+  '𞀀' => 230,
+  '�' => 230,
+  '𞀂' => 230,
+  '𞀃' => 230,
+  '𞀄' => 230,
+  '𞀅' => 230,
+  '𞀆' => 230,
+  '𞀈' => 230,
+  '𞀉' => 230,
+  '𞀊' => 230,
+  '𞀋' => 230,
+  '𞀌' => 230,
+  '�' => 230,
+  '𞀎' => 230,
+  '�' => 230,
+  '�' => 230,
+  '𞀑' => 230,
+  '𞀒' => 230,
+  '𞀓' => 230,
+  '𞀔' => 230,
+  '𞀕' => 230,
+  '𞀖' => 230,
+  '𞀗' => 230,
+  '𞀘' => 230,
+  '𞀛' => 230,
+  '𞀜' => 230,
+  '�' => 230,
+  '𞀞' => 230,
+  '𞀟' => 230,
+  '𞀠' => 230,
+  '𞀡' => 230,
+  '𞀣' => 230,
+  '𞀤' => 230,
+  '𞀦' => 230,
+  '𞀧' => 230,
+  '𞀨' => 230,
+  '𞀩' => 230,
+  '𞀪' => 230,
+  'ðž„°' => 230,
+  '𞄱' => 230,
+  '𞄲' => 230,
+  '𞄳' => 230,
+  'ðž„´' => 230,
+  '𞄵' => 230,
+  '𞄶' => 230,
+  '𞋬' => 230,
+  'ðž‹­' => 230,
+  'ðž‹®' => 230,
+  '𞋯' => 230,
+  '�' => 220,
+  '𞣑' => 220,
+  '𞣒' => 220,
+  '𞣓' => 220,
+  '𞣔' => 220,
+  '𞣕' => 220,
+  '𞣖' => 220,
+  '𞥄' => 230,
+  '𞥅' => 230,
+  '𞥆' => 230,
+  '𞥇' => 230,
+  '𞥈' => 230,
+  '𞥉' => 230,
+  '𞥊' => 7,
+);
diff --git a/lib/symfony/polyfill-intl-normalizer/Resources/unidata/compatibilityDecomposition.php b/lib/symfony/polyfill-intl-normalizer/Resources/unidata/compatibilityDecomposition.php
new file mode 100644
index 000000000..157490289
--- /dev/null
+++ b/lib/symfony/polyfill-intl-normalizer/Resources/unidata/compatibilityDecomposition.php
@@ -0,0 +1,3695 @@
+<?php
+
+return array (
+  ' ' => ' ',
+  '¨' => ' ̈',
+  'ª' => 'a',
+  '¯' => ' ̄',
+  '²' => '2',
+  '³' => '3',
+  '´' => ' �',
+  'µ' => 'μ',
+  '¸' => ' ̧',
+  '¹' => '1',
+  'º' => 'o',
+  '¼' => '1�4',
+  '½' => '1�2',
+  '¾' => '3�4',
+  'IJ' => 'IJ',
+  'ij' => 'ij',
+  'Ŀ' => 'L·',
+  'ŀ' => 'l·',
+  'ʼn' => 'ʼn',
+  'Å¿' => 's',
+  'DŽ' => 'DŽ',
+  'Dž' => 'Dž',
+  'dž' => 'dž',
+  'LJ' => 'LJ',
+  'Lj' => 'Lj',
+  'lj' => 'lj',
+  'ÇŠ' => 'NJ',
+  'Ç‹' => 'Nj',
+  'nj' => 'nj',
+  'DZ' => 'DZ',
+  'Dz' => 'Dz',
+  'dz' => 'dz',
+  'Ê°' => 'h',
+  'ʱ' => 'ɦ',
+  'ʲ' => 'j',
+  'ʳ' => 'r',
+  'ʴ' => 'ɹ',
+  'ʵ' => 'ɻ',
+  'ʶ' => '�',
+  'Ê·' => 'w',
+  'ʸ' => 'y',
+  '˘' => ' ̆',
+  '˙' => ' ̇',
+  'Ëš' => ' ÌŠ',
+  '˛' => ' ̨',
+  '˜' => ' ̃',
+  '�' => ' ̋',
+  'Ë ' => 'É£',
+  'Ë¡' => 'l',
+  'Ë¢' => 's',
+  'Ë£' => 'x',
+  'ˤ' => 'ʕ',
+  'ͺ' => ' ͅ',
+  '΄' => ' �',
+  '΅' => ' ̈�',
+  '�' => 'β',
+  'ϑ' => 'θ',
+  'Ï’' => 'Î¥',
+  'ϓ' => 'Υ�',
+  'ϔ' => 'Ϋ',
+  'ϕ' => 'φ',
+  'Ï–' => 'Ï€',
+  'ϰ' => 'κ',
+  'ϱ' => '�',
+  'ϲ' => 'ς',
+  'ϴ' => 'Θ',
+  'ϵ' => 'ε',
+  'Ϲ' => 'Σ',
+  'Ö‡' => 'Õ¥Ö‚',
+  'ٵ' => 'اٴ',
+  'ٶ' => 'وٴ',
+  'Ù·' => 'Û‡Ù´',
+  'ٸ' => 'يٴ',
+  'ำ' => '�า',
+  'ຳ' => '�າ',
+  'ໜ' => 'ຫນ',
+  '�' => 'ຫມ',
+  '༌' => '་',
+  'ཷ' => 'ྲཱྀ',
+  'ཹ' => 'ླཱྀ',
+  'ჼ' => 'ნ',
+  'á´¬' => 'A',
+  'ᴭ' => 'Æ',
+  'á´®' => 'B',
+  'á´°' => 'D',
+  'á´±' => 'E',
+  'á´²' => 'ÆŽ',
+  'á´³' => 'G',
+  'á´´' => 'H',
+  'á´µ' => 'I',
+  'á´¶' => 'J',
+  'á´·' => 'K',
+  'á´¸' => 'L',
+  'á´¹' => 'M',
+  'á´º' => 'N',
+  'á´¼' => 'O',
+  'á´½' => 'È¢',
+  'á´¾' => 'P',
+  'á´¿' => 'R',
+  'áµ€' => 'T',
+  '�' => 'U',
+  'ᵂ' => 'W',
+  'ᵃ' => 'a',
+  'ᵄ' => '�',
+  'áµ…' => 'É‘',
+  'ᵆ' => 'ᴂ',
+  'ᵇ' => 'b',
+  'ᵈ' => 'd',
+  'ᵉ' => 'e',
+  'ᵊ' => 'ə',
+  'ᵋ' => 'ɛ',
+  'ᵌ' => 'ɜ',
+  '�' => 'g',
+  '�' => 'k',
+  '�' => 'm',
+  'ᵑ' => 'ŋ',
+  'áµ’' => 'o',
+  'ᵓ' => 'ɔ',
+  'áµ”' => 'á´–',
+  'ᵕ' => 'ᴗ',
+  'áµ–' => 'p',
+  'áµ—' => 't',
+  'ᵘ' => 'u',
+  'áµ™' => 'á´�',
+  'ᵚ' => 'ɯ',
+  'áµ›' => 'v',
+  'ᵜ' => 'ᴥ',
+  '�' => 'β',
+  'ᵞ' => 'γ',
+  'ᵟ' => 'δ',
+  'ᵠ' => 'φ',
+  'ᵡ' => 'χ',
+  'áµ¢' => 'i',
+  'áµ£' => 'r',
+  'ᵤ' => 'u',
+  'áµ¥' => 'v',
+  'ᵦ' => 'β',
+  'ᵧ' => 'γ',
+  'ᵨ' => '�',
+  'ᵩ' => 'φ',
+  'ᵪ' => 'χ',
+  'ᵸ' => 'н',
+  'ᶛ' => 'ɒ',
+  'ᶜ' => 'c',
+  '�' => 'ɕ',
+  'ᶞ' => 'ð',
+  'ᶟ' => 'ɜ',
+  'ᶠ' => 'f',
+  'ᶡ' => 'ɟ',
+  'ᶢ' => 'ɡ',
+  'ᶣ' => 'ɥ',
+  'ᶤ' => 'ɨ',
+  'ᶥ' => 'ɩ',
+  'ᶦ' => 'ɪ',
+  'ᶧ' => 'ᵻ',
+  'ᶨ' => '�',
+  'ᶩ' => 'ɭ',
+  'ᶪ' => 'ᶅ',
+  'ᶫ' => 'ʟ',
+  'ᶬ' => 'ɱ',
+  'ᶭ' => 'ɰ',
+  'ᶮ' => 'ɲ',
+  'ᶯ' => 'ɳ',
+  'ᶰ' => 'ɴ',
+  'ᶱ' => 'ɵ',
+  'ᶲ' => 'ɸ',
+  'ᶳ' => 'ʂ',
+  'ᶴ' => 'ʃ',
+  'ᶵ' => 'ƫ',
+  'ᶶ' => 'ʉ',
+  'ᶷ' => 'ʊ',
+  'ᶸ' => 'ᴜ',
+  'ᶹ' => 'ʋ',
+  'ᶺ' => 'ʌ',
+  'ᶻ' => 'z',
+  'ᶼ' => '�',
+  'ᶽ' => 'ʑ',
+  'ᶾ' => 'ʒ',
+  'ᶿ' => 'θ',
+  'ẚ' => 'aʾ',
+  'ẛ' => 'ṡ',
+  'á¾½' => ' Ì“',
+  '᾿' => ' ̓',
+  'á¿€' => ' Í‚',
+  '�' => ' ̈͂',
+  '�' => ' ̓̀',
+  '῎' => ' ̓�',
+  '�' => ' ̓͂',
+  '�' => ' ̔̀',
+  '῞' => ' ̔�',
+  '῟' => ' ̔͂',
+  '῭' => ' ̈̀',
+  '΅' => ' ̈�',
+  '´' => ' �',
+  '῾' => ' ̔',
+  ' ' => ' ',
+  '�' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  ' ' => ' ',
+  '‑' => '�',
+  '‗' => ' ̳',
+  '․' => '.',
+  '‥' => '..',
+  '…' => '...',
+  ' ' => ' ',
+  '″' => '′′',
+  '‴' => '′′′',
+  '‶' => '‵‵',
+  '‷' => '‵‵‵',
+  '‼' => '!!',
+  '‾' => ' ̅',
+  '�' => '??',
+  '�' => '?!',
+  '�' => '!?',
+  '�' => '′′′′',
+  '�' => ' ',
+  '�' => '0',
+  '�' => 'i',
+  '�' => '4',
+  '�' => '5',
+  '�' => '6',
+  '�' => '7',
+  '�' => '8',
+  '�' => '9',
+  '�' => '+',
+  '�' => '−',
+  '�' => '=',
+  '�' => '(',
+  '�' => ')',
+  '�' => 'n',
+  'â‚€' => '0',
+  '�' => '1',
+  'â‚‚' => '2',
+  '₃' => '3',
+  'â‚„' => '4',
+  'â‚…' => '5',
+  '₆' => '6',
+  '₇' => '7',
+  '₈' => '8',
+  '₉' => '9',
+  'â‚Š' => '+',
+  '₋' => '−',
+  '₌' => '=',
+  '�' => '(',
+  'â‚Ž' => ')',
+  '�' => 'a',
+  'â‚‘' => 'e',
+  'â‚’' => 'o',
+  'â‚“' => 'x',
+  'â‚”' => 'É™',
+  'â‚•' => 'h',
+  'â‚–' => 'k',
+  'â‚—' => 'l',
+  'ₘ' => 'm',
+  'â‚™' => 'n',
+  'â‚š' => 'p',
+  'â‚›' => 's',
+  'ₜ' => 't',
+  '₨' => 'Rs',
+  'â„€' => 'a/c',
+  '�' => 'a/s',
+  'â„‚' => 'C',
+  '℃' => '°C',
+  'â„…' => 'c/o',
+  '℆' => 'c/u',
+  'ℇ' => '�',
+  '℉' => '°F',
+  'â„Š' => 'g',
+  'â„‹' => 'H',
+  'ℌ' => 'H',
+  '�' => 'H',
+  'â„Ž' => 'h',
+  '�' => 'ħ',
+  '�' => 'I',
+  'â„‘' => 'I',
+  'â„’' => 'L',
+  'â„“' => 'l',
+  'â„•' => 'N',
+  'â„–' => 'No',
+  'â„™' => 'P',
+  'â„š' => 'Q',
+  'â„›' => 'R',
+  'ℜ' => 'R',
+  '�' => 'R',
+  'â„ ' => 'SM',
+  'â„¡' => 'TEL',
+  'â„¢' => 'TM',
+  'ℤ' => 'Z',
+  'ℨ' => 'Z',
+  'ℬ' => 'B',
+  'â„­' => 'C',
+  'ℯ' => 'e',
+  'â„°' => 'E',
+  'ℱ' => 'F',
+  'ℳ' => 'M',
+  'â„´' => 'o',
+  'ℵ' => '�',
+  'ℶ' => 'ב',
+  'â„·' => '×’',
+  'ℸ' => 'ד',
+  'ℹ' => 'i',
+  'â„»' => 'FAX',
+  'ℼ' => 'π',
+  'ℽ' => 'γ',
+  'ℾ' => 'Γ',
+  'ℿ' => 'Π',
+  '⅀' => '∑',
+  'â……' => 'D',
+  'â…†' => 'd',
+  'â…‡' => 'e',
+  'â…ˆ' => 'i',
+  'â…‰' => 'j',
+  '�' => '1�7',
+  '⅑' => '1�9',
+  '⅒' => '1�10',
+  '⅓' => '1�3',
+  '⅔' => '2�3',
+  '⅕' => '1�5',
+  '⅖' => '2�5',
+  '⅗' => '3�5',
+  '⅘' => '4�5',
+  '⅙' => '1�6',
+  '⅚' => '5�6',
+  '⅛' => '1�8',
+  '⅜' => '3�8',
+  '�' => '5�8',
+  '⅞' => '7�8',
+  '⅟' => '1�',
+  'â… ' => 'I',
+  'â…¡' => 'II',
+  'â…¢' => 'III',
+  'â…£' => 'IV',
+  'â…¤' => 'V',
+  'â…¥' => 'VI',
+  'â…¦' => 'VII',
+  'â…§' => 'VIII',
+  'â…¨' => 'IX',
+  'â…©' => 'X',
+  'â…ª' => 'XI',
+  'â…«' => 'XII',
+  'â…¬' => 'L',
+  'â…­' => 'C',
+  'â…®' => 'D',
+  'â…¯' => 'M',
+  'â…°' => 'i',
+  'â…±' => 'ii',
+  'â…²' => 'iii',
+  'â…³' => 'iv',
+  'â…´' => 'v',
+  'â…µ' => 'vi',
+  'â…¶' => 'vii',
+  'â…·' => 'viii',
+  'â…¸' => 'ix',
+  'â…¹' => 'x',
+  'â…º' => 'xi',
+  'â…»' => 'xii',
+  'â…¼' => 'l',
+  'â…½' => 'c',
+  'â…¾' => 'd',
+  'â…¿' => 'm',
+  '↉' => '0�3',
+  '∬' => '∫∫',
+  '∭' => '∫∫∫',
+  '∯' => '∮∮',
+  '∰' => '∮∮∮',
+  'â‘ ' => '1',
+  'â‘¡' => '2',
+  'â‘¢' => '3',
+  'â‘£' => '4',
+  '⑤' => '5',
+  'â‘¥' => '6',
+  '⑦' => '7',
+  '⑧' => '8',
+  '⑨' => '9',
+  'â‘©' => '10',
+  '⑪' => '11',
+  'â‘«' => '12',
+  '⑬' => '13',
+  'â‘­' => '14',
+  'â‘®' => '15',
+  '⑯' => '16',
+  'â‘°' => '17',
+  '⑱' => '18',
+  '⑲' => '19',
+  '⑳' => '20',
+  'â‘´' => '(1)',
+  '⑵' => '(2)',
+  '⑶' => '(3)',
+  'â‘·' => '(4)',
+  '⑸' => '(5)',
+  '⑹' => '(6)',
+  '⑺' => '(7)',
+  'â‘»' => '(8)',
+  '⑼' => '(9)',
+  '⑽' => '(10)',
+  '⑾' => '(11)',
+  'â‘¿' => '(12)',
+  'â’€' => '(13)',
+  'â’�' => '(14)',
+  'â’‚' => '(15)',
+  'â’ƒ' => '(16)',
+  'â’„' => '(17)',
+  'â’…' => '(18)',
+  'â’†' => '(19)',
+  'â’‡' => '(20)',
+  'â’ˆ' => '1.',
+  'â’‰' => '2.',
+  'â’Š' => '3.',
+  'â’‹' => '4.',
+  '⒌' => '5.',
+  'â’�' => '6.',
+  'â’Ž' => '7.',
+  'â’�' => '8.',
+  'â’�' => '9.',
+  'â’‘' => '10.',
+  'â’’' => '11.',
+  'â’“' => '12.',
+  'â’”' => '13.',
+  'â’•' => '14.',
+  'â’–' => '15.',
+  'â’—' => '16.',
+  'â’˜' => '17.',
+  'â’™' => '18.',
+  'â’š' => '19.',
+  'â’›' => '20.',
+  '⒜' => '(a)',
+  'â’�' => '(b)',
+  'â’ž' => '(c)',
+  'â’Ÿ' => '(d)',
+  'â’ ' => '(e)',
+  'â’¡' => '(f)',
+  'â’¢' => '(g)',
+  'â’£' => '(h)',
+  'â’¤' => '(i)',
+  'â’¥' => '(j)',
+  'â’¦' => '(k)',
+  'â’§' => '(l)',
+  'â’¨' => '(m)',
+  'â’©' => '(n)',
+  'â’ª' => '(o)',
+  'â’«' => '(p)',
+  'â’¬' => '(q)',
+  'â’­' => '(r)',
+  'â’®' => '(s)',
+  'â’¯' => '(t)',
+  'â’°' => '(u)',
+  'â’±' => '(v)',
+  'â’²' => '(w)',
+  'â’³' => '(x)',
+  'â’´' => '(y)',
+  'â’µ' => '(z)',
+  'â’¶' => 'A',
+  'â’·' => 'B',
+  'â’¸' => 'C',
+  'â’¹' => 'D',
+  'â’º' => 'E',
+  'â’»' => 'F',
+  'â’¼' => 'G',
+  'â’½' => 'H',
+  'â’¾' => 'I',
+  'â’¿' => 'J',
+  'â“€' => 'K',
+  '�' => 'L',
+  'â“‚' => 'M',
+  'Ⓝ' => 'N',
+  'â“„' => 'O',
+  'â“…' => 'P',
+  'Ⓠ' => 'Q',
+  'Ⓡ' => 'R',
+  'Ⓢ' => 'S',
+  'Ⓣ' => 'T',
+  'â“Š' => 'U',
+  'â“‹' => 'V',
+  'Ⓦ' => 'W',
+  '�' => 'X',
+  'â“Ž' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  'â“‘' => 'b',
+  'â“’' => 'c',
+  'â““' => 'd',
+  'â“”' => 'e',
+  'â“•' => 'f',
+  'â“–' => 'g',
+  'â“—' => 'h',
+  'ⓘ' => 'i',
+  'â“™' => 'j',
+  'â“š' => 'k',
+  'â“›' => 'l',
+  'ⓜ' => 'm',
+  '�' => 'n',
+  'â“ž' => 'o',
+  'â“Ÿ' => 'p',
+  'â“ ' => 'q',
+  'â“¡' => 'r',
+  'â“¢' => 's',
+  'â“£' => 't',
+  'ⓤ' => 'u',
+  'â“¥' => 'v',
+  'ⓦ' => 'w',
+  'ⓧ' => 'x',
+  'ⓨ' => 'y',
+  'â“©' => 'z',
+  '⓪' => '0',
+  '⨌' => '∫∫∫∫',
+  'â©´' => '::=',
+  '⩵' => '==',
+  '⩶' => '===',
+  'â±¼' => 'j',
+  'â±½' => 'V',
+  'ⵯ' => 'ⵡ',
+  '⺟' => '�',
+  '⻳' => '龟',
+  '⼀' => '一',
+  '�' => '丨',
+  '⼂' => '丶',
+  '⼃' => '丿',
+  '⼄' => '乙',
+  '⼅' => '亅',
+  '⼆' => '二',
+  '⼇' => '亠',
+  '⼈' => '人',
+  '⼉' => '儿',
+  '⼊' => '入',
+  '⼋' => '八',
+  '⼌' => '冂',
+  '�' => '冖',
+  '⼎' => '冫',
+  '�' => '几',
+  '�' => '凵',
+  '⼑' => '刀',
+  '⼒' => '力',
+  '⼓' => '勹',
+  '⼔' => '匕',
+  '⼕' => '匚',
+  '⼖' => '匸',
+  '⼗' => '�',
+  '⼘' => '�',
+  '⼙' => '�',
+  '⼚' => '厂',
+  '⼛' => '厶',
+  '⼜' => '�',
+  '�' => '�',
+  '⼞' => '囗',
+  '⼟' => '土',
+  '⼠' => '士',
+  '⼡' => '夂',
+  '⼢' => '夊',
+  '⼣' => '夕',
+  '⼤' => '大',
+  '⼥' => '女',
+  '⼦' => '�',
+  '⼧' => '宀',
+  '⼨' => '寸',
+  '⼩' => '�',
+  '⼪' => '尢',
+  '⼫' => '尸',
+  '⼬' => '屮',
+  'â¼­' => 'å±±',
+  'â¼®' => 'å·›',
+  '⼯' => '工',
+  'â¼°' => 'å·±',
+  'â¼±' => 'å·¾',
+  'â¼²' => 'å¹²',
+  '⼳' => '幺',
+  '⼴' => '广',
+  'â¼µ' => 'å»´',
+  '⼶' => '廾',
+  '⼷' => '弋',
+  '⼸' => '弓',
+  '⼹' => '�',
+  '⼺' => '彡',
+  'â¼»' => 'å½³',
+  '⼼' => '心',
+  '⼽' => '戈',
+  '⼾' => '戶',
+  '⼿' => '手',
+  '⽀' => '支',
+  '�' => '攴',
+  '⽂' => '文',
+  '⽃' => '斗',
+  '⽄' => '斤',
+  'â½…' => 'æ–¹',
+  '⽆' => '无',
+  '⽇' => '日',
+  '⽈' => '曰',
+  '⽉' => '月',
+  '⽊' => '木',
+  '⽋' => '欠',
+  '⽌' => '止',
+  '�' => '歹',
+  '⽎' => '殳',
+  '�' => '毋',
+  '�' => '比',
+  '⽑' => '毛',
+  'â½’' => 'æ°�',
+  '⽓' => '气',
+  'â½”' => 'æ°´',
+  '⽕' => '�',
+  '⽖' => '爪',
+  '⽗' => '父',
+  '⽘' => '爻',
+  '⽙' => '爿',
+  '⽚' => '片',
+  '⽛' => '牙',
+  '⽜' => '牛',
+  '�' => '犬',
+  '⽞' => '玄',
+  '⽟' => '玉',
+  '⽠' => '瓜',
+  '⽡' => '瓦',
+  '⽢' => '甘',
+  '⽣' => '生',
+  '⽤' => '用',
+  'â½¥' => 'ç”°',
+  '⽦' => '疋',
+  '⽧' => '疒',
+  '⽨' => '癶',
+  '⽩' => '白',
+  '⽪' => '皮',
+  '⽫' => '皿',
+  '⽬' => '目',
+  '⽭' => '矛',
+  '⽮' => '矢',
+  '⽯' => '石',
+  '⽰' => '示',
+  '⽱' => '禸',
+  '⽲' => '禾',
+  'â½³' => 'ç©´',
+  'â½´' => 'ç«‹',
+  '⽵' => '竹',
+  '⽶' => '米',
+  '⽷' => '糸',
+  '⽸' => '缶',
+  '⽹' => '网',
+  '⽺' => '羊',
+  'â½»' => 'ç¾½',
+  '⽼' => '�',
+  '⽽' => '而',
+  '⽾' => '耒',
+  '⽿' => '耳',
+  '⾀' => '�',
+  '�' => '肉',
+  '⾂' => '臣',
+  '⾃' => '自',
+  '⾄' => '至',
+  '⾅' => '臼',
+  '⾆' => '舌',
+  '⾇' => '舛',
+  '⾈' => '舟',
+  '⾉' => '艮',
+  '⾊' => '色',
+  '⾋' => '艸',
+  '⾌' => '�',
+  '�' => '虫',
+  '⾎' => '血',
+  '�' => '行',
+  '�' => '衣',
+  '⾑' => '襾',
+  '⾒' => '見',
+  '⾓' => '角',
+  '⾔' => '言',
+  '⾕' => '谷',
+  '⾖' => '豆',
+  '⾗' => '豕',
+  '⾘' => '豸',
+  '⾙' => '�',
+  '⾚' => '赤',
+  'â¾›' => 'èµ°',
+  '⾜' => '足',
+  '�' => '身',
+  '⾞' => '車',
+  '⾟' => '辛',
+  'â¾ ' => 'è¾°',
+  '⾡' => '辵',
+  'â¾¢' => 'é‚‘',
+  'â¾£' => 'é…‰',
+  '⾤' => '釆',
+  '⾥' => '里',
+  '⾦' => '金',
+  '⾧' => '長',
+  '⾨' => '門',
+  '⾩' => '阜',
+  '⾪' => '隶',
+  '⾫' => '隹',
+  '⾬' => '雨',
+  '⾭' => '�',
+  '⾮' => '�',
+  '⾯' => '�',
+  '⾰' => '�',
+  '⾱' => '韋',
+  '⾲' => '韭',
+  '⾳' => '音',
+  'â¾´' => 'é �',
+  '⾵' => '風',
+  '⾶' => '飛',
+  '⾷' => '食',
+  '⾸' => '首',
+  '⾹' => '香',
+  '⾺' => '馬',
+  '⾻' => '骨',
+  '⾼' => '高',
+  'â¾½' => 'é«Ÿ',
+  '⾾' => '鬥',
+  '⾿' => '鬯',
+  '⿀' => '鬲',
+  '�' => '鬼',
+  'â¿‚' => 'é­š',
+  '⿃' => '鳥',
+  'â¿„' => 'é¹µ',
+  '⿅' => '鹿',
+  '⿆' => '麥',
+  '⿇' => '麻',
+  '⿈' => '黃',
+  '⿉' => '�',
+  '⿊' => '黑',
+  '⿋' => '黹',
+  '⿌' => '黽',
+  '�' => '鼎',
+  '⿎' => '鼓',
+  '�' => '鼠',
+  '�' => '鼻',
+  '⿑' => '齊',
+  'â¿’' => 'é½’',
+  '⿓' => '�',
+  '⿔' => '龜',
+  'â¿•' => 'é¾ ',
+  '　' => ' ',
+  '〶' => '〒',
+  '〸' => '�',
+  '〹' => '�',
+  '〺' => '�',
+  'ã‚›' => ' ã‚™',
+  '゜' => ' ゚',
+  'ゟ' => 'より',
+  'ヿ' => 'コト',
+  'ㄱ' => 'ᄀ',
+  'ㄲ' => '�',
+  'ㄳ' => 'ᆪ',
+  'ã„´' => 'á„‚',
+  'ㄵ' => 'ᆬ',
+  'ㄶ' => 'ᆭ',
+  'ㄷ' => 'ᄃ',
+  'ㄸ' => 'ᄄ',
+  'ㄹ' => 'ᄅ',
+  'ㄺ' => 'ᆰ',
+  'ㄻ' => 'ᆱ',
+  'ㄼ' => 'ᆲ',
+  'ㄽ' => 'ᆳ',
+  'ㄾ' => 'ᆴ',
+  'ㄿ' => 'ᆵ',
+  'ã…€' => 'á„š',
+  '�' => 'ᄆ',
+  'ㅂ' => 'ᄇ',
+  'ㅃ' => 'ᄈ',
+  'ã…„' => 'á„¡',
+  'ㅅ' => 'ᄉ',
+  'ã…†' => 'á„Š',
+  'ã…‡' => 'á„‹',
+  'ㅈ' => 'ᄌ',
+  'ㅉ' => '�',
+  'ã…Š' => 'á„Ž',
+  'ㅋ' => '�',
+  'ㅌ' => '�',
+  'ã…�' => 'á„‘',
+  'ã…Ž' => 'á„’',
+  'ã…�' => 'á…¡',
+  'ã…�' => 'á…¢',
+  'ã…‘' => 'á…£',
+  'ã…’' => 'á…¤',
+  'ã…“' => 'á…¥',
+  'ã…”' => 'á…¦',
+  'ã…•' => 'á…§',
+  'ã…–' => 'á…¨',
+  'ã…—' => 'á…©',
+  'ã…˜' => 'á…ª',
+  'ã…™' => 'á…«',
+  'ã…š' => 'á…¬',
+  'ã…›' => 'á…­',
+  'ㅜ' => 'ᅮ',
+  'ã…�' => 'á…¯',
+  'ã…ž' => 'á…°',
+  'ã…Ÿ' => 'á…±',
+  'ã… ' => 'á…²',
+  'ã…¡' => 'á…³',
+  'ã…¢' => 'á…´',
+  'ã…£' => 'á…µ',
+  'ã…¤' => 'á… ',
+  'ã…¥' => 'á„”',
+  'ã…¦' => 'á„•',
+  'ㅧ' => 'ᇇ',
+  'ㅨ' => 'ᇈ',
+  'ㅩ' => 'ᇌ',
+  'ㅪ' => 'ᇎ',
+  'ㅫ' => 'ᇓ',
+  'ㅬ' => 'ᇗ',
+  'ㅭ' => 'ᇙ',
+  'ㅮ' => 'ᄜ',
+  'ㅯ' => '�',
+  'ㅰ' => 'ᇟ',
+  'ㅱ' => '�',
+  'ã…²' => 'á„ž',
+  'ã…³' => 'á„ ',
+  'ã…´' => 'á„¢',
+  'ã…µ' => 'á„£',
+  'ㅶ' => 'ᄧ',
+  'ã…·' => 'á„©',
+  'ã…¸' => 'á„«',
+  'ㅹ' => 'ᄬ',
+  'ã…º' => 'á„­',
+  'ã…»' => 'á„®',
+  'ㅼ' => 'ᄯ',
+  'ㅽ' => 'ᄲ',
+  'ㅾ' => 'ᄶ',
+  'ã…¿' => 'á…€',
+  'ㆀ' => 'ᅇ',
+  '�' => 'ᅌ',
+  'ㆂ' => 'ᇱ',
+  'ㆃ' => 'ᇲ',
+  'ㆄ' => 'ᅗ',
+  'ㆅ' => 'ᅘ',
+  'ㆆ' => 'ᅙ',
+  'ㆇ' => 'ᆄ',
+  'ㆈ' => 'ᆅ',
+  'ㆉ' => 'ᆈ',
+  'ㆊ' => 'ᆑ',
+  'ㆋ' => 'ᆒ',
+  'ㆌ' => 'ᆔ',
+  '�' => 'ᆞ',
+  'ㆎ' => 'ᆡ',
+  '㆒' => '一',
+  '㆓' => '二',
+  '㆔' => '三',
+  '㆕' => '四',
+  '㆖' => '上',
+  '㆗' => '中',
+  '㆘' => '下',
+  '㆙' => '甲',
+  '㆚' => '乙',
+  '㆛' => '丙',
+  '㆜' => '�',
+  '�' => '天',
+  '㆞' => '地',
+  '㆟' => '人',
+  '㈀' => '(ᄀ)',
+  '�' => '(ᄂ)',
+  '㈂' => '(ᄃ)',
+  '㈃' => '(ᄅ)',
+  '㈄' => '(ᄆ)',
+  '㈅' => '(ᄇ)',
+  '㈆' => '(ᄉ)',
+  '㈇' => '(ᄋ)',
+  '㈈' => '(ᄌ)',
+  '㈉' => '(ᄎ)',
+  '㈊' => '(�)',
+  '㈋' => '(�)',
+  '㈌' => '(ᄑ)',
+  '�' => '(ᄒ)',
+  '㈎' => '(가)',
+  '�' => '(나)',
+  '�' => '(다)',
+  '㈑' => '(라)',
+  '㈒' => '(마)',
+  '㈓' => '(바)',
+  '㈔' => '(사)',
+  '㈕' => '(아)',
+  '㈖' => '(자)',
+  '㈗' => '(차)',
+  '㈘' => '(�ᅡ)',
+  '㈙' => '(�ᅡ)',
+  '㈚' => '(파)',
+  '㈛' => '(하)',
+  '㈜' => '(주)',
+  '�' => '(오전)',
+  '㈞' => '(오후)',
+  '㈠' => '(一)',
+  '㈡' => '(二)',
+  '㈢' => '(三)',
+  '㈣' => '(四)',
+  '㈤' => '(五)',
+  '㈥' => '(六)',
+  '㈦' => '(七)',
+  '㈧' => '(八)',
+  '㈨' => '(�)',
+  '㈩' => '(�)',
+  '㈪' => '(月)',
+  '㈫' => '(�)',
+  '㈬' => '(水)',
+  '㈭' => '(木)',
+  '㈮' => '(金)',
+  '㈯' => '(土)',
+  '㈰' => '(日)',
+  '㈱' => '(株)',
+  '㈲' => '(有)',
+  '㈳' => '(社)',
+  '㈴' => '(�)',
+  '㈵' => '(特)',
+  '㈶' => '(財)',
+  '㈷' => '(�)',
+  '㈸' => '(労)',
+  '㈹' => '(代)',
+  '㈺' => '(呼)',
+  '㈻' => '(学)',
+  '㈼' => '(監)',
+  '㈽' => '(�)',
+  '㈾' => '(資)',
+  '㈿' => '(�)',
+  '㉀' => '(祭)',
+  '�' => '(休)',
+  '㉂' => '(自)',
+  '㉃' => '(至)',
+  '㉄' => '�',
+  '㉅' => '幼',
+  '㉆' => '文',
+  '㉇' => '�',
+  '�' => 'PTE',
+  '㉑' => '21',
+  '㉒' => '22',
+  '㉓' => '23',
+  '㉔' => '24',
+  '㉕' => '25',
+  '㉖' => '26',
+  '㉗' => '27',
+  '㉘' => '28',
+  '㉙' => '29',
+  '㉚' => '30',
+  '㉛' => '31',
+  '㉜' => '32',
+  '�' => '33',
+  '㉞' => '34',
+  '㉟' => '35',
+  '㉠' => 'ᄀ',
+  '㉡' => 'ᄂ',
+  '㉢' => 'ᄃ',
+  '㉣' => 'ᄅ',
+  '㉤' => 'ᄆ',
+  '㉥' => 'ᄇ',
+  '㉦' => 'ᄉ',
+  '㉧' => 'ᄋ',
+  '㉨' => 'ᄌ',
+  '㉩' => 'ᄎ',
+  '㉪' => '�',
+  '㉫' => '�',
+  '㉬' => 'ᄑ',
+  '㉭' => 'ᄒ',
+  '㉮' => '가',
+  '㉯' => '나',
+  '㉰' => '다',
+  '㉱' => '라',
+  '㉲' => '마',
+  '㉳' => '바',
+  '㉴' => '사',
+  '㉵' => '아',
+  '㉶' => '자',
+  '㉷' => '차',
+  '㉸' => '�ᅡ',
+  '㉹' => '�ᅡ',
+  '㉺' => '파',
+  '㉻' => '하',
+  '㉼' => '참고',
+  '㉽' => '주의',
+  '㉾' => '우',
+  '㊀' => '一',
+  '�' => '二',
+  '㊂' => '三',
+  '㊃' => '四',
+  '㊄' => '五',
+  '㊅' => '六',
+  '㊆' => '七',
+  '㊇' => '八',
+  '㊈' => '�',
+  '㊉' => '�',
+  '㊊' => '月',
+  '㊋' => '�',
+  '㊌' => '水',
+  '�' => '木',
+  '㊎' => '金',
+  '�' => '土',
+  '�' => '日',
+  '㊑' => '株',
+  '㊒' => '有',
+  '㊓' => '社',
+  '㊔' => '�',
+  '㊕' => '特',
+  '㊖' => '財',
+  '㊗' => '�',
+  '㊘' => '労',
+  '㊙' => '秘',
+  '㊚' => '男',
+  '㊛' => '女',
+  '㊜' => '�',
+  '�' => '優',
+  '㊞' => '�',
+  '㊟' => '注',
+  '㊠' => '項',
+  '㊡' => '休',
+  '㊢' => '写',
+  '㊣' => '正',
+  '㊤' => '上',
+  '㊥' => '中',
+  '㊦' => '下',
+  '㊧' => '左',
+  '㊨' => '�',
+  '㊩' => '医',
+  '㊪' => '宗',
+  '㊫' => '学',
+  '㊬' => '監',
+  '㊭' => '�',
+  '㊮' => '資',
+  '㊯' => '�',
+  '㊰' => '夜',
+  '㊱' => '36',
+  '㊲' => '37',
+  '㊳' => '38',
+  '㊴' => '39',
+  '㊵' => '40',
+  '㊶' => '41',
+  '㊷' => '42',
+  '㊸' => '43',
+  '㊹' => '44',
+  '㊺' => '45',
+  '㊻' => '46',
+  '㊼' => '47',
+  '㊽' => '48',
+  '㊾' => '49',
+  '㊿' => '50',
+  '㋀' => '1月',
+  '�' => '2月',
+  '㋂' => '3月',
+  '㋃' => '4月',
+  '㋄' => '5月',
+  '㋅' => '6月',
+  '㋆' => '7月',
+  '㋇' => '8月',
+  '㋈' => '9月',
+  '㋉' => '10月',
+  '㋊' => '11月',
+  '㋋' => '12月',
+  '㋌' => 'Hg',
+  '�' => 'erg',
+  'ã‹Ž' => 'eV',
+  '�' => 'LTD',
+  '�' => 'ア',
+  '㋑' => 'イ',
+  '㋒' => 'ウ',
+  '㋓' => 'エ',
+  '㋔' => 'オ',
+  'ã‹•' => 'ã‚«',
+  'ã‹–' => 'ã‚­',
+  '㋗' => 'ク',
+  '㋘' => 'ケ',
+  '㋙' => 'コ',
+  '㋚' => 'サ',
+  'ã‹›' => 'ã‚·',
+  '㋜' => 'ス',
+  '�' => 'セ',
+  '㋞' => 'ソ',
+  'ã‹Ÿ' => 'ã‚¿',
+  '㋠' => '�',
+  '㋡' => 'ツ',
+  '㋢' => 'テ',
+  '㋣' => 'ト',
+  '㋤' => 'ナ',
+  '㋥' => 'ニ',
+  '㋦' => 'ヌ',
+  '㋧' => '�',
+  '㋨' => 'ノ',
+  '㋩' => '�',
+  '㋪' => 'ヒ',
+  '㋫' => 'フ',
+  '㋬' => 'ヘ',
+  '㋭' => 'ホ',
+  '㋮' => 'マ',
+  '㋯' => 'ミ',
+  '㋰' => 'ム',
+  '㋱' => 'メ',
+  '㋲' => 'モ',
+  '㋳' => 'ヤ',
+  '㋴' => 'ユ',
+  '㋵' => 'ヨ',
+  '㋶' => 'ラ',
+  '㋷' => 'リ',
+  '㋸' => 'ル',
+  '㋹' => 'レ',
+  '㋺' => 'ロ',
+  '㋻' => 'ワ',
+  '㋼' => 'ヰ',
+  '㋽' => 'ヱ',
+  '㋾' => 'ヲ',
+  '㋿' => '令和',
+  '㌀' => 'ア�゚ート',
+  '�' => 'アルファ',
+  '㌂' => 'アンペア',
+  '㌃' => 'アール',
+  '㌄' => 'イニング',
+  '㌅' => 'イン�',
+  '㌆' => 'ウォン',
+  '㌇' => 'エスクード',
+  '㌈' => 'エーカー',
+  '㌉' => 'オンス',
+  '㌊' => 'オーム',
+  '㌋' => 'カイリ',
+  '㌌' => 'カラット',
+  '�' => 'カロリー',
+  '㌎' => 'ガロン',
+  '�' => 'ガンマ',
+  '�' => 'ギガ',
+  '㌑' => 'ギニー',
+  '㌒' => 'キュリー',
+  '㌓' => 'ギルダー',
+  '㌔' => 'キロ',
+  '㌕' => 'キログラム',
+  '㌖' => 'キロメートル',
+  '㌗' => 'キロワット',
+  '㌘' => 'グラム',
+  '㌙' => 'グラムトン',
+  '㌚' => 'クルゼイロ',
+  '㌛' => 'クロー�',
+  '㌜' => 'ケース',
+  '�' => 'コルナ',
+  '㌞' => 'コーポ',
+  '㌟' => 'サイクル',
+  '㌠' => 'サン�ーム',
+  '㌡' => 'シリング',
+  '㌢' => 'セン�',
+  '㌣' => 'セント',
+  '㌤' => 'ダース',
+  '㌥' => 'デシ',
+  '㌦' => 'ドル',
+  '㌧' => 'トン',
+  '㌨' => 'ナノ',
+  '㌩' => 'ノット',
+  '㌪' => '�イツ',
+  '㌫' => '�゚ーセント',
+  '㌬' => '�゚ーツ',
+  '㌭' => '�゙ーレル',
+  '㌮' => 'ピアストル',
+  '㌯' => 'ピクル',
+  '㌰' => 'ピコ',
+  '㌱' => 'ビル',
+  '㌲' => 'ファラッド',
+  '㌳' => 'フィート',
+  '㌴' => 'ブッシェル',
+  '㌵' => 'フラン',
+  '㌶' => 'ヘクタール',
+  '㌷' => 'ペソ',
+  '㌸' => 'ペニヒ',
+  '㌹' => 'ヘルツ',
+  '㌺' => 'ペンス',
+  '㌻' => 'ページ',
+  '㌼' => 'ベータ',
+  '㌽' => 'ポイント',
+  '㌾' => 'ボルト',
+  '㌿' => 'ホン',
+  '�' => 'ポンド',
+  '�' => 'ホール',
+  '�' => 'ホーン',
+  '�' => 'マイクロ',
+  '�' => 'マイル',
+  '�' => 'マッ�',
+  '�' => 'マルク',
+  '�' => 'マンション',
+  '�' => 'ミクロン',
+  '�' => 'ミリ',
+  '�' => 'ミリ�゙ール',
+  '�' => 'メガ',
+  '�' => 'メガトン',
+  '�' => 'メートル',
+  '�' => 'ヤード',
+  '�' => 'ヤール',
+  '�' => 'ユアン',
+  '�' => 'リットル',
+  '�' => 'リラ',
+  '�' => 'ルピー',
+  '�' => 'ルーブル',
+  '�' => 'レム',
+  '�' => 'レントゲン',
+  '�' => 'ワット',
+  '�' => '0点',
+  '�' => '1点',
+  '�' => '2点',
+  '�' => '3点',
+  '�' => '4点',
+  '�' => '5点',
+  '�' => '6点',
+  '�' => '7点',
+  '�' => '8点',
+  '�' => '9点',
+  '�' => '10点',
+  '�' => '11点',
+  '�' => '12点',
+  '�' => '13点',
+  '�' => '14点',
+  '�' => '15点',
+  '�' => '16点',
+  '�' => '17点',
+  '�' => '18点',
+  '�' => '19点',
+  '�' => '20点',
+  '�' => '21点',
+  '�' => '22点',
+  '�' => '23点',
+  '�' => '24点',
+  '�' => 'hPa',
+  '�' => 'da',
+  '�' => 'AU',
+  '�' => 'bar',
+  '�' => 'oV',
+  '�' => 'pc',
+  '�' => 'dm',
+  '�' => 'dm2',
+  '�' => 'dm3',
+  '�' => 'IU',
+  '�' => '平�',
+  '�' => '昭和',
+  '�' => '大正',
+  '�' => '明治',
+  '�' => '株�会社',
+  '㎀' => 'pA',
+  '�' => 'nA',
+  '㎂' => 'μA',
+  '㎃' => 'mA',
+  '㎄' => 'kA',
+  '㎅' => 'KB',
+  '㎆' => 'MB',
+  '㎇' => 'GB',
+  '㎈' => 'cal',
+  '㎉' => 'kcal',
+  '㎊' => 'pF',
+  '㎋' => 'nF',
+  '㎌' => 'μF',
+  '�' => 'μg',
+  '㎎' => 'mg',
+  '�' => 'kg',
+  '�' => 'Hz',
+  '㎑' => 'kHz',
+  '㎒' => 'MHz',
+  '㎓' => 'GHz',
+  '㎔' => 'THz',
+  '㎕' => 'μl',
+  '㎖' => 'ml',
+  '㎗' => 'dl',
+  '㎘' => 'kl',
+  '㎙' => 'fm',
+  '㎚' => 'nm',
+  '㎛' => 'μm',
+  '㎜' => 'mm',
+  '�' => 'cm',
+  '㎞' => 'km',
+  '㎟' => 'mm2',
+  '㎠' => 'cm2',
+  '㎡' => 'm2',
+  '㎢' => 'km2',
+  '㎣' => 'mm3',
+  '㎤' => 'cm3',
+  '㎥' => 'm3',
+  '㎦' => 'km3',
+  '㎧' => 'm∕s',
+  '㎨' => 'm∕s2',
+  '㎩' => 'Pa',
+  '㎪' => 'kPa',
+  '㎫' => 'MPa',
+  '㎬' => 'GPa',
+  '㎭' => 'rad',
+  '㎮' => 'rad∕s',
+  '㎯' => 'rad∕s2',
+  '㎰' => 'ps',
+  '㎱' => 'ns',
+  '㎲' => 'μs',
+  '㎳' => 'ms',
+  '㎴' => 'pV',
+  '㎵' => 'nV',
+  '㎶' => 'μV',
+  '㎷' => 'mV',
+  '㎸' => 'kV',
+  '㎹' => 'MV',
+  '㎺' => 'pW',
+  '㎻' => 'nW',
+  '㎼' => 'μW',
+  '㎽' => 'mW',
+  '㎾' => 'kW',
+  '㎿' => 'MW',
+  '�' => 'kΩ',
+  '�' => 'MΩ',
+  '�' => 'a.m.',
+  '�' => 'Bq',
+  '�' => 'cc',
+  '�' => 'cd',
+  '�' => 'C∕kg',
+  '�' => 'Co.',
+  '�' => 'dB',
+  '�' => 'Gy',
+  '�' => 'ha',
+  '�' => 'HP',
+  '�' => 'in',
+  '�' => 'KK',
+  '�' => 'KM',
+  '�' => 'kt',
+  '�' => 'lm',
+  '�' => 'ln',
+  '�' => 'log',
+  '�' => 'lx',
+  '�' => 'mb',
+  '�' => 'mil',
+  '�' => 'mol',
+  '�' => 'PH',
+  '�' => 'p.m.',
+  '�' => 'PPM',
+  '�' => 'PR',
+  '�' => 'sr',
+  '�' => 'Sv',
+  '�' => 'Wb',
+  '�' => 'V∕m',
+  '�' => 'A∕m',
+  '�' => '1日',
+  '�' => '2日',
+  '�' => '3日',
+  '�' => '4日',
+  '�' => '5日',
+  '�' => '6日',
+  '�' => '7日',
+  '�' => '8日',
+  '�' => '9日',
+  '�' => '10日',
+  '�' => '11日',
+  '�' => '12日',
+  '�' => '13日',
+  '�' => '14日',
+  '�' => '15日',
+  '�' => '16日',
+  '�' => '17日',
+  '�' => '18日',
+  '�' => '19日',
+  '�' => '20日',
+  '�' => '21日',
+  '�' => '22日',
+  '�' => '23日',
+  '�' => '24日',
+  '�' => '25日',
+  '�' => '26日',
+  '�' => '27日',
+  '�' => '28日',
+  '�' => '29日',
+  '�' => '30日',
+  '�' => '31日',
+  '�' => 'gal',
+  'ꚜ' => 'ъ',
+  '�' => 'ь',
+  '�' => '�',
+  'ꟸ' => 'Ħ',
+  'ꟹ' => 'œ',
+  'ꭜ' => 'ꜧ',
+  '�' => 'ꬷ',
+  'ê­ž' => 'É«',
+  'ê­Ÿ' => 'ê­’',
+  'ꭩ' => '�',
+  'ff' => 'ff',
+  '�' => 'fi',
+  'fl' => 'fl',
+  'ffi' => 'ffi',
+  'ffl' => 'ffl',
+  'ſt' => 'st',
+  'st' => 'st',
+  'ﬓ' => 'մն',
+  'ﬔ' => 'մե',
+  'ﬕ' => 'մի',
+  'ﬖ' => 'վն',
+  'ﬗ' => 'մխ',
+  'ﬠ' => 'ע',
+  'ﬡ' => '�',
+  'ﬢ' => 'ד',
+  'ﬣ' => 'ה',
+  'ﬤ' => 'כ',
+  'ﬥ' => 'ל',
+  'ﬦ' => '�',
+  'ﬧ' => 'ר',
+  'ﬨ' => 'ת',
+  '﬩' => '+',
+  '�' => '�ל',
+  'ï­�' => 'Ù±',
+  'ï­‘' => 'Ù±',
+  'ï­’' => 'Ù»',
+  'ï­“' => 'Ù»',
+  'ï­”' => 'Ù»',
+  'ï­•' => 'Ù»',
+  'ï­–' => 'Ù¾',
+  'ï­—' => 'Ù¾',
+  'ï­˜' => 'Ù¾',
+  'ï­™' => 'Ù¾',
+  'ï­š' => 'Ú€',
+  'ï­›' => 'Ú€',
+  'ﭜ' => 'ڀ',
+  'ï­�' => 'Ú€',
+  'ï­ž' => 'Ùº',
+  'ï­Ÿ' => 'Ùº',
+  'ï­ ' => 'Ùº',
+  'ï­¡' => 'Ùº',
+  'ï­¢' => 'Ù¿',
+  'ï­£' => 'Ù¿',
+  'ï­¤' => 'Ù¿',
+  'ï­¥' => 'Ù¿',
+  'ï­¦' => 'Ù¹',
+  'ï­§' => 'Ù¹',
+  'ï­¨' => 'Ù¹',
+  'ï­©' => 'Ù¹',
+  'ï­ª' => 'Ú¤',
+  'ï­«' => 'Ú¤',
+  'ï­¬' => 'Ú¤',
+  'ï­­' => 'Ú¤',
+  'ï­®' => 'Ú¦',
+  'ï­¯' => 'Ú¦',
+  'ï­°' => 'Ú¦',
+  'ï­±' => 'Ú¦',
+  'ï­²' => 'Ú„',
+  'ï­³' => 'Ú„',
+  'ï­´' => 'Ú„',
+  'ï­µ' => 'Ú„',
+  'ï­¶' => 'Úƒ',
+  'ï­·' => 'Úƒ',
+  'ï­¸' => 'Úƒ',
+  'ï­¹' => 'Úƒ',
+  'ï­º' => 'Ú†',
+  'ï­»' => 'Ú†',
+  'ï­¼' => 'Ú†',
+  'ï­½' => 'Ú†',
+  'ï­¾' => 'Ú‡',
+  'ï­¿' => 'Ú‡',
+  'ﮀ' => 'ڇ',
+  '�' => 'ڇ',
+  'ﮂ' => '�',
+  'ﮃ' => '�',
+  'ﮄ' => 'ڌ',
+  'ﮅ' => 'ڌ',
+  'ﮆ' => 'ڎ',
+  'ﮇ' => 'ڎ',
+  'ﮈ' => 'ڈ',
+  'ﮉ' => 'ڈ',
+  'ﮊ' => 'ژ',
+  'ﮋ' => 'ژ',
+  'ﮌ' => 'ڑ',
+  '�' => 'ڑ',
+  'ﮎ' => 'ک',
+  '�' => 'ک',
+  '�' => 'ک',
+  'ﮑ' => 'ک',
+  'ï®’' => 'Ú¯',
+  'ﮓ' => 'گ',
+  'ï®”' => 'Ú¯',
+  'ﮕ' => 'گ',
+  'ï®–' => 'Ú³',
+  'ï®—' => 'Ú³',
+  'ﮘ' => 'ڳ',
+  'ï®™' => 'Ú³',
+  'ﮚ' => 'ڱ',
+  'ï®›' => 'Ú±',
+  'ﮜ' => 'ڱ',
+  '�' => 'ڱ',
+  'ﮞ' => 'ں',
+  'ﮟ' => 'ں',
+  'ï® ' => 'Ú»',
+  'ﮡ' => 'ڻ',
+  'ﮢ' => 'ڻ',
+  'ﮣ' => 'ڻ',
+  'ﮤ' => 'ۀ',
+  'ﮥ' => 'ۀ',
+  'ﮦ' => '�',
+  'ﮧ' => '�',
+  'ﮨ' => '�',
+  'ﮩ' => '�',
+  'ﮪ' => 'ھ',
+  'ﮫ' => 'ھ',
+  'ﮬ' => 'ھ',
+  'ï®­' => 'Ú¾',
+  'ï®®' => 'Û’',
+  'ﮯ' => 'ے',
+  'ï®°' => 'Û’Ù”',
+  'ï®±' => 'Û’Ù”',
+  'ﯓ' => 'ڭ',
+  'ﯔ' => 'ڭ',
+  'ﯕ' => 'ڭ',
+  'ﯖ' => 'ڭ',
+  'ﯗ' => 'ۇ',
+  'ﯘ' => 'ۇ',
+  'ﯙ' => 'ۆ',
+  'ﯚ' => 'ۆ',
+  'ﯛ' => 'ۈ',
+  'ﯜ' => 'ۈ',
+  '�' => 'ۇٴ',
+  'ﯞ' => 'ۋ',
+  'ﯟ' => 'ۋ',
+  'ﯠ' => 'ۅ',
+  'ﯡ' => 'ۅ',
+  'ﯢ' => 'ۉ',
+  'ﯣ' => 'ۉ',
+  'ﯤ' => '�',
+  'ﯥ' => '�',
+  'ﯦ' => '�',
+  'ﯧ' => '�',
+  'ﯨ' => 'ى',
+  'ﯩ' => 'ى',
+  'ﯪ' => 'ئا',
+  'ﯫ' => 'ئا',
+  'ﯬ' => 'ئە',
+  'ﯭ' => 'ئە',
+  'ﯮ' => 'ئو',
+  'ﯯ' => 'ئو',
+  'ﯰ' => 'ئۇ',
+  'ﯱ' => 'ئۇ',
+  'ﯲ' => 'ئۆ',
+  'ﯳ' => 'ئۆ',
+  'ﯴ' => 'ئۈ',
+  'ﯵ' => 'ئۈ',
+  'ﯶ' => 'ئ�',
+  'ﯷ' => 'ئ�',
+  'ﯸ' => 'ئ�',
+  'ﯹ' => 'ئى',
+  'ﯺ' => 'ئى',
+  'ﯻ' => 'ئى',
+  'ﯼ' => 'ی',
+  'ﯽ' => 'ی',
+  'ﯾ' => 'ی',
+  'ﯿ' => 'ی',
+  'ﰀ' => 'ئج',
+  '�' => 'ئح',
+  'ï°‚' => 'ÙŠÙ”Ù…',
+  'ï°ƒ' => 'ÙŠÙ”Ù‰',
+  'ï°„' => 'ÙŠÙ”ÙŠ',
+  'ﰅ' => 'بج',
+  'ﰆ' => 'بح',
+  'ﰇ' => 'بخ',
+  'ﰈ' => 'بم',
+  'ﰉ' => 'بى',
+  'ﰊ' => 'بي',
+  'ﰋ' => 'تج',
+  'ﰌ' => 'تح',
+  '�' => 'تخ',
+  'ﰎ' => 'تم',
+  '�' => 'تى',
+  '�' => 'تي',
+  'ﰑ' => 'ثج',
+  'ﰒ' => 'ثم',
+  'ﰓ' => 'ثى',
+  'ﰔ' => 'ثي',
+  'ﰕ' => 'جح',
+  'ﰖ' => 'جم',
+  'ﰗ' => 'حج',
+  'ﰘ' => 'حم',
+  'ﰙ' => 'خج',
+  'ﰚ' => 'خح',
+  'ﰛ' => 'خم',
+  'ﰜ' => 'سج',
+  '�' => 'سح',
+  'ﰞ' => 'سخ',
+  'ﰟ' => 'سم',
+  'ﰠ' => 'صح',
+  'ﰡ' => 'صم',
+  'ﰢ' => 'ضج',
+  'ﰣ' => 'ضح',
+  'ﰤ' => 'ضخ',
+  'ﰥ' => 'ضم',
+  'ﰦ' => 'طح',
+  'ﰧ' => 'طم',
+  'ﰨ' => 'ظم',
+  'ﰩ' => 'عج',
+  'ﰪ' => 'عم',
+  'ﰫ' => 'غج',
+  'ﰬ' => 'غم',
+  'ﰭ' => '�ج',
+  'ﰮ' => '�ح',
+  'ﰯ' => '�خ',
+  'ﰰ' => '�م',
+  'ﰱ' => '�ى',
+  'ﰲ' => '�ي',
+  'ﰳ' => 'قح',
+  'ﰴ' => 'قم',
+  'ﰵ' => 'قى',
+  'ﰶ' => 'قي',
+  'ﰷ' => 'كا',
+  'ﰸ' => 'كج',
+  'ﰹ' => 'كح',
+  'ﰺ' => 'كخ',
+  'ﰻ' => 'كل',
+  'ﰼ' => 'كم',
+  'ﰽ' => 'كى',
+  'ﰾ' => 'كي',
+  'ﰿ' => 'لج',
+  'ﱀ' => 'لح',
+  '�' => 'لخ',
+  'ﱂ' => 'لم',
+  'ﱃ' => 'لى',
+  'ﱄ' => 'لي',
+  'ﱅ' => 'مج',
+  'ﱆ' => 'مح',
+  'ﱇ' => 'مخ',
+  'ﱈ' => 'مم',
+  'ﱉ' => 'مى',
+  'ﱊ' => 'مي',
+  'ﱋ' => 'نج',
+  'ﱌ' => 'نح',
+  '�' => 'نخ',
+  'ﱎ' => 'نم',
+  '�' => 'نى',
+  '�' => 'ني',
+  'ﱑ' => 'هج',
+  'ﱒ' => 'هم',
+  'ﱓ' => 'هى',
+  'ﱔ' => 'هي',
+  'ﱕ' => 'يج',
+  'ﱖ' => 'يح',
+  'ﱗ' => 'يخ',
+  'ﱘ' => 'يم',
+  'ﱙ' => 'يى',
+  'ﱚ' => 'يي',
+  'ﱛ' => 'ذٰ',
+  'ﱜ' => 'رٰ',
+  '�' => 'ىٰ',
+  'ﱞ' => ' ٌّ',
+  'ﱟ' => ' �ّ',
+  'ï± ' => ' ÙŽÙ‘',
+  'ﱡ' => ' �ّ',
+  'ﱢ' => ' �ّ',
+  'ﱣ' => ' ّٰ',
+  'ﱤ' => 'ئر',
+  'ﱥ' => 'ئز',
+  'ﱦ' => 'ئم',
+  'ﱧ' => 'ئن',
+  'ﱨ' => 'ئى',
+  'ﱩ' => 'ئي',
+  'ﱪ' => 'بر',
+  'ﱫ' => 'بز',
+  'ﱬ' => 'بم',
+  'ﱭ' => 'بن',
+  'ﱮ' => 'بى',
+  'ﱯ' => 'بي',
+  'ﱰ' => 'تر',
+  'ﱱ' => 'تز',
+  'ﱲ' => 'تم',
+  'ﱳ' => 'تن',
+  'ﱴ' => 'تى',
+  'ﱵ' => 'تي',
+  'ﱶ' => 'ثر',
+  'ﱷ' => 'ثز',
+  'ﱸ' => 'ثم',
+  'ﱹ' => 'ثن',
+  'ﱺ' => 'ثى',
+  'ﱻ' => 'ثي',
+  'ﱼ' => '�ى',
+  'ﱽ' => '�ي',
+  'ﱾ' => 'قى',
+  'ﱿ' => 'قي',
+  'ﲀ' => 'كا',
+  '�' => 'كل',
+  'ﲂ' => 'كم',
+  'ﲃ' => 'كى',
+  'ﲄ' => 'كي',
+  'ﲅ' => 'لم',
+  'ﲆ' => 'لى',
+  'ﲇ' => 'لي',
+  'ﲈ' => 'ما',
+  'ﲉ' => 'مم',
+  'ﲊ' => 'نر',
+  'ﲋ' => 'نز',
+  'ﲌ' => 'نم',
+  '�' => 'نن',
+  'ﲎ' => 'نى',
+  '�' => 'ني',
+  '�' => 'ىٰ',
+  'ﲑ' => 'ير',
+  'ﲒ' => 'يز',
+  'ﲓ' => 'يم',
+  'ﲔ' => 'ين',
+  'ﲕ' => 'يى',
+  'ﲖ' => 'يي',
+  'ﲗ' => 'ئج',
+  'ﲘ' => 'ئح',
+  'ﲙ' => 'ئخ',
+  'ﲚ' => 'ئم',
+  'ï²›' => 'ÙŠÙ”Ù‡',
+  'ﲜ' => 'بج',
+  '�' => 'بح',
+  'ﲞ' => 'بخ',
+  'ﲟ' => 'بم',
+  'ﲠ' => 'به',
+  'ﲡ' => 'تج',
+  'ﲢ' => 'تح',
+  'ﲣ' => 'تخ',
+  'ﲤ' => 'تم',
+  'ﲥ' => 'ته',
+  'ﲦ' => 'ثم',
+  'ﲧ' => 'جح',
+  'ﲨ' => 'جم',
+  'ﲩ' => 'حج',
+  'ﲪ' => 'حم',
+  'ﲫ' => 'خج',
+  'ﲬ' => 'خم',
+  'ﲭ' => 'سج',
+  'ﲮ' => 'سح',
+  'ﲯ' => 'سخ',
+  'ﲰ' => 'سم',
+  'ﲱ' => 'صح',
+  'ﲲ' => 'صخ',
+  'ﲳ' => 'صم',
+  'ﲴ' => 'ضج',
+  'ﲵ' => 'ضح',
+  'ﲶ' => 'ضخ',
+  'ﲷ' => 'ضم',
+  'ﲸ' => 'طح',
+  'ﲹ' => 'ظم',
+  'ﲺ' => 'عج',
+  'ﲻ' => 'عم',
+  'ﲼ' => 'غج',
+  'ﲽ' => 'غم',
+  'ﲾ' => '�ج',
+  'ﲿ' => '�ح',
+  'ﳀ' => '�خ',
+  '�' => '�م',
+  'ﳂ' => 'قح',
+  'ﳃ' => 'قم',
+  'ﳄ' => 'كج',
+  'ﳅ' => 'كح',
+  'ﳆ' => 'كخ',
+  'ﳇ' => 'كل',
+  'ﳈ' => 'كم',
+  'ﳉ' => 'لج',
+  'ﳊ' => 'لح',
+  'ﳋ' => 'لخ',
+  'ﳌ' => 'لم',
+  '�' => 'له',
+  'ﳎ' => 'مج',
+  '�' => 'مح',
+  '�' => 'مخ',
+  'ﳑ' => 'مم',
+  'ﳒ' => 'نج',
+  'ﳓ' => 'نح',
+  'ﳔ' => 'نخ',
+  'ﳕ' => 'نم',
+  'ﳖ' => 'نه',
+  'ﳗ' => 'هج',
+  'ﳘ' => 'هم',
+  'ﳙ' => 'هٰ',
+  'ﳚ' => 'يج',
+  'ﳛ' => 'يح',
+  'ﳜ' => 'يخ',
+  '�' => 'يم',
+  'ﳞ' => 'يه',
+  'ﳟ' => 'ئم',
+  'ï³ ' => 'ÙŠÙ”Ù‡',
+  'ﳡ' => 'بم',
+  'ﳢ' => 'به',
+  'ﳣ' => 'تم',
+  'ﳤ' => 'ته',
+  'ﳥ' => 'ثم',
+  'ﳦ' => 'ثه',
+  'ﳧ' => 'سم',
+  'ﳨ' => 'سه',
+  'ﳩ' => 'شم',
+  'ﳪ' => 'شه',
+  'ﳫ' => 'كل',
+  'ﳬ' => 'كم',
+  'ﳭ' => 'لم',
+  'ﳮ' => 'نم',
+  'ﳯ' => 'نه',
+  'ﳰ' => 'يم',
+  'ﳱ' => 'يه',
+  'ï³²' => 'Ù€ÙŽÙ‘',
+  'ﳳ' => 'ـ�ّ',
+  'ﳴ' => 'ـ�ّ',
+  'ﳵ' => 'طى',
+  'ﳶ' => 'طي',
+  'ﳷ' => 'عى',
+  'ﳸ' => 'عي',
+  'ﳹ' => 'غى',
+  'ﳺ' => 'غي',
+  'ﳻ' => 'سى',
+  'ﳼ' => 'سي',
+  'ﳽ' => 'شى',
+  'ﳾ' => 'شي',
+  'ﳿ' => 'حى',
+  'ﴀ' => 'حي',
+  '�' => 'جى',
+  'ﴂ' => 'جي',
+  'ﴃ' => 'خى',
+  'ﴄ' => 'خي',
+  'ﴅ' => 'صى',
+  'ﴆ' => 'صي',
+  'ﴇ' => 'ضى',
+  'ﴈ' => 'ضي',
+  'ﴉ' => 'شج',
+  'ﴊ' => 'شح',
+  'ﴋ' => 'شخ',
+  'ﴌ' => 'شم',
+  '�' => 'شر',
+  'ﴎ' => 'سر',
+  '�' => 'صر',
+  '�' => 'ضر',
+  'ﴑ' => 'طى',
+  'ﴒ' => 'طي',
+  'ﴓ' => 'عى',
+  'ﴔ' => 'عي',
+  'ﴕ' => 'غى',
+  'ﴖ' => 'غي',
+  'ﴗ' => 'سى',
+  'ﴘ' => 'سي',
+  'ﴙ' => 'شى',
+  'ﴚ' => 'شي',
+  'ﴛ' => 'حى',
+  'ﴜ' => 'حي',
+  '�' => 'جى',
+  'ﴞ' => 'جي',
+  'ﴟ' => 'خى',
+  'ﴠ' => 'خي',
+  'ﴡ' => 'صى',
+  'ﴢ' => 'صي',
+  'ﴣ' => 'ضى',
+  'ﴤ' => 'ضي',
+  'ﴥ' => 'شج',
+  'ﴦ' => 'شح',
+  'ﴧ' => 'شخ',
+  'ﴨ' => 'شم',
+  'ﴩ' => 'شر',
+  'ﴪ' => 'سر',
+  'ﴫ' => 'صر',
+  'ﴬ' => 'ضر',
+  'ﴭ' => 'شج',
+  'ﴮ' => 'شح',
+  'ﴯ' => 'شخ',
+  'ﴰ' => 'شم',
+  'ﴱ' => 'سه',
+  'ﴲ' => 'شه',
+  'ﴳ' => 'طم',
+  'ﴴ' => 'سج',
+  'ﴵ' => 'سح',
+  'ﴶ' => 'سخ',
+  'ﴷ' => 'شج',
+  'ﴸ' => 'شح',
+  'ﴹ' => 'شخ',
+  'ﴺ' => 'طم',
+  'ﴻ' => 'ظم',
+  'ﴼ' => 'اً',
+  'ﴽ' => 'اً',
+  '�' => 'تجم',
+  'ﵑ' => 'تحج',
+  'ﵒ' => 'تحج',
+  'ﵓ' => 'تحم',
+  'ﵔ' => 'تخم',
+  'ﵕ' => 'تمج',
+  'ﵖ' => 'تمح',
+  'ﵗ' => 'تمخ',
+  'ﵘ' => 'جمح',
+  'ﵙ' => 'جمح',
+  'ﵚ' => 'حمي',
+  'ﵛ' => 'حمى',
+  'ﵜ' => 'سحج',
+  '�' => 'سجح',
+  'ﵞ' => 'سجى',
+  'ﵟ' => 'سمح',
+  'ﵠ' => 'سمح',
+  'ﵡ' => 'سمج',
+  'ﵢ' => 'سمم',
+  'ﵣ' => 'سمم',
+  'ﵤ' => 'صحح',
+  'ﵥ' => 'صحح',
+  'ﵦ' => 'صمم',
+  'ﵧ' => 'شحم',
+  'ﵨ' => 'شحم',
+  'ﵩ' => 'شجي',
+  'ﵪ' => 'شمخ',
+  'ﵫ' => 'شمخ',
+  'ﵬ' => 'شمم',
+  'ﵭ' => 'شمم',
+  'ﵮ' => 'ضحى',
+  'ﵯ' => 'ضخم',
+  'ﵰ' => 'ضخم',
+  'ﵱ' => 'طمح',
+  'ﵲ' => 'طمح',
+  'ﵳ' => 'طمم',
+  'ﵴ' => 'طمي',
+  'ﵵ' => 'عجم',
+  'ﵶ' => 'عمم',
+  'ﵷ' => 'عمم',
+  'ﵸ' => 'عمى',
+  'ﵹ' => 'غمم',
+  'ﵺ' => 'غمي',
+  'ﵻ' => 'غمى',
+  'ﵼ' => '�خم',
+  'ﵽ' => '�خم',
+  'ﵾ' => 'قمح',
+  'ﵿ' => 'قمم',
+  'ﶀ' => 'لحم',
+  '�' => 'لحي',
+  'ﶂ' => 'لحى',
+  'ﶃ' => 'لجج',
+  'ﶄ' => 'لجج',
+  'ﶅ' => 'لخم',
+  'ﶆ' => 'لخم',
+  'ﶇ' => 'لمح',
+  'ﶈ' => 'لمح',
+  'ﶉ' => 'محج',
+  'ﶊ' => 'محم',
+  'ﶋ' => 'محي',
+  'ﶌ' => 'مجح',
+  '�' => 'مجم',
+  'ﶎ' => 'مخج',
+  '�' => 'مخم',
+  'ﶒ' => 'مجخ',
+  'ﶓ' => 'همج',
+  'ﶔ' => 'همم',
+  'ﶕ' => 'نحم',
+  'ﶖ' => 'نحى',
+  'ﶗ' => 'نجم',
+  'ﶘ' => 'نجم',
+  'ﶙ' => 'نجى',
+  'ﶚ' => 'نمي',
+  'ﶛ' => 'نمى',
+  'ﶜ' => 'يمم',
+  '�' => 'يمم',
+  'ﶞ' => 'بخي',
+  'ﶟ' => 'تجي',
+  'ﶠ' => 'تجى',
+  'ﶡ' => 'تخي',
+  'ﶢ' => 'تخى',
+  'ﶣ' => 'تمي',
+  'ﶤ' => 'تمى',
+  'ﶥ' => 'جمي',
+  'ﶦ' => 'جحى',
+  'ﶧ' => 'جمى',
+  'ﶨ' => 'سخى',
+  'ﶩ' => 'صحي',
+  'ﶪ' => 'شحي',
+  'ﶫ' => 'ضحي',
+  'ﶬ' => 'لجي',
+  'ﶭ' => 'لمي',
+  'ﶮ' => 'يحي',
+  'ﶯ' => 'يجي',
+  'ﶰ' => 'يمي',
+  'ﶱ' => 'ممي',
+  'ﶲ' => 'قمي',
+  'ﶳ' => 'نحي',
+  'ﶴ' => 'قمح',
+  'ﶵ' => 'لحم',
+  'ﶶ' => 'عمي',
+  'ﶷ' => 'كمي',
+  'ﶸ' => 'نجح',
+  'ﶹ' => 'مخي',
+  'ﶺ' => 'لجم',
+  'ﶻ' => 'كمم',
+  'ﶼ' => 'لجم',
+  'ﶽ' => 'نجح',
+  'ﶾ' => 'جحي',
+  'ﶿ' => 'حجي',
+  'ﷀ' => 'مجي',
+  '�' => '�مي',
+  'ﷂ' => 'بحي',
+  'ﷃ' => 'كمم',
+  'ﷄ' => 'عجم',
+  'ﷅ' => 'صمم',
+  'ﷆ' => 'سخي',
+  'ﷇ' => 'نجي',
+  'ﷰ' => 'صلے',
+  'ﷱ' => 'قلے',
+  'ﷲ' => 'الله',
+  'ﷳ' => 'اكبر',
+  'ﷴ' => 'محمد',
+  'ﷵ' => 'صلعم',
+  'ﷶ' => 'رسول',
+  'ﷷ' => 'عليه',
+  'ﷸ' => 'وسلم',
+  'ﷹ' => 'صلى',
+  'ﷺ' => 'صلى الله عليه وسلم',
+  'ﷻ' => 'جل جلاله',
+  '﷼' => 'ریال',
+  '�' => ',',
+  '︑' => '�',
+  '︒' => '。',
+  '︓' => ':',
+  '︔' => ';',
+  '︕' => '!',
+  '︖' => '?',
+  '︗' => '〖',
+  '︘' => '〗',
+  '︙' => '...',
+  '︰' => '..',
+  '︱' => '—',
+  '︲' => '–',
+  '︳' => '_',
+  '︴' => '_',
+  '︵' => '(',
+  '︶' => ')',
+  '︷' => '{',
+  '︸' => '}',
+  '︹' => '〔',
+  '︺' => '〕',
+  '︻' => '�',
+  '︼' => '】',
+  '︽' => '《',
+  '︾' => '》',
+  '︿' => '〈',
+  '﹀' => '〉',
+  '�' => '「',
+  '﹂' => '�',
+  '﹃' => '『',
+  '﹄' => '�',
+  '﹇' => '[',
+  '﹈' => ']',
+  '﹉' => ' ̅',
+  '﹊' => ' ̅',
+  '﹋' => ' ̅',
+  '﹌' => ' ̅',
+  '�' => '_',
+  '﹎' => '_',
+  '�' => '_',
+  '�' => ',',
+  '﹑' => '�',
+  'ï¹’' => '.',
+  'ï¹”' => ';',
+  '﹕' => ':',
+  'ï¹–' => '?',
+  'ï¹—' => '!',
+  '﹘' => '—',
+  'ï¹™' => '(',
+  '﹚' => ')',
+  'ï¹›' => '{',
+  '﹜' => '}',
+  '�' => '〔',
+  '﹞' => '〕',
+  '﹟' => '#',
+  'ï¹ ' => '&',
+  '﹡' => '*',
+  'ï¹¢' => '+',
+  'ï¹£' => '-',
+  '﹤' => '<',
+  'ï¹¥' => '>',
+  '﹦' => '=',
+  '﹨' => '\\',
+  '﹩' => '$',
+  '﹪' => '%',
+  '﹫' => '@',
+  'ï¹°' => ' Ù‹',
+  'ﹱ' => 'ـً',
+  'ﹲ' => ' ٌ',
+  'ï¹´' => ' Ù�',
+  'ﹶ' => ' َ',
+  'ï¹·' => 'Ù€ÙŽ',
+  'ﹸ' => ' �',
+  'ﹹ' => 'ـ�',
+  'ﹺ' => ' �',
+  'ﹻ' => 'ـ�',
+  'ï¹¼' => ' Ù‘',
+  'ﹽ' => 'ـّ',
+  'ï¹¾' => ' Ù’',
+  'ﹿ' => 'ـْ',
+  'ﺀ' => 'ء',
+  '�' => 'آ',
+  'ﺂ' => 'آ',
+  'ﺃ' => 'أ',
+  'ﺄ' => 'أ',
+  'ﺅ' => 'ؤ',
+  'ﺆ' => 'ؤ',
+  'ﺇ' => 'إ',
+  'ﺈ' => 'إ',
+  'ﺉ' => 'ئ',
+  'ﺊ' => 'ئ',
+  'ﺋ' => 'ئ',
+  'ﺌ' => 'ئ',
+  '�' => 'ا',
+  'ﺎ' => 'ا',
+  '�' => 'ب',
+  '�' => 'ب',
+  'ﺑ' => 'ب',
+  'ﺒ' => 'ب',
+  'ﺓ' => 'ة',
+  'ﺔ' => 'ة',
+  'ﺕ' => 'ت',
+  'ﺖ' => 'ت',
+  'ﺗ' => 'ت',
+  'ﺘ' => 'ت',
+  'ﺙ' => 'ث',
+  'ﺚ' => 'ث',
+  'ﺛ' => 'ث',
+  'ﺜ' => 'ث',
+  '�' => 'ج',
+  'ﺞ' => 'ج',
+  'ﺟ' => 'ج',
+  'ﺠ' => 'ج',
+  'ﺡ' => 'ح',
+  'ﺢ' => 'ح',
+  'ﺣ' => 'ح',
+  'ﺤ' => 'ح',
+  'ﺥ' => 'خ',
+  'ﺦ' => 'خ',
+  'ﺧ' => 'خ',
+  'ﺨ' => 'خ',
+  'ﺩ' => 'د',
+  'ﺪ' => 'د',
+  'ﺫ' => 'ذ',
+  'ﺬ' => 'ذ',
+  'ﺭ' => 'ر',
+  'ﺮ' => 'ر',
+  'ﺯ' => 'ز',
+  'ﺰ' => 'ز',
+  'ﺱ' => 'س',
+  'ﺲ' => 'س',
+  'ﺳ' => 'س',
+  'ﺴ' => 'س',
+  'ﺵ' => 'ش',
+  'ﺶ' => 'ش',
+  'ﺷ' => 'ش',
+  'ﺸ' => 'ش',
+  'ﺹ' => 'ص',
+  'ﺺ' => 'ص',
+  'ﺻ' => 'ص',
+  'ﺼ' => 'ص',
+  'ﺽ' => 'ض',
+  'ﺾ' => 'ض',
+  'ﺿ' => 'ض',
+  'ﻀ' => 'ض',
+  '�' => 'ط',
+  'ﻂ' => 'ط',
+  'ﻃ' => 'ط',
+  'ﻄ' => 'ط',
+  'ﻅ' => 'ظ',
+  'ﻆ' => 'ظ',
+  'ﻇ' => 'ظ',
+  'ﻈ' => 'ظ',
+  'ﻉ' => 'ع',
+  'ﻊ' => 'ع',
+  'ﻋ' => 'ع',
+  'ﻌ' => 'ع',
+  '�' => 'غ',
+  'ﻎ' => 'غ',
+  '�' => 'غ',
+  '�' => 'غ',
+  'ﻑ' => '�',
+  'ï»’' => 'Ù�',
+  'ﻓ' => '�',
+  'ï»”' => 'Ù�',
+  'ﻕ' => 'ق',
+  'ï»–' => 'Ù‚',
+  'ï»—' => 'Ù‚',
+  'ﻘ' => 'ق',
+  'ï»™' => 'Ùƒ',
+  'ﻚ' => 'ك',
+  'ï»›' => 'Ùƒ',
+  'ﻜ' => 'ك',
+  '�' => 'ل',
+  'ﻞ' => 'ل',
+  'ﻟ' => 'ل',
+  'ï» ' => 'Ù„',
+  'ﻡ' => 'م',
+  'ﻢ' => 'م',
+  'ﻣ' => 'م',
+  'ﻤ' => 'م',
+  'ﻥ' => 'ن',
+  'ﻦ' => 'ن',
+  'ﻧ' => 'ن',
+  'ﻨ' => 'ن',
+  'ﻩ' => 'ه',
+  'ﻪ' => 'ه',
+  'ﻫ' => 'ه',
+  'ﻬ' => 'ه',
+  'ï»­' => 'Ùˆ',
+  'ï»®' => 'Ùˆ',
+  'ﻯ' => 'ى',
+  'ï»°' => 'Ù‰',
+  'ï»±' => 'ÙŠ',
+  'ﻲ' => 'ي',
+  'ﻳ' => 'ي',
+  'ï»´' => 'ÙŠ',
+  'ﻵ' => 'لآ',
+  'ﻶ' => 'لآ',
+  'ﻷ' => 'لأ',
+  'ﻸ' => 'لأ',
+  'ﻹ' => 'لإ',
+  'ﻺ' => 'لإ',
+  'ﻻ' => 'لا',
+  'ﻼ' => 'لا',
+  '�' => '!',
+  '＂' => '"',
+  '＃' => '#',
+  '＄' => '$',
+  'ï¼…' => '%',
+  '＆' => '&',
+  '＇' => '\'',
+  '（' => '(',
+  '）' => ')',
+  '＊' => '*',
+  '＋' => '+',
+  '，' => ',',
+  '�' => '-',
+  '．' => '.',
+  '�' => '/',
+  '�' => '0',
+  '１' => '1',
+  'ï¼’' => '2',
+  '３' => '3',
+  'ï¼”' => '4',
+  '５' => '5',
+  'ï¼–' => '6',
+  'ï¼—' => '7',
+  '８' => '8',
+  'ï¼™' => '9',
+  '：' => ':',
+  'ï¼›' => ';',
+  '＜' => '<',
+  '�' => '=',
+  '＞' => '>',
+  '？' => '?',
+  'ï¼ ' => '@',
+  'Ａ' => 'A',
+  'ï¼¢' => 'B',
+  'ï¼£' => 'C',
+  'Ｄ' => 'D',
+  'ï¼¥' => 'E',
+  'Ｆ' => 'F',
+  'Ｇ' => 'G',
+  'Ｈ' => 'H',
+  'Ｉ' => 'I',
+  'Ｊ' => 'J',
+  'Ｋ' => 'K',
+  'Ｌ' => 'L',
+  'ï¼­' => 'M',
+  'ï¼®' => 'N',
+  'Ｏ' => 'O',
+  'ï¼°' => 'P',
+  'ï¼±' => 'Q',
+  'ï¼²' => 'R',
+  'ï¼³' => 'S',
+  'ï¼´' => 'T',
+  'ï¼µ' => 'U',
+  'Ｖ' => 'V',
+  'ï¼·' => 'W',
+  'Ｘ' => 'X',
+  'ï¼¹' => 'Y',
+  'Ｚ' => 'Z',
+  'ï¼»' => '[',
+  'ï¼¼' => '\\',
+  'ï¼½' => ']',
+  'ï¼¾' => '^',
+  '＿' => '_',
+  'ï½€' => '`',
+  '�' => 'a',
+  'ｂ' => 'b',
+  'ｃ' => 'c',
+  'ｄ' => 'd',
+  'ï½…' => 'e',
+  'ｆ' => 'f',
+  'ｇ' => 'g',
+  'ｈ' => 'h',
+  'ｉ' => 'i',
+  'ｊ' => 'j',
+  'ｋ' => 'k',
+  'ｌ' => 'l',
+  '�' => 'm',
+  'ｎ' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  'ｑ' => 'q',
+  'ï½’' => 'r',
+  'ｓ' => 's',
+  'ï½”' => 't',
+  'ｕ' => 'u',
+  'ï½–' => 'v',
+  'ï½—' => 'w',
+  'ｘ' => 'x',
+  'ï½™' => 'y',
+  'ｚ' => 'z',
+  'ï½›' => '{',
+  '｜' => '|',
+  '�' => '}',
+  '～' => '~',
+  '｟' => '⦅',
+  '｠' => '⦆',
+  '｡' => '。',
+  '｢' => '「',
+  '｣' => '�',
+  '､' => '�',
+  '･' => '・',
+  'ｦ' => 'ヲ',
+  'ｧ' => 'ァ',
+  'ｨ' => 'ィ',
+  'ｩ' => 'ゥ',
+  'ｪ' => 'ェ',
+  'ｫ' => 'ォ',
+  'ｬ' => 'ャ',
+  'ｭ' => 'ュ',
+  'ｮ' => 'ョ',
+  'ｯ' => 'ッ',
+  'ｰ' => 'ー',
+  'ï½±' => 'ã‚¢',
+  'ｲ' => 'イ',
+  'ｳ' => 'ウ',
+  'ｴ' => 'エ',
+  'ｵ' => 'オ',
+  'ｶ' => 'カ',
+  'ï½·' => 'ã‚­',
+  'ｸ' => 'ク',
+  'ｹ' => 'ケ',
+  'ｺ' => 'コ',
+  'ｻ' => 'サ',
+  'ï½¼' => 'ã‚·',
+  'ｽ' => 'ス',
+  'ï½¾' => 'ã‚»',
+  'ｿ' => 'ソ',
+  'ï¾€' => 'ã‚¿',
+  '�' => '�',
+  'ﾂ' => 'ツ',
+  'ﾃ' => 'テ',
+  'ﾄ' => 'ト',
+  'ﾅ' => 'ナ',
+  'ﾆ' => 'ニ',
+  'ﾇ' => 'ヌ',
+  'ﾈ' => '�',
+  'ﾉ' => 'ノ',
+  'ﾊ' => '�',
+  'ﾋ' => 'ヒ',
+  'ﾌ' => 'フ',
+  '�' => 'ヘ',
+  'ﾎ' => 'ホ',
+  '�' => 'マ',
+  '�' => 'ミ',
+  'ﾑ' => 'ム',
+  'ﾒ' => 'メ',
+  'ﾓ' => 'モ',
+  'ﾔ' => 'ヤ',
+  'ﾕ' => 'ユ',
+  'ﾖ' => 'ヨ',
+  'ﾗ' => 'ラ',
+  'ﾘ' => 'リ',
+  'ﾙ' => 'ル',
+  'ﾚ' => 'レ',
+  'ﾛ' => 'ロ',
+  'ﾜ' => 'ワ',
+  '�' => 'ン',
+  'ﾞ' => '゙',
+  'ﾟ' => '゚',
+  'ï¾ ' => 'á… ',
+  'ﾡ' => 'ᄀ',
+  'ﾢ' => '�',
+  'ﾣ' => 'ᆪ',
+  'ﾤ' => 'ᄂ',
+  'ﾥ' => 'ᆬ',
+  'ﾦ' => 'ᆭ',
+  'ﾧ' => 'ᄃ',
+  'ﾨ' => 'ᄄ',
+  'ﾩ' => 'ᄅ',
+  'ﾪ' => 'ᆰ',
+  'ﾫ' => 'ᆱ',
+  'ﾬ' => 'ᆲ',
+  'ﾭ' => 'ᆳ',
+  'ﾮ' => 'ᆴ',
+  'ﾯ' => 'ᆵ',
+  'ï¾°' => 'á„š',
+  'ﾱ' => 'ᄆ',
+  'ﾲ' => 'ᄇ',
+  'ﾳ' => 'ᄈ',
+  'ï¾´' => 'á„¡',
+  'ﾵ' => 'ᄉ',
+  'ﾶ' => 'ᄊ',
+  'ï¾·' => 'á„‹',
+  'ﾸ' => 'ᄌ',
+  'ﾹ' => '�',
+  'ﾺ' => 'ᄎ',
+  'ﾻ' => '�',
+  'ﾼ' => '�',
+  'ï¾½' => 'á„‘',
+  'ï¾¾' => 'á„’',
+  'ï¿‚' => 'á…¡',
+  'ￃ' => 'ᅢ',
+  'ï¿„' => 'á…£',
+  'ï¿…' => 'á…¤',
+  'ￆ' => 'ᅥ',
+  'ￇ' => 'ᅦ',
+  'ï¿Š' => 'á…§',
+  'ï¿‹' => 'á…¨',
+  'ￌ' => 'ᅩ',
+  '�' => 'ᅪ',
+  'ï¿Ž' => 'á…«',
+  '�' => 'ᅬ',
+  'ï¿’' => 'á…­',
+  'ï¿“' => 'á…®',
+  'ï¿”' => 'á…¯',
+  'ï¿•' => 'á…°',
+  'ï¿–' => 'á…±',
+  'ï¿—' => 'á…²',
+  'ï¿š' => 'á…³',
+  'ï¿›' => 'á…´',
+  'ￜ' => 'ᅵ',
+  '￠' => '¢',
+  '￡' => '£',
+  '￢' => '¬',
+  'ï¿£' => ' Ì„',
+  '￤' => '¦',
+  'ï¿¥' => 'Â¥',
+  '￦' => '₩',
+  '￨' => '│',
+  '￩' => '�',
+  '￪' => '↑',
+  '￫' => '→',
+  '￬' => '↓',
+  'ï¿­' => 'â– ',
+  'ï¿®' => 'â—‹',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'H',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'R',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'H',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'R',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'H',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'R',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'G',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'f',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'H',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'R',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'O',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'H',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'R',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'H',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'R',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'H',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'R',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'H',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'R',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'H',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'R',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'A',
+  '�' => 'B',
+  '�' => 'C',
+  '�' => 'D',
+  '�' => 'E',
+  '�' => 'F',
+  '�' => 'G',
+  '�' => 'H',
+  '�' => 'I',
+  '�' => 'J',
+  '�' => 'K',
+  '�' => 'L',
+  '�' => 'M',
+  '�' => 'N',
+  '�' => 'O',
+  '�' => 'P',
+  '�' => 'Q',
+  '�' => 'R',
+  '�' => 'S',
+  '�' => 'T',
+  '�' => 'U',
+  '�' => 'V',
+  '�' => 'W',
+  '�' => 'X',
+  '�' => 'Y',
+  '�' => 'Z',
+  '�' => 'a',
+  '�' => 'b',
+  '�' => 'c',
+  '�' => 'd',
+  '�' => 'e',
+  '�' => 'f',
+  '�' => 'g',
+  '�' => 'h',
+  '�' => 'i',
+  '�' => 'j',
+  '�' => 'k',
+  '�' => 'l',
+  '�' => 'm',
+  '�' => 'n',
+  '�' => 'o',
+  '�' => 'p',
+  '�' => 'q',
+  '�' => 'r',
+  '�' => 's',
+  '�' => 't',
+  '�' => 'u',
+  '�' => 'v',
+  '�' => 'w',
+  '�' => 'x',
+  '�' => 'y',
+  '�' => 'z',
+  '�' => 'ı',
+  '�' => 'ȷ',
+  '�' => 'Α',
+  '�' => 'Β',
+  '�' => 'Γ',
+  '�' => 'Δ',
+  '�' => 'Ε',
+  '�' => 'Ζ',
+  '�' => 'Η',
+  '�' => 'Θ',
+  '�' => 'Ι',
+  '�' => 'Κ',
+  '�' => 'Λ',
+  '�' => 'Μ',
+  '�' => '�',
+  '�' => 'Ξ',
+  '�' => 'Ο',
+  '�' => 'Π',
+  '�' => 'Ρ',
+  '�' => 'Θ',
+  '�' => 'Σ',
+  '�' => 'Τ',
+  '�' => 'Υ',
+  '�' => 'Φ',
+  '�' => 'Χ',
+  '�' => 'Ψ',
+  '�' => 'Ω',
+  '�' => '∇',
+  '�' => 'α',
+  '�' => 'β',
+  '�' => 'γ',
+  '�' => 'δ',
+  '�' => 'ε',
+  '�' => 'ζ',
+  '�' => 'η',
+  '�' => 'θ',
+  '�' => 'ι',
+  '�' => 'κ',
+  '�' => 'λ',
+  '�' => 'μ',
+  '�' => 'ν',
+  '�' => 'ξ',
+  '�' => 'ο',
+  '�' => 'π',
+  '�' => '�',
+  '�' => 'ς',
+  '�' => 'σ',
+  '�' => 'τ',
+  '�' => 'υ',
+  '�' => 'φ',
+  '�' => 'χ',
+  '�' => 'ψ',
+  '�' => 'ω',
+  '�' => '∂',
+  '�' => 'ε',
+  '�' => 'θ',
+  '�' => 'κ',
+  '�' => 'φ',
+  '�' => '�',
+  '�' => 'π',
+  '�' => 'Α',
+  '�' => 'Β',
+  '�' => 'Γ',
+  '�' => 'Δ',
+  '�' => 'Ε',
+  '�' => 'Ζ',
+  '�' => 'Η',
+  '�' => 'Θ',
+  '�' => 'Ι',
+  '�' => 'Κ',
+  '�' => 'Λ',
+  '�' => 'Μ',
+  '�' => '�',
+  '�' => 'Ξ',
+  '�' => 'Ο',
+  '�' => 'Π',
+  '�' => 'Ρ',
+  '�' => 'Θ',
+  '�' => 'Σ',
+  '�' => 'Τ',
+  '�' => 'Υ',
+  '�' => 'Φ',
+  '�' => 'Χ',
+  '�' => 'Ψ',
+  '�' => 'Ω',
+  '�' => '∇',
+  '�' => 'α',
+  '�' => 'β',
+  '�' => 'γ',
+  '�' => 'δ',
+  '�' => 'ε',
+  '�' => 'ζ',
+  '�' => 'η',
+  '�' => 'θ',
+  '�' => 'ι',
+  '�' => 'κ',
+  '�' => 'λ',
+  '�' => 'μ',
+  '�' => 'ν',
+  '�' => 'ξ',
+  '�' => 'ο',
+  '�' => 'π',
+  '�' => '�',
+  '�' => 'ς',
+  '�' => 'σ',
+  '�' => 'τ',
+  '�' => 'υ',
+  '�' => 'φ',
+  '�' => 'χ',
+  '�' => 'ψ',
+  '�' => 'ω',
+  '�' => '∂',
+  '�' => 'ε',
+  '�' => 'θ',
+  '�' => 'κ',
+  '�' => 'φ',
+  '�' => '�',
+  '�' => 'π',
+  '�' => 'Α',
+  '�' => 'Β',
+  '�' => 'Γ',
+  '�' => 'Δ',
+  '�' => 'Ε',
+  '�' => 'Ζ',
+  '�' => 'Η',
+  '�' => 'Θ',
+  '�' => 'Ι',
+  '�' => 'Κ',
+  '�' => 'Λ',
+  '�' => 'Μ',
+  '�' => '�',
+  '�' => 'Ξ',
+  '�' => 'Ο',
+  '�' => 'Π',
+  '�' => 'Ρ',
+  '�' => 'Θ',
+  '�' => 'Σ',
+  '�' => 'Τ',
+  '�' => 'Υ',
+  '�' => 'Φ',
+  '�' => 'Χ',
+  '�' => 'Ψ',
+  '�' => 'Ω',
+  '�' => '∇',
+  '�' => 'α',
+  '�' => 'β',
+  '�' => 'γ',
+  '�' => 'δ',
+  '�' => 'ε',
+  '�' => 'ζ',
+  '�' => 'η',
+  '�' => 'θ',
+  '�' => 'ι',
+  '�' => 'κ',
+  '�' => 'λ',
+  '�' => 'μ',
+  '�' => 'ν',
+  '�' => 'ξ',
+  '�' => 'ο',
+  '�' => 'π',
+  '�' => '�',
+  '�' => 'ς',
+  '�' => 'σ',
+  '�' => 'τ',
+  '�' => 'υ',
+  '�' => 'φ',
+  '�' => 'χ',
+  '�' => 'ψ',
+  '�' => 'ω',
+  '�' => '∂',
+  '�' => 'ε',
+  '�' => 'θ',
+  '�' => 'κ',
+  '�' => 'φ',
+  '�' => '�',
+  '�' => 'π',
+  '�' => 'Α',
+  '�' => 'Β',
+  '�' => 'Γ',
+  '�' => 'Δ',
+  '�' => 'Ε',
+  '�' => 'Ζ',
+  '�' => 'Η',
+  '�' => 'Θ',
+  '�' => 'Ι',
+  '�' => 'Κ',
+  '�' => 'Λ',
+  '�' => 'Μ',
+  '�' => '�',
+  '�' => 'Ξ',
+  '�' => 'Ο',
+  '�' => 'Π',
+  '�' => 'Ρ',
+  '�' => 'Θ',
+  '�' => 'Σ',
+  '�' => 'Τ',
+  '�' => 'Υ',
+  '�' => 'Φ',
+  '�' => 'Χ',
+  '�' => 'Ψ',
+  '�' => 'Ω',
+  '�' => '∇',
+  '�' => 'α',
+  '�' => 'β',
+  '�' => 'γ',
+  '�' => 'δ',
+  '�' => 'ε',
+  '�' => 'ζ',
+  '�' => 'η',
+  '�' => 'θ',
+  '�' => 'ι',
+  '�' => 'κ',
+  '�' => 'λ',
+  '�' => 'μ',
+  '�' => 'ν',
+  '�' => 'ξ',
+  '�' => 'ο',
+  '�' => 'π',
+  '�' => '�',
+  '�' => 'ς',
+  '�' => 'σ',
+  '�' => 'τ',
+  '�' => 'υ',
+  '�' => 'φ',
+  '�' => 'χ',
+  '�' => 'ψ',
+  '�' => 'ω',
+  '�' => '∂',
+  '�' => 'ε',
+  '�' => 'θ',
+  '�' => 'κ',
+  '�' => 'φ',
+  '�' => '�',
+  '�' => 'π',
+  '�' => 'Α',
+  '�' => 'Β',
+  '�' => 'Γ',
+  '�' => 'Δ',
+  '�' => 'Ε',
+  '�' => 'Ζ',
+  '�' => 'Η',
+  '�' => 'Θ',
+  '�' => 'Ι',
+  '�' => 'Κ',
+  '�' => 'Λ',
+  '�' => 'Μ',
+  '�' => '�',
+  '�' => 'Ξ',
+  '�' => 'Ο',
+  '�' => 'Π',
+  '�' => 'Ρ',
+  '�' => 'Θ',
+  '�' => 'Σ',
+  '�' => 'Τ',
+  '�' => 'Υ',
+  '�' => 'Φ',
+  '�' => 'Χ',
+  '�' => 'Ψ',
+  '�' => 'Ω',
+  '�' => '∇',
+  '�' => 'α',
+  '�' => 'β',
+  '�' => 'γ',
+  '�' => 'δ',
+  '�' => 'ε',
+  '�' => 'ζ',
+  '�' => 'η',
+  '�' => 'θ',
+  '�' => 'ι',
+  '�' => 'κ',
+  '�' => 'λ',
+  '�' => 'μ',
+  '�' => 'ν',
+  '�' => 'ξ',
+  '�' => 'ο',
+  '�' => 'π',
+  '�' => '�',
+  '�' => 'ς',
+  '�' => 'σ',
+  '�' => 'τ',
+  '�' => 'υ',
+  '�' => 'φ',
+  '�' => 'χ',
+  '�' => 'ψ',
+  '�' => 'ω',
+  '�' => '∂',
+  '�' => 'ε',
+  '�' => 'θ',
+  '�' => 'κ',
+  '�' => 'φ',
+  '�' => '�',
+  '�' => 'π',
+  '�' => 'Ϝ',
+  '�' => '�',
+  '�' => '0',
+  '�' => '1',
+  '�' => '2',
+  '�' => '3',
+  '�' => '4',
+  '�' => '5',
+  '�' => '6',
+  '�' => '7',
+  '�' => '8',
+  '�' => '9',
+  '�' => '0',
+  '�' => '1',
+  '�' => '2',
+  '�' => '3',
+  '�' => '4',
+  '�' => '5',
+  '�' => '6',
+  '�' => '7',
+  '�' => '8',
+  '�' => '9',
+  '�' => '0',
+  '�' => '1',
+  '�' => '2',
+  '�' => '3',
+  '�' => '4',
+  '�' => '5',
+  '�' => '6',
+  '�' => '7',
+  '�' => '8',
+  '�' => '9',
+  '�' => '0',
+  '�' => '1',
+  '�' => '2',
+  '�' => '3',
+  '�' => '4',
+  '�' => '5',
+  '�' => '6',
+  '�' => '7',
+  '�' => '8',
+  '�' => '9',
+  '�' => '0',
+  '�' => '1',
+  '�' => '2',
+  '�' => '3',
+  '�' => '4',
+  '�' => '5',
+  '�' => '6',
+  '�' => '7',
+  '�' => '8',
+  '�' => '9',
+  '𞸀' => 'ا',
+  '�' => 'ب',
+  '𞸂' => 'ج',
+  '𞸃' => 'د',
+  '𞸅' => 'و',
+  '𞸆' => 'ز',
+  '𞸇' => 'ح',
+  '𞸈' => 'ط',
+  '𞸉' => 'ي',
+  '𞸊' => 'ك',
+  '𞸋' => 'ل',
+  '𞸌' => 'م',
+  '�' => 'ن',
+  '𞸎' => 'س',
+  '�' => 'ع',
+  '�' => '�',
+  '𞸑' => 'ص',
+  '𞸒' => 'ق',
+  '𞸓' => 'ر',
+  '𞸔' => 'ش',
+  '𞸕' => 'ت',
+  '𞸖' => 'ث',
+  '𞸗' => 'خ',
+  '𞸘' => 'ذ',
+  '𞸙' => 'ض',
+  '𞸚' => 'ظ',
+  '𞸛' => 'غ',
+  '𞸜' => 'ٮ',
+  '�' => 'ں',
+  '𞸞' => 'ڡ',
+  '𞸟' => 'ٯ',
+  '𞸡' => 'ب',
+  '𞸢' => 'ج',
+  '𞸤' => 'ه',
+  '𞸧' => 'ح',
+  '𞸩' => 'ي',
+  '𞸪' => 'ك',
+  '𞸫' => 'ل',
+  '𞸬' => 'م',
+  '𞸭' => 'ن',
+  '𞸮' => 'س',
+  '𞸯' => 'ع',
+  '𞸰' => '�',
+  '𞸱' => 'ص',
+  '𞸲' => 'ق',
+  '𞸴' => 'ش',
+  '𞸵' => 'ت',
+  '𞸶' => 'ث',
+  '𞸷' => 'خ',
+  '𞸹' => 'ض',
+  '𞸻' => 'غ',
+  '𞹂' => 'ج',
+  '𞹇' => 'ح',
+  '𞹉' => 'ي',
+  '𞹋' => 'ل',
+  '�' => 'ن',
+  '𞹎' => 'س',
+  '�' => 'ع',
+  '𞹑' => 'ص',
+  'ðž¹’' => 'Ù‚',
+  'ðž¹”' => 'Ø´',
+  'ðž¹—' => 'Ø®',
+  '𞹙' => 'ض',
+  '𞹛' => 'غ',
+  '�' => 'ں',
+  '𞹟' => 'ٯ',
+  '𞹡' => 'ب',
+  '𞹢' => 'ج',
+  '𞹤' => 'ه',
+  '𞹧' => 'ح',
+  '𞹨' => 'ط',
+  '𞹩' => 'ي',
+  '𞹪' => 'ك',
+  '𞹬' => 'م',
+  'ðž¹­' => 'Ù†',
+  '𞹮' => 'س',
+  '𞹯' => 'ع',
+  'ðž¹°' => 'Ù�',
+  '𞹱' => 'ص',
+  'ðž¹²' => 'Ù‚',
+  'ðž¹´' => 'Ø´',
+  '𞹵' => 'ت',
+  '𞹶' => 'ث',
+  'ðž¹·' => 'Ø®',
+  '𞹹' => 'ض',
+  '𞹺' => 'ظ',
+  '𞹻' => 'غ',
+  'ðž¹¼' => 'Ù®',
+  'ðž¹¾' => 'Ú¡',
+  '𞺀' => 'ا',
+  '�' => 'ب',
+  '𞺂' => 'ج',
+  '𞺃' => 'د',
+  '𞺄' => 'ه',
+  '𞺅' => 'و',
+  '𞺆' => 'ز',
+  '𞺇' => 'ح',
+  '𞺈' => 'ط',
+  '𞺉' => 'ي',
+  '𞺋' => 'ل',
+  '𞺌' => 'م',
+  '�' => 'ن',
+  '𞺎' => 'س',
+  '�' => 'ع',
+  '�' => '�',
+  '𞺑' => 'ص',
+  '𞺒' => 'ق',
+  '𞺓' => 'ر',
+  '𞺔' => 'ش',
+  '𞺕' => 'ت',
+  '𞺖' => 'ث',
+  '𞺗' => 'خ',
+  '𞺘' => 'ذ',
+  '𞺙' => 'ض',
+  '𞺚' => 'ظ',
+  '𞺛' => 'غ',
+  '𞺡' => 'ب',
+  '𞺢' => 'ج',
+  '𞺣' => 'د',
+  '𞺥' => 'و',
+  '𞺦' => 'ز',
+  '𞺧' => 'ح',
+  '𞺨' => 'ط',
+  '𞺩' => 'ي',
+  '𞺫' => 'ل',
+  '𞺬' => 'م',
+  '𞺭' => 'ن',
+  '𞺮' => 'س',
+  '𞺯' => 'ع',
+  '𞺰' => '�',
+  '𞺱' => 'ص',
+  '𞺲' => 'ق',
+  '𞺳' => 'ر',
+  '𞺴' => 'ش',
+  '𞺵' => 'ت',
+  '𞺶' => 'ث',
+  '𞺷' => 'خ',
+  '𞺸' => 'ذ',
+  '𞺹' => 'ض',
+  '𞺺' => 'ظ',
+  '𞺻' => 'غ',
+  '🄀' => '0.',
+  '�' => '0,',
+  '🄂' => '1,',
+  '🄃' => '2,',
+  '🄄' => '3,',
+  '🄅' => '4,',
+  '🄆' => '5,',
+  '🄇' => '6,',
+  '🄈' => '7,',
+  '🄉' => '8,',
+  '🄊' => '9,',
+  '�' => '(A)',
+  '🄑' => '(B)',
+  '🄒' => '(C)',
+  '🄓' => '(D)',
+  '🄔' => '(E)',
+  '🄕' => '(F)',
+  '🄖' => '(G)',
+  '🄗' => '(H)',
+  '🄘' => '(I)',
+  '🄙' => '(J)',
+  '🄚' => '(K)',
+  '🄛' => '(L)',
+  '🄜' => '(M)',
+  '�' => '(N)',
+  '🄞' => '(O)',
+  '🄟' => '(P)',
+  '🄠' => '(Q)',
+  '🄡' => '(R)',
+  '🄢' => '(S)',
+  '🄣' => '(T)',
+  '🄤' => '(U)',
+  '🄥' => '(V)',
+  '🄦' => '(W)',
+  '🄧' => '(X)',
+  '🄨' => '(Y)',
+  '🄩' => '(Z)',
+  '🄪' => '〔S〕',
+  '🄫' => 'C',
+  '🄬' => 'R',
+  '🄭' => 'CD',
+  '🄮' => 'WZ',
+  '🄰' => 'A',
+  '🄱' => 'B',
+  '🄲' => 'C',
+  '🄳' => 'D',
+  '🄴' => 'E',
+  '🄵' => 'F',
+  '🄶' => 'G',
+  '🄷' => 'H',
+  '🄸' => 'I',
+  '🄹' => 'J',
+  '🄺' => 'K',
+  '🄻' => 'L',
+  '🄼' => 'M',
+  '🄽' => 'N',
+  '🄾' => 'O',
+  '🄿' => 'P',
+  '🅀' => 'Q',
+  '�' => 'R',
+  '🅂' => 'S',
+  '🅃' => 'T',
+  '🅄' => 'U',
+  '🅅' => 'V',
+  '🅆' => 'W',
+  '🅇' => 'X',
+  '🅈' => 'Y',
+  '🅉' => 'Z',
+  '🅊' => 'HV',
+  '🅋' => 'MV',
+  '🅌' => 'SD',
+  '�' => 'SS',
+  '🅎' => 'PPV',
+  '�' => 'WC',
+  '🅪' => 'MC',
+  '🅫' => 'MD',
+  '🅬' => 'MR',
+  '�' => 'DJ',
+  '🈀' => '��',
+  '�' => 'ココ',
+  '🈂' => 'サ',
+  '�' => '手',
+  '🈑' => '字',
+  '🈒' => '�',
+  '🈓' => 'デ',
+  '🈔' => '二',
+  '🈕' => '多',
+  '🈖' => '解',
+  '🈗' => '天',
+  '🈘' => '交',
+  '🈙' => '映',
+  '🈚' => '無',
+  '🈛' => '料',
+  '🈜' => '�',
+  '�' => '後',
+  '🈞' => '�',
+  '🈟' => '新',
+  '🈠' => '�',
+  '🈡' => '終',
+  '🈢' => '生',
+  '🈣' => '販',
+  '🈤' => '声',
+  '🈥' => '�',
+  '🈦' => '演',
+  '🈧' => '投',
+  '🈨' => '�',
+  '🈩' => '一',
+  '🈪' => '三',
+  '🈫' => '�',
+  '🈬' => '左',
+  '🈭' => '中',
+  '🈮' => '�',
+  '🈯' => '指',
+  '🈰' => '走',
+  '🈱' => '打',
+  '🈲' => '�',
+  '🈳' => '空',
+  '🈴' => '�',
+  '🈵' => '満',
+  '🈶' => '有',
+  '🈷' => '月',
+  '🈸' => '申',
+  '🈹' => '割',
+  '🈺' => '営',
+  '🈻' => '�',
+  '🉀' => '〔本〕',
+  '�' => '〔三〕',
+  '🉂' => '〔二〕',
+  '🉃' => '〔安〕',
+  '🉄' => '〔点〕',
+  '🉅' => '〔打〕',
+  '🉆' => '〔盗〕',
+  '🉇' => '〔�〕',
+  '🉈' => '〔敗〕',
+  '�' => '得',
+  '🉑' => '�',
+  '🯰' => '0',
+  '🯱' => '1',
+  '🯲' => '2',
+  '🯳' => '3',
+  '🯴' => '4',
+  '🯵' => '5',
+  '🯶' => '6',
+  '🯷' => '7',
+  '🯸' => '8',
+  '🯹' => '9',
+);
diff --git a/lib/symfony/polyfill-intl-normalizer/bootstrap.php b/lib/symfony/polyfill-intl-normalizer/bootstrap.php
new file mode 100644
index 000000000..bac4318c9
--- /dev/null
+++ b/lib/symfony/polyfill-intl-normalizer/bootstrap.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Polyfill\Intl\Normalizer as p;
+
+if (!function_exists('normalizer_is_normalized')) {
+    function normalizer_is_normalized($input, $form = p\Normalizer::NFC) { return p\Normalizer::isNormalized($input, $form); }
+}
+if (!function_exists('normalizer_normalize')) {
+    function normalizer_normalize($input, $form = p\Normalizer::NFC) { return p\Normalizer::normalize($input, $form); }
+}
diff --git a/lib/symfony/polyfill-intl-normalizer/composer.json b/lib/symfony/polyfill-intl-normalizer/composer.json
new file mode 100644
index 000000000..8df2fa1e6
--- /dev/null
+++ b/lib/symfony/polyfill-intl-normalizer/composer.json
@@ -0,0 +1,39 @@
+{
+    "name": "symfony/polyfill-intl-normalizer",
+    "type": "library",
+    "description": "Symfony polyfill for intl's Normalizer class and related functions",
+    "keywords": ["polyfill", "shim", "compatibility", "portable", "intl", "normalizer"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Nicolas Grekas",
+            "email": "p@tchwork.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Polyfill\\Intl\\Normalizer\\": "" },
+        "files": [ "bootstrap.php" ],
+        "classmap": [ "Resources/stubs" ]
+    },
+    "suggest": {
+        "ext-intl": "For best performance"
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-main": "1.19-dev"
+        },
+        "thanks": {
+            "name": "symfony/polyfill",
+            "url": "https://github.com/symfony/polyfill"
+        }
+    }
+}
diff --git a/lib/symfony/polyfill-php72/LICENSE b/lib/symfony/polyfill-php72/LICENSE
new file mode 100644
index 000000000..4cd8bdd30
--- /dev/null
+++ b/lib/symfony/polyfill-php72/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2015-2019 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/lib/symfony/polyfill-php72/Php72.php b/lib/symfony/polyfill-php72/Php72.php
new file mode 100644
index 000000000..1e36d5e62
--- /dev/null
+++ b/lib/symfony/polyfill-php72/Php72.php
@@ -0,0 +1,217 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Symfony\Polyfill\Php72;
+
+/**
+ * @author Nicolas Grekas <p@tchwork.com>
+ * @author Dariusz Rumiński <dariusz.ruminski@gmail.com>
+ *
+ * @internal
+ */
+final class Php72
+{
+    private static $hashMask;
+
+    public static function utf8_encode($s)
+    {
+        $s .= $s;
+        $len = \strlen($s);
+
+        for ($i = $len >> 1, $j = 0; $i < $len; ++$i, ++$j) {
+            switch (true) {
+                case $s[$i] < "\x80": $s[$j] = $s[$i]; break;
+                case $s[$i] < "\xC0": $s[$j] = "\xC2"; $s[++$j] = $s[$i]; break;
+                default: $s[$j] = "\xC3"; $s[++$j] = \chr(\ord($s[$i]) - 64); break;
+            }
+        }
+
+        return substr($s, 0, $j);
+    }
+
+    public static function utf8_decode($s)
+    {
+        $s = (string) $s;
+        $len = \strlen($s);
+
+        for ($i = 0, $j = 0; $i < $len; ++$i, ++$j) {
+            switch ($s[$i] & "\xF0") {
+                case "\xC0":
+                case "\xD0":
+                    $c = (\ord($s[$i] & "\x1F") << 6) | \ord($s[++$i] & "\x3F");
+                    $s[$j] = $c < 256 ? \chr($c) : '?';
+                    break;
+
+                case "\xF0":
+                    ++$i;
+                    // no break
+
+                case "\xE0":
+                    $s[$j] = '?';
+                    $i += 2;
+                    break;
+
+                default:
+                    $s[$j] = $s[$i];
+            }
+        }
+
+        return substr($s, 0, $j);
+    }
+
+    public static function php_os_family()
+    {
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            return 'Windows';
+        }
+
+        $map = array(
+            'Darwin' => 'Darwin',
+            'DragonFly' => 'BSD',
+            'FreeBSD' => 'BSD',
+            'NetBSD' => 'BSD',
+            'OpenBSD' => 'BSD',
+            'Linux' => 'Linux',
+            'SunOS' => 'Solaris',
+        );
+
+        return isset($map[PHP_OS]) ? $map[PHP_OS] : 'Unknown';
+    }
+
+    public static function spl_object_id($object)
+    {
+        if (null === self::$hashMask) {
+            self::initHashMask();
+        }
+        if (null === $hash = spl_object_hash($object)) {
+            return;
+        }
+
+        // On 32-bit systems, PHP_INT_SIZE is 4,
+        return self::$hashMask ^ hexdec(substr($hash, 16 - (\PHP_INT_SIZE * 2 - 1), (\PHP_INT_SIZE * 2 - 1)));
+    }
+
+    public static function sapi_windows_vt100_support($stream, $enable = null)
+    {
+        if (!\is_resource($stream)) {
+            trigger_error('sapi_windows_vt100_support() expects parameter 1 to be resource, '.\gettype($stream).' given', E_USER_WARNING);
+
+            return false;
+        }
+
+        $meta = stream_get_meta_data($stream);
+
+        if ('STDIO' !== $meta['stream_type']) {
+            trigger_error('sapi_windows_vt100_support() was not able to analyze the specified stream', E_USER_WARNING);
+
+            return false;
+        }
+
+        // We cannot actually disable vt100 support if it is set
+        if (false === $enable || !self::stream_isatty($stream)) {
+            return false;
+        }
+
+        // The native function does not apply to stdin
+        $meta = array_map('strtolower', $meta);
+        $stdin = 'php://stdin' === $meta['uri'] || 'php://fd/0' === $meta['uri'];
+
+        return !$stdin
+            && (false !== getenv('ANSICON')
+            || 'ON' === getenv('ConEmuANSI')
+            || 'xterm' === getenv('TERM')
+            || 'Hyper' === getenv('TERM_PROGRAM'));
+    }
+
+    public static function stream_isatty($stream)
+    {
+        if (!\is_resource($stream)) {
+            trigger_error('stream_isatty() expects parameter 1 to be resource, '.\gettype($stream).' given', E_USER_WARNING);
+
+            return false;
+        }
+
+        if ('\\' === \DIRECTORY_SEPARATOR) {
+            $stat = @fstat($stream);
+            // Check if formatted mode is S_IFCHR
+            return $stat ? 0020000 === ($stat['mode'] & 0170000) : false;
+        }
+
+        return \function_exists('posix_isatty') && @posix_isatty($stream);
+    }
+
+    private static function initHashMask()
+    {
+        $obj = (object) array();
+        self::$hashMask = -1;
+
+        // check if we are nested in an output buffering handler to prevent a fatal error with ob_start() below
+        $obFuncs = array('ob_clean', 'ob_end_clean', 'ob_flush', 'ob_end_flush', 'ob_get_contents', 'ob_get_flush');
+        foreach (debug_backtrace(\PHP_VERSION_ID >= 50400 ? DEBUG_BACKTRACE_IGNORE_ARGS : false) as $frame) {
+            if (isset($frame['function'][0]) && !isset($frame['class']) && 'o' === $frame['function'][0] && \in_array($frame['function'], $obFuncs)) {
+                $frame['line'] = 0;
+                break;
+            }
+        }
+        if (!empty($frame['line'])) {
+            ob_start();
+            debug_zval_dump($obj);
+            self::$hashMask = (int) substr(ob_get_clean(), 17);
+        }
+
+        self::$hashMask ^= hexdec(substr(spl_object_hash($obj), 16 - (\PHP_INT_SIZE * 2 - 1), (\PHP_INT_SIZE * 2 - 1)));
+    }
+
+    public static function mb_chr($code, $encoding = null)
+    {
+        if (0x80 > $code %= 0x200000) {
+            $s = \chr($code);
+        } elseif (0x800 > $code) {
+            $s = \chr(0xC0 | $code >> 6).\chr(0x80 | $code & 0x3F);
+        } elseif (0x10000 > $code) {
+            $s = \chr(0xE0 | $code >> 12).\chr(0x80 | $code >> 6 & 0x3F).\chr(0x80 | $code & 0x3F);
+        } else {
+            $s = \chr(0xF0 | $code >> 18).\chr(0x80 | $code >> 12 & 0x3F).\chr(0x80 | $code >> 6 & 0x3F).\chr(0x80 | $code & 0x3F);
+        }
+
+        if ('UTF-8' !== $encoding) {
+            $s = mb_convert_encoding($s, $encoding, 'UTF-8');
+        }
+
+        return $s;
+    }
+
+    public static function mb_ord($s, $encoding = null)
+    {
+        if (null === $encoding) {
+            $s = mb_convert_encoding($s, 'UTF-8');
+        } elseif ('UTF-8' !== $encoding) {
+            $s = mb_convert_encoding($s, 'UTF-8', $encoding);
+        }
+
+        if (1 === \strlen($s)) {
+            return \ord($s);
+        }
+
+        $code = ($s = unpack('C*', substr($s, 0, 4))) ? $s[1] : 0;
+        if (0xF0 <= $code) {
+            return (($code - 0xF0) << 18) + (($s[2] - 0x80) << 12) + (($s[3] - 0x80) << 6) + $s[4] - 0x80;
+        }
+        if (0xE0 <= $code) {
+            return (($code - 0xE0) << 12) + (($s[2] - 0x80) << 6) + $s[3] - 0x80;
+        }
+        if (0xC0 <= $code) {
+            return (($code - 0xC0) << 6) + $s[2] - 0x80;
+        }
+
+        return $code;
+    }
+}
diff --git a/lib/symfony/polyfill-php72/README.md b/lib/symfony/polyfill-php72/README.md
new file mode 100644
index 000000000..59dec8a23
--- /dev/null
+++ b/lib/symfony/polyfill-php72/README.md
@@ -0,0 +1,28 @@
+Symfony Polyfill / Php72
+========================
+
+This component provides functions added to PHP 7.2 core:
+
+- [`spl_object_id`](https://php.net/spl_object_id)
+- [`stream_isatty`](https://php.net/stream_isatty)
+
+On Windows only:
+
+- [`sapi_windows_vt100_support`](https://php.net/sapi_windows_vt100_support)
+
+Moved to core since 7.2 (was in the optional XML extension earlier):
+
+- [`utf8_encode`](https://php.net/utf8_encode)
+- [`utf8_decode`](https://php.net/utf8_decode)
+
+Also, it provides constants added to PHP 7.2:
+- [`PHP_FLOAT_*`](https://php.net/reserved.constants#constant.php-float-dig)
+- [`PHP_OS_FAMILY`](https://php.net/reserved.constants#constant.php-os-family)
+
+More information can be found in the
+[main Polyfill README](https://github.com/symfony/polyfill/blob/master/README.md).
+
+License
+=======
+
+This library is released under the [MIT license](LICENSE).
diff --git a/lib/symfony/polyfill-php72/bootstrap.php b/lib/symfony/polyfill-php72/bootstrap.php
new file mode 100644
index 000000000..3154b2c32
--- /dev/null
+++ b/lib/symfony/polyfill-php72/bootstrap.php
@@ -0,0 +1,57 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\Polyfill\Php72 as p;
+
+if (PHP_VERSION_ID >= 70200) {
+    return;
+}
+
+if (!defined('PHP_FLOAT_DIG')) {
+    define('PHP_FLOAT_DIG', 15);
+}
+if (!defined('PHP_FLOAT_EPSILON')) {
+    define('PHP_FLOAT_EPSILON', 2.2204460492503E-16);
+}
+if (!defined('PHP_FLOAT_MIN')) {
+    define('PHP_FLOAT_MIN', 2.2250738585072E-308);
+}
+if (!defined('PHP_FLOAT_MAX')) {
+    define('PHP_FLOAT_MAX', 1.7976931348623157E+308);
+}
+if (!defined('PHP_OS_FAMILY')) {
+    define('PHP_OS_FAMILY', p\Php72::php_os_family());
+}
+
+if ('\\' === DIRECTORY_SEPARATOR && !function_exists('sapi_windows_vt100_support')) {
+    function sapi_windows_vt100_support($stream, $enable = null) { return p\Php72::sapi_windows_vt100_support($stream, $enable); }
+}
+if (!function_exists('stream_isatty')) {
+    function stream_isatty($stream) { return p\Php72::stream_isatty($stream); }
+}
+if (!function_exists('utf8_encode')) {
+    function utf8_encode($string) { return p\Php72::utf8_encode($string); }
+}
+if (!function_exists('utf8_decode')) {
+    function utf8_decode($string) { return p\Php72::utf8_decode($string); }
+}
+if (!function_exists('spl_object_id')) {
+    function spl_object_id($object) { return p\Php72::spl_object_id($object); }
+}
+if (!function_exists('mb_ord')) {
+    function mb_ord($string, $encoding = null) { return p\Php72::mb_ord($string, $encoding); }
+}
+if (!function_exists('mb_chr')) {
+    function mb_chr($codepoint, $encoding = null) { return p\Php72::mb_chr($codepoint, $encoding); }
+}
+if (!function_exists('mb_scrub')) {
+    function mb_scrub($string, $encoding = null) { $encoding = null === $encoding ? mb_internal_encoding() : $encoding; return mb_convert_encoding($string, $encoding, $encoding); }
+}
diff --git a/lib/symfony/polyfill-php72/composer.json b/lib/symfony/polyfill-php72/composer.json
new file mode 100644
index 000000000..872b312c1
--- /dev/null
+++ b/lib/symfony/polyfill-php72/composer.json
@@ -0,0 +1,35 @@
+{
+    "name": "symfony/polyfill-php72",
+    "type": "library",
+    "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions",
+    "keywords": ["polyfill", "shim", "compatibility", "portable"],
+    "homepage": "https://symfony.com",
+    "license": "MIT",
+    "authors": [
+        {
+            "name": "Nicolas Grekas",
+            "email": "p@tchwork.com"
+        },
+        {
+            "name": "Symfony Community",
+            "homepage": "https://symfony.com/contributors"
+        }
+    ],
+    "require": {
+        "php": ">=5.3.3"
+    },
+    "autoload": {
+        "psr-4": { "Symfony\\Polyfill\\Php72\\": "" },
+        "files": [ "bootstrap.php" ]
+    },
+    "minimum-stability": "dev",
+    "extra": {
+        "branch-alias": {
+            "dev-main": "1.19-dev"
+        },
+        "thanks": {
+            "name": "symfony/polyfill",
+            "url": "https://github.com/symfony/polyfill"
+        }
+    }
+}

From 6f0e1a7f477b0fd46b9b979f9125bb96b2a1ff44 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Fri, 11 Mar 2022 09:55:53 +0100
Subject: [PATCH 13/15] =?UTF-8?q?N=C2=B04824=20Update=20consumers=20after?=
 =?UTF-8?q?=20swiftmailer/swiftmailer=20update=20Also=20remove=20new=20Doc?=
 =?UTF-8?q?trine=20test=20dir=20(iTopComposerTest=20feedback)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/email.class.inc.php                      |  25 +-
 .../Common/Lexer/AbstractLexerTest.php        | 268 ------------------
 .../Doctrine/Common/Lexer/ConcreteLexer.php   |  49 ----
 sources/Composer/iTopComposer.php             |   2 +
 4 files changed, 12 insertions(+), 332 deletions(-)
 delete mode 100644 lib/doctrine/lexer/tests/Doctrine/Common/Lexer/AbstractLexerTest.php
 delete mode 100644 lib/doctrine/lexer/tests/Doctrine/Common/Lexer/ConcreteLexer.php

diff --git a/core/email.class.inc.php b/core/email.class.inc.php
index 9eb7853af..36122e56f 100644
--- a/core/email.class.inc.php
+++ b/core/email.class.inc.php
@@ -493,23 +493,17 @@ class EMail
 class Swift_Transport_LogFileTransport extends Swift_Transport_NullTransport
 {
 	protected $sLogFile;
-	
+
 	/**
-	 * Sends the given message.
-	 *
-	 * @param Swift_Mime_Message $message
-	 * @param string[]           $failedRecipients An array of failures by-reference
-	 *
-	 * @return int     The number of sent emails
+	 * @inheritDoc
 	 */
-	public function send(Swift_Mime_Message $message, &$failedRecipients = null)
+	public function send(Swift_Mime_SimpleMessage $message, &$failedRecipients = null)
 	{
 		$hFile = @fopen($this->sLogFile, 'a');
-		if ($hFile)
-		{
+		if ($hFile) {
 			$sTxt = "================== ".date('Y-m-d H:i:s')." ==================\n";
 			$sTxt .= $message->toString()."\n";
-		
+
 			@fwrite($hFile, $sTxt);
 			@fclose($hFile);
 		}
@@ -534,12 +528,13 @@ class Swift_LogFileTransport extends Swift_Transport_LogFileTransport
 	/**
 	 * Create a new LogFileTransport.
 	 */
-	public function __construct()
+	public function __construct(Swift_Events_EventDispatcher $eventDispatcher)
 	{
+		parent::__construct($eventDispatcher);
 		call_user_func_array(
-		array($this, 'Swift_Transport_LogFileTransport::__construct'),
-		Swift_DependencyContainer::getInstance()
-		->createDependenciesFor('transport.null')
+			array($this, 'Swift_Transport_LogFileTransport::__construct'),
+			Swift_DependencyContainer::getInstance()
+				->createDependenciesFor('transport.null')
 		);
 	}
 
diff --git a/lib/doctrine/lexer/tests/Doctrine/Common/Lexer/AbstractLexerTest.php b/lib/doctrine/lexer/tests/Doctrine/Common/Lexer/AbstractLexerTest.php
deleted file mode 100644
index 8a2a4e49c..000000000
--- a/lib/doctrine/lexer/tests/Doctrine/Common/Lexer/AbstractLexerTest.php
+++ /dev/null
@@ -1,268 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Lexer;
-
-class AbstractLexerTest extends \PHPUnit_Framework_TestCase
-{
-    /**
-     * @var ConcreteLexer
-     */
-    private $concreteLexer;
-
-    public function setUp()
-    {
-        $this->concreteLexer = new ConcreteLexer();
-    }
-
-    public function dataProvider()
-    {
-        return array(
-            array(
-                'price=10',
-                array(
-                    array(
-                        'value' => 'price',
-                        'type' => 'string',
-                        'position' => 0,
-                    ),
-                    array(
-                        'value' => '=',
-                        'type' => 'operator',
-                        'position' => 5,
-                    ),
-                    array(
-                        'value' => 10,
-                        'type' => 'int',
-                        'position' => 6,
-                    ),
-                ),
-            ),
-        );
-    }
-
-    public function testResetPeek()
-    {
-        $expectedTokens = array(
-            array(
-                'value' => 'price',
-                'type' => 'string',
-                'position' => 0,
-            ),
-            array(
-                'value' => '=',
-                'type' => 'operator',
-                'position' => 5,
-            ),
-            array(
-                'value' => 10,
-                'type' => 'int',
-                'position' => 6,
-            ),
-        );
-
-        $this->concreteLexer->setInput('price=10');
-
-        $this->assertEquals($expectedTokens[0], $this->concreteLexer->peek());
-        $this->assertEquals($expectedTokens[1], $this->concreteLexer->peek());
-        $this->concreteLexer->resetPeek();
-        $this->assertEquals($expectedTokens[0], $this->concreteLexer->peek());
-    }
-
-    public function testResetPosition()
-    {
-        $expectedTokens = array(
-            array(
-                'value' => 'price',
-                'type' => 'string',
-                'position' => 0,
-            ),
-            array(
-                'value' => '=',
-                'type' => 'operator',
-                'position' => 5,
-            ),
-            array(
-                'value' => 10,
-                'type' => 'int',
-                'position' => 6,
-            ),
-        );
-
-        $this->concreteLexer->setInput('price=10');
-        $this->assertNull($this->concreteLexer->lookahead);
-
-        $this->assertTrue($this->concreteLexer->moveNext());
-        $this->assertEquals($expectedTokens[0], $this->concreteLexer->lookahead);
-
-        $this->assertTrue($this->concreteLexer->moveNext());
-        $this->assertEquals($expectedTokens[1], $this->concreteLexer->lookahead);
-
-        $this->concreteLexer->resetPosition(0);
-
-        $this->assertTrue($this->concreteLexer->moveNext());
-        $this->assertEquals($expectedTokens[0], $this->concreteLexer->lookahead);
-    }
-
-    /**
-     * @dataProvider dataProvider
-     *
-     * @param $input
-     * @param $expectedTokens
-     */
-    public function testMoveNext($input, $expectedTokens)
-    {
-        $this->concreteLexer->setInput($input);
-        $this->assertNull($this->concreteLexer->lookahead);
-
-        for ($i = 0; $i < count($expectedTokens); $i++) {
-            $this->assertTrue($this->concreteLexer->moveNext());
-            $this->assertEquals($expectedTokens[$i], $this->concreteLexer->lookahead);
-        }
-
-        $this->assertFalse($this->concreteLexer->moveNext());
-        $this->assertNull($this->concreteLexer->lookahead);
-    }
-
-    public function testSkipUntil()
-    {
-        $this->concreteLexer->setInput('price=10');
-
-        $this->assertTrue($this->concreteLexer->moveNext());
-        $this->concreteLexer->skipUntil('operator');
-
-        $this->assertEquals(
-            array(
-                'value' => '=',
-                'type' => 'operator',
-                'position' => 5,
-            ),
-            $this->concreteLexer->lookahead
-        );
-    }
-
-    public function testUtf8Mismatch()
-    {
-        $this->concreteLexer->setInput("\xE9=10");
-
-        $this->assertTrue($this->concreteLexer->moveNext());
-
-        $this->assertEquals(
-            array(
-                'value' => "\xE9=10",
-                'type' => 'string',
-                'position' => 0,
-            ),
-            $this->concreteLexer->lookahead
-        );
-    }
-
-    /**
-     * @dataProvider dataProvider
-     *
-     * @param $input
-     * @param $expectedTokens
-     */
-    public function testPeek($input, $expectedTokens)
-    {
-        $this->concreteLexer->setInput($input);
-        foreach ($expectedTokens as $expectedToken) {
-            $this->assertEquals($expectedToken, $this->concreteLexer->peek());
-        }
-
-        $this->assertNull($this->concreteLexer->peek());
-    }
-
-    /**
-     * @dataProvider dataProvider
-     *
-     * @param $input
-     * @param $expectedTokens
-     */
-    public function testGlimpse($input, $expectedTokens)
-    {
-        $this->concreteLexer->setInput($input);
-
-        foreach ($expectedTokens as $expectedToken) {
-            $this->assertEquals($expectedToken, $this->concreteLexer->glimpse());
-            $this->concreteLexer->moveNext();
-        }
-
-        $this->assertNull($this->concreteLexer->peek());
-    }
-
-    public function inputUntilPositionDataProvider()
-    {
-        return array(
-            array('price=10', 5, 'price'),
-        );
-    }
-
-    /**
-     * @dataProvider inputUntilPositionDataProvider
-     *
-     * @param $input
-     * @param $position
-     * @param $expectedInput
-     */
-    public function testGetInputUntilPosition($input, $position, $expectedInput)
-    {
-        $this->concreteLexer->setInput($input);
-
-        $this->assertSame($expectedInput, $this->concreteLexer->getInputUntilPosition($position));
-    }
-
-    /**
-     * @dataProvider dataProvider
-     *
-     * @param $input
-     * @param $expectedTokens
-     */
-    public function testIsNextToken($input, $expectedTokens)
-    {
-        $this->concreteLexer->setInput($input);
-
-        $this->concreteLexer->moveNext();
-        for ($i = 0; $i < count($expectedTokens); $i++) {
-            $this->assertTrue($this->concreteLexer->isNextToken($expectedTokens[$i]['type']));
-            $this->concreteLexer->moveNext();
-        }
-    }
-
-    /**
-     * @dataProvider dataProvider
-     *
-     * @param $input
-     * @param $expectedTokens
-     */
-    public function testIsNextTokenAny($input, $expectedTokens)
-    {
-        $allTokenTypes = array_map(function ($token) {
-            return $token['type'];
-        }, $expectedTokens);
-
-        $this->concreteLexer->setInput($input);
-
-        $this->concreteLexer->moveNext();
-        for ($i = 0; $i < count($expectedTokens); $i++) {
-            $this->assertTrue($this->concreteLexer->isNextTokenAny(array($expectedTokens[$i]['type'])));
-            $this->assertTrue($this->concreteLexer->isNextTokenAny($allTokenTypes));
-            $this->concreteLexer->moveNext();
-        }
-    }
-
-    public function testGetLiteral()
-    {
-        $this->assertSame('Doctrine\Tests\Common\Lexer\ConcreteLexer::INT', $this->concreteLexer->getLiteral('int'));
-        $this->assertSame('fake_token', $this->concreteLexer->getLiteral('fake_token'));
-    }
-
-    public function testIsA()
-    {
-        $this->assertTrue($this->concreteLexer->isA(11, 'int'));
-        $this->assertTrue($this->concreteLexer->isA(1.1, 'int'));
-        $this->assertTrue($this->concreteLexer->isA('=', 'operator'));
-        $this->assertTrue($this->concreteLexer->isA('>', 'operator'));
-        $this->assertTrue($this->concreteLexer->isA('<', 'operator'));
-        $this->assertTrue($this->concreteLexer->isA('fake_text', 'string'));
-    }
-}
diff --git a/lib/doctrine/lexer/tests/Doctrine/Common/Lexer/ConcreteLexer.php b/lib/doctrine/lexer/tests/Doctrine/Common/Lexer/ConcreteLexer.php
deleted file mode 100644
index ed4d153d1..000000000
--- a/lib/doctrine/lexer/tests/Doctrine/Common/Lexer/ConcreteLexer.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-
-namespace Doctrine\Tests\Common\Lexer;
-
-use Doctrine\Common\Lexer\AbstractLexer;
-
-class ConcreteLexer extends AbstractLexer
-{
-    const INT = 'int';
-
-    protected function getCatchablePatterns()
-    {
-        return array(
-            '=|<|>',
-            '[a-z]+',
-            '\d+',
-        );
-    }
-
-    protected function getNonCatchablePatterns()
-    {
-        return array(
-            '\s+',
-            '(.)',
-        );
-    }
-
-    protected function getType(&$value)
-    {
-        if (is_numeric($value)) {
-            $value = (int)$value;
-
-            return 'int';
-        }
-        if (in_array($value, array('=', '<', '>'))) {
-            return 'operator';
-        }
-        if (is_string($value)) {
-            return 'string';
-        }
-
-        return;
-    }
-
-    protected function getModifiers()
-    {
-        return parent::getModifiers().'u';
-    }
-}
diff --git a/sources/Composer/iTopComposer.php b/sources/Composer/iTopComposer.php
index 11ee89a91..d93266f79 100644
--- a/sources/Composer/iTopComposer.php
+++ b/sources/Composer/iTopComposer.php
@@ -96,6 +96,8 @@ class iTopComposer
 	{
 		$APPROOT_WITH_SLASHES = $this->GetApprootWithSlashes();
 		return array(
+			$APPROOT_WITH_SLASHES.'lib/doctrine/lexer/tests',
+
 			$APPROOT_WITH_SLASHES.'lib/goaop/framework/tests',
 
 			$APPROOT_WITH_SLASHES.'lib/nikic/php-parser/test',

From a023f73509bb0090f366e46a01e8fa4e8ccac4aa Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Fri, 29 Apr 2022 15:34:54 +0200
Subject: [PATCH 14/15] =?UTF-8?q?N=C2=B04284=20Update=20jquery=20UI=20SCSS?=
 =?UTF-8?q?=20to=20remove=20SCSSPHP=20warnings?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Replace "Alpha(..." with "alpha(..."

Example of warning at compilation with SCSSPHP :

DEPRECATION WARNING: Calling built-in functions with a non-standard name is deprecated since Scssphp 1.8.0 and will not work anymore in 2.0 (they will be treated as CSS function calls instead).
Use "alpha" instead of "Alpha".
         on line 55 of /var/www/html/iTop/css/../css/ui-lightness/jqueryui.scss
---
 css/ui-lightness/jqueryui.scss | 79 ++++++++++++++++++----------------
 1 file changed, 41 insertions(+), 38 deletions(-)

diff --git a/css/ui-lightness/jqueryui.scss b/css/ui-lightness/jqueryui.scss
index 37ebb2ec5..00208f723 100644
--- a/css/ui-lightness/jqueryui.scss
+++ b/css/ui-lightness/jqueryui.scss
@@ -4,6 +4,8 @@
 * To view and modify this theme, visit http://jqueryui.com/themeroller/?scope=&folderName=custom-theme&bgImgOpacityError=18&bgImgOpacityHighlight=75&bgImgOpacityActive=65&bgImgOpacityHover=100&bgImgOpacityDefault=100&bgImgOpacityContent=100&bgImgOpacityHeader=35&cornerRadiusShadow=5px&offsetLeftShadow=-5px&offsetTopShadow=-5px&thicknessShadow=5px&opacityShadow=20&bgImgOpacityShadow=10&bgTextureShadow=flat&bgColorShadow=%23000000&opacityOverlay=50&bgImgOpacityOverlay=20&bgTextureOverlay=diagonals_thick&bgColorOverlay=%23666666&iconColorError=%23ffd27a&fcError=%23ffffff&borderColorError=%23cd0a0a&bgTextureError=diagonals_thick&bgColorError=%23b81900&iconColorHighlight=%231c94c4&fcHighlight=%23363636&borderColorHighlight=%23fed22f&bgTextureHighlight=flat&bgColorHighlight=%23ffe45c&iconColorActive=%23E87C1E&fcActive=%23E87C1E&borderColorActive=%23E87C1E&bgTextureActive=flat&bgColorActive=%23ffffff&iconColorHover=%23E87C1E&fcHover=%23E87C1E&borderColorHover=%23E87C1E&bgTextureHover=flat&bgColorHover=%23fde17c&iconColorDefault=%23F26522&fcDefault=%23555555&borderColorDefault=%23cccccc&bgTextureDefault=flat&bgColorDefault=%23f1f1f1&iconColorContent=%23222222&fcContent=%23333333&borderColorContent=%23dddddd&bgTextureContent=flat&bgColorContent=%23eeeeee&iconColorHeader=%23ffffff&fcHeader=%23ffffff&borderColorHeader=%23F26522&bgTextureHeader=flat&bgColorHeader=%23E87C1E&cornerRadius=0&fwDefault=bold&fsDefault=1.1em&ffDefault=Trebuchet%20MS%2CTahoma%2CVerdana%2CArial%2Csans-serif
 * Copyright jQuery Foundation and other contributors; Licensed MIT 
 * The original css file has been scssized (through www.css2scss.com)
+*
+* Other modification done : replaced the `Alpha(` by `alpha(` to avoid warnings generated by SCSSPHP
  */
 .ui-draggable-handle {
     -ms-touch-action: none;
@@ -46,26 +48,27 @@
     }
 }
 .ui-helper-zfix {
-    width: 100%;
-    height: 100%;
-    top: 0;
-    left: 0;
-    position: absolute;
-    opacity: 0;
-    filter: Alpha(Opacity=0);
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  position: absolute;
+  opacity: 0;
+  filter: alpha(Opacity=0);
 }
 .ui-front {
     z-index: 100;
 }
 .ui-state-disabled {
-    cursor: default !important;
-    pointer-events: none;
-    opacity: .35;
-    filter: Alpha(Opacity=35);
-    background-image: none;
-    .ui-icon {
-        filter: Alpha(Opacity=35);
-    }
+  cursor: default !important;
+  pointer-events: none;
+  opacity: .35;
+  filter: alpha(Opacity=35);
+  background-image: none;
+
+  .ui-icon {
+    filter: alpha(Opacity=35);
+  }
 }
 .ui-icon {
     display: inline-block;
@@ -86,14 +89,14 @@
     display: block;
 }
 .ui-widget-overlay {
-    position: fixed;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background: #666666 url($approot-relative + "css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=" + $version) 50% 50% repeat;
-    opacity: .5;
-    filter: Alpha(Opacity=50);
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: #666666 url($approot-relative + "css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png?v=" + $version) 50% 50% repeat;
+  opacity: .5;
+  filter: alpha(Opacity=50);
 }
 .ui-resizable {
     position: relative;
@@ -1069,14 +1072,14 @@ body {
         font-weight: bold;
     }
     .ui-priority-secondary {
-        opacity: .7;
-        filter: Alpha(Opacity=70);
-        font-weight: normal;
+      opacity: .7;
+      filter: alpha(Opacity=70);
+      font-weight: normal;
     }
     .ui-state-disabled {
-        opacity: .35;
-        filter: Alpha(Opacity=35);
-        background-image: none;
+      opacity: .35;
+      filter: alpha(Opacity=35);
+      background-image: none;
     }
     .ui-icon {
         background-image: url($approot-relative + "css/ui-lightness/images/ui-icons_222222_256x240.png?v=" + $version);
@@ -1137,14 +1140,14 @@ body {
         font-weight: bold;
     }
     .ui-priority-secondary {
-        opacity: .7;
-        filter: Alpha(Opacity=70);
-        font-weight: normal;
+      opacity: .7;
+      filter: alpha(Opacity=70);
+      font-weight: normal;
     }
     .ui-state-disabled {
-        opacity: .35;
-        filter: Alpha(Opacity=35);
-        background-image: none;
+      opacity: .35;
+      filter: alpha(Opacity=35);
+      background-image: none;
     }
     .ui-icon {
         background-image: url($approot-relative + "css/ui-lightness/images/ui-icons_ffffff_256x240.png?v=" + $version);
@@ -1341,9 +1344,9 @@ a {
     font-weight: bold;
 }
 .ui-priority-secondary {
-    opacity: .7;
-    filter: Alpha(Opacity=70);
-    font-weight: normal;
+  opacity: .7;
+  filter: alpha(Opacity=70);
+  font-weight: normal;
 }
 .ui-icon-blank {
     background-position: 16px 16px;

From 1e8818984e59daa874e44e51b333367bf7b55f77 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Fri, 29 Apr 2022 15:53:03 +0200
Subject: [PATCH 15/15] =?UTF-8?q?:page=5Ffacing=5Fup:=20N=C2=B04284=20Upda?=
 =?UTF-8?q?te=20licenses?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 setup/licenses/community-licenses.xml | 1165 ++++++-------------------
 1 file changed, 278 insertions(+), 887 deletions(-)

diff --git a/setup/licenses/community-licenses.xml b/setup/licenses/community-licenses.xml
index 37767de58..5d6f0c473 100644
--- a/setup/licenses/community-licenses.xml
+++ b/setup/licenses/community-licenses.xml
@@ -2725,866 +2725,157 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</pre>
           <author>Nicola Asuni - Combodo</author>
           <license_type>LGPL-3.0-only</license_type>
           <text><![CDATA[
-  **********************************************************************
-* TCPDF LICENSE
-**********************************************************************
-
-  TCPDF is free software: you can redistribute it and/or modify it
-  under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
-  
-  2002-2019 Nicola Asuni - Tecnick.com LTD
-
-**********************************************************************
-**********************************************************************
-
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
-
-**********************************************************************
-**********************************************************************
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
-**********************************************************************
-**********************************************************************
+  Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
+Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)
+
+Bitstream Vera Fonts Copyright
+------------------------------
+
+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is
+a trademark of Bitstream, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute the
+Font Software, including without limitation the rights to use, copy, merge,
+publish, distribute, and/or sell copies of the Font Software, and to permit
+persons to whom the Font Software is furnished to do so, subject to the
+following conditions:
+
+The above copyright and trademark notices and this permission notice shall
+be included in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be modified, altered, or added to, and in particular
+the designs of glyphs or characters in the Fonts may be modified and
+additional glyphs or characters may be added to the Fonts, only if the fonts
+are renamed to names not containing either the words "Bitstream" or the word
+"Vera".
+
+This License becomes null and void to the extent applicable to Fonts or Font
+Software that has been modified and is distributed under the "Bitstream
+Vera" names.
+
+The Font Software may be sold as part of a larger software package but no
+copy of one or more of the Font Software typefaces may be sold by itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
+TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME
+FOUNDATION BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING
+ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
+THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE
+FONT SOFTWARE.
+
+Except as contained in this notice, the names of Gnome, the Gnome
+Foundation, and Bitstream Inc., shall not be used in advertising or
+otherwise to promote the sale, use or other dealings in this Font Software
+without prior written authorization from the Gnome Foundation or Bitstream
+Inc., respectively. For further information, contact: fonts at gnome dot
+org. 
+
+Arev Fonts Copyright
+------------------------------
+
+Copyright (c) 2006 by Tavmjong Bah. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the fonts accompanying this license ("Fonts") and
+associated documentation files (the "Font Software"), to reproduce
+and distribute the modifications to the Bitstream Vera Font Software,
+including without limitation the rights to use, copy, merge, publish,
+distribute, and/or sell copies of the Font Software, and to permit
+persons to whom the Font Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright and trademark notices and this permission notice
+shall be included in all copies of one or more of the Font Software
+typefaces.
+
+The Font Software may be modified, altered, or added to, and in
+particular the designs of glyphs or characters in the Fonts may be
+modified and additional glyphs or characters may be added to the
+Fonts, only if the fonts are renamed to names not containing either
+the words "Tavmjong Bah" or the word "Arev".
+
+This License becomes null and void to the extent applicable to Fonts
+or Font Software that has been modified and is distributed under the 
+"Tavmjong Bah Arev" names.
+
+The Font Software may be sold as part of a larger software package but
+no copy of one or more of the Font Software typefaces may be sold by
+itself.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL
+TAVMJONG BAH BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.
+
+Except as contained in this notice, the name of Tavmjong Bah shall not
+be used in advertising or otherwise to promote the sale, use or other
+dealings in this Font Software without prior written authorization
+from Tavmjong Bah. For further information, contact: tavmjong @ free
+. fr.
+
+$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">doctrine/lexer</product>
+          <author>Guilherme Blanco - Roman Borschel - Johannes Schmitt</author>
+          <license_type>MIT</license_type>
+          <text><![CDATA[
+  Copyright (c) 2006-2018 Doctrine Project
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">egulias/email-validator</product>
+          <author>Eduardo Gulias Davis</author>
+          <license_type>MIT</license_type>
+          <text><![CDATA[
+  Copyright (c) 2013-2016 Eduardo Gulias Davis
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
   ]]></text>
       </license>
   <license>
@@ -3592,36 +2883,34 @@ Public License instead of this License.  But first, please read
           <author>Nikita Popov</author>
           <license_type>BSD-3-Clause</license_type>
           <text><![CDATA[
-  Copyright (c) 2011-2018 by Nikita Popov.
+  BSD 3-Clause License
 
-Some rights reserved.
+Copyright (c) 2011, Nikita Popov
+All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
+modification, are permitted provided that the following conditions are met:
 
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
 
-    * Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
 
-    * The names of the contributors may not be used to endorse or
-      promote products derived from this software without specific
-      prior written permission.
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   ]]></text>
       </license>
@@ -3903,7 +3192,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
           <author>Chris Corbyn - Fabien Potencier</author>
           <license_type>MIT</license_type>
           <text><![CDATA[
-  Copyright (c) 2013-2016 Fabien Potencier
+  Copyright (c) 2013-2021 Fabien Potencier
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -4331,6 +3620,84 @@ to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">symfony/polyfill-iconv</product>
+          <author>Nicolas Grekas - Symfony Community</author>
+          <license_type>MIT</license_type>
+          <text><![CDATA[
+  Copyright (c) 2015-2019 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">symfony/polyfill-intl-idn</product>
+          <author>Laurent Bassin - Trevor Rowbotham - Symfony Community</author>
+          <license_type>MIT</license_type>
+          <text><![CDATA[
+  Copyright (c) 2018-2019 Fabien Potencier and Trevor Rowbotham <trevor.rowbotham@pm.me>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">symfony/polyfill-intl-normalizer</product>
+          <author>Nicolas Grekas - Symfony Community</author>
+          <license_type>MIT</license_type>
+          <text><![CDATA[
+  Copyright (c) 2015-2019 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -4409,6 +3776,32 @@ to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+  ]]></text>
+      </license>
+  <license>
+          <product scope="lib">symfony/polyfill-php72</product>
+          <author>Nicolas Grekas - Symfony Community</author>
+          <license_type>MIT</license_type>
+          <text><![CDATA[
+  Copyright (c) 2015-2019 Fabien Potencier
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -4631,9 +4024,7 @@ THE SOFTWARE.
           <author>Fabien Potencier - Twig Team - Armin Ronacher</author>
           <license_type>BSD-3-Clause</license_type>
           <text><![CDATA[
-  Copyright (c) 2009-2019 by the Twig Team.
-
-Some rights reserved.
+  Copyright (c) 2009-2020 by the Twig Team.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are